diff --git a/calendar/csv_import.php b/calendar/csv_import.php
new file mode 100644
index 0000000000..807e20fe40
--- /dev/null
+++ b/calendar/csv_import.php
@@ -0,0 +1,500 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - Calendar: CSV - Import                                    *
+  * http://www.phpgroupware.org                                              *
+  * Written 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$ */
+
+	$GLOBALS['phpgw_info']['flags'] = array(
+		'currentapp' => 'calendar',
+		'noheader'   => True
+	);
+	include('../header.inc.php');
+
+	if (!isset($GLOBALS['phpgw_info']['user']['apps']['admin']) ||
+	    !$GLOBALS['phpgw_info']['user']['apps']['admin'])		// no admin
+	{
+		$GLOBALS['phpgw']->redirect_link('/home.php');
+	}
+	if ($_POST['cancel'])
+	{
+		$GLOBALS['phpgw']->redirect_link('/admin/index.php');
+	}
+	$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Import CSV-File');
+	$GLOBALS['phpgw']->common->phpgw_header();
+
+	$GLOBALS['phpgw']->template->set_file(array('import_t' => 'csv_import.tpl'));
+	$GLOBALS['phpgw']->template->set_block('import_t','filename','filenamehandle');
+	$GLOBALS['phpgw']->template->set_block('import_t','fheader','fheaderhandle');
+	$GLOBALS['phpgw']->template->set_block('import_t','fields','fieldshandle');
+	$GLOBALS['phpgw']->template->set_block('import_t','ffooter','ffooterhandle');
+	$GLOBALS['phpgw']->template->set_block('import_t','imported','importedhandle');
+	$GLOBALS['phpgw']->template->set_block('import_t','import','importhandle');
+
+
+	// $GLOBALS['phpgw']->template->set_var("navbar_bg",$GLOBALS['phpgw_info']["theme"]["navbar_bg"]);
+	// $GLOBALS['phpgw']->template->set_var("navbar_text",$GLOBALS['phpgw_info']["theme"]["navbar_text"]);
+
+	$csvfile  = isset($_POST['csvfile']) ? $_POST['csvfile'] : $_FILES['csvfile']['tmp_name'];
+
+	if(($_POST['action'] == 'download' || $_POST['action'] == 'continue') && (!$_POST['fieldsep'] || !$csvfile || !($fp=fopen($csvfile,'rb'))))
+	{
+		$_POST['action'] = '';
+	}
+	$GLOBALS['phpgw']->template->set_var("action_url",$GLOBALS['phpgw']->link("/calendar/csv_import.php"));
+
+	$PSep = '||'; // Pattern-Separator, separats the pattern-replacement-pairs in trans
+	$ASep = '|>'; // Assignment-Separator, separats pattern and replacesment
+	$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
+
+function addr_id( $n_family,$n_given,$org_name )
+{		// find in Addressbook, at least n_family AND (n_given OR org_name) have to match
+	$contacts = createobject('phpgwapi.contacts');
+
+	$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given,org_name=$org_name" );
+	if (!count($addrs))
+		$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given" );
+	if (!count($addrs))
+		$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,org_name=$org_name" );
+
+	if (count($addrs))
+		return $addrs[0]['id'];
+
+	return False;
+}
+
+$cat2id = array( );
+
+function cat_id($cats)
+{
+	if (!$cats)
+	{
+		return '';
+	}
+
+	$cats = split('[,;]',$cats);
+
+	foreach($cats as $k => $cat)
+	{
+		if (isset($cat2id[$cat]))
+		{
+			$ids[$cat] = $cat2id[$cat];	// cat is in cache
+		}
+		else
+		{
+			if (!is_object($GLOBALS['phpgw']->categories))
+			{
+				$GLOBALS['phpgw']->categories = createobject('phpgwapi.categories');
+			}
+			if ($id = $GLOBALS['phpgw']->categories->name2id( addslashes($cat) ))
+			{	// cat exists
+				$cat2id[$cat] = $ids[$cat] = $id;
+			}
+			else
+			{	// create new cat
+				$GLOBALS['phpgw']->categories->add( array('name' => $cat,'descr' => $cat ));
+				$cat2id[$cat] = $ids[$cat] = $GLOBALS['phpgw']->categories->name2id( addslashes($cat) );
+			}
+		}
+	}
+	$id_str = implode( ',',$ids );
+
+	if (count($ids) > 1)		// multiple cats need to be in ','
+	{
+		$id_str = ",$id_str,";
+	}
+	return  $id_str;
+}
+
+	if (!is_object($GLOBALS['phpgw']->html))
+	{
+		$GLOBALS['phpgw']->html = CreateObject('phpgwapi.html');
+	}
+
+	if ($_POST['next']) $_POST['action'] = 'next';
+	switch ($_POST['action'])
+	{
+	case '':	// Start, ask Filename
+		$GLOBALS['phpgw']->template->set_var('lang_csvfile',lang('CSV-Filename'));
+		$GLOBALS['phpgw']->template->set_var('lang_fieldsep',lang('Fieldseparator'));
+		$GLOBALS['phpgw']->template->set_var('lang_charset',lang('Charset of file'));
+		$GLOBALS['phpgw']->template->set_var('select_charset',
+			$GLOBALS['phpgw']->html->select('charset','',
+			$GLOBALS['phpgw']->translation->get_installed_charsets()+
+			array('utf-8' => 'utf-8 (Unicode)'),True));
+		$GLOBALS['phpgw']->template->set_var('fieldsep',$_POST['fieldsep'] ? $_POST['fieldsep'] : ',');
+		$GLOBALS['phpgw']->template->set_var('submit',lang('Import'));
+		$GLOBALS['phpgw']->template->set_var('csvfile',$csvfile);
+		$GLOBALS['phpgw']->template->set_var('enctype','ENCTYPE="multipart/form-data"');
+		$hiddenvars .= '<input type="hidden" name="action" value="download">'."\n";
+
+		$GLOBALS['phpgw']->template->parse('rows','filename');
+		break;
+
+	case 'continue':
+	case 'download':
+		$GLOBALS['phpgw']->preferences->read_repository();
+		$defaults = $GLOBALS['phpgw_info']['user']['preferences']['calendar']['cvs_import'];
+		if (!is_array($defaults))
+		{
+			$defaults = array();
+		}
+		$GLOBALS['phpgw']->template->set_var('lang_csv_fieldname',lang('CSV-Fieldname'));
+		$GLOBALS['phpgw']->template->set_var('lang_info_fieldname',lang('calendar-Fieldname'));
+		$GLOBALS['phpgw']->template->set_var('lang_translation',lang("Translation").' <a href="#help">'.lang('help').'</a>');
+		$GLOBALS['phpgw']->template->set_var('submit',
+			$GLOBALS['phpgw']->html->submit_button('convert','Import') . '&nbsp;'.
+			$GLOBALS['phpgw']->html->submit_button('cancel','Cancel'));
+		$GLOBALS['phpgw']->template->set_var('lang_debug',lang('Test Import (show importable records <u>only</u> in browser)'));
+		$GLOBALS['phpgw']->template->parse('rows','fheader');
+
+		$cal_names = array(
+			'title'		=> 'Title varchar(80)',
+			'description' => 'Description text',
+			'location'	=> 'Location varchar(255)',
+			'start'	=> 'Start Date: start: Timestamp or eg. YYYY-MM-DD hh:mm',
+			'end'	=> 'End Date: start',
+			'participants' => 'Participants: comma separated user-id\'s or -names',
+			'category' 	=> 'Categories: id\'s or names, comma separated (new ones got created)',
+			'priority'  => 'Priority: 1=Low, 2=Normal, 3=High',
+			'public'	=> 'Access: 1=public, 0=private',
+			'owner'		=> 'Owner: int(11) user-id/-name',
+			'modtime' => 'Modification date',
+//			'groups' 	=> 'Groups (dont know what this field is for)',
+//			'cal_type'	=> 'cal_type: single_event=E (default) else M',
+		);
+
+		// the next line is used in the help-text too
+		$mktime_lotus = "${PSep}0?([0-9]+)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*).*$ASep@mktime(${VPre}4,${VPre}5,${VPre}6,${VPre}2,${VPre}3,${VPre}1)";
+
+		$cal_name_options = "<option value=\"\">none\n";
+		foreach($cal_names as $field => $name) 
+		{
+			$cal_name_options .= "<option value=\"$field\">".$GLOBALS['phpgw']->strip_html($name)."\n";
+		}
+		$csv_fields = fgetcsv($fp,8000,$_POST['fieldsep']);
+		$csv_fields = $GLOBALS['phpgw']->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';
+		foreach($csv_fields as $csv_idx => $csv_field) 
+		{
+			$GLOBALS['phpgw']->template->set_var('csv_field',$csv_field);
+			$GLOBALS['phpgw']->template->set_var('csv_idx',$csv_idx);
+			if ($def = $defaults[$csv_field]) 
+			{
+				list( $info,$trans ) = explode($PSep,$def,2);
+				$GLOBALS['phpgw']->template->set_var('trans',$trans);
+				$GLOBALS['phpgw']->template->set_var('cal_fields',str_replace('="'.$info.'">','="'.$info.'" selected>',$cal_name_options));
+			} 
+			else 
+			{
+				$GLOBALS['phpgw']->template->set_var('trans','');
+				$GLOBALS['phpgw']->template->set_var('cal_fields',$cal_name_options);
+			}
+			$GLOBALS['phpgw']->template->parse('rows','fields',True);
+		}
+		$GLOBALS['phpgw']->template->set_var('lang_start',lang('Startrecord'));
+		$GLOBALS['phpgw']->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'):
+			lang('empty for all');
+		$GLOBALS['phpgw']->template->set_var('lang_max',lang('Number of records to read (%1)',$msg));
+		$GLOBALS['phpgw']->template->set_var('max',get_var('max',array('POST'),$safe_mode ? 200 : ''));
+		$GLOBALS['phpgw']->template->set_var('debug',get_var('debug',array('POST'),True)?' checked':'');
+		$GLOBALS['phpgw']->template->parse('rows','ffooter',True);
+		fclose($fp);
+		if ($_POST['action'] == 'download')
+		{
+			$old = $csvfile; $csvfile = $GLOBALS['phpgw_info']['server']['temp_dir'].'/info_log_import_'.basename($csvfile);
+			rename($old,$csvfile);
+		}
+		$hiddenvars = $GLOBALS['phpgw']->html->input_hidden(array(
+			'action'  => 'import',
+			'fieldsep'=> $_POST['fieldsep'],
+			'csvfile' => $csvfile,
+			'charset' => $_POST['charset']
+		));
+		$help_on_trans = 	"<a name=\"help\"></a><b>How to use Translation's</b><p>".
+			"Translations enable you to change / adapt the content of each CSV field for your needs. <br>".
+			"General syntax is: <b>pattern1 ${ASep} replacement1 ${PSep} ... ${PSep} patternN ${ASep} replacementN</b><br>".
+			"If the pattern-part of a pair is ommited it will match everything ('^.*$'), which is only ".
+			"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 CVS 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). ".
+			"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>.<p>".
+			"Example using regular expressions and '@'-eval(): <br><b>$mktime_lotus</b><br>".
+			"It will read a date of the form '2001-05-20 08:00:00.00000000000000000' (and many more, see the regular expr.). ".
+			"The&nbsp;[&nbsp;.:-]-separated fields are read and assigned in different order to @mktime(). Please note to use ".
+			"${VPre} insted of a backslash (I couldn't get backslash through all the involved templates and forms.) ".
+			"plus the field-number of the pattern.<p>".
+			"In addintion to the fields assign by the pattern of the reg.exp. you can use all other CSV-fields, with the ".
+			"syntax <b>${CPre}CVS-FIELDNAME$CPos</b>. Here is an example: <br>".
+			"<b>.+$ASep${CPre}Company$CPos: ${CPre}NFamily$CPos, ${CPre}NGiven$CPos$PSep${CPre}NFamily$CPos, ${CPre}NGiven$CPos</b><br>".
+			"It is used on the CVS-field 'Company' and constructs a something like <i>Company: FamilyName, GivenName</i> or ".
+			"<i>FamilyName, GivenName</i> if 'Company' is empty.<p>".
+			"You can use the 'No CVS #'-fields to assign cvs-values to more than on field, the following example uses the ".
+			"cvs-field 'Note' (which gots already assingned to the description) and construct a short subject: ".
+			"<b>@substr(${CPre}Note$CPos,0,60).' ...'</b><p>".
+			"Their is two important user-function for the calendar:<br>".
+			"<b>@addr_id(${CPre}NFamily$CPos,${CPre}NGiven$CPos,${CPre}Company$CPos)</b> ".
+			"searches the addressbook for an address and returns the id if it founds an exact match of at least ".
+			"<i>NFamily</i> AND (<i>NGiven</i> OR <i>Company</i>). This is necessary to link your imported calendar-entrys ".
+			"with the addressbook.<br>".
+			"<b>@cat_id(Cat1,...,CatN)</b> returns a (','-separated) list with the cat_id's. If a category isn't found, it ".
+			"will be automaticaly added.<p>".
+			"I hope that helped to understand the features, if not <a href='mailto:RalfBecker@outdoor-training.de'>ask</a>.";
+
+		$GLOBALS['phpgw']->template->set_var('help_on_trans',lang($help_on_trans));	// I don't think anyone will translate this
+		break;
+
+	case 'next':
+		$_POST['cal_fields'] = unserialize(stripslashes($_POST['cal_fields']));
+		$_POST['trans']       = unserialize(stripslashes($_POST['trans']));
+		// fall-through
+	case 'import':
+		$hiddenvars = $GLOBALS['phpgw']->html->input_hidden(array(
+			'action'  => 'continue',
+			'fieldsep'=> $_POST['fieldsep'],
+			'csvfile' => $csvfile,
+			'charset' => $_POST['charset'],
+			'start'   => $_POST['start']+(!$_POST['debug'] ? $_POST['max'] : 0),
+			'max'     => $_POST['max'],
+			'debug'   => $_POST['debug'],
+			'cal_fields' => $_POST['cal_fields'],
+			'trans'   => $_POST['trans']
+		));
+		@set_time_limit(0);
+		$fp=fopen($_POST['csvfile'],'r');
+		$csv_fields = fgetcsv($fp,8000,$_POST['fieldsep']);
+		$csv_fields = $GLOBALS['phpgw']->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';
+
+		$cal_fields = array_diff($_POST['cal_fields'],array( '' ));	// throw away empty / not assigned entrys
+
+		$defaults = array();
+		foreach($cal_fields as $csv_idx => $info)
+		{	// convert $trans[$csv_idx] into array of pattern => value
+			$defaults[$csv_fields[$csv_idx]] = $info;
+			if ($_POST['trans'][$csv_idx])
+			{
+				$defaults[$csv_fields[$csv_idx]] .= $PSep.addslashes($_POST['trans'][$csv_idx]);
+			}
+		}
+
+		$GLOBALS['phpgw']->preferences->read_repository();
+		$GLOBALS['phpgw']->preferences->add('calendar','cvs_import',$defaults);
+		$GLOBALS['phpgw']->preferences->save_repository(True);
+
+		$log = "<table border=1>\n\t<tr><td>#</td>\n";
+
+		foreach($cal_fields as $csv_idx => $info)
+		{	// convert $trans[$csv_idx] into array of pattern => value
+			// if (!$debug) echo "<p>$csv_idx: ".$csv_fields[$csv_idx].": $info".($trans[$csv_idx] ? ': '.$trans[$csv_idx] : '')."</p>";
+			$pat_reps = explode($PSep,stripslashes($_POST['trans'][$csv_idx]));
+			$replaces = ''; $values = '';
+			if ($pat_reps[0] != '') 
+			{
+				foreach($pat_reps as $k => $pat_rep) 
+				{
+					list($pattern,$replace) = explode($ASep,$pat_rep,2);
+					if ($replace == '') 
+					{ 
+						$replace = $pattern; $pattern = '^.*$'; 
+					}
+					$values[$pattern] = $replace;	// replace two with only one, added by the form
+					$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";
+		}
+/* maybe later ;-)
+		if (!in_array('cal_type',$cal_fields))	// autocreate single event if not set by user
+		{
+			$log .= "\t\t<td><b>recureing</b></td>\n";
+		}
+*/
+		$start = $_POST['start'] < 1 ? 1 : $_POST['start'];
+
+		// ignore empty lines, is_null($fields[0]) is returned on empty lines !!!
+		for($i = 1; $i < $start; ++$i) 	// overread lines before our start-record
+		{
+			while(($fields = fgetcsv($fp,8000,$_POST['fieldsep'])) && is_null($fields[0])) ;
+		}
+		for($anz = 0; !$_POST['max'] || $anz < $_POST['max']; ++$anz)
+		{
+			while(($fields = fgetcsv($fp,8000,$_POST['fieldsep'])) && is_null($fields[0])) ;
+			if (!$fields)
+			{
+				break;	// EOF
+			}
+			$fields = $GLOBALS['phpgw']->translation->convert($fields,$_POST['charset']);
+
+			$log .= "\t</tr><tr><td>".($start+$anz)."</td>\n";
+
+			$values = array();
+			foreach($cal_fields as $csv_idx => $info)
+			{
+				//echo "<p>$csv: $info".($trans[$csv] ? ': '.$trans[$csv] : '')."</p>";
+				$val = $fields[$csv_idx];
+				if (isset($trans[$csv_idx]))
+				{
+					$trans_csv = $trans[$csv_idx];
+					while (list($pattern,$replace) = each($trans_csv))
+					{
+						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 "'$val'</p>";
+
+							$reg = $CPreReg.'([a-zA-Z_0-9]+)'.$CPosReg;
+							while (ereg($reg,$val,$vars))
+							{	// expand all CSV fields
+								$val = str_replace($CPre.$vars[1].$CPos,$val[0] == '@' ? "'".addslashes($fields[array_search($vars[1],$csv_fields)])."'" : $fields[array_search($vars[1],$csv_fields)],$val);
+							}
+							if ($val[0] == '@')
+							{
+								// removing the $ to close security hole of showing vars, which contain eg. passwords
+								$val = 'return '.substr(str_replace('$','',$val),1).';';
+								// echo "<p>eval('$val')=";
+								$val = eval($val);
+								// echo "'$val'</p>";
+							}
+							if ($pattern[0] != '@' || $val)
+								break;
+						}
+					}
+				}
+				$values[$info] = $val;
+
+				$log .= "\t\t<td>$val</td>\n";
+			}
+			if (!in_array('public',$cal_fields))
+			{
+				$values['public'] = 1;	// public access if not set by user
+				$log .= "\t\t<td>".$values['public']."</td>\n";
+			}
+/* maybe later ;-)
+			if (!in_array('cal_type',$cal_fields))
+			{
+				$values['cal_type'] = 'E';	// single event if not set by user
+				$log .= "\t\t<td>".$values['cal_type']."</td>\n";
+			}
+*/
+			if(!$_POST['debug'] && count($values))	// dont import empty contacts
+			{
+				//echo "values=<pre>".print_r($values,True)."</pre>\n";
+				if (!is_numeric($values['owner']))
+				{
+					$values['owner'] = $GLOBALS['phpgw']->accounts->name2id($values['owner']);
+				}
+				if (!$values['owner'] || !$GLOBALS['phpgw']->accounts->exists($values['owner']))
+				{
+					$values['owner'] = $GLOBALS['phpgw_info']['user']['account_id'];
+				}
+				if (!is_object($calendar))
+				{
+					$calendar = createobject('calendar.socalendar',array());
+					$cal_owner = False;
+				}
+				if ($cal_owner != $values['owner'])
+				{
+					$calendar->open_box($cal_owner = $values['owner']);
+				}
+				// echo "<p>adding: ".dump_array($values)."</p>\n";
+				$calendar->event_init();		// set some reasonable defaults
+				$calendar->set_recur_none();
+
+				if ($values['priority'] < 1 || $values['priority'] > 3)
+				{
+					$values['priority'] = 2;
+				}
+				// convert the category name to an id
+				if ($values['category'] && !is_numeric($values['category']))
+				{
+					$values['category'] = cat_id($values['category']);
+				}
+				if (empty($values['title']))
+				{
+					$values['title'] = '('.lang('none').')';
+				}
+				foreach(array('owner','title','description','location','category','priority','public') as $name)
+				{
+					$calendar->add_attribute($name,$values[$name]);
+				}
+
+				if (!isset($values['modtime'])) $values['modtime'] = $values['start'];
+				// convert dates to timestamps
+				foreach(array('start','end','modtime') as $date)
+				{
+					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]{2}).([0-9]{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]);
+					}
+					$datearr = $GLOBALS['phpgw']->datetime->localdates($values[$date]);
+					$calendar->set_date($date,$datearr['year'],$datearr['month'],$datearr['day'],
+						$datearr['hour'],$datearr['minute'],$datearr['second']);
+				}
+				// convert participants-names to user-id's
+				$parts = isset($values['participants']) ? split('[,;]',$values['participants']) : array($values['owner'].'=A');
+echo "<p>parts=".print_r($parts,True)."</p>\n";
+				foreach($parts as $part_status)
+				{
+					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['phpgw']->accounts->exists($part))
+					{
+						$part = $GLOBALS['phpgw']->accounts->name2id($part);
+					}
+					if ($part)
+					{echo "<p>add_attribute('participants','$status','$part')</p>\n";
+						$calendar->add_attribute('participants',$status,$part);
+					}
+				}
+				//echo "add_entry(<pre>".print_r($calendar->cal->event,True).")</pre>\n";
+				$calendar->add_entry( $calendar->cal->event );
+			}
+		}
+		$log .= "\t</tr>\n</table>\n";
+
+		$GLOBALS['phpgw']->template->set_var('anz_imported',($_POST['debug'] ?
+			lang('%1 records read (not yet imported, you may go back and uncheck Test Import)',
+			$anz,'','') :
+			lang('%1 records imported',$anz)). '&nbsp;'.
+			(!$_POST['debug'] && $fields ? $GLOBALS['phpgw']->html->submit_button('next','Import next set') . '&nbsp;':'').
+			$GLOBALS['phpgw']->html->submit_button('continue','Back') . '&nbsp;'.
+			$GLOBALS['phpgw']->html->submit_button('cancel','Cancel'));
+		$GLOBALS['phpgw']->template->set_var('log',$log);
+		$GLOBALS['phpgw']->template->parse('rows','imported');
+		break;
+	}
+	$GLOBALS['phpgw']->template->set_var('hiddenvars',str_replace('{','&#x7B;',$hiddenvars));
+	$GLOBALS['phpgw']->template->pfp('phpgw_body','import');
+	$GLOBALS['phpgw']->common->phpgw_footer();
+
+?>
diff --git a/calendar/inc/class.socalendar_sql.inc.php b/calendar/inc/class.socalendar_sql.inc.php
index 1751cb4ac8..310c1729a9 100755
--- a/calendar/inc/class.socalendar_sql.inc.php
+++ b/calendar/inc/class.socalendar_sql.inc.php
@@ -600,7 +600,7 @@ class socalendar_ extends socalendar__
 			}
 			$this->stream->query('INSERT INTO phpgw_cal(uid,title,owner,priority,is_public,category) '
 				. "values('".$event['uid']."','".$this->stream->db_addslashes($event['title'])
-				. "',".$event['owner'].','.$event['priority'].','.$event['public'].",'"
+				. "',".intval($event['owner']).','.intval($event['priority']).','.intval($event['public']).",'"
 				. $event['category']."')",__LINE__,__FILE__);
 			$event['id'] = $this->stream->get_last_insert_id('phpgw_cal','cal_id');
 		}
@@ -619,24 +619,24 @@ class socalendar_ extends socalendar__
 		}
 
 		$sql = 'UPDATE phpgw_cal SET '
-				. 'owner='.$event['owner'].', '
-				. 'datetime='.$date.', '
-				. 'mdatetime='.$today.', '
-				. 'edatetime='.$enddate.', '
-				. 'priority='.$event['priority'].', '
-				. "category='".$event['category']."', "
-				. "cal_type='".$type."', "
-				. 'is_public='.$event['public'].', '
+				. 'owner='.intval($event['owner']).', '
+				. 'datetime='.intval($date).', '
+				. 'mdatetime='.intval($today).', '
+				. 'edatetime='.intval($enddate).', '
+				. 'priority='.intval($event['priority']).', '
+				. "category='".$this->stream->db_addslashes($event['category'])."', "
+				. "cal_type='".$this->stream->db_addslashes($type)."', "
+				. 'is_public='.intval($event['public']).', '
 				. "title='".$this->stream->db_addslashes($event['title'])."', "
 				. "description='".$this->stream->db_addslashes($event['description'])."', "
 				. "location='".$this->stream->db_addslashes($event['location'])."', "
 				. ($event['groups']?"groups='".(count($event['groups'])>1?implode(',',$event['groups']):','.$event['groups'][0].',')."', ":'')
-				. 'reference='.$event['reference'].' '
-				. 'WHERE cal_id='.$event['id'];
+				. 'reference='.intval($event['reference']).' '
+				. 'WHERE cal_id='.intval($event['id']);
 				
 		$this->stream->query($sql,__LINE__,__FILE__);
 		
-		$this->stream->query('DELETE FROM phpgw_cal_user WHERE cal_id='.$event['id'],__LINE__,__FILE__);
+		$this->stream->query('DELETE FROM phpgw_cal_user WHERE cal_id='.intval($event['id']),__LINE__,__FILE__);
 
 		@reset($event['participants']);
 		while (list($key,$value) = @each($event['participants']))
@@ -646,7 +646,7 @@ class socalendar_ extends socalendar__
 				$value = 'A';
 			}
 			$this->stream->query('INSERT INTO phpgw_cal_user(cal_id,cal_login,cal_status) '
-				. 'VALUES('.$event['id'].','.intval($key).",'".$value."')",__LINE__,__FILE__);
+				. 'VALUES('.intval($event['id']).','.intval($key).",'".$this->stream->db_addslashes($value)."')",__LINE__,__FILE__);
 		}
 
 		if($event['recur_type'] != MCAL_RECUR_NONE)
@@ -660,19 +660,19 @@ class socalendar_ extends socalendar__
 				$end = 0;
 			}
 
-			$this->stream->query('SELECT count(cal_id) FROM phpgw_cal_repeats WHERE cal_id='.$event['id'],__LINE__,__FILE__);
+			$this->stream->query('SELECT count(cal_id) FROM phpgw_cal_repeats WHERE cal_id='.intval($event['id']),__LINE__,__FILE__);
 			$this->stream->next_record();
 			$num_rows = $this->stream->f(0);
 			if($num_rows == 0)
 			{
 				$this->stream->query('INSERT INTO phpgw_cal_repeats(cal_id,recur_type,recur_enddate,recur_data,recur_interval) '
-					.'VALUES('.$event['id'].','.$event['recur_type'].','.$end.','.$event['recur_data'].','.$event['recur_interval'].')',__LINE__,__FILE__);
+					.'VALUES('.intval($event['id']).','.$event['recur_type'].','.intval($end).','.$event['recur_data'].','.$event['recur_interval'].')',__LINE__,__FILE__);
 			}
 			else
 			{
 				$this->stream->query('UPDATE phpgw_cal_repeats '
 					. 'SET recur_type='.$event['recur_type'].', '
-					. 'recur_enddate='.$end.', '
+					. 'recur_enddate='.intval($end).', '
 					. 'recur_data='.$event['recur_data'].', '
 					. 'recur_interval='.$event['recur_interval'].', '
 					. "recur_exception='".(count($event['recur_exception'])>1?implode(',',$event['recur_exception']):(count($event['recur_exception'])==1?$event['recur_exception'][0]:''))."' "
diff --git a/calendar/inc/hook_admin.inc.php b/calendar/inc/hook_admin.inc.php
index bd2794cd8b..e411a324ce 100755
--- a/calendar/inc/hook_admin.inc.php
+++ b/calendar/inc/hook_admin.inc.php
@@ -18,6 +18,7 @@
 		'Site Configuration' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname),
 		'Custom fields and sorting' => $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicustom_fields.index'),
 		'Calendar Holiday Management' => $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uiholiday.admin'),
+		'Import CSV-File' => $GLOBALS['phpgw']->link('/calendar/csv_import.php'),
 		'Global Categories' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=calendar')
 	);
 //Do not modify below this line
diff --git a/calendar/inc/hook_sidebox_menu.inc.php b/calendar/inc/hook_sidebox_menu.inc.php
index b78e71658b..bb1d2c720e 100644
--- a/calendar/inc/hook_sidebox_menu.inc.php
+++ b/calendar/inc/hook_sidebox_menu.inc.php
@@ -56,6 +56,7 @@
 			'Configuration'=>$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=calendar'),
 			'Custom Fields'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicustom_fields.index'),
 			'Holiday Management'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uiholiday.admin'),
+			'Import CSV-File' => $GLOBALS['phpgw']->link('/calendar/csv_import.php'),
 			'Global Categories' =>$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=calendar'),
 		);
 		display_sidebox($appname,$menu_title,$file);
diff --git a/calendar/setup/phpgw_de.lang b/calendar/setup/phpgw_de.lang
index 9fb2686740..41cee4cfca 100644
--- a/calendar/setup/phpgw_de.lang
+++ b/calendar/setup/phpgw_de.lang
@@ -42,6 +42,7 @@ calendar-fieldname	calendar	de	Kalender Feldname
 canceled	calendar	de	Abgesagt
 change all events for $params['old_owner'] to $params['new_owner'].	calendar	de	Ändere alle Termine für $params['old_owner'] auf $params['new_owner'].
 change status	calendar	de	Zusage ändern
+charset of file	calendar	de	Zeichensatz der Datei
 choose the category	calendar	de	Kategorie auswählen
 click %1here%2 to return to the calendar.	calendar	de	%1Hier%2 klicken um zum Kalender zurück zu kehren.
 configuration	calendar	de	Konfiguration
@@ -87,6 +88,7 @@ edit series	calendar	de	Serie bearbeiten
 edit single	calendar	de	Einzel bearbeiten
 email notification	calendar	de	Benachrichtigung per Email
 email notification for %1	calendar	de	Benachrichtigung per Email für %1
+empty for all	calendar	de	leer für alle
 enable	calendar	de	Einschalten
 enabled	calendar	de	eingeschaltet
 end date/time	calendar	de	Enddatum/-zeit
@@ -131,7 +133,7 @@ ical / rfc2445	calendar	de	iCal / RFC2445
 if checked holidays falling on a weekend, are taken on the monday after.	calendar	de	Wenn ausgewählt werden Feiertage die auf ein Wochenende fallen, am drauffolgenden Montag nachgeholt.
 ignore conflict	calendar	de	Konflikt ignorieren
 import	calendar	de	Importieren
-import csv-file into calendar	calendar	de	CSV-Datei in den Kalender importieren
+import csv-file	calendar	de	CSV-Datei importieren
 interval	calendar	de	Interval
 intervals in day view	calendar	de	Zeitintervalle in der Tagesansicht
 intervals per day in planner view	calendar	de	Zeitintervalle pro Tag in der Planeransicht
@@ -169,7 +171,7 @@ notification messages for your alarms	calendar	de	Benachrichtigungstext f
 notification messages for your responses	calendar	de	Benachrichtigungstext für ihre Antworten
 number of intervals per day in planner view	calendar	de	Anzahl Intervale pro Tag im Planer
 number of months	calendar	de	Anzahl Monate
-number of records to read (<=200)	calendar	de	Anzeil Datensätze zu lesen (<= 200)
+number of records to read (%1)	calendar	de	Anzeil Datensätze zu lesen (%1)
 observance rule	calendar	de	Observance Rule
 occurence	calendar	de	Wiederholung
 old startdate	calendar	de	Altes Startdatum
@@ -293,6 +295,7 @@ thu	calendar	de	Do
 title	calendar	de	Titel
 title of the event	calendar	de	Titel des Termin
 title-row	calendar	de	Titelzeile
+to many might exceed your execution-time-limit	calendar	de	zu viele können ihre Laufzeitbeschränkung überschreiten
 to-firstname	calendar	de	An-Vorname
 to-fullname	calendar	de	An-Name
 to-lastname	calendar	de	An-Nachname
diff --git a/calendar/setup/phpgw_en.lang b/calendar/setup/phpgw_en.lang
index a868176115..3d073b50e7 100644
--- a/calendar/setup/phpgw_en.lang
+++ b/calendar/setup/phpgw_en.lang
@@ -41,6 +41,7 @@ calendar-fieldname	calendar	en	Calendar-Fieldname
 canceled	calendar	en	Canceled
 change all events for $params['old_owner'] to $params['new_owner'].	calendar	en	Change all events for $params['old_owner'] to $params['new_owner'].
 change status	calendar	en	Change Status
+charset of file	calendar	en	Charset of file
 click %1here%2 to return to the calendar.	calendar	en	Click %1here%2 to return to the calendar.
 configuration	calendar	en	Configuration
 countries	calendar	en	Countries
@@ -81,6 +82,7 @@ edit series	calendar	en	Edit Series
 edit single	calendar	en	Edit Single
 email notification	calendar	en	Email Notification
 email notification for %1	calendar	en	Email Notification for %1
+empty for all	calendar	en	empty for all
 enable	calendar	en	Enable
 enabled	calendar	en	enabled
 end date/time	calendar	en	End Date/Time
@@ -124,7 +126,7 @@ ical / rfc2445	calendar	en	iCal / rfc2445
 if checked holidays falling on a weekend, are taken on the monday after.	calendar	en	If checked holidays falling on a weekend, are taken on the monday after.
 ignore conflict	calendar	en	Ignore Conflict
 import	calendar	en	Import
-import csv-file into calendar	calendar	en	Import CSV-File into Calendar
+import csv-file	calendar	en	Import CSV-File
 interval	calendar	en	Interval
 intervals in day view	calendar	en	Intervals in day view
 intervals per day in planner view	calendar	en	Intervals per day in planner view
@@ -158,7 +160,7 @@ notification messages for your alarms	calendar	en	Notification messages for your
 notification messages for your responses	calendar	en	Notification messages for your responses
 number of intervals per day in planner view	calendar	en	Number of Intervals per Day in Planner View
 number of months	calendar	en	Number of months
-number of records to read (<=200)	calendar	en	Number of records to read (<=200)
+number of records to read (%1)	calendar	en	Number of records to read (%1)
 observance rule	calendar	en	Observance Rule
 occurence	calendar	en	Occurence
 old startdate	calendar	en	Old Startdate
@@ -264,6 +266,7 @@ thu	calendar	en	Thu
 title	calendar	en	Title
 title of the event	calendar	en	Title of the event
 title-row	calendar	en	Title-row
+to many might exceed your execution-time-limit	calendar	en	to many might exceed your execution-time-limit
 to-firstname	calendar	en	To-Firstname
 to-fullname	calendar	en	To-Fullname
 to-lastname	calendar	en	To-Lastname
diff --git a/calendar/templates/default/csv_import.tpl b/calendar/templates/default/csv_import.tpl
index 8d0faf4400..c6eda427c7 100644
--- a/calendar/templates/default/csv_import.tpl
+++ b/calendar/templates/default/csv_import.tpl
@@ -1,10 +1,3 @@
-<p class=action>{lang_cal_action}<br>
-<hr noshade width="98%" align="center" size="1">
-<center>
-
-		<FORM {enctype} action="{action_url}" method="post">
-      <TABLE>
-
 <!-- BEGIN filename -->
 	  		<TR>
 	    		<TD>{lang_csvfile}</td>
@@ -14,6 +7,12 @@
 				<td>{lang_fieldsep}</td>
 				<td><input name="fieldsep" size=1 value="{fieldsep}"></td>
 			</tr>
+			<tr>
+				<td>{lang_charset}</td>
+				<td>
+			{select_charset}
+				</td>
+			</tr>
 			<tr><td>&nbsp;</td>
 				<td><INPUT NAME="convert" TYPE="submit" VALUE="{submit}"></TD>
 			</TR>
@@ -22,7 +21,7 @@
 <!-- BEGIN fheader -->
 			<tr>
 				<td><b>{lang_csv_fieldname}</b></td>
-				<td><b>{lang_cal_fieldname}</b></td>
+				<td><b>{lang_info_fieldname}</b></td>
 				<td><b>{lang_translation}</b></td>
 			</tr>
 <!-- END fheader -->
@@ -37,29 +36,38 @@
 
 <!-- BEGIN ffooter -->
 			<tr>
-				<td rowspan=2 valign="middle"><br><INPUT NAME="convert" TYPE="submit" VALUE="{submit}"></TD>
-				<td colspan=2><br>
+				<td rowspan="2" valign="middle" nowrap><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><INPUT name="debug" type="checkbox" value="1" checked> {lang_debug}</td>
+				<td colspan="2"><INPUT name="debug" type="checkbox" value="1"{debug}> {lang_debug}</td>
 			</TR>
-			<tr><td colspan=3>&nbsp;<p>
+			<tr><td colspan="3">&nbsp;<p>
 				{help_on_trans}
-			</td></tr>			
+			</td></tr>
 <!-- END ffooter -->
 
 <!-- BEGIN imported -->
 			<tr>
 				<td colspan=2 align=center>
-					{log}<p>					
-					{anz_imported}					
+					{log}<p>
+					{anz_imported}
 				</td>
 			</TR>
 <!-- END imported -->
 
+<!-- BEGIN import -->
+<br><center>
+		<FORM {enctype} action="{action_url}" method="post">
+		<TABLE>
+
+		{rows}
+
 		</TABLE>
-		{hiddenvars}</form>
+		{hiddenvars}
+		</form>
 
 </CENTER>
+<!-- END import -->