diff --git a/calendar/csv_import.php b/calendar/csv_import.php
index 09e69b1d40..006c075f20 100644
--- a/calendar/csv_import.php
+++ b/calendar/csv_import.php
@@ -62,64 +62,70 @@
 	$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');
+	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" );
+		$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'];
+		if (count($addrs))
+		{
+			return $addrs[0]['id'];
+		}
 
-	return False;
-}
-
-$cat2id = array( );
-
-function cat_id($cats)
-{
-	if (!$cats)
-	{
-		return '';
+		return False;
 	}
 
-	$cats = split('[,;]',$cats);
+	$cat2id = array( );
 
-	foreach($cats as $k => $cat)
+	function cat_id($cats)
 	{
-		if (isset($cat2id[$cat]))
+		if (!$cats)
 		{
-			$ids[$cat] = $cat2id[$cat];	// cat is in cache
+			return '';
 		}
-		else
+
+		$cats = split('[,;]',$cats);
+
+		foreach($cats as $k => $cat)
 		{
-			if (!is_object($GLOBALS['phpgw']->categories))
+			if (isset($cat2id[$cat]))
 			{
-				$GLOBALS['phpgw']->categories = createobject('phpgwapi.categories');
-			}
-			if ($id = $GLOBALS['phpgw']->categories->name2id( addslashes($cat) ))
-			{	// cat exists
-				$cat2id[$cat] = $ids[$cat] = $id;
+				$ids[$cat] = $cat2id[$cat];	// cat is in cache
 			}
 			else
-			{	// create new cat
-				$GLOBALS['phpgw']->categories->add( array('name' => $cat,'descr' => $cat ));
-				$cat2id[$cat] = $ids[$cat] = $GLOBALS['phpgw']->categories->name2id( addslashes($cat) );
+			{
+				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 );
+		$id_str = implode( ',',$ids );
 
-	if (count($ids) > 1)		// multiple cats need to be in ','
-	{
-		$id_str = ",$id_str,";
+		if (count($ids) > 1)		// multiple cats need to be in ','
+		{
+			$id_str = ",$id_str,";
+		}
+		return  $id_str;
 	}
-	return  $id_str;
-}
 
 	if (!is_object($GLOBALS['phpgw']->html))
 	{
@@ -168,12 +174,12 @@ function cat_id($cats)
 			'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)',
+			'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)',
+			'modtime'	=> 'Modification date',
+//			'groups'	=> 'Groups (dont know what this field is for)',
 //			'cal_type'	=> 'cal_type: single_event=E (default) else M',
 		);
 
@@ -181,26 +187,26 @@ function cat_id($cats)
 		$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) 
+		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 1';					// eg. for static assignments
 		$csv_fields[] = 'no CSV 2';
 		$csv_fields[] = 'no CSV 3';
-		foreach($csv_fields as $csv_idx => $csv_field) 
+		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]) 
+			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 
+			}
+			else
 			{
 				$GLOBALS['phpgw']->template->set_var('trans','');
 				$GLOBALS['phpgw']->template->set_var('cal_fields',$cal_name_options);
@@ -222,7 +228,7 @@ function cat_id($cats)
 			'fieldsep'=> $_POST['fieldsep'],
 			'charset' => $_POST['charset']
 		));
-		$help_on_trans = 	"<a name=\"help\"></a><b>How to use Translation's</b><p>".
+		$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 ".
@@ -276,7 +282,7 @@ function cat_id($cats)
 		$fp=fopen($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 1';						// eg. for static assignments
 		$csv_fields[] = 'no CSV 2';
 		$csv_fields[] = 'no CSV 3';
 
@@ -303,14 +309,14 @@ function cat_id($cats)
 			// 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] != '') 
+			if ($pat_reps[0] != '')
 			{
-				foreach($pat_reps as $k => $pat_rep) 
+				foreach($pat_reps as $k => $pat_rep)
 				{
 					list($pattern,$replace) = explode($ASep,$pat_rep,2);
-					if ($replace == '') 
-					{ 
-						$replace = $pattern; $pattern = '^.*$'; 
+					if ($replace == '')
+					{
+						$replace = $pattern; $pattern = '^.*$';
 					}
 					$values[$pattern] = $replace;	// replace two with only one, added by the form
 					$replaces .= ($replaces != '' ? $PSep : '') . $pattern . $ASep . $replace;
@@ -334,7 +340,7 @@ function cat_id($cats)
 		$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
+		for($i = 1; $i < $start; ++$i)	// overread lines before our start-record
 		{
 			while(($fields = fgetcsv($fp,8000,$_POST['fieldsep'])) && is_null($fields[0])) ;
 		}
diff --git a/calendar/inc/class.boalarm.inc.php b/calendar/inc/class.boalarm.inc.php
index 8ec2a4f3d5..872fa49653 100755
--- a/calendar/inc/class.boalarm.inc.php
+++ b/calendar/inc/class.boalarm.inc.php
@@ -36,7 +36,7 @@
 
 		function boalarm()
 		{
-			$cal_id = (isset($_POST['cal_id'])?intval($_POST['cal_id']):'');
+			$cal_id = (isset($_POST['cal_id'])?(int)$_POST['cal_id']:'');
 			if($cal_id)
 			{
 				$this->cal_id = $cal_id;
@@ -71,7 +71,7 @@
 
 		function read_entry($cal_id)
 		{
-			return $this->bo->read_entry(intval($cal_id));
+			return $this->bo->read_entry((int)$cal_id);
 		}
 
 		/*!
@@ -168,7 +168,7 @@
 				{
 					return -1;
 				}
-				$alarm['enabled'] = intval(!$alarm['enabled']);
+				$alarm['enabled'] = (int)(!$alarm['enabled']);
 				if ($this->so->save_alarm($alarm['cal_id'],$alarm))
 				{
 					++$enabled;
diff --git a/calendar/inc/class.bocalendar.inc.php b/calendar/inc/class.bocalendar.inc.php
index 1334a81b7d..9883dbf681 100755
--- a/calendar/inc/class.bocalendar.inc.php
+++ b/calendar/inc/class.bocalendar.inc.php
@@ -111,11 +111,11 @@
 		var $cached_holidays;
 
 		var $g_owner = 0;
-		
+
 		var $filter;
 		var $cat_id;
 		var $users_timeformat;
-		
+
 		var $modified;
 		var $deleted;
 		var $added;
@@ -123,7 +123,7 @@
 		var $is_group = False;
 
 		var $soap = False;
-		
+
 		var $use_session = False;
 
 		var $today;
@@ -143,7 +143,7 @@
 				{
 					$this->debug_string = '';
 					ob_start();
-				}	
+				}
 
 				foreach($this->grants as $grantor => $rights)
 				{
@@ -166,13 +166,13 @@
 			$this->check_set_default_prefs();
 
 			$owner = get_var('owner',array('GET','POST'),$GLOBALS['owner']);
-			
+
 			ereg('menuaction=([a-zA-Z.]+)',$_SERVER['HTTP_REFERER'],$regs);
 			$from = $regs[1];
 			if ((substr($_SERVER['PHP_SELF'],-8) == 'home.php' && substr($this->prefs['calendar']['defaultcalendar'],0,7) == 'planner'
-				 || $_GET['menuaction'] == 'calendar.uicalendar.planner' &&
-				    $from  != 'calendar.uicalendar.planner' && !$this->save_owner)
-				 && intval($this->prefs['calendar']['planner_start_with_group']) > 0)
+				|| $_GET['menuaction'] == 'calendar.uicalendar.planner' &&
+				$from  != 'calendar.uicalendar.planner' && !$this->save_owner)
+				&& (int)$this->prefs['calendar']['planner_start_with_group'] > 0)
 			{
 				// entering planner for the first time ==> saving owner in save_owner, setting owner to default
 				//
@@ -180,11 +180,11 @@
 				$owner = 'g_'.$this->prefs['calendar']['planner_start_with_group'];
 			}
 			elseif ($_GET['menuaction'] != 'calendar.uicalendar.planner' &&
-			        $this->save_owner)
+				$this->save_owner)
 			{
 				// leaving planner with an unchanged user/owner ==> setting owner back to save_owner
 				//
-				$owner = intval(isset($_GET['owner']) ? $_GET['owner'] : $this->save_owner);
+				$owner = (int)(isset($_GET['owner']) ? $_GET['owner'] : $this->save_owner);
 				unset($this->save_owner);
 			}
 			elseif (!empty($owner) && $owner != $this->owner && $from == 'calendar.uicalendar.planner')
@@ -193,22 +193,22 @@
 				//
 				unset($this->save_owner);
 			}
-			
+
 			if(isset($owner) && $owner!='' && substr($owner,0,2) == 'g_')
 			{
 				$this->set_owner_to_group(substr($owner,2));
 			}
 			elseif(isset($owner) && $owner!='')
 			{
-				$this->owner = intval($owner);
+				$this->owner = (int)$owner;
 			}
 			elseif(!@isset($this->owner) || !@$this->owner)
 			{
-				$this->owner = intval($GLOBALS['phpgw_info']['user']['account_id']);
+				$this->owner = (int)$GLOBALS['phpgw_info']['user']['account_id'];
 			}
 			elseif(isset($this->owner) && $GLOBALS['phpgw']->accounts->get_type($this->owner) == 'g')
 			{
-				$this->set_owner_to_group(intval($this->owner));
+				$this->set_owner_to_group((int)$this->owner);
 			}
 
 			$this->prefs['common']    = $GLOBALS['phpgw_info']['user']['preferences']['common'];
@@ -226,7 +226,7 @@
 			$friendly = (isset($_GET['friendly'])?$_GET['friendly']:'');
 			$friendly = ($friendly=='' && isset($_POST['friendly'])?$_POST['friendly']:$friendly);
 
-			$this->printer_friendly = (intval($friendly) == 1?True:False);
+			$this->printer_friendly = ((int)$friendly == 1?True:False);
 
 			if(isset($_POST['filter'])) { $this->filter = $_POST['filter']; }
 			if(isset($_POST['sortby'])) { $this->sortby = $_POST['sortby']; }
@@ -239,7 +239,7 @@
 
 			if(!isset($this->sortby))
 			{
-			   $this->sortby = $this->prefs['calendar']['defaultcalendar'] == 'planner_user' ? 'user' : 'category';
+				$this->sortby = $this->prefs['calendar']['defaultcalendar'] == 'planner_user' ? 'user' : 'category';
 			}
 
 			if($GLOBALS['phpgw']->accounts->get_type($this->owner)=='g')
@@ -283,7 +283,7 @@
 				MCAL_RECUR_MONTHLY_MDAY	=> 'Monthly (by date)',
 				MCAL_RECUR_YEARLY	=> 'Yearly'
 			);
-			
+
 			$localtime = $GLOBALS['phpgw']->datetime->users_localtime;
 
 			$date = (isset($GLOBALS['date'])?$GLOBALS['date']:'');
@@ -304,9 +304,9 @@
 
 			if(isset($date) && $date!='')
 			{
-				$this->year = intval(substr($date,0,4));
-				$this->month = intval(substr($date,4,2));
-				$this->day = intval(substr($date,6,2));
+				$this->year  = (int)(substr($date,0,4));
+				$this->month = (int)(substr($date,4,2));
+				$this->day   = (int)(substr($date,6,2));
 			}
 			else
 			{
@@ -435,7 +435,7 @@
 		function set_owner_to_group($owner)
 		{
 			print_debug('calendar::bocalendar::set_owner_to_group:owner',$owner);
-			$this->owner = intval($owner);
+			$this->owner = (int)$owner;
 			$this->is_group = True;
 			$this->g_owner = Array();
 			$members = $GLOBALS['phpgw']->accounts->member($owner);
@@ -512,12 +512,12 @@
 			$this->filter = $data['filter'];
 			$this->cat_id = $data['cat_id'];
 			$this->sortby = $data['sortby'];
-			$this->owner  = intval($data['owner']);
-			$this->save_owner = intval($data['save_owner']);
-			$this->year   = intval($data['year']);
-			$this->month  = intval($data['month']);
-			$this->day    = intval($data['day']);
-			$this->num_months = intval($data['num_months']);
+			$this->owner  = (int)$data['owner'];
+			$this->save_owner = (int)$data['save_owner'];
+			$this->year   = (int)$data['year'];
+			$this->month  = (int)$data['month'];
+			$this->day    = (int)$data['day'];
+			$this->num_months = (int)$data['num_months'];
 			$this->return_to = $data['return_to'];
 		}
 
@@ -533,7 +533,7 @@
 				$event = $this->so->read_entry($id);
 				if(!isset($event['participants'][$this->owner]) && $this->user_is_a_member($event,$this->owner))
 				{
-					$this->so->add_attribute('participants','U',intval($this->owner));
+					$this->so->add_attribute('participants','U',(int)$this->owner);
 					$this->so->add_entry($event);
 					$event = $this->get_cached_event();
 				}
@@ -544,20 +544,20 @@
 
 		function delete_single($param)
 		{
-			if($this->check_perms(PHPGW_ACL_DELETE,intval($param['id'])))
+			if($this->check_perms(PHPGW_ACL_DELETE,(int)$param['id']))
 			{
 				$temp_event = $this->get_cached_event();
-				$event = $this->read_entry(intval($param['id']));
+				$event = $this->read_entry((int)$param['id']);
 //				if($this->owner == $event['owner'])
 //				{
 				$exception_time = mktime($event['start']['hour'],$event['start']['min'],0,$param['month'],$param['day'],$param['year']) - $GLOBALS['phpgw']->datetime->tz_offset;
-				$event['recur_exception'][] = intval($exception_time);
+				$event['recur_exception'][] = (int)$exception_time;
 				$this->so->cal->event = $event;
 //				print_debug('exception time',$event['recur_exception'][count($event['recur_exception']) -1]);
 //				print_debug('count event exceptions',count($event['recur_exception']));
 				$this->so->add_entry($event);
 				$cd = 16;
-				
+
 				$this->so->cal->event = $temp_event;
 				unset($temp_event);
 			}
@@ -600,17 +600,17 @@
 				{
 					while(list($key,$value) = each($params['reinstate_index']))
 					{
-						print_debug('reinstate_index ['.$key.']',intval($value));
-						print_debug('exception time',$event['recur_exception'][intval($value)]);
-						unset($event['recur_exception'][intval($value)]);
+						print_debug('reinstate_index ['.$key.']',(int)$value);
+						print_debug('exception time',$event['recur_exception'][(int)$value]);
+						unset($event['recur_exception'][(int)$value]);
 						print_debug('count event exceptions',count($event['recur_exception']));
-				 	}
+					}
 				}
 				else
 				{
-					print_debug('reinstate_index[0]',intval($params['reinstate_index'][0]));
-					print_debug('exception time',$event['recur_exception'][intval($params['reinstate_index'][0])]);
-					unset($event['recur_exception'][intval($params['reinstate_index'][0])]);
+					print_debug('reinstate_index[0]',(int)$params['reinstate_index'][0]);
+					print_debug('exception time',$event['recur_exception'][(int)$params['reinstate_index'][0]]);
+					unset($event['recur_exception'][(int)$params['reinstate_index'][0]]);
 					print_debug('count event exceptions',count($event['recur_exception']));
 				}
 				$this->so->cal->event = $event;
@@ -664,7 +664,7 @@
 		{
 			$type = $GLOBALS['phpgw']->accounts->get_type($this->owner);
 
-			if($type == 'g') 
+			if($type == 'g')
 			{
 				$members = $GLOBALS['phpgw']->acl->get_ids_for_location($this->owner, 1, 'phpgw_group');
 			}
@@ -808,7 +808,7 @@
 					$l_categories = 0;
 				}
 
-				$is_public = intval(isset($l_cal['public']) ? $l_cal['public'] : $l_cal['private'] == 'public');
+				$is_public = (int)(isset($l_cal['public']) ? $l_cal['public'] : $l_cal['private'] == 'public');
 				$this->so->event_init();
 				$this->add_attribute('uid',$l_cal['uid']);
 				if(count($l_categories) >= 2)
@@ -842,36 +842,36 @@
 					$l_recur_enddate = $this->jscal->input2date($l_recur_enddate['str'],False,'mday');
 				}
 
-				switch(intval($l_cal['recur_type']))
+				switch((int)$l_cal['recur_type'])
 				{
 					case MCAL_RECUR_NONE:
 						$this->so->set_recur_none();
 						break;
 					case MCAL_RECUR_DAILY:
-						$this->so->set_recur_daily(intval($l_recur_enddate['year']),intval($l_recur_enddate['month']),intval($l_recur_enddate['mday']),intval($l_cal['recur_interval']));
+						$this->so->set_recur_daily((int)$l_recur_enddate['year'],(int)$l_recur_enddate['month'],(int)$l_recur_enddate['mday'],(int)$l_cal['recur_interval']);
 						break;
 					case MCAL_RECUR_WEEKLY:
 						foreach(array('rpt_sun','rpt_mon','rpt_tue','rpt_wed','rpt_thu','rpt_fri','rpt_sat') as $rpt_day)
 						{
-							$l_cal['recur_data'] += intval($l_cal[$rpt_day]);
+							$l_cal['recur_data'] += (int)$l_cal[$rpt_day];
 						}
 						if (is_array($l_cal['rpt_day']))
 						{
 							foreach ($l_cal['rpt_day'] as $mask)
 							{
-								$l_cal['recur_data'] |= intval($mask);
+								$l_cal['recur_data'] |= (int)$mask;
 							}
 						}
-						$this->so->set_recur_weekly(intval($l_recur_enddate['year']),intval($l_recur_enddate['month']),intval($l_recur_enddate['mday']),intval($l_cal['recur_interval']),$l_cal['recur_data']);
+						$this->so->set_recur_weekly((int)$l_recur_enddate['year'],(int)$l_recur_enddate['month'],(int)$l_recur_enddate['mday'],(int)$l_cal['recur_interval'],$l_cal['recur_data']);
 						break;
 					case MCAL_RECUR_MONTHLY_MDAY:
-						$this->so->set_recur_monthly_mday(intval($l_recur_enddate['year']),intval($l_recur_enddate['month']),intval($l_recur_enddate['mday']),intval($l_cal['recur_interval']));
+						$this->so->set_recur_monthly_mday((int)$l_recur_enddate['year'],(int)$l_recur_enddate['month'],(int)$l_recur_enddate['mday'],(int)$l_cal['recur_interval']);
 						break;
 					case MCAL_RECUR_MONTHLY_WDAY:
-						$this->so->set_recur_monthly_wday(intval($l_recur_enddate['year']),intval($l_recur_enddate['month']),intval($l_recur_enddate['mday']),intval($l_cal['recur_interval']));
+						$this->so->set_recur_monthly_wday((int)$l_recur_enddate['year'],(int)$l_recur_enddate['month'],(int)$l_recur_enddate['mday'],(int)$l_cal['recur_interval']);
 						break;
 					case MCAL_RECUR_YEARLY:
-						$this->so->set_recur_yearly(intval($l_recur_enddate['year']),intval($l_recur_enddate['month']),intval($l_recur_enddate['mday']),intval($l_cal['recur_interval']));
+						$this->so->set_recur_yearly((int)$l_recur_enddate['year'],(int)$l_recur_enddate['month'],(int)$l_recur_enddate['mday'],(int)$l_cal['recur_interval']);
 						break;
 				}
 
@@ -882,23 +882,23 @@
 					$part = Array();
 					for($i=0;$i<count($parts);$i++)
 					{
-						if (($accept_type = substr($parts[$i],-1,1)) == '0' || intval($accept_type) > 0)
+						if (($accept_type = substr($parts[$i],-1,1)) == '0' || (int)$accept_type > 0)
 						{
 							$accept_type = 'U';
 						}
-						$acct_type = $GLOBALS['phpgw']->accounts->get_type(intval($parts[$i]));
+						$acct_type = $GLOBALS['phpgw']->accounts->get_type((int)$parts[$i]);
 						if($acct_type == 'u')
 						{
-							$part[intval($parts[$i])] = $accept_type;
+							$part[(int)$parts[$i]] = $accept_type;
 						}
 						elseif($acct_type == 'g')
 						{
-							$part[intval($parts[$i])] = $accept_type;
+							$part[(int)$parts[$i]] = $accept_type;
 							$groups[] = $parts[$i];
 							/* This pulls ALL users of a group and makes them as participants to the event */
 							/* I would like to turn this back into a group thing. */
-							$acct = CreateObject('phpgwapi.accounts',intval($parts[$i]));
-							$members = $acct->member(intval($parts[$i]));
+							$acct = CreateObject('phpgwapi.accounts',(int)$parts[$i]);
+							$members = $acct->member((int)$parts[$i]);
 							unset($acct);
 							if($members == False)
 							{
@@ -921,14 +921,14 @@
 					@reset($part);
 					while(list($key,$accept_type) = each($part))
 					{
-						$this->so->add_attribute('participants',$accept_type,intval($key));
+						$this->so->add_attribute('participants',$accept_type,(int)$key);
 					}
 				}
 
 				if($groups)
 				{
 					@reset($groups);
-					$this->so->add_attribute('groups',intval($group_id));
+					$this->so->add_attribute('groups',(int)$group_id);
 				}
 
 				$event = $this->get_cached_event();
@@ -1027,10 +1027,10 @@
 					unset($GLOBALS['phpgw_info']['flags']['noheader']);
 					unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
 					ExecMethod('calendar.uicalendar.overlap',
-				   		Array(
-				   			'o_events'	=> $overlapping_events,
-				   			'this_event'	=> $event
-				   		)
+						Array(
+							'o_events'	=> $overlapping_events,
+							'this_event'	=> $event
+						)
 					);
 					$GLOBALS['phpgw']->common->phpgw_exit(True);
 				}
@@ -1055,7 +1055,7 @@
 					// if old event has alarm and the start-time changed => update them
 					//echo "<p>checking ".count($old_event['alarm'])." alarms of event #$event[id] start moved from ".print_r($old_event['start'],True)." to ".print_r($event['start'],True)."</p>\n";
 					if ($old_event['alarm'] &&
-					    $this->maketime($old_event['start']) != $this->maketime($event['start']))
+						$this->maketime($old_event['start']) != $this->maketime($event['start']))
 					{
 						$this->so->delete_alarms($old_event['id']);
 						foreach($old_event['alarm'] as $id => $alarm)
@@ -1083,7 +1083,7 @@
 				}
 				else
 				{
-					return intval($event['id']);
+					return (int)$event['id'];
 				}
 			}
 			return True;
@@ -1141,13 +1141,13 @@
 		function time2array($time,$alarm = 0)
 		{
 			return array(
-				'year'  => intval(date('Y',$time)),
-				'month' => intval(date('m',$time)),
-				'mday'  => intval(date('d',$time)),
-				'hour'  => intval(date('H',$time)),
-				'min'   => intval(date('i',$time)),
-				'sec'   => intval(date('s',$time)),
-				'alarm' => intval($alarm)
+				'year'  => (int)(date('Y',$time)),
+				'month' => (int)(date('m',$time)),
+				'mday'  => (int)(date('d',$time)),
+				'hour'  => (int)(date('H',$time)),
+				'min'   => (int)(date('i',$time)),
+				'sec'   => (int)(date('s',$time)),
+				'alarm' => (int)($alarm)
 			);
 		}
 
@@ -1196,7 +1196,7 @@
 						$time_param['hour'] -= 12;
 					}
 				}
-		
+
 				if($time_param['hour'] > 24)
 				{
 					$time_param['hour'] -= 12;
@@ -1245,7 +1245,7 @@
 			{
 				//echo "testing event[participants][uid=$uid] = '".$event['participants'][$uid]."'<br>\n";
 				if (isset($event['participants'][$uid]) && $event['participants'][$uid] != 'R' &&
-				    $status != 'R')
+					$status != 'R')
 				{
 					return True;	// found not rejected participant in event
 				}
@@ -1265,14 +1265,14 @@
 				$temp_cache_events = $this->cached_events;
 			}
 
-//			$temp_start = intval($GLOBALS['phpgw']->common->show_date($starttime,'Ymd'));
-//			$temp_start_time = intval($GLOBALS['phpgw']->common->show_date($starttime,'Hi'));
-//			$temp_end = intval($GLOBALS['phpgw']->common->show_date($endtime,'Ymd'));
-//			$temp_end_time = intval($GLOBALS['phpgw']->common->show_date($endtime,'Hi'));
-			$temp_start = intval(date('Ymd',$starttime));
-			$temp_start_time = intval(date('Hi',$starttime));
-			$temp_end = intval(date('Ymd',$endtime));
-			$temp_end_time = intval(date('Hi',$endtime));
+//			$temp_start = (int)$GLOBALS['phpgw']->common->show_date($starttime,'Ymd');
+//			$temp_start_time = (int)($GLOBALS['phpgw']->common->show_date($starttime,'Hi');
+//			$temp_end = (int)$GLOBALS['phpgw']->common->show_date($endtime,'Ymd');
+//			$temp_end_time = (int)$GLOBALS['phpgw']->common->show_date($endtime,'Hi');
+			$temp_start = (int)(date('Ymd',$starttime));
+			$temp_start_time = (int)(date('Hi',$starttime));
+			$temp_end = (int)(date('Ymd',$endtime));
+			$temp_end_time = (int)(date('Hi',$endtime));
 			if($this->debug)
 			{
 				echo '<!-- Temp_Start: '.$temp_start.' -->'."\n";
@@ -1349,19 +1349,19 @@
 								echo '<!-- Checking event id #'.$event['id'];
 							}
 							$temp_event_start = sprintf("%d%02d",$event['start']['hour'],$event['start']['min']);
-							$temp_event_end = sprintf("%d%02d",$event['end']['hour'],$event['end']['min']);					
+							$temp_event_end = sprintf("%d%02d",$event['end']['hour'],$event['end']['min']);
 //							if((($temp_start_time <= $temp_event_start) && ($temp_end_time >= $temp_event_start) && ($temp_end_time <= $temp_event_end)) ||
-							if(($temp_start_time <= $temp_event_start && 
-							    $temp_end_time > $temp_event_start && 
-							    $temp_end_time <= $temp_event_end ||
-							    $temp_start_time >= $temp_event_start && 
-							    $temp_start_time < $temp_event_end && 
-							    $temp_end_time >= $temp_event_end ||
-							    $temp_start_time <= $temp_event_start && 
-							    $temp_end_time >= $temp_event_end ||
-							    $temp_start_time >= $temp_event_start && 
-							    $temp_end_time <= $temp_event_end) && 
-							   $this->participants_not_rejected($participants,$event))
+							if(($temp_start_time <= $temp_event_start &&
+								$temp_end_time > $temp_event_start &&
+								$temp_end_time <= $temp_event_end ||
+								$temp_start_time >= $temp_event_start &&
+								$temp_start_time < $temp_event_end &&
+								$temp_end_time >= $temp_event_end ||
+								$temp_start_time <= $temp_event_start &&
+								$temp_end_time >= $temp_event_end ||
+								$temp_start_time >= $temp_event_start &&
+								$temp_end_time <= $temp_event_end) &&
+								$this->participants_not_rejected($participants,$event))
 							{
 								if($this->debug)
 								{
@@ -1393,7 +1393,7 @@
 		/*!
 		@function check_perms( )
 		@syntax check_perms($needed,$event=0,$other=0)
-		@abstract Checks if the current user has the necessary ACL rights 
+		@abstract Checks if the current user has the necessary ACL rights
 		@author ralfbecker
 		@discussion The check is performed on an event or general on the cal of an other user
 		@param $needed necessary ACL right: PHPGW_ACL_{READ|EDIT|DELETE}
@@ -1424,7 +1424,7 @@
 			}
 			$user = $GLOBALS['phpgw_info']['user']['account_id'];
 			$grants = $this->grants[$owner];
-			
+
 			if (is_array($event) && $needed == PHPGW_ACL_READ)
 			{
 				// Check if the $user is one of the participants or has a read-grant from one of them
@@ -1447,7 +1447,7 @@
 			{
 				$access = $user == $owner || $grants & $needed && (!$private || $grants & PHPGW_ACL_PRIVATE);
 			}
-			//echo "<p>".function_backtrace()." check_perms($needed,$event_id,$other) for user $user and needed_acl $needed: event='$event[title]': owner=$owner, privat=$private, grants=$grants ==> access=$access</p>\n";
+			//echo "<p>".function_backtrace()." check_perms($needed,$event_id,$other) for user $user and needed_acl $needed: event='$event[title]': owner=$owner, private=$private, grants=$grants ==> access=$access</p>\n";
 
 			return $access;
 		}
@@ -1553,7 +1553,7 @@
 				$last['day'] = $last['mday'];
 			}
 			$datefmt = $this->prefs['common']['dateformat'];
-			
+
 			$month_before_day = strtolower($datefmt[0]) == 'm' ||
 				strtolower($datefmt[2]) == 'm' && $datefmt[4] == 'd';
 
@@ -1578,7 +1578,7 @@
 								return $range;
 							}
 							$range .= ' - ';
-							
+
 							if ($first['year'] != $last['year'] && $datefmt[0] == 'Y')
 							{
 								$range .= $last['year'] . ', ';
@@ -1611,14 +1611,14 @@
 		{
 			$first = $GLOBALS['phpgw']->datetime->gmtdate($GLOBALS['phpgw']->datetime->get_weekday_start($this->year, $this->month, $this->day));
 			$last = $GLOBALS['phpgw']->datetime->gmtdate($first['raw'] + 518400);
-         
+
 			return ($this->long_date($first,$last));
 		}
-		
+
 		function normalizeminutes(&$minutes)
 		{
 			$hour = 0;
-			$min = intval($minutes);
+			$min = (int)$minutes;
 			if($min >= 60)
 			{
 				$hour += $min / 60;
@@ -1633,9 +1633,9 @@
 		{
 			$temp = array('hour','minute','second','ampm');
 			$time = strrev($time);
-			$second = intval(strrev(substr($time,0,2)));
-			$minute = intval(strrev(substr($time,2,2)));
-			$hour   = intval(strrev(substr($time,4)));
+			$second = (int)(strrev(substr($time,0,2)));
+			$minute = (int)(strrev(substr($time,2,2)));
+			$hour   = (int)(strrev(substr($time,4)));
 			$hour += $this->normalizeminutes(&$minute);
 			$temp['second'] = $second;
 			$temp['minute'] = $minute;
@@ -1647,16 +1647,16 @@
 				{
 					return $temp;
 				}
-		
+
 				$temp['ampm'] = 'am';
-		
+
 				if ((int)$temp['hour'] > 12)
 				{
 					$temp['hour'] = (int)((int)$temp['hour'] - 12);
 					$temp['ampm'] = 'pm';
-   		   }
-      		elseif ((int)$temp['hour'] == 12)
-	      	{
+				}
+				elseif ((int)$temp['hour'] == 12)
+				{
 					$temp['ampm'] = 'pm';
 				}
 			}
@@ -1671,12 +1671,12 @@
 				$exceptions = explode(',',$exception_str);
 				for($exception_count=0;$exception_count<count($exceptions);$exception_count++)
 				{
-					$exception[] = intval($exceptions[$exception_count]);
+					$exception[] = (int)$exceptions[$exception_count];
 				}
 			}
 			elseif($exception_str != '')
 			{
-				$exception[] = intval($exception_str);
+				$exception[] = (int)$exception_str;
 			}
 			return $exception;
 		}
@@ -1685,12 +1685,12 @@
 		{
 			$time = $this->splittime($fixed_time);
 			$str = $time['hour'].':'.((int)$time['minute']<=9?'0':'').$time['minute'];
-		
+
 			if ($this->prefs['common']['timeformat'] == '12')
 			{
 				$str .= ' ' . $time['ampm'];
 			}
-		
+
 			return $str;
 		}
 
@@ -1699,7 +1699,7 @@
 			$inserted = False;
 			if(isset($event['recur_exception']))
 			{
-				$event_time = mktime($event['start']['hour'],$event['start']['min'],0,intval(substr($date,4,2)),intval(substr($date,6,2)),intval(substr($date,0,4))) - $GLOBALS['phpgw']->datetime->tz_offset;
+				$event_time = mktime($event['start']['hour'],$event['start']['min'],0,(int)(substr($date,4,2)),(int)(substr($date,6,2)),(int)(substr($date,0,4))) - $GLOBALS['phpgw']->datetime->tz_offset;
 				while($inserted == False && list($key,$exception_time) = each($event['recur_exception']))
 				{
 					if($this->debug)
@@ -2028,7 +2028,7 @@
 				return;
 			}
 
-			$cache_start = intval(sprintf("%04d%02d%02d",$syear,$smonth,$sday));
+			$cache_start = (int)(sprintf("%04d%02d%02d",$syear,$smonth,$sday));
 			if($c_cached_ids)
 			{
 				for($i=0;$i<$c_cached_ids;$i++)
@@ -2038,15 +2038,15 @@
 					{
 						continue;	// fetch recuring events only in 2. loop
 					}
-					$startdate = intval(date('Ymd',$this->maketime($event['start'])));
-					$enddate = intval(date('Ymd',$this->maketime($event['end'])));
+					$startdate = (int)(date('Ymd',$this->maketime($event['start'])));
+					$enddate = (int)(date('Ymd',$this->maketime($event['end'])));
 					$this->cached_events[$startdate][] = $event;
 					if($startdate != $enddate)
 					{
-						$start['year'] = intval(substr($startdate,0,4));
-						$start['month'] = intval(substr($startdate,4,2));
-						$start['mday'] = intval(substr($startdate,6,2));
-						for($j=$startdate,$k=0;$j<=$enddate;$k++,$j=intval(date('Ymd',mktime(0,0,0,$start['month'],$start['mday'] + $k,$start['year']))))
+						$start['year'] = (int)(substr($startdate,0,4));
+						$start['month'] = (int)(substr($startdate,4,2));
+						$start['mday'] = (int)(substr($startdate,6,2));
+						for($j=$startdate,$k=0;$j<=$enddate;$k++,$j=(int)(date('Ymd',mktime(0,0,0,$start['month'],$start['mday'] + $k,$start['year']))))
 						{
 							$c_evt_day = count($this->cached_events[$j]) - 1;
 							if($c_evt_day < 0)
@@ -2206,7 +2206,7 @@
 			{
 				foreach(array('year','month','mday','hour','min','sec') as $n => $name)
 				{
-					$date[$name] = intval($arr[$n]);
+					$date[$name] = (int)$arr[$n];
 				}
 				return $timestamp ? mktime($date['hour'],$date['min'],$date['sec'],
 					$date['month'],$date['mday'],$date['year']) : $date;
@@ -2234,7 +2234,7 @@
 		{
 			return $this->so->get_cached_event();
 		}
-		
+
 		function add_attribute($var,$value,$index='**(**')
 		{
 			$this->so->add_attribute($var,$value,$index);
@@ -2336,7 +2336,7 @@
 				for($m=0;$m<$interval;$m++)
 				{
 					$minutes = $increment * $m;
-					if(intval($starttemp['minute']) > $minutes && intval($starttemp['minute']) < ($minutes + $increment))
+					if((int)$starttemp['minute'] > $minutes && (int)$starttemp['minute'] < ($minutes + $increment))
 					{
 						$subminute = ($starttemp['minute'] - $minutes) * 100;
 					}
@@ -2356,17 +2356,17 @@
 				$end += $addminute;
 				$starttemp = $this->splittime("$start",False);
 				$endtemp = $this->splittime("$end",False);
-					
+
 				for($h=$starttemp['hour'];$h<=$endtemp['hour'];$h++)
 				{
 					$startminute = 0;
 					$endminute = $interval;
 					$hour = $h * 10000;
-					if($h == intval($starttemp['hour']))
+					if($h == (int)$starttemp['hour'])
 					{
 						$startminute = ($starttemp['minute'] / $increment);
 					}
-					if($h == intval($endtemp['hour']))
+					if($h == (int)$endtemp['hour'])
 					{
 						$endminute = ($endtemp['minute'] / $increment);
 					}
@@ -2425,7 +2425,7 @@
 				return True;	// always True for now
 			}
 			$want_update = 0;
-			
+
 			// the following switch fall-through all cases, as each included the following too
 			//
 			$msg_is_response = $msg_type == MSG_REJECTED || $msg_type == MSG_ACCEPTED || $msg_type == MSG_TENTATIVE;
@@ -2453,7 +2453,7 @@
 					}
 				case 'add_cancel':
 					if ($old_event['owner'] == $userid && $msg_is_response ||
-					    $msg_type == MSG_DELETED || $msg_type == MSG_ADDED)
+						$msg_type == MSG_DELETED || $msg_type == MSG_ADDED)
 					{
 						++$want_update;
 					}
@@ -2495,7 +2495,7 @@
 			$temp_timeformat = $this->prefs['common']['timeformat'];
 			$temp_dateformat = $this->prefs['common']['dateformat'];
 
-			$tz_offset = ((60 * 60) * intval($temp_tz_offset));
+			$tz_offset = ((60 * 60) * (int)$temp_tz_offset);
 
 			if($old_event != False)
 			{
@@ -2593,7 +2593,7 @@
 
 			foreach($to_notify as $userid => $statusid)
 			{
-				$userid = intval($userid);
+				$userid = (int)$userid;
 
 				if ($statusid == 'R')
 				{
@@ -2626,7 +2626,7 @@
 					$GLOBALS['phpgw_info']['user']['preferences']['common']['timeformat'] = $part_prefs['common']['timeformat'];
 					$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'] = $part_prefs['common']['dateformat'];
 
-					$GLOBALS['phpgw']->datetime->tz_offset = ((60 * 60) * intval($GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']));
+					$GLOBALS['phpgw']->datetime->tz_offset = ((60 * 60) * (int)$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']);
 
 					if($old_starttime)
 					{
@@ -2634,7 +2634,7 @@
 					}
 					$details['startdate'] = $GLOBALS['phpgw']->common->show_date($starttime);
 					$details['enddate']   = $GLOBALS['phpgw']->common->show_date($endtime);
-				
+
 					list($subject,$body) = split("\n",$GLOBALS['phpgw']->preferences->parse_notify($notify_msg,$details),2);
 					$subject = $send->encode_subject($subject);
 					switch($part_prefs['calendar']['update_format'])
@@ -2670,7 +2670,7 @@
 					}
 					$returncode = $send->msg('email',$to,$subject,$body,''/*$msgtype*/,'','','',$sender, $content_type/*,$boundary*/);
 					//echo "<p>send(to='$to', sender='$sender'<br>subject='$subject') returncode=$returncode<br>".nl2br($body)."</p>\n";
-					
+
 					if (!$returncode)	// not nice, but better than failing silently
 					{
 						echo '<p><b>bocalendar::send_update</b>: '.lang("Failed sending message to '%1' #%2 subject='%3', sender='%4' !!!",$to,$userid,htmlspecialchars($subject), $sender)."<br>\n";
@@ -2681,7 +2681,7 @@
 				}
 			}
 			unset($send);
-		
+
 			if((is_int($this->user) && $this->user != $temp_user['account_id']) ||
 				(is_string($this->user) && $this->user != $temp_user['account_lid']))
 			{
@@ -2692,7 +2692,7 @@
 			$GLBOALS['phpgw']->datetime->tz_offset = ((60 * 60) * $temp_tz_offset);
 			$GLOBALS['phpgw_info']['user']['preferences']['common']['timeformat'] = $temp_timeformat;
 			$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'] = $temp_dateformat;
-			
+
 			return $returncode;
 		}
 
@@ -2764,7 +2764,7 @@
 			print_debug('Found',$found);
 			return $found;
 		}
-		
+
 		function prepare_recipients(&$new_event,$old_event)
 		{
 			// Find modified and deleted users.....
@@ -2773,12 +2773,12 @@
 				if(isset($new_event['participants'][$old_userid]))
 				{
 					print_debug('Modifying event for user',$old_userid);
-					$this->modified[intval($old_userid)] = $new_status;
+					$this->modified[(int)$old_userid] = $new_status;
 				}
 				else
 				{
 					print_debug('Deleting user from the event',$old_userid);
-					$this->deleted[intval($old_userid)] = $old_status;
+					$this->deleted[(int)$old_userid] = $old_status;
 				}
 			}
 			// Find new users.....
@@ -2791,7 +2791,7 @@
 					$new_event['participants'][$new_userid] = 'U';
 				}
 			}
-		
+
 			if(count($this->added) > 0 || count($this->modified) > 0 || count($this->deleted) > 0)
 			{
 				if(count($this->added) > 0)
@@ -2836,7 +2836,7 @@
 				}
 			}
 		}
-		
+
 		function get_dirty_entries($lastmod=-1)
 		{
 			$events = false;
@@ -2859,7 +2859,7 @@
 				}
 			}
 			unset($rep_event_ids);
-			
+
 			return $events;
 		}
 
@@ -2868,7 +2868,7 @@
 			echo '<br>UI:';
 			_debug_array($data);
 		}
-		
+
 		/*!
 		@function rejected_no_show
 		@abstract checks if event is rejected from user and he's not the owner and dont want rejected
@@ -2877,13 +2877,13 @@
 		*/
 		function rejected_no_show($event)
 		{
-			$ret = !$this->prefs['calendar']['show_rejected'] && 
-			       $event['owner'] != $this->owner && 
-			       $event['participants'][$this->owner] == 'R';
+			$ret = !$this->prefs['calendar']['show_rejected'] &&
+				$event['owner'] != $this->owner &&
+				$event['participants'][$this->owner] == 'R';
 			//echo "<p>rejected_no_show($event[title])='$ret': user=$this->owner, event-owner=$event[owner], status='".$event['participants'][$this->owner]."', show_rejected='".$this->prefs['calendar']['show_rejected']."'</p>\n";
 			return $ret;
 		}
-		
+
 		/*!
 		@function list_cals
 		@abstract generate list of user- / group-calendars for the selectbox in the header
@@ -2933,7 +2933,7 @@
 
 			return $users + $groups;	// users first and then groups, both alphabeticaly
 		}
-		
+
 		/*!
 		@function event2array
 		@abstract create array with name, translated name and readable content of each attributes of an event
@@ -2994,7 +2994,7 @@
 			$pri = Array(
 				1	=> lang('Low'),
 				2	=> lang('Normal'),
-		  		3	=> lang('High')
+				3	=> lang('High')
 			);
 			$var['priority'] = Array(
 				'field'	=> lang('Priority'),
@@ -3013,7 +3013,7 @@
 
 			$var['access'] = Array(
 				'field'	=> lang('Access'),
-				'data'	=> $event['public'] ? lang('Public') : lang('Privat')
+				'data'	=> $event['public'] ? lang('Public') : lang('Private')
 			);
 
 			if(@isset($event['groups'][0]))
diff --git a/calendar/inc/class.boholiday.inc.php b/calendar/inc/class.boholiday.inc.php
index 1825f64ec8..2305a47182 100755
--- a/calendar/inc/class.boholiday.inc.php
+++ b/calendar/inc/class.boholiday.inc.php
@@ -39,16 +39,16 @@
 		var $start;
 		var $query;
 		var $sort;
-		
+
 		var $locales = Array();
 		var $holidays;
 		var $cached_holidays;
-		
+
 		function boholiday()
 		{
 			$this->so = CreateObject('calendar.soholiday');
 
-			$this->start  = intval(get_var('start',array('POST','GET')));
+			$this->start  = (int)get_var('start',array('POST','GET'));
 			$this->query  = get_var('query',array('POST','GET'));
 			$this->sort   = get_var('sort',array('POST','GET'));
 			$this->order  = get_var('order',array('POST','GET'));
@@ -59,7 +59,7 @@
 			{
 				$this->locales[] = $this->locale;
 			}
-			
+
 			if($this->debug)
 			{
 				echo '<-- Locale = '.$this->locales[0].' -->'."\n";
@@ -75,7 +75,7 @@
 			{
 				echo "BO : Reading Holiday ID : ".$id."<br>\n";
 			}
-			
+
 			if(!$id)
 			{
 				if(!$this->id)
@@ -112,7 +112,7 @@
 				$this->ui->admin();
 			}
 		}
-		
+
 		function delete_locale($locale='')
 		{
 			if(!$locale)
@@ -153,7 +153,7 @@
 			}
 			Header('Location: '.$send_back_to);
 		}
-		
+
 		function get_holiday_list($locale='', $sort='', $order='', $query='', $total='', $year=0)
 		{
 			$locale = ($locale?$locale:$this->locales[0]);
@@ -194,7 +194,7 @@
 			{
 				$this->locales[] = 'US';
 			}
-			
+
 			if($this->owner != $GLOBALS['phpgw_info']['user']['account_id'])
 			{
 				$owner_pref = CreateObject('phpgwapi.preferences',$owner);
@@ -219,7 +219,7 @@
 				}
 			}
 		}
-		
+
 		function auto_load_holidays($locale)
 		{
 			if($this->so->holiday_total($locale) == 0)
@@ -270,11 +270,11 @@
 					{
 						$holiday['locale'] = $holiday[0];
 						$holiday['name'] = $GLOBALS['phpgw']->db->db_addslashes($holiday[1]);
-						$holiday['mday'] = intval($holiday[2]);
-						$holiday['month_num'] = intval($holiday[3]);
-						$holiday['occurence'] = intval($holiday[4]);
-						$holiday['dow'] = intval($holiday[5]);
-						$holiday['observance_rule'] = intval($holiday[6]);
+						$holiday['mday'] = (int)$holiday[2];
+						$holiday['month_num'] = (int)$holiday[3];
+						$holiday['occurence'] = (int)$holiday[4];
+						$holiday['dow'] = (int)$holiday[5];
+						$holiday['observance_rule'] = (int)$holiday[6];
 						$holiday['hol_id'] = 0;
 						$this->so->save_holiday($holiday);
 					}
@@ -309,7 +309,7 @@
 				{
 					$holiday['hol_id'] = $this->bo->id;
 				}
-				
+
 				// some input validation
 
 				if (!$holiday['mday'] == !$holiday['occurence'])
@@ -322,11 +322,10 @@
 				}
 				else
 				{
-					$holiday['occurence'] = intval($holiday['occurence'] ? $holiday['occurence'] : $holiday['year']);
+					$holiday['occurence'] = (int)($holiday['occurence'] ? $holiday['occurence'] : $holiday['year']);
 					unset($holiday['year']);
 				}
 
-		
 	// Still need to put some validation in here.....
 
 				$this->ui = CreateObject('calendar.uiholiday');
@@ -385,7 +384,7 @@
 			if(count($holidays) == 0)
 			{
 				return $holidays;
-			}			
+			}
 
 			$temp_locale = $GLOBALS['phpgw_info']['user']['preferences']['common']['country'];
 			for($i=0;$i<count($holidays);$i++)
@@ -421,7 +420,7 @@
 				Header('Location: ' . $GLOBALS['phpgw']->link('/index.php'));
 			}
 		}
-		
+
 		function rule_string($holiday)
 		{
 			if (!is_array($holiday))
diff --git a/calendar/inc/class.boicalendar.inc.php b/calendar/inc/class.boicalendar.inc.php
index 2782e902bd..29effa06e9 100755
--- a/calendar/inc/class.boicalendar.inc.php
+++ b/calendar/inc/class.boicalendar.inc.php
@@ -12,1639 +12,1697 @@
 
 	/* $Id$ */
 
-define('FOLD_LENGTH',75);
+	define('FOLD_LENGTH',75);
 
-define('VEVENT',1);
-define('VTODO',2);
+	define('VEVENT',1);
+	define('VTODO',2);
 
-define('NONE',0);
-define('CHAIR',1);
-define('REQ_PARTICIPANT',2);
-define('OPT_PARTICIPANT',3);
-define('NON_PARTICIPANT',4);
+	define('NONE',0);
+	define('CHAIR',1);
+	define('REQ_PARTICIPANT',2);
+	define('OPT_PARTICIPANT',3);
+	define('NON_PARTICIPANT',4);
 
-define('INDIVIDUAL',1);
-define('GROUP',2);
-define('RESOURCE',4);
-define('ROOM',8);
-define('UNKNOWN',16);
+	define('INDIVIDUAL',1);
+	define('GROUP',2);
+	define('RESOURCE',4);
+	define('ROOM',8);
+	define('UNKNOWN',16);
 
-define('NEEDS_ACTION',0);
-define('ACCEPTED',1);
-define('DECLINED',2);
-define('TENTATIVE',3);
-define('DELEGATED',4);
-define('COMPLETED',5);
-define('IN_PROCESS',6);
+	define('NEEDS_ACTION',0);
+	define('ACCEPTED',1);
+	define('DECLINED',2);
+	define('TENTATIVE',3);
+	define('DELEGATED',4);
+	define('COMPLETED',5);
+	define('IN_PROCESS',6);
 
 	/*
-	 * Class
-	 */
-define('PRIVATE',0);
-define('PUBLIC',1);
-define('CONFIDENTIAL',3);
+	* Class
+	*/
+	define('PRIVATE',0);
+	define('PUBLIC',1);
+	define('CONFIDENTIAL',3);
 
 	/*
-	 * Transparency
-	 */
-define('TRANSPARENT',0);
-define('OPAQUE',1);
+	* Transparency
+	*/
+	define('TRANSPARENT',0);
+	define('OPAQUE',1);
 
 	/*
-	 * Frequency
-	 */
-define('SECONDLY',1);
-define('MINUTELY',2);
-define('HOURLY',3);
-define('DAILY',4);
-define('WEEKLY',5);
-define('MONTHLY',6);
-define('YEARLY',7);
+	* Frequency
+	*/
+	define('SECONDLY',1);
+	define('MINUTELY',2);
+	define('HOURLY',3);
+	define('DAILY',4);
+	define('WEEKLY',5);
+	define('MONTHLY',6);
+	define('YEARLY',7);
 
-define('FREE',0);
-define('BUSY',1);
-define('BUSY_UNAVAILABLE',2);
-define('BUSY_TENTATIVE',3);
+	define('FREE',0);
+	define('BUSY',1);
+	define('BUSY_UNAVAILABLE',2);
+	define('BUSY_TENTATIVE',3);
 
-define('THISANDPRIOR',0);
-define('THISANDFUTURE',1);
+	define('THISANDPRIOR',0);
+	define('THISANDFUTURE',1);
 
-define('START',0);
-define('END',1);
+	define('START',0);
+	define('END',1);
 
-define('_8BIT',0);
-define('_BASE64',1);
+	define('_8BIT',0);
+	define('_BASE64',1);
 
-define('OTHER',99);
-
-class boicalendar
-{
+	define('OTHER',99);
 
+	class boicalendar
+	{
 		var $public_functions = array(
-			'import'		=> True,
-			'export'		=> True
+			'import' => True,
+			'export' => True
 		);
 
+		var $ical;
+		var $line = 0;
+		var $event = Array();
+		var $todo = Array();
+		var $journal = Array();
+		var $freebusy = Array();
+		var $timezone = Array();
+		var $property = Array();
+		var $parameter = Array();
+		var $debug_str = False;
+		var $api = True;
+		var $chunk_split = True;
 
-	var $ical;
-	var $line = 0;
-	var $event = Array();
-	var $todo = Array();
-	var $journal = Array();
-	var $freebusy = Array();
-	var $timezone = Array();
-	var $property = Array();
-	var $parameter = Array();
-	var $debug_str = False;
-	var $api = True;
-	var $chunk_split = True;
-	
-	/*
-	 * Base Functions
-	 */
+		/*
+		* Base Functions
+		*/
 
-	function boicalendar()
-	{
-		$this->property = Array(
-			'action'		=> Array(
-				'type'		=> 'text',
-				'to_text'	=> True,
-				'valarm'		=> Array(
-					'state'		=> 'required',
-					'multiples'	=> False
-				)
-			),
-			'attach'		=> Array(
-				'type'		=> 'uri',
-				'to_text'	=> True,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'valarm'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				)
-			),
-			'attendee'		=> Array(
-				'type'		=> 'cal-address',
-				'to_text'	=> False,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'valarm'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vfreebusy'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				)
-			),			
-			'categories'		=> Array(
-				'type'		=> 'text',
-				'to_text'	=> True,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				)
-			),
-			'class'			=> Array(
-				'type'		=> 'text',
-				'to_text'	=> True,
-				'vevent'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'comment'		=> Array(
-				'type'		=> 'text',
-				'to_text'	=> True,
-				'daylight'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'standard'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'valarm'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vfreebusy'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				)
-			),
-			'completed'		=> Array(
-				'type'		=> 'date-time',
-				'to_text'	=> False,
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'contact'		=> Array(
-				'type'		=> 'text',
-				'to_text'	=> True,
-				'vevent'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vfreebusy'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				)
-			),
-			'created'		=> Array(
-				'type'		=> 'date-time',
-				'to_text'	=> False,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'description'		=> Array(
-				'type'		=> 'text',
-				'to_text'	=> True,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'valarm'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'dtend'			=> Array(
-				'type'		=> 'date-time',
-				'to_text'	=> False,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vfreebusy'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'dtstamp'		=> Array(
-				'type'		=> 'date-time',
-				'to_text'	=> False,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vfreebusy'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),			
-			'dtstart'		=> Array(
-				'type'		=> 'date-time',
-				'to_text'	=> False,
-				'daylight'	=> Array(
-					'state'		=> 'required',
-					'multiples'	=> False
-				),
-				'standard'	=> Array(
-					'state'		=> 'required',
-					'multiples'	=> False
-				),
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vfreebusy'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'due'			=> Array(
-				'type'		=> 'date-time',
-				'to_text'	=> False,
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'duration'		=> Array(
-				'type'		=> 'duration',
-				'to_text'	=> False,
-				'valarm'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vfreebusy'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'exdate'		=> Array(
-				'type'		=> 'date-time',
-				'to_text'	=> False,
-				'vevent'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				)
-			),
-			'exrule'		=> Array(
-				'type'		=> 'recur',
-				'to_text'	=> False,
-				'vevent'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				)
-			),
-			'freebusy'		=> Array(
-				'type'		=> 'freebusy',
-				'to_text'	=> False,
-				'vfreebusy'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				)
-			),
-			'geo'			=> Array(
-				'type'		=> 'float',
-				'to_text'	=> True,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'last_modified'		=> Array(
-				'type'		=> 'date-time',
-				'to_text'	=> False,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vtimezone'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'location'		=> Array(
-				'type'		=> 'text',
-				'to_text'	=> True,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'method'			=> Array(
-				'type'		=> 'text',
-				'to_text'	=> True,
-				'ical'	=> Array(
-					'state'		=> 'required',
-					'multiples'	=> False
-				)
-			),
-			'organizer'		=> Array(
-				'type'		=> 'cal-address',
-				'to_text'	=> False,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vfreebusy'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),			
-			'percent_complete'	=> Array(
-				'type'		=> 'integer',
-				'to_text'	=> False,
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'priority'		=> Array(
-				'type'		=> 'integer',
-				'to_text'	=> True,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'prodid'			=> Array(
-				'type'		=> 'text',
-				'to_text'	=> True,
-				'ical'	=> Array(
-					'state'		=> 'required',
-					'multiples'	=> False
-				)
-			),
-			'rdate'			=> Array(
-				'type'		=> 'date-time',
-				'to_text'	=> False,
-				'daylight'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'standard'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				)
-			),
-			'recurrence_id'		=> Array(
-				'type'		=> 'date-time',
-				'to_text'	=> False,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vtodo'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'related_to'		=> Array(
-				'type'		=> 'text',
-				'to_text'	=> False,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				)
-			),
-			'request_status'	=> Array(
-				'type'		=> 'text',
-				'to_text'	=> True,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vfreebusy'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				)
-			),
-			'resources'		=> Array(
-				'type'		=> 'text',
-				'to_text'	=> False,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'rrule'			=> Array(
-				'type'		=> 'recur',
-				'to_text'	=> False,
-				'daylight'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'standard'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				)
-			),
-			'sequence'		=> Array(
-				'type'		=> 'integer',
-				'to_text'	=> True,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'status'		=> Array(
-				'type'		=> 'text',
-				'to_text'	=> True,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'summary'		=> Array(
-				'type'		=> 'text',
-				'to_text'	=> True,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'valarm'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'transp'		=> Array(
-				'type'		=> 'text',
-				'to_text'	=> True,
-				'vevent'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'trigger'		=> Array(
-				'type'		=> 'text',
-				'to_text'	=> True,
-				'valarm'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'tzid'			=> Array(
-				'type'		=> 'text',
-				'to_text'	=> True,
-				'vtimezone'		=> Array(
-					'state'		=> 'required',
-					'multiples'	=> False
-				)
-			),
-			'tzname'		=> Array(
-				'type'		=> 'text',
-				'to_text'	=> True,
-				'daylight'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				),
-				'standard'	=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> True
-				)
-			),
-			'tzoffsetfrom'		=> Array(
-				'type'		=> 'utc-offset',
-				'to_text'	=> True,
-				'daylight'		=> Array(
-					'state'		=> 'required',
-					'multiples'	=> False
-				),
-				'standard'		=> Array(
-					'state'		=> 'required',
-					'multiples'	=> False
-				)
-			),
-			'tzoffsetto'		=> Array(
-				'type'		=> 'utc-offset',
-				'to_text'	=> True,
-				'daylight'		=> Array(
-					'state'		=> 'required',
-					'multiples'	=> False
-				),
-				'standard'		=> Array(
-					'state'		=> 'required',
-					'multiples'	=> False
-				)
-			),
-			'tzurl'			=> Array(
-				'type'		=> 'uri',
-				'to_text'	=> True,
-				'vtimezone'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				)
-			),
-			'uid'			=> Array(
-				'type'		=> 'text',
-				'to_text'	=> True,
-				'vevent'	=> Array(
-					'state'		=> 'required',
-					'multiples'	=> False
-				),
-				'vfreebusy'		=> Array(
-					'state'		=> 'required',
-					'multiples'	=> False
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'required',
-					'multiples'	=> False
-				),
-				'vtodo'		=> Array(
-					'state'		=> 'required',
-					'multiples'	=> False
-				)
-			),
-			'url'			=> Array(
-				'type'		=> 'text',
-				'to_text'	=> True,
-				'vevent'	=> Array(
-					'state'		=> 'required',
-					'multiples'	=> False
-				),
-				'vfreebusy'		=> Array(
-					'state'		=> 'required',
-					'multiples'	=> False
-				),
-				'vjournal'		=> Array(
-					'state'		=> 'optional',
-					'multiples'	=> False
-				),
-				'vtodo'	=> Array(
-					'state'		=> 'required',
-					'multiples'	=> False
-				)
-			),
-			'version'			=> Array(
-				'type'		=> 'text',
-				'to_text'	=> True,
-				'ical'	=> Array(
-					'state'		=> 'required',
-					'multiples'	=> False
-				)
-			)
-		);
-		$this->parameter = Array(
-			'altrep'		=> Array(
-				'type'		=> 'uri',
-				'quoted'		=> True,
-				'to_text'	=> True,
-				'properties'	=> Array(
-					'comment'		=> True,
-					'description'	=> True,
-					'location'		=> True,
-					'prodid'			=> True,
-					'resources'		=> True,
-					'summary'		=> True,
-					'contact'		=> True					
-				)
-			),
-			'byday'		=> Array(
-				'type'		=> 'text',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'rrule'		=> True
-				)
-			),
-			'byhour'		=> Array(
-				'type'		=> 'text',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'rrule'		=> True
-				)
-			),
-			'byminute'		=> Array(
-				'type'		=> 'text',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'rrule'		=> True
-				)
-			),
-			'bymonth'		=> Array(
-				'type'		=> 'text',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'rrule'		=> True
-				)
-			),
-			'bymonthday'	=> Array(
-				'type'		=> 'text',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'rrule'		=> True
-				)
-			),
-			'bysecond'		=> Array(
-				'type'		=> 'text',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'rrule'		=> True
-				)
-			),
-			'bysetpos'		=> Array(
-				'type'		=> 'text',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'rrule'		=> True
-				)
-			),
-			'byweekno'		=> Array(
-				'type'		=> 'text',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'rrule'		=> True
-				)
-			),
-			'byyearday'		=> Array(
-				'type'		=> 'text',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'rrule'		=> True
-				)
-			),
-			'class'			=> Array(
-				'type'		=> 'function',
-				'function'	=> 'switch_class',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'class'			=> True
-				)
-			),
-			'cn'			=> Array(
-				'type'		=> 'text',
-				'quoted'		=> True,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'attendee'		=> True,
-					'organizer'		=> True					
-				)
-			),
-			'count'		=> Array(
-				'type'		=> 'integer',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'rrule'			=> True
-				)
-			),
-			'cu'			=> Array(
-				'type'		=> 'function',
-				'function'	=> 'switch_cu',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'attendee'		=> True
-				)
-			),
-			'delegated_from'	=> Array(
-				'type'		=> 'function',
-				'function'	=> 'switch_mailto',
-				'quoted'		=> True,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'attendee'		=> True
-				)
-			),
-			'delegated_to'	=> Array(
-				'type'		=> 'function',
-				'function'	=> 'switch_mailto',
-				'quoted'		=> True,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'attendee'		=> True
-				)
-			),
-			'dir'			=> Array(
-				'type'		=> 'dir',
-				'quoted'		=> True,
-				'to_text'	=> True,
-				'properties'	=> Array(
-					'attendee'		=> True,
-					'organizer'		=> True
-				)
-			),
-			'dtend'		=> Array(
-				'type'		=> 'function',
-				'function'	=> 'switch_date',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'dtend'		=> True
-				)
-			),
-			'dtstamp'		=> Array(
-				'type'		=> 'function',
-				'function'	=> 'switch_date',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'dtstamp'		=> True
-				)
-			),
-			'dtstart'		=> Array(
-				'type'		=> 'function',
-				'function'	=> 'switch_date',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'dtstart'		=> True
-				)
-			),
-			'enocding'	=> Array(
-				'type'		=> 'function',
-				'function'	=> 'switch_encoding',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'attach'			=> True
-				)
-			),
-			'fmttype'	=> Array(
-				'type'		=> 'text',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'attach'			=> True
-				)
-			),
-			'fbtype'		=> Array(
-				'type'		=> 'function',
-				'function'	=> 'switch_fbtype',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'attach'			=> True
-				)
-			),
-			'freq'		=> Array(
-				'type'		=> 'function',
-				'function'	=> 'switch_freq',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'rrule'			=> True
-				)
-			),
-			'interval'		=> Array(
-				'type'		=> 'integer',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'rrule'		=> True
-				)
-			),
-			'language'		=> Array(
-				'type'		=> 'text',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'categories'	=> True,
-					'comment'		=> True,
-					'description'	=> True,
-					'location'		=> True,
-					'resources'		=> True,
-					'summary'		=> True,
-					'tzname'			=> True,
-					'attendee'		=> True,
-					'contact'		=> True,
-					'organizer'		=> True,
-					'x-type'			=> True
-				)
-			),
-			'last_modified'		=> Array(
-				'type'		=> 'function',
-				'function'	=> 'switch_date',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'last_modified'	=> True
-				)
-			),
-			'mailto'		=> Array(
-				'type'		=> 'function',
-				'function'	=> 'switch_mailto',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'attendee'		=> True,
-					'organizer'		=> True
-				)
-			),
-			'member'		=> Array(
-				'type'		=> 'function',
-				'function'	=> 'switch_mailto',
-				'quoted'		=> True,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'attendee'		=> True
-				)
-			),
-			'partstat'		=> Array(
-				'type'		=> 'function',
-				'function'	=> 'switch_partstat',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'attendee'		=> True,
-					'organizer'		=> True
-				)
-			),
-			'range'		=> Array(
-				'type'		=> 'function',
-				'function'	=> 'switch_range',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'recurrence_id'	=> True
-				)
-			),
-			'related'		=> Array(
-				'type'		=> 'function',
-				'function'	=> 'switch_related',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'related_to'	=> True
-				)
-			),
-			'role'		=> Array(
-				'type'		=> 'function',
-				'function'	=> 'switch_role',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'attendee'		=> True,
-					'organizer'		=> True
-				)
-			),
-			'rsvp'		=> Array(
-				'type'		=> 'function',
-				'function'	=> 'switch_rsvp',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'attendee'		=> True
-				)
-			),
-			'sent_by'		=> Array(
-				'type'		=> 'function',
-				'function'	=> 'parse_user_host',
-				'quoted'		=> True,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'attendee'		=> True,
-					'organizer'		=> True
-				)
-			),
-			'tzid'		=> Array(
-				'type'		=> 'text',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'dtend'		=> True,
-					'due'			=> True,
-					'dtstart'	=> True,
-					'exdate'		=> True,
-					'rdate'		=> True,
-					'recurrence_id'	=> True
-				)
-			),
-			'until'		=> Array(
-				'type'		=> 'function',
-				'function'	=> 'switch_date',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'rrule'		=> True
-				)
-			),
-			'value'		=> Array(
-				'type'		=> 'value',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'calscale'	=> True,
-					'prodid'		=> True,
-					'method'		=> True,
-					'version'	=> True,
-					'attach'		=> True,
-					'categories'	=> True,
-					'class'		=> True,
-					'comment'	=> True,
-					'description'	=> True,
-					'geo'		=> True,
-					'location'	=> True,
-					'percent'	=> True,
-					'priority'	=> True,
-					'resources'	=> True,
-					'status'		=> True,
-					'summary'	=> True,
-					'completed'	=> True,
-					'dtend'		=> True,
-					'due'		=> True,
-					'dtstart'	=> True,
-					'duration'	=> True,
-					'freebusy'	=> True,
-					'transp'		=> True,
-					'tzid'		=> True,
-					'tzname'		=> True,
-					'tzoffsetfrom'	=> True,
-					'tzoffsetto'	=> True,
-					'tzurl'		=> True,
-					'attendee'	=> True,
-					'contact'	=> True,
-					'organizer'	=> True,
-					'recurrence_id'	=> True,
-					'url'		=> True,
-					'uid'		=> True,
-					'exdate'	=> True,
-					'exrule'	=> True,
-					'rdate'	=> True,
-					'rrule'	=> True,
-					'action'	=> True,
-					'repeat'	=> True,
-					'trigger'	=> True,
-					'created'	=> True,
-					'dtstamp'	=> True,
-					'last_modified'	=> True,
-					'sequence'	=> True,
-					'x_type'		=> True,
-					'request_status'	=> True
-				)
-			),
-			'wkst'		=> Array(
-				'type'		=> 'string',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'rrule'		=> True
-				)
-			),
-			'x_type'		=> Array(
-				'type'		=> 'x_type',
-				'quoted'		=> False,
-				'to_text'	=> False,
-				'properties'	=> Array(
-					'calscale'	=> True,
-					'method'		=> True,
-					'prodid'		=> True,
-					'version'	=> True,
-					'attach'		=> True,
-					'categories'	=> True,
-					'class'		=> True,
-					'comment'	=> True,
-					'description'	=> True,
-					'geo'		=> True,
-					'location'	=> True,
-					'percent'	=> True,
-					'priority'	=> True,
-					'resources'	=> True,
-					'status'		=> True,
-					'summary'	=> True,
-					'completed'	=> True,
-					'dtend'		=> True,
-					'due'		=> True,
-					'dtstart'	=> True,
-					'duration'	=> True,
-					'freebusy'	=> True,
-					'transp'		=> True,
-					'tzid'		=> True,
-					'tzname'		=> True,
-					'tzoffsetfrom'	=> True,
-					'tzoffsetto'	=> True,
-					'tzurl'		=> True,
-					'attendee'	=> True,
-					'contact'	=> True,
-					'organizer'	=> True,
-					'recurrence_id'	=> True,
-					'url'		=> True,
-					'uid'		=> True,
-					'exdate'	=> True,
-					'exrule'	=> True,
-					'rdate'	=> True,
-					'rrule'	=> True,
-					'action'	=> True,
-					'repeat'	=> True,
-					'trigger'	=> True,
-					'created'	=> True,
-					'dtstamp'	=> True,
-					'last_modified'	=> True,
-					'sequence'	=> True,
-					'x_type'		=> True,
-					'request_status'	=> True
-				)
-			)			
-		);
-		if(!is_object($GLOBALS['phpgw']->datetime))
+		function boicalendar()
 		{
-			$GLOBALS['phpgw']->datetime = createobject('phpgwapi.datetime');
-		}
-	}
-
-	function set_var(&$event,$type,$value)
-	{
-		$type = strtolower(str_replace('-','_',$type));
-		$event[$type] = $value;
-		if(is_string($value))
-		{
-			$this->debug("Setting ".$type." = ".$value);
-		}
-		else
-		{
-			$this->debug("Setting ".$type." = "._debug_array($value,False));
-		}
-	}
-
-	function read_line_unfold($ical_text)
-	{
-		if($this->line < count($ical_text))
-		{
-			$str = str_replace("\r\n",'',$ical_text[$this->line]);
-			$this->line = $this->line + 1;
-			while(ereg("^[[:space:]]",$ical_text[$this->line]))
-			{
-				$str .= substr(str_replace("\r\n",'',$ical_text[$this->line]),1);
-				$this->line = $this->line + 1;
-			}
-			$this->debug("LINE : ".$str);
-			return $str;
-		}
-		else
-		{
-			return False;
-		}
-	}
-
-	function fold($str)
-	{
-		 return $this->chunk_split==True ? chunk_split($str,FOLD_LENGTH,"\r\n") : $str."\r\n";
-	}
-
-	function strip_quotes($str)
-	{
-		return str_replace('"','',$str);
-	}
-
-	function from_text($str)
-	{
-		$str = str_replace("\\,",",",$str);
-		$str = str_replace("\\;",";",$str);
-		$str = str_replace("\\N","\n",$str);
-		$str = str_replace("\\n","\n",$str);
-		$str = str_replace("\\\\","\\",$str);
-		return "$str";
-	}
-
-	function to_text($str)
-	{
-		$str = str_replace("\\","\\\\",$str);
-		$str = str_replace(",","\\,",$str);
-		$str = str_replace(";","\\;",$str);
-		$str = str_replace("\n","\\n",$str);
-		return "$str";
-	}
-
-	function from_dir($str)
-	{
-		return str_replace('=3D','=',str_replace('%20',' ',$str));
-	}
-
-	function to_dir($str)
-	{
-		return str_replace('=','=3D',str_replace(' ','%20',$str));
-	}
-
-	function find_parameters($property)
-	{
-		static  $cached_returns;
-
-		if(isset($cached_returns[$property]))
-		{
-			reset($cached_returns[$property]);
-			return $cached_returns[$property];
-		}
-		
-		reset($this->parameter);
-		while(list($key,$param_array) = each($this->parameter))
-		{
-			if($param_array['properties'][$property])
-			{
-				$param[] = $key;
-				$this->debug('Property : '.$property.' = Parameter : '.$key);
-			}
-		}
-		reset($param);
-		$cached_returns[$property] = $param;
-		return $param;
-	}
-
-	function find_properties($ical_type)
-	{
-		static  $cached_returns;
-
-		if(isset($cached_returns[$ical_type]))
-		{
-			reset($cached_returns[$ical_type]);
-			return $cached_returns[$ical_type];
-		}
-		
-		reset($this->property);
-		while(list($key,$param_array) = each($this->property))
-		{
-			if($param_array[$ical_type])
-			{
-				$prop[] = $key;
-			}
-		}
-		reset($prop);
-		$cached_returns[$ical_type] = $prop;
-		return $prop;
-	}
-
-	function new_ical()
-	{
-		return Array();
-	}
-
-	/*
-	 * Parse Functions
-	 */
-
-	function parse_geo(&$event,$value)
-	{
-//		$return_value = $this->explode_param($value,True);
-		if(count($return_value) == 2)
-		{
-			$event['lat'] = $return_value[0];
-			$event['lon'] = $return_value[1];
-		}
-	}
-
-	function parse_xtype(&$event,$majortype,$value)
-	{
-		$temp_x_type['name'] = strtoupper(substr($majortype,2));
-		$temp_x_type['value'] = $value;
-		$event['x_type'][] = $temp_x_type;
-	}
-
-	function parse_parameters(&$event,$majortype,$value)
-	{
-		if(!ereg('[\=\;]',$value))
-		{
-			$return_value[] = Array(
-				'param'	=> $majortype,
-				'value'	=> $value
+			$this->property = Array(
+				'action'		=> Array(
+					'type'		=> 'text',
+					'to_text'	=> True,
+					'valarm'		=> Array(
+						'state'		=> 'required',
+						'multiples'	=> False
+					)
+				),
+				'attach'		=> Array(
+					'type'		=> 'uri',
+					'to_text'	=> True,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'valarm'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					)
+				),
+				'attendee'		=> Array(
+					'type'		=> 'cal-address',
+					'to_text'	=> False,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'valarm'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vfreebusy'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					)
+				),
+				'categories'		=> Array(
+					'type'		=> 'text',
+					'to_text'	=> True,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					)
+				),
+				'class'			=> Array(
+					'type'		=> 'text',
+					'to_text'	=> True,
+					'vevent'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'comment'		=> Array(
+					'type'		=> 'text',
+					'to_text'	=> True,
+					'daylight'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'standard'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'valarm'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vfreebusy'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					)
+				),
+				'completed'		=> Array(
+					'type'		=> 'date-time',
+					'to_text'	=> False,
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'contact'		=> Array(
+					'type'		=> 'text',
+					'to_text'	=> True,
+					'vevent'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vfreebusy'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					)
+				),
+				'created'		=> Array(
+					'type'		=> 'date-time',
+					'to_text'	=> False,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'description'		=> Array(
+					'type'		=> 'text',
+					'to_text'	=> True,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'valarm'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'dtend'			=> Array(
+					'type'		=> 'date-time',
+					'to_text'	=> False,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vfreebusy'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'dtstamp'		=> Array(
+					'type'		=> 'date-time',
+					'to_text'	=> False,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vfreebusy'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'dtstart'		=> Array(
+					'type'		=> 'date-time',
+					'to_text'	=> False,
+					'daylight'	=> Array(
+						'state'		=> 'required',
+						'multiples'	=> False
+					),
+					'standard'	=> Array(
+						'state'		=> 'required',
+						'multiples'	=> False
+					),
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vfreebusy'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'due'			=> Array(
+					'type'		=> 'date-time',
+					'to_text'	=> False,
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'duration'		=> Array(
+					'type'		=> 'duration',
+					'to_text'	=> False,
+					'valarm'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vfreebusy'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'exdate'		=> Array(
+					'type'		=> 'date-time',
+					'to_text'	=> False,
+					'vevent'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					)
+				),
+				'exrule'		=> Array(
+					'type'		=> 'recur',
+					'to_text'	=> False,
+					'vevent'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					)
+				),
+				'freebusy'		=> Array(
+					'type'		=> 'freebusy',
+					'to_text'	=> False,
+					'vfreebusy'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					)
+				),
+				'geo'			=> Array(
+					'type'		=> 'float',
+					'to_text'	=> True,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'last_modified'		=> Array(
+					'type'		=> 'date-time',
+					'to_text'	=> False,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vtimezone'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'location'		=> Array(
+					'type'		=> 'text',
+					'to_text'	=> True,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'method'			=> Array(
+					'type'		=> 'text',
+					'to_text'	=> True,
+					'ical'	=> Array(
+						'state'		=> 'required',
+						'multiples'	=> False
+					)
+				),
+				'organizer'		=> Array(
+					'type'		=> 'cal-address',
+					'to_text'	=> False,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vfreebusy'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'percent_complete'	=> Array(
+					'type'		=> 'integer',
+					'to_text'	=> False,
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'priority'		=> Array(
+					'type'		=> 'integer',
+					'to_text'	=> True,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'prodid'			=> Array(
+					'type'		=> 'text',
+					'to_text'	=> True,
+					'ical'	=> Array(
+						'state'		=> 'required',
+						'multiples'	=> False
+					)
+				),
+				'rdate'			=> Array(
+					'type'		=> 'date-time',
+					'to_text'	=> False,
+					'daylight'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'standard'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					)
+				),
+				'recurrence_id'		=> Array(
+					'type'		=> 'date-time',
+					'to_text'	=> False,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vtodo'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'related_to'		=> Array(
+					'type'		=> 'text',
+					'to_text'	=> False,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					)
+				),
+				'request_status'	=> Array(
+					'type'		=> 'text',
+					'to_text'	=> True,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vfreebusy'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					)
+				),
+				'resources'		=> Array(
+					'type'		=> 'text',
+					'to_text'	=> False,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'rrule'			=> Array(
+					'type'		=> 'recur',
+					'to_text'	=> False,
+					'daylight'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'standard'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					)
+				),
+				'sequence'		=> Array(
+					'type'		=> 'integer',
+					'to_text'	=> True,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'status'		=> Array(
+					'type'		=> 'text',
+					'to_text'	=> True,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'summary'		=> Array(
+					'type'		=> 'text',
+					'to_text'	=> True,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'valarm'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'transp'		=> Array(
+					'type'		=> 'text',
+					'to_text'	=> True,
+					'vevent'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'trigger'		=> Array(
+					'type'		=> 'text',
+					'to_text'	=> True,
+					'valarm'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'tzid'			=> Array(
+					'type'		=> 'text',
+					'to_text'	=> True,
+					'vtimezone'		=> Array(
+						'state'		=> 'required',
+						'multiples'	=> False
+					)
+				),
+				'tzname'		=> Array(
+					'type'		=> 'text',
+					'to_text'	=> True,
+					'daylight'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					),
+					'standard'	=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> True
+					)
+				),
+				'tzoffsetfrom'		=> Array(
+					'type'		=> 'utc-offset',
+					'to_text'	=> True,
+					'daylight'		=> Array(
+						'state'		=> 'required',
+						'multiples'	=> False
+					),
+					'standard'		=> Array(
+						'state'		=> 'required',
+						'multiples'	=> False
+					)
+				),
+				'tzoffsetto'		=> Array(
+					'type'		=> 'utc-offset',
+					'to_text'	=> True,
+					'daylight'		=> Array(
+						'state'		=> 'required',
+						'multiples'	=> False
+					),
+					'standard'		=> Array(
+						'state'		=> 'required',
+						'multiples'	=> False
+					)
+				),
+				'tzurl'			=> Array(
+					'type'		=> 'uri',
+					'to_text'	=> True,
+					'vtimezone'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					)
+				),
+				'uid'			=> Array(
+					'type'		=> 'text',
+					'to_text'	=> True,
+					'vevent'	=> Array(
+						'state'		=> 'required',
+						'multiples'	=> False
+					),
+					'vfreebusy'		=> Array(
+						'state'		=> 'required',
+						'multiples'	=> False
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'required',
+						'multiples'	=> False
+					),
+					'vtodo'		=> Array(
+						'state'		=> 'required',
+						'multiples'	=> False
+					)
+				),
+				'url'			=> Array(
+					'type'		=> 'text',
+					'to_text'	=> True,
+					'vevent'	=> Array(
+						'state'		=> 'required',
+						'multiples'	=> False
+					),
+					'vfreebusy'		=> Array(
+						'state'		=> 'required',
+						'multiples'	=> False
+					),
+					'vjournal'		=> Array(
+						'state'		=> 'optional',
+						'multiples'	=> False
+					),
+					'vtodo'	=> Array(
+						'state'		=> 'required',
+						'multiples'	=> False
+					)
+				),
+				'version'			=> Array(
+					'type'		=> 'text',
+					'to_text'	=> True,
+					'ical'	=> Array(
+						'state'		=> 'required',
+						'multiples'	=> False
+					)
+				)
 			);
-			$value = '';
-		}
-		elseif(ereg('(.*(\:\\\\)?.*):(.*)',$value,$temp))
-		{
-			$this->debug('Value : '._debug_array($temp,False));
-			$this->debug('Param '.$majortype.' Value : '.$temp[3]);
-			if($temp[3])
+			$this->parameter = Array(
+				'altrep'		=> Array(
+					'type'		=> 'uri',
+					'quoted'		=> True,
+					'to_text'	=> True,
+					'properties'	=> Array(
+						'comment'		=> True,
+						'description'	=> True,
+						'location'		=> True,
+						'prodid'			=> True,
+						'resources'		=> True,
+						'summary'		=> True,
+						'contact'		=> True
+					)
+				),
+				'byday'		=> Array(
+					'type'		=> 'text',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'rrule'		=> True
+					)
+				),
+				'byhour'		=> Array(
+					'type'		=> 'text',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'rrule'		=> True
+					)
+				),
+				'byminute'		=> Array(
+					'type'		=> 'text',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'rrule'		=> True
+					)
+				),
+				'bymonth'		=> Array(
+					'type'		=> 'text',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'rrule'		=> True
+					)
+				),
+				'bymonthday'	=> Array(
+					'type'		=> 'text',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'rrule'		=> True
+					)
+				),
+				'bysecond'		=> Array(
+					'type'		=> 'text',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'rrule'		=> True
+					)
+				),
+				'bysetpos'		=> Array(
+					'type'		=> 'text',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'rrule'		=> True
+					)
+				),
+				'byweekno'		=> Array(
+					'type'		=> 'text',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'rrule'		=> True
+					)
+				),
+				'byyearday'		=> Array(
+					'type'		=> 'text',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'rrule'		=> True
+					)
+				),
+				'class'			=> Array(
+					'type'		=> 'function',
+					'function'	=> 'switch_class',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'class'			=> True
+					)
+				),
+				'cn'			=> Array(
+					'type'		=> 'text',
+					'quoted'		=> True,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'attendee'		=> True,
+						'organizer'		=> True
+					)
+				),
+				'count'		=> Array(
+					'type'		=> 'integer',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'rrule'			=> True
+					)
+				),
+				'cu'			=> Array(
+					'type'		=> 'function',
+					'function'	=> 'switch_cu',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'attendee'		=> True
+					)
+				),
+				'delegated_from'	=> Array(
+					'type'		=> 'function',
+					'function'	=> 'switch_mailto',
+					'quoted'		=> True,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'attendee'		=> True
+					)
+				),
+				'delegated_to'	=> Array(
+					'type'		=> 'function',
+					'function'	=> 'switch_mailto',
+					'quoted'		=> True,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'attendee'		=> True
+					)
+				),
+				'dir'			=> Array(
+					'type'		=> 'dir',
+					'quoted'		=> True,
+					'to_text'	=> True,
+					'properties'	=> Array(
+						'attendee'		=> True,
+						'organizer'		=> True
+					)
+				),
+				'dtend'		=> Array(
+					'type'		=> 'function',
+					'function'	=> 'switch_date',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'dtend'		=> True
+					)
+				),
+				'dtstamp'		=> Array(
+					'type'		=> 'function',
+					'function'	=> 'switch_date',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'dtstamp'		=> True
+					)
+				),
+				'dtstart'		=> Array(
+					'type'		=> 'function',
+					'function'	=> 'switch_date',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'dtstart'		=> True
+					)
+				),
+				'encoding'	=> Array( // was enocding ???
+					'type'		=> 'function',
+					'function'	=> 'switch_encoding',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'attach'			=> True
+					)
+				),
+				'fmttype'	=> Array(
+					'type'		=> 'text',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'attach'			=> True
+					)
+				),
+				'fbtype'		=> Array(
+					'type'		=> 'function',
+					'function'	=> 'switch_fbtype',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'attach'			=> True
+					)
+				),
+				'freq'		=> Array(
+					'type'		=> 'function',
+					'function'	=> 'switch_freq',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'rrule'			=> True
+					)
+				),
+				'interval'		=> Array(
+					'type'		=> 'integer',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'rrule'		=> True
+					)
+				),
+				'language'		=> Array(
+					'type'		=> 'text',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'categories'	=> True,
+						'comment'		=> True,
+						'description'	=> True,
+						'location'		=> True,
+						'resources'		=> True,
+						'summary'		=> True,
+						'tzname'			=> True,
+						'attendee'		=> True,
+						'contact'		=> True,
+						'organizer'		=> True,
+						'x-type'			=> True
+					)
+				),
+				'last_modified'		=> Array(
+					'type'		=> 'function',
+					'function'	=> 'switch_date',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'last_modified'	=> True
+					)
+				),
+				'mailto'		=> Array(
+					'type'		=> 'function',
+					'function'	=> 'switch_mailto',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'attendee'		=> True,
+						'organizer'		=> True
+					)
+				),
+				'member'		=> Array(
+					'type'		=> 'function',
+					'function'	=> 'switch_mailto',
+					'quoted'		=> True,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'attendee'		=> True
+					)
+				),
+				'partstat'		=> Array(
+					'type'		=> 'function',
+					'function'	=> 'switch_partstat',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'attendee'		=> True,
+						'organizer'		=> True
+					)
+				),
+				'range'		=> Array(
+					'type'		=> 'function',
+					'function'	=> 'switch_range',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'recurrence_id'	=> True
+					)
+				),
+				'related'		=> Array(
+					'type'		=> 'function',
+					'function'	=> 'switch_related',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'related_to'	=> True
+					)
+				),
+				'role'		=> Array(
+					'type'		=> 'function',
+					'function'	=> 'switch_role',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'attendee'		=> True,
+						'organizer'		=> True
+					)
+				),
+				'rsvp'		=> Array(
+					'type'		=> 'function',
+					'function'	=> 'switch_rsvp',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'attendee'		=> True
+					)
+				),
+				'sent_by'		=> Array(
+					'type'		=> 'function',
+					'function'	=> 'parse_user_host',
+					'quoted'		=> True,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'attendee'		=> True,
+						'organizer'		=> True
+					)
+				),
+				'tzid'		=> Array(
+					'type'		=> 'text',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'dtend'		=> True,
+						'due'			=> True,
+						'dtstart'	=> True,
+						'exdate'		=> True,
+						'rdate'		=> True,
+						'recurrence_id'	=> True
+					)
+				),
+				'until'		=> Array(
+					'type'		=> 'function',
+					'function'	=> 'switch_date',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'rrule'		=> True
+					)
+				),
+				'value'		=> Array(
+					'type'		=> 'value',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'calscale'	=> True,
+						'prodid'		=> True,
+						'method'		=> True,
+						'version'	=> True,
+						'attach'		=> True,
+						'categories'	=> True,
+						'class'		=> True,
+						'comment'	=> True,
+						'description'	=> True,
+						'geo'		=> True,
+						'location'	=> True,
+						'percent'	=> True,
+						'priority'	=> True,
+						'resources'	=> True,
+						'status'		=> True,
+						'summary'	=> True,
+						'completed'	=> True,
+						'dtend'		=> True,
+						'due'		=> True,
+						'dtstart'	=> True,
+						'duration'	=> True,
+						'freebusy'	=> True,
+						'transp'		=> True,
+						'tzid'		=> True,
+						'tzname'		=> True,
+						'tzoffsetfrom'	=> True,
+						'tzoffsetto'	=> True,
+						'tzurl'		=> True,
+						'attendee'	=> True,
+						'contact'	=> True,
+						'organizer'	=> True,
+						'recurrence_id'	=> True,
+						'url'		=> True,
+						'uid'		=> True,
+						'exdate'	=> True,
+						'exrule'	=> True,
+						'rdate'	=> True,
+						'rrule'	=> True,
+						'action'	=> True,
+						'repeat'	=> True,
+						'trigger'	=> True,
+						'created'	=> True,
+						'dtstamp'	=> True,
+						'last_modified'	=> True,
+						'sequence'	=> True,
+						'x_type'		=> True,
+						'request_status'	=> True
+					)
+				),
+				'wkst'		=> Array(
+					'type'		=> 'string',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'rrule'		=> True
+					)
+				),
+				'x_type'		=> Array(
+					'type'		=> 'x_type',
+					'quoted'		=> False,
+					'to_text'	=> False,
+					'properties'	=> Array(
+						'calscale'	=> True,
+						'method'		=> True,
+						'prodid'		=> True,
+						'version'	=> True,
+						'attach'		=> True,
+						'categories'	=> True,
+						'class'		=> True,
+						'comment'	=> True,
+						'description'	=> True,
+						'geo'		=> True,
+						'location'	=> True,
+						'percent'	=> True,
+						'priority'	=> True,
+						'resources'	=> True,
+						'status'		=> True,
+						'summary'	=> True,
+						'completed'	=> True,
+						'dtend'		=> True,
+						'due'		=> True,
+						'dtstart'	=> True,
+						'duration'	=> True,
+						'freebusy'	=> True,
+						'transp'		=> True,
+						'tzid'		=> True,
+						'tzname'		=> True,
+						'tzoffsetfrom'	=> True,
+						'tzoffsetto'	=> True,
+						'tzurl'		=> True,
+						'attendee'	=> True,
+						'contact'	=> True,
+						'organizer'	=> True,
+						'recurrence_id'	=> True,
+						'url'		=> True,
+						'uid'		=> True,
+						'exdate'	=> True,
+						'exrule'	=> True,
+						'rdate'	=> True,
+						'rrule'	=> True,
+						'action'	=> True,
+						'repeat'	=> True,
+						'trigger'	=> True,
+						'created'	=> True,
+						'dtstamp'	=> True,
+						'last_modified'	=> True,
+						'sequence'	=> True,
+						'x_type'		=> True,
+						'request_status'	=> True
+					)
+				)
+			);
+			if(!is_object($GLOBALS['phpgw']->datetime))
 			{
-				$return_value[] = Array(
-					'param'	=> $majortype,
-					'value'	=> $temp[3]
-				);
-				$value = str_replace(':MAILTO','',$temp[1]);
-			}
-			while(ereg('(([A-Z\-]*)[=]([[:alnum:] \_\)\(\/\$\.\,\:\\\|\*\&\^\%\#\!\~\"\?\&\@\<\>\-]*))([\;]?)(.*)',$value,$temp))
-			{
-				$this->debug('Value : '._debug_array($temp,False));
-				$this->debug('Param '.$temp[2].' Value : '.$temp[3]);
-				$return_value[] = Array(
-					'param'	=> $temp[2],
-					'value'	=> $temp[3]
-				);
-				$value = chop($temp[5]);
-				$this->debug('Value would be = '.$value);
-				flush();
+				$GLOBALS['phpgw']->datetime = createobject('phpgwapi.datetime');
 			}
 		}
-		else
+
+		function set_var(&$event,$type,$value)
 		{
-			while(ereg('(([A-Z\-]*)[=]([[:alnum:] \_\)\(\/\$\.\,\:\\\|\*\&\^\%\#\!\~\"\?\&\@\<\>\-]*))([\;]?)(.*)',$value,$temp))
+			$type = strtolower(str_replace('-','_',$type));
+			$event[$type] = $value;
+			if(is_string($value))
 			{
-				$this->debug('Value : '._debug_array($temp,False));
-				$this->debug('Param '.$temp[2].' Value : '.$temp[3]);
-				$return_value[] = Array(
-					'param'	=> $temp[2],
-					'value'	=> $temp[3]
-				);
-				$value = chop($temp[5]);
-				$this->debug('Value would be = '.$value);
-				flush();
-			}
-		}
-		
-		for($i=0;$i<count($return_value);$i++)
-		{
-			$name = strtolower($return_value[$i]['param']);
-			$value = $this->strip_quotes($return_value[$i]['value']);
-			if(substr($name,0,2) == 'x-')
-			{
-				$param = 'x_type';
-				$name = str_replace('-','_',$return_value[$i]['param']);
+				$this->debug("Setting ".$type." = ".$value);
 			}
 			else
 			{
-				$param = str_replace('-','_',strtolower($name));
-				if(!isset($this->parameter[$param]) || $majortype == 'tzid')
+				$this->debug("Setting ".$type." = "._debug_array($value,False));
+			}
+		}
+
+		function read_line_unfold($ical_text)
+		{
+			if($this->line < count($ical_text))
+			{
+				$str = str_replace("\r\n",'',$ical_text[$this->line]);
+				$this->line = $this->line + 1;
+				while(ereg("^[[:space:]]",$ical_text[$this->line]))
 				{
-					if($majortype == 'attendee' || $majortype == 'organizer')
+					$str .= substr(str_replace("\r\n",'',$ical_text[$this->line]),1);
+					$this->line = $this->line + 1;
+				}
+				$this->debug("LINE : ".$str);
+				return $str;
+			}
+			else
+			{
+				return False;
+			}
+		}
+
+		function fold($str)
+		{
+			return $this->chunk_split==True ? chunk_split($str,FOLD_LENGTH,"\r\n") : $str."\r\n";
+		}
+
+		function strip_quotes($str)
+		{
+			return str_replace('"','',$str);
+		}
+
+		function from_text($str)
+		{
+			$str = str_replace("\\,",",",$str);
+			$str = str_replace("\\;",";",$str);
+			$str = str_replace("\\N","\n",$str);
+			$str = str_replace("\\n","\n",$str);
+			$str = str_replace("\\\\","\\",$str);
+			return "$str";
+		}
+
+		function to_text($str)
+		{
+			$str = str_replace("\\","\\\\",$str);
+			$str = str_replace(",","\\,",$str);
+			$str = str_replace(";","\\;",$str);
+			$str = str_replace("\n","\\n",$str);
+			return "$str";
+		}
+
+		function from_dir($str)
+		{
+			return str_replace('=3D','=',str_replace('%20',' ',$str));
+		}
+
+		function to_dir($str)
+		{
+			return str_replace('=','=3D',str_replace(' ','%20',$str));
+		}
+
+		function find_parameters($property)
+		{
+			static  $cached_returns;
+
+			if(isset($cached_returns[$property]))
+			{
+				reset($cached_returns[$property]);
+				return $cached_returns[$property];
+			}
+
+			reset($this->parameter);
+			while(list($key,$param_array) = each($this->parameter))
+			{
+				if($param_array['properties'][$property])
+				{
+					$param[] = $key;
+					$this->debug('Property : '.$property.' = Parameter : '.$key);
+				}
+			}
+			reset($param);
+			$cached_returns[$property] = $param;
+			return $param;
+		}
+
+		function find_properties($ical_type)
+		{
+			static  $cached_returns;
+
+			if(isset($cached_returns[$ical_type]))
+			{
+				reset($cached_returns[$ical_type]);
+				return $cached_returns[$ical_type];
+			}
+
+			reset($this->property);
+			while(list($key,$param_array) = each($this->property))
+			{
+				if($param_array[$ical_type])
+				{
+					$prop[] = $key;
+				}
+			}
+			reset($prop);
+			$cached_returns[$ical_type] = $prop;
+			return $prop;
+		}
+
+		function new_ical()
+		{
+			return Array();
+		}
+
+		/*
+		* Parse Functions
+		*/
+
+		function parse_geo(&$event,$value)
+		{
+			//		$return_value = $this->explode_param($value,True);
+			if(count($return_value) == 2)
+			{
+				$event['lat'] = $return_value[0];
+				$event['lon'] = $return_value[1];
+			}
+		}
+
+		function parse_xtype(&$event,$majortype,$value)
+		{
+			$temp_x_type['name'] = strtoupper(substr($majortype,2));
+			$temp_x_type['value'] = $value;
+			$event['x_type'][] = $temp_x_type;
+		}
+
+		function parse_parameters(&$event,$majortype,$value)
+		{
+			if(!ereg('[\=\;]',$value))
+			{
+				$return_value[] = Array(
+					'param'	=> $majortype,
+					'value'	=> $value
+				);
+				$value = '';
+			}
+			elseif(ereg('(.*(\:\\\\)?.*):(.*)',$value,$temp))
+			{
+				$this->debug('Value : '._debug_array($temp,False));
+				$this->debug('Param '.$majortype.' Value : '.$temp[3]);
+				if($temp[3])
+				{
+					$return_value[] = Array(
+						'param'	=> $majortype,
+						'value'	=> $temp[3]
+					);
+					$value = str_replace(':MAILTO','',$temp[1]);
+				}
+				while(ereg('(([A-Z\-]*)[=]([[:alnum:] \_\)\(\/\$\.\,\:\\\|\*\&\^\%\#\!\~\"\?\&\@\<\>\-]*))([\;]?)(.*)',$value,$temp))
+				{
+					$this->debug('Value : '._debug_array($temp,False));
+					$this->debug('Param '.$temp[2].' Value : '.$temp[3]);
+					$return_value[] = Array(
+						'param'	=> $temp[2],
+						'value'	=> $temp[3]
+					);
+					$value = chop($temp[5]);
+					$this->debug('Value would be = '.$value);
+					flush();
+				}
+			}
+			else
+			{
+				while(ereg('(([A-Z\-]*)[=]([[:alnum:] \_\)\(\/\$\.\,\:\\\|\*\&\^\%\#\!\~\"\?\&\@\<\>\-]*))([\;]?)(.*)',$value,$temp))
+				{
+					$this->debug('Value : '._debug_array($temp,False));
+					$this->debug('Param '.$temp[2].' Value : '.$temp[3]);
+					$return_value[] = Array(
+						'param'	=> $temp[2],
+						'value'	=> $temp[3]
+					);
+					$value = chop($temp[5]);
+					$this->debug('Value would be = '.$value);
+					flush();
+				}
+			}
+
+			for($i=0;$i<count($return_value);$i++)
+			{
+				$name = strtolower($return_value[$i]['param']);
+				$value = $this->strip_quotes($return_value[$i]['value']);
+				if(substr($name,0,2) == 'x-')
+				{
+					$param = 'x_type';
+					$name = str_replace('-','_',$return_value[$i]['param']);
+				}
+				else
+				{
+					$param = str_replace('-','_',strtolower($name));
+					if(!isset($this->parameter[$param]) || $majortype == 'tzid')
 					{
-						$param = 'mailto';
-						$name = $param;
+						if($majortype == 'attendee' || $majortype == 'organizer')
+						{
+							$param = 'mailto';
+							$name = $param;
+						}
+						else
+						{
+							$param = 'value';
+						}
 					}
-					else
+				}
+				$this->debug('name : '.$name.' : Param = '.$param);
+				if(@$this->parameter[$param]['properties'][$majortype])
+				{
+					switch(@$this->parameter[$param]['type'])
 					{
-						$param = 'value';
+						case 'dir':
+							$this->set_var($event,$name,$this->from_dir($value));
+							break;
+						case 'text':
+							$this->set_var($event,$name,$value);
+							break;
+						case 'x_type':
+							$this->parse_xtype($event,$name,$value);
+							break;
+						case 'function':
+							$function = $this->parameter[$param]['function'];
+							$this->set_var($event,$name,$this->$function($value));
+							break;
+						case 'uri':
+							if(@$this->parameter[$param]['to_text'])
+							{
+								$value = $this->to_text($value);
+							}
+							$this->set_var($event,$name,$value);
+							break;
+						case 'integer':
+							$this->set_var($event,$name,(int)$value);
+							break;
+						case 'value':
+							if(@$this->property[$majortype]['type'] == 'date-time')
+							{
+								$this->set_var($event,$param,$this->switch_date($name));
+							}
+							elseif($value <> "\\n" && $value)
+							{
+								$this->set_var($event[$majortype],$param,$value);
+							}
+							$this->debug('Event : '._debug_array($event,False));
+							break;
 					}
 				}
 			}
-			$this->debug('name : '.$name.' : Param = '.$param);
-			if(@$this->parameter[$param]['properties'][$majortype])
+		}
+
+		function parse_value(&$event,$majortype,$value,$mode)
+		{
+			$var = Array();
+			$this->debug('Mode : '.$mode.' Majortype : '.$majortype);
+			$this->parse_parameters($var,$majortype,$value);
+			if($this->property[$majortype][$mode]['multiples'])
 			{
-				switch(@$this->parameter[$param]['type'])
+				$this->debug(_debug_array($var,False));
+				$event[$majortype][] = $var;
+			}
+			else
+			{
+				$this->debug('Majortype : '.$majortype);
+				$this->debug('Property : '.$this->property[$majortype]['type']);
+				if($this->property[$majortype]['type'] == 'date-time')
 				{
-					case 'dir':
-						$this->set_var($event,$name,$this->from_dir($value));
-						break;
-					case 'text':
-						$this->set_var($event,$name,$value);
-						break;
-					case 'x_type':
-						$this->parse_xtype($event,$name,$value);
-						break;
-					case 'function':
-						$function = $this->parameter[$param]['function'];
-						$this->set_var($event,$name,$this->$function($value));
-						break;
-					case 'uri':
-						if(@$this->parameter[$param]['to_text'])
+					$this->debug('Got a DATE-TIME type!');
+					$t_var = $var[$majortype];
+					unset($var[$majortype]);
+					reset($t_var);
+					while(list($key,$val) = each($t_var))
+					{
+						$var[$key] = $val;
+					}
+					$this->debug($majortype.' : '._debug_array($var,False));
+				}
+				$this->set_var($event,$majortype,$var);
+			}
+		}
+
+		/*
+		 * Build-Card Functions
+		 */
+
+		function build_xtype($x_type,$seperator='=')
+		{
+			$quote = '';
+			if($seperator == '=')
+			{
+				$quote = '"';
+			}
+
+			$return_value = $this->fold('X-'.$x_type['name'].$seperator.$quote.$x_type['value'].$quote);
+			if($seperator == '=')
+			{
+				return str_replace("\r\n",'',$return_value);
+			}
+			else
+			{
+				return $return_value;
+			}
+		}
+
+		function build_parameters($event,$property)
+		{
+			$str = '';
+			$include_mailto = False;
+			$include_datetime = False;
+			$param = $this->find_parameters($property);
+
+			if($property == 'exdate')
+			{
+				while(list($key,$value) = each($event))
+				{
+					$exdates[] = $this->switch_date($value);
+				}
+				return ':'.implode($exdates,',');
+			}
+			else
+			{
+				while(list($dumb_key,$key) = each($param))
+				{
+					if($key == 'value')
+					{
+						continue;
+					}
+					if($key == 'mailto')
+					{
+						$include_mailto = True;
+						continue;
+					}
+					$param_array = @$this->parameter[$key];
+					$type = @$this->parameter[$key]['type'];
+					if($type == 'date-time')
+					{
+						$include_datetime = True;
+						continue;
+					}
+					$quote = (@$this->parameter[$key]['quoted']?'"':'');
+					if(isset($event[$key]) && @$this->parameter[$key]['properties'][$property])
+					{
+						$change_text = @$this->parameter[$key]['to_text'];
+						$value = $event[$key];
+						if($change_text && $type == 'text')
 						{
 							$value = $this->to_text($value);
 						}
-						$this->set_var($event,$name,$value);
-						break;
-					case 'integer':
-						$this->set_var($event,$name,intval($value));
-						break;
-					case 'value':
-						if(@$this->property[$majortype]['type'] == 'date-time')
+						switch($type)
 						{
-							$this->set_var($event,$param,$this->switch_date($name));
+							case 'dir':
+								$str .= ';'.str_replace('_','-',strtoupper($key)).'='.$quote.$this->to_dir($value).$quote;
+								break;
+							case 'function':
+								$str .= ';'.str_replace('_','-',strtoupper($key)).'=';
+								$function = $this->parameter[$key]['function'];
+								$this->debug($key.' Function Param : '.$value);
+								$str .= $quote.$this->$function($value).$quote;
+								break;
+							case 'text':
+							case 'string':
+								$str .= ';'.strtoupper($key).'='.$quote.$value.$quote;
+								break;
+							case 'date-time':
+								$str .= ($key=='until'?':':';UNTIL=').date('Ymd\THis',mktime($event['hour'],$event['min'],$event['sec'],$event['month'],$event['mday'],$event['year'])).(!@isset($event['tzid'])?'Z':'');
+								break;
 						}
-						elseif($value <> "\\n" && $value)
-						{
-							$this->set_var($event[$majortype],$param,$value);
-						}
-						$this->debug('Event : '._debug_array($event,False));
-						break;
+						unset($value);
+					}
 				}
-			}
-		}				
-	}
 
-	function parse_value(&$event,$majortype,$value,$mode)
-	{
-		$var = Array();
-		$this->debug('Mode : '.$mode.' Majortype : '.$majortype);
-		$this->parse_parameters($var,$majortype,$value);
-		if($this->property[$majortype][$mode]['multiples'])
-		{
-			$this->debug(_debug_array($var,False));
-			$event[$majortype][] = $var;
-		}
-		else
-		{
-			$this->debug('Majortype : '.$majortype);
-			$this->debug('Property : '.$this->property[$majortype]['type']);
-			if($this->property[$majortype]['type'] == 'date-time')
-			{
-				$this->debug('Got a DATE-TIME type!');
-				$t_var = $var[$majortype];
-				unset($var[$majortype]);
-				reset($t_var);
-				while(list($key,$val) = each($t_var))
+				if(!empty($event['x_type']))
 				{
-					$var[$key] = $val;
+					$c_x_type = count($event['x_type']);
+					for($j=0;$j<$c_x_type;$j++)
+					{
+						$str .= ';'.$this->build_xtype($event['x_type'][$j],'=');
+					}
 				}
-				$this->debug($majortype.' : '._debug_array($var,False));
+				if(!empty($event['value']))
+				{
+					if($property == 'trigger')
+					{
+						$seperator = ';';
+					}
+					else
+					{
+						$seperator = ':';
+					}
+					$str .= $seperator.($this->parameter['value']['to_text']?$this->to_text($event['value']):$event['value']);
+				}
+				if($include_mailto == True)
+				{
+					$key = 'mailto';
+					$function = $this->parameter[$key]['function'];
+					$ret_value = $this->$function($event[$key]);
+					$str .= ($ret_value?':'.$ret_value:'');
+				}
+				if($include_datetime == True || @$this->property[$property]['type'] == 'date-time')
+				{
+					$str .= ':'.date('Ymd\THis',mktime($event['hour'],$event['min'],$event['sec'],$event['month'],$event['mday'],$event['year'])).(!@isset($event['tzid'])?'Z':'');
+				}
+				return ($property=='rrule'?':'.substr($str,1):$str);
 			}
-			$this->set_var($event,$majortype,$var);
 		}
-	}
 
-
-	/*
-	 * Build-Card Functions
-	 */
-
-	function build_xtype($x_type,$seperator='=')
-	{
-		$quote = '';
-		if($seperator == '=')
-		{
-			$quote = '"';
-		}
-		
-		$return_value = $this->fold('X-'.$x_type['name'].$seperator.$quote.$x_type['value'].$quote);
-		if($seperator == '=')
-		{
-			return str_replace("\r\n",'',$return_value);
-		}
-		else
-		{
-			return $return_value;
-		}
-	}
-
-	function build_parameters($event,$property)
-	{
-		$str = '';
-		$include_mailto = False;
-		$include_datetime = False;
-		$param = $this->find_parameters($property);
-
-		if($property == 'exdate')
-		{
-			while(list($key,$value) = each($event))
-			{
-				$exdates[] = $this->switch_date($value);
-			}
-			return ':'.implode($exdates,',');
-		}
-		else
+		function build_text($event,$property)
 		{
+			$str = '';
+			$param = $this->find_parameters($property);
 			while(list($dumb_key,$key) = each($param))
 			{
-				if($key == 'value')
+				if(!empty($event[$key]) && $key != 'value')
 				{
-					continue;
-				}
-				if($key == 'mailto')
-				{
-					$include_mailto = True;
-					continue;
-				}
-				$param_array = @$this->parameter[$key];
-				$type = @$this->parameter[$key]['type'];
-				if($type == 'date-time')
-				{
-					$include_datetime = True;
-					continue;
-				}
-				$quote = (@$this->parameter[$key]['quoted']?'"':'');
-				if(isset($event[$key]) && @$this->parameter[$key]['properties'][$property])
-				{
-					$change_text = @$this->parameter[$key]['to_text'];
-					$value = $event[$key];
-					if($change_text && $type == 'text')
+					$type = @$this->parameter[$key]['type'];
+					$quote = @$this->parameter[$key]['quote'];
+					if(@$this->parameter[$key]['to_text'] == True)
 					{
-						$value = $this->to_text($value);
+						$value = $this->to_text($event[$key]);
+					}
+					else
+					{
+						$value = $event[$key];
 					}
 					switch($type)
 					{
-						case 'dir':
-							$str .= ';'.str_replace('_','-',strtoupper($key)).'='.$quote.$this->to_dir($value).$quote;
-							break;
-						case 'function':
-							$str .= ';'.str_replace('_','-',strtoupper($key)).'=';
-							$function = $this->parameter[$key]['function'];
-							$this->debug($key.' Function Param : '.$value);
-							$str .= $quote.$this->$function($value).$quote;
-							break;
 						case 'text':
-						case 'string':
-							$str .= ';'.strtoupper($key).'='.$quote.$value.$quote;
-							break;
-						case 'date-time':
-							$str .= ($key=='until'?':':';UNTIL=').date('Ymd\THis',mktime($event['hour'],$event['min'],$event['sec'],$event['month'],$event['mday'],$event['year'])).(!@isset($event['tzid'])?'Z':'');
-							break;
+						$str .= ';'.strtoupper($key).'='.$quote.$value.$quote;
+						break;
 					}
-					unset($value);
 				}
 			}
-
 			if(!empty($event['x_type']))
 			{
 				$c_x_type = count($event['x_type']);
@@ -1655,158 +1713,29 @@ class boicalendar
 			}
 			if(!empty($event['value']))
 			{
-				if($property == 'trigger')
-				{
-					$seperator = ';';
-				}
-				else
-				{
-					$seperator = ':';
-				}
-				$str .= $seperator.($this->parameter['value']['to_text']?$this->to_text($event['value']):$event['value']);
+				$str .= ':'.($this->parameter['value']['to_text']?$this->to_text($event['value']):$event['value']);
 			}
-			if($include_mailto == True)
-			{
-				$key = 'mailto';
-				$function = $this->parameter[$key]['function'];
-				$ret_value = $this->$function($event[$key]);
-				$str .= ($ret_value?':'.$ret_value:'');
-			}
-			if($include_datetime == True || @$this->property[$property]['type'] == 'date-time')
-			{
-				$str .= ':'.date('Ymd\THis',mktime($event['hour'],$event['min'],$event['sec'],$event['month'],$event['mday'],$event['year'])).(!@isset($event['tzid'])?'Z':'');
-			}
-			return ($property=='rrule'?':'.substr($str,1):$str);
+			return $str;
 		}
-	}
 
-	function build_text($event,$property)
-	{
-		$str = '';
-		$param = $this->find_parameters($property);
-		while(list($dumb_key,$key) = each($param))
+		function build_card_internals($ical_item,$event)
 		{
-			if(!empty($event[$key]) && $key != 'value')
+			$prop = $this->find_properties($ical_item);
+			reset($prop);
+			while(list($dumb_key,$key) = each($prop))
 			{
-				$type = @$this->parameter[$key]['type'];
-				$quote = @$this->parameter[$key]['quote'];
-				if(@$this->parameter[$key]['to_text'] == True)
-				{
-					$value = $this->to_text($event[$key]);
-				}
-				else
-				{
-					$value = $event[$key];
-				}
+				$value  = $key;
+				$varray = $this->property[$key];
+				$type   = $varray['type'];
+				$to_text = $varray['to_text'];
+				$state  = @$varray[$ical_item]['state'];
+				$multiples  = @$varray[$ical_item]['multiples'];
 				switch($type)
 				{
-					case 'text':
-						$str .= ';'.strtoupper($key).'='.$quote.$value.$quote;
-						break;						
-				}
-			}
-		}
-		if(!empty($event['x_type']))
-		{
-			$c_x_type = count($event['x_type']);
-			for($j=0;$j<$c_x_type;$j++)
-			{
-				$str .= ';'.$this->build_xtype($event['x_type'][$j],'=');
-			}
-		}
-		if(!empty($event['value']))
-		{
-			$str .= ':'.($this->parameter['value']['to_text']?$this->to_text($event['value']):$event['value']);
-		}
-		return $str;
-	}
-
-	function build_card_internals($ical_item,$event)
-	{
-		$prop = $this->find_properties($ical_item);
-		reset($prop);
-		while(list($dumb_key,$key) = each($prop))
-		{
-			$value  = $key;
-			$varray = $this->property[$key];
-			$type   = $varray['type'];
-			$to_text = $varray['to_text'];
-			$state  = @$varray[$ical_item]['state'];
-			$multiples  = @$varray[$ical_item]['multiples'];
-			switch($type)
-			{
-				case 'date-time':
-					if(!empty($event[$value]))
-					{
-						if($multiples && $value != 'exdate')
+					case 'date-time':
+						if(!empty($event[$value]))
 						{
-							for($i=0;$i<count($event[$value]);$i++)
-							{
-								$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters($event[$value][$i],$value));
-							}
-						}
-						else
-						{
-							$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters($event[$value],$value));
-						}
-					}
-					elseif($value == 'dtstamp' || $value == 'created')
-					{
-						$str .= $this->fold(strtoupper(str_replace('_','-',$value)).':'.gmdate('Ymd\THis\Z'));
-					}
-					break;
-				case 'uri':
-					if(!empty($event[$value]))
-					{
-						for($i=0;$i<count($event[$value]);$i++)
-						{
-							$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters($event[$value][$i],$to_text));
-						}
-					}
-					break;
-				case 'recur':
-					if(!empty($event[$value]))
-					{
-						if($multiples)
-						{
-							for($i=0;$i<count($event[$value]);$i++)
-							{
-								$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters($event[$value][$i],$value));
-							}
-						}
-						else
-						{
-							$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters($event[$value],$value));
-						}
-					}
-					break;
-				case 'integer':
-					if(!empty($event[$value]))
-					{
-						$str .= $this->fold(strtoupper(str_replace('_','-',$value)).':'.$event[$value]);
-					}
-					elseif($value == 'sequence' || $value == 'percent_complete')
-					{
-						$str .= $this->fold(strtoupper(str_replace('_','-',$value)).':0');
-					}
-					break;
-				case 'function':
-					$str .= ';'.str_replace('_','-',strtoupper($value)).'=';
-					$function = @$this->parameter[$key]['function'];
-					$str .= (@$this->parameter[$key]['quoted']?'"':'').$this->$function($event[$key]).(@$this->parameter[$key]['quoted']?'"':'');
-					break;
-				case 'float':
-					if(!empty($event[$value]))
-					{
-						$str .= $this->fold(strtoupper(str_replace('_','-',$value)).':'.$event[$value]['lat'].';'.$event[$value]['lon']);
-					}
-					break;
-				case 'text':
-					if(isset($event[$value]))
-					{
-						if(@$this->parameter[$key]['type'] != 'function')
-						{
-							if($multiples && count($event[$value]) > 1)
+							if($multiples && $value != 'exdate')
 							{
 								for($i=0;$i<count($event[$value]);$i++)
 								{
@@ -1818,1041 +1747,1123 @@ class boicalendar
 								$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters($event[$value],$value));
 							}
 						}
-						else
+						elseif($value == 'dtstamp' || $value == 'created')
+						{
+							$str .= $this->fold(strtoupper(str_replace('_','-',$value)).':'.gmdate('Ymd\THis\Z'));
+						}
+						break;
+					case 'uri':
+						if(!empty($event[$value]))
+						{
+							for($i=0;$i<count($event[$value]);$i++)
+							{
+								$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters($event[$value][$i],$to_text));
+							}
+						}
+						break;
+					case 'recur':
+						if(!empty($event[$value]))
 						{
-							$function = $this->parameter[$value]['function'];
 							if($multiples)
 							{
 								for($i=0;$i<count($event[$value]);$i++)
 								{
-									$str .= $this->fold(strtoupper(str_replace('_','-',$value)).':'.$this->$function($event[$value][$i]));
+									$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters($event[$value][$i],$value));
 								}
 							}
 							else
 							{
-								$str .= $this->fold(strtoupper(str_replace('_','-',$value)).':'.$this->$function($event[$value]));
+								$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters($event[$value],$value));
 							}
 						}
-					}
-					break;
-				case 'cal-address':
-					if(is_array($event[$value][0]))
-					{
-						for($j=0;$j<count($event[$value]);$j++)
+						break;
+					case 'integer':
+						if(!empty($event[$value]))
 						{
-							$temp_output = $this->build_parameters($event[$value][$j],$value);
+							$str .= $this->fold(strtoupper(str_replace('_','-',$value)).':'.$event[$value]);
+						}
+						elseif($value == 'sequence' || $value == 'percent_complete')
+						{
+							$str .= $this->fold(strtoupper(str_replace('_','-',$value)).':0');
+						}
+						break;
+					case 'function':
+						$str .= ';'.str_replace('_','-',strtoupper($value)).'=';
+						$function = @$this->parameter[$key]['function'];
+						$str .= (@$this->parameter[$key]['quoted']?'"':'').$this->$function($event[$key]).(@$this->parameter[$key]['quoted']?'"':'');
+						break;
+					case 'float':
+						if(!empty($event[$value]))
+						{
+							$str .= $this->fold(strtoupper(str_replace('_','-',$value)).':'.$event[$value]['lat'].';'.$event[$value]['lon']);
+						}
+						break;
+					case 'text':
+						if(isset($event[$value]))
+						{
+							if(@$this->parameter[$key]['type'] != 'function')
+							{
+								if($multiples && count($event[$value]) > 1)
+								{
+									for($i=0;$i<count($event[$value]);$i++)
+									{
+										$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters($event[$value][$i],$value));
+									}
+								}
+								else
+								{
+									$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$this->build_parameters($event[$value],$value));
+								}
+							}
+							else
+							{
+								$function = $this->parameter[$value]['function'];
+								if($multiples)
+								{
+									for($i=0;$i<count($event[$value]);$i++)
+									{
+										$str .= $this->fold(strtoupper(str_replace('_','-',$value)).':'.$this->$function($event[$value][$i]));
+									}
+								}
+								else
+								{
+									$str .= $this->fold(strtoupper(str_replace('_','-',$value)).':'.$this->$function($event[$value]));
+								}
+							}
+						}
+						break;
+					case 'cal-address':
+						if(is_array($event[$value][0]))
+						{
+							for($j=0;$j<count($event[$value]);$j++)
+							{
+								$temp_output = $this->build_parameters($event[$value][$j],$value);
+								if($temp_output)
+								{
+									$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$temp_output);
+								}
+							}
+						}
+						else
+						{
+							$temp_output = $this->build_parameters($event[$value],$value);
 							if($temp_output)
 							{
 								$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$temp_output);
 							}
 						}
+						break;
+				}
+			}
+			if(!empty($event['x_type']))
+			{
+				for($i=0;$i<count($event['x_type']);$i++)
+				{
+					$str .= $this->build_xtype($event['x_type'][$i],':');
+				}
+			}
+
+			if($ical_item == 'vtimezone')
+			{
+				if($event['tzdata'])
+				{
+					for($k=0;$k<count($event['tzdata']);$k++)
+					{
+						$str .= 'BEGIN:'.strtoupper($event['tzdata'][$k]['type'])."\r\n";
+						$str .= $this->build_card_internals(strtolower($event['tzdata'][$k]['type']),$event['tzdata'][$k]);
+						$str .= 'END:'.strtoupper($event['tzdata'][$k]['type'])."\r\n";
+					}
+				}
+			}
+			elseif($event['alarm'])
+			{
+				for($k=0;$k<count($event['alarm']);$k++)
+				{
+					$str .= 'BEGIN:VALARM'."\r\n";
+					$str .= $this->build_card_internals('valarm',$event['alarm'][$k]);
+					$str .= 'END:VALARM'."\r\n";
+				}
+			}
+			return $str;
+		}
+
+		/*
+		* Switching Functions
+		*/
+
+		function switch_class($var)
+		{
+			if(is_string($var))
+			{
+				switch($var)
+				{
+					case 'PRIVATE':
+						return PRIVATE;
+						break;
+					case 'PUBLIC':
+						return PUBLIC;
+						break;
+					case 'CONFIDENTIAL':
+						return CONFIDENTIAL;
+						break;
+				}
+			}
+			elseif(is_int($var))
+			{
+				switch((int)$var)
+				{
+					case PRIVATE:
+						return 'PRIVATE';
+						break;
+					case PUBLIC:
+						return 'PUBLIC';
+						break;
+					case CONFIDENTIAL:
+						return 'CONFIDENTIAL';
+						break;
+				}
+			}
+			else
+			{
+				return $var;
+			}
+		}
+
+		function switch_cu($var)
+		{
+			if(gettype($var) == 'string')
+			{
+				switch($var)
+				{
+					case 'INDIVIDUAL':
+						return INDIVIDUAL;
+						break;
+					case 'GROUP':
+						return GROUP;
+						break;
+					case 'RESOURCE':
+						return RESOURCE;
+						break;
+					case 'ROOM':
+						return ROOM;
+						break;
+					case 'UNKNOWN':
+						return UNKNOWN;
+						break;
+					default:
+						return OTHER;
+						break;
+				}
+			}
+			elseif(gettype($var) == 'integer')
+			{
+				switch($var)
+				{
+					case INDIVIDUAL:
+						return 'INDIVIDUAL';
+						break;
+					case GROUP:
+						return 'GROUP';
+						break;
+					case RESOURCE:
+						return 'RESOURCE';
+						break;
+					case ROOM:
+						return 'ROOM';
+						break;
+					case UNKNOWN:
+						return 'UNKNOWN';
+						break;
+					default:
+						return 'X-OTHER';
+						break;
+				}
+			}
+			else
+			{
+				return $var;
+			}
+		}
+
+		function switch_date($var)
+		{
+		$this->debug('SWITCH_DATE: gettype = '.gettype($var));
+			if(is_string($var))
+			{
+				$dtime = Array();
+				if(strpos($var,':'))
+				{
+					$pos = explode(':',$var);
+					$var = $pos[1];
+				}
+				$this->set_var($dtime,'year',(int)(substr($var,0,4)));
+				$this->set_var($dtime,'month',(int)(substr($var,4,2)));
+				$this->set_var($dtime,'mday',(int)(substr($var,6,2)));
+				if(substr($var,8,1) == 'T')
+				{
+					$this->set_var($dtime,'hour',(int)(substr($var,9,2)));
+					$this->set_var($dtime,'min',(int)(substr($var,11,2)));
+					$this->set_var($dtime,'sec',(int)(substr($var,13,2)));
+					if(strlen($var) > 14)
+					{
+						if(substr($var,14,1) != 'Z')
+						{
+							if($this->api)
+							{
+								$dtime['hour'] -= $GLOBALS['phpgw_info']['users']['common']['tz_offset'];
+								if($dtime['hour'] < 0)
+								{
+									$dtime['mday'] -= 1;
+									$dtime['hour'] = 24 - $dtime['hour'];
+								}
+								elseif($dtime['hour'] >= 24)
+								{
+									$dtime['mday'] += 1;
+									$dtime['hour'] = $dtime['hour'] - 24;
+								}
+							}
+						}
 					}
 					else
 					{
-						$temp_output = $this->build_parameters($event[$value],$value);
-						if($temp_output)
-						{
-							$str .= $this->fold(strtoupper(str_replace('_','-',$value)).$temp_output);
-						}
-					}
-					break;
-			}
-		}
-		if(!empty($event['x_type']))
-		{
-			for($i=0;$i<count($event['x_type']);$i++)
-			{
-				$str .= $this->build_xtype($event['x_type'][$i],':');
-			}
-		}
-
-		if($ical_item == 'vtimezone')
-		{
-			if($event['tzdata'])
-			{
-				for($k=0;$k<count($event['tzdata']);$k++)
-				{
-					$str .= 'BEGIN:'.strtoupper($event['tzdata'][$k]['type'])."\r\n";
-					$str .= $this->build_card_internals(strtolower($event['tzdata'][$k]['type']),$event['tzdata'][$k]);
-					$str .= 'END:'.strtoupper($event['tzdata'][$k]['type'])."\r\n";
-				}
-			}
-		}
-		elseif($event['alarm'])
-		{
-			for($k=0;$k<count($event['alarm']);$k++)
-			{
-				$str .= 'BEGIN:VALARM'."\r\n";
-				$str .= $this->build_card_internals('valarm',$event['alarm'][$k]);
-				$str .= 'END:VALARM'."\r\n";
-			}			
-		}
-		return $str;
-	}
-
-	/*
-	 * Switching Functions
-	 */
-
-	function switch_class($var)
-	{
-		if(is_string($var))
-		{
-			switch($var)
-			{
-				case 'PRIVATE':
-					return PRIVATE;
-					break;
-				case 'PUBLIC':
-					return PUBLIC;
-					break;
-				case 'CONFIDENTIAL':
-					return CONFIDENTIAL;
-					break;
-			}
-		}
-		elseif(is_int($var))
-		{
-			switch(intval($var))
-			{
-				case PRIVATE:
-					return 'PRIVATE';
-					break;
-				case PUBLIC:
-					return 'PUBLIC';
-					break;
-				case CONFIDENTIAL:
-					return 'CONFIDENTIAL';
-					break;
-			}
-		}
-		else
-		{
-			return $var;
-		}
-	}
-
-	function switch_cu($var)
-	{
-		if(gettype($var) == 'string')
-		{
-			switch($var)
-			{
-				case 'INDIVIDUAL':
-					return INDIVIDUAL;
-					break;
-				case 'GROUP':
-					return GROUP;
-					break;
-				case 'RESOURCE':
-					return RESOURCE;
-					break;
-				case 'ROOM':
-					return ROOM;
-					break;
-				case 'UNKNOWN':
-					return UNKNOWN;
-					break;
-				default:
-					return OTHER;
-					break;
-			}
-		}
-		elseif(gettype($var) == 'integer')
-		{
-			switch($var)
-			{
-				case INDIVIDUAL:
-					return 'INDIVIDUAL';
-					break;
-				case GROUP:
-					return 'GROUP';
-					break;
-				case RESOURCE:
-					return 'RESOURCE';
-					break;
-				case ROOM:
-					return 'ROOM';
-					break;
-				case UNKNOWN:
-					return 'UNKNOWN';
-					break;
-				default:
-					return 'X-OTHER';
-					break;
-			}
-		}
-		else
-		{
-			return $var;
-		}
-	}
-
-	function switch_date($var)
-	{
-	$this->debug('SWITCH_DATE: gettype = '.gettype($var));
-		if(is_string($var))
-		{
-			$dtime = Array();
-			if(strpos($var,':'))
-			{
-				$pos = explode(':',$var);
-				$var = $pos[1];
-			}
-			$this->set_var($dtime,'year',intval(substr($var,0,4)));
-			$this->set_var($dtime,'month',intval(substr($var,4,2)));
-			$this->set_var($dtime,'mday',intval(substr($var,6,2)));
-			if(substr($var,8,1) == 'T')
-			{
-				$this->set_var($dtime,'hour',intval(substr($var,9,2)));
-				$this->set_var($dtime,'min',intval(substr($var,11,2)));
-				$this->set_var($dtime,'sec',intval(substr($var,13,2)));
-				if(strlen($var) > 14)
-				{
-					if(substr($var,14,1) != 'Z')
-					{
-						if($this->api)
-						{
-							$dtime['hour'] -= $GLOBALS['phpgw_info']['users']['common']['tz_offset'];
-							if($dtime['hour'] < 0)
-							{
-								$dtime['mday'] -= 1;
-								$dtime['hour'] = 24 - $dtime['hour'];
-							}
-							elseif($dtime['hour'] >= 24)
-							{
-								$dtime['mday'] += 1;
-								$dtime['hour'] = $dtime['hour'] - 24;
-							}
-						}
+						/*
+						* The time provided by the iCal is considered local time.
+						*
+						* The implementor will need to consider how to convert that time to UTC.
+						*/
+						//					if($this->api)
+						//					{
+						//						$dtime['hour'] -= $GLOBALS['phpgw_info']['users']['common']['tz_offset'];
+						//						if($dtime['hour'] < 0)
+						//						{
+						//							$dtime['mday'] -= 1;
+						//							$dtime['hour'] = 24 - $dtime['hour'];
+						//						}
+						//						elseif($dtime['hour'] >= 24)
+						//						{
+						//							$dtime['mday'] += 1;
+						//							$dtime['hour'] = $dtime['hour'] - 24;
+						//						}
+						//					}
 					}
 				}
 				else
 				{
-					/*
-					 * The time provided by the iCal is considered local time.
-					 *
-					 * The implementor will need to consider how to convert that time to UTC.
-					 */
-//					if($this->api)
-//					{
-//						$dtime['hour'] -= $GLOBALS['phpgw_info']['users']['common']['tz_offset'];
-//						if($dtime['hour'] < 0)
-//						{
-//							$dtime['mday'] -= 1;
-//							$dtime['hour'] = 24 - $dtime['hour'];
-//						}
-//						elseif($dtime['hour'] >= 24)
-//						{
-//							$dtime['mday'] += 1;
-//							$dtime['hour'] = $dtime['hour'] - 24;
-//						}
-//					}
+					$this->set_var($dtime,'hour',0);
+					$this->set_var($dtime,'min',0);
+					$this->set_var($dtime,'sec',0);
+					if($this->api)
+					{
+						$dtime['hour'] -= $GLOBALS['phpgw_info']['users']['common']['tz_offset'];
+						if($dtime['hour'] < 0)
+						{
+							$dtime['mday'] -= 1;
+							$dtime['hour'] = 24 - $dtime['hour'];
+						}
+						elseif($dtime['hour'] >= 24)
+						{
+							$dtime['mday'] += 1;
+							$dtime['hour'] = $dtime['hour'] - 24;
+						}
+					}
+				}
+				$this->debug('DATETIME : '._debug_array($dtime,False));
+				return $dtime;
+			}
+			elseif(is_array($var))
+			{
+				return date('Ymd\THis\Z',mktime($var['hour'],$var['min'],$var['sec'],$var['month'],$var['mday'],$var['year']));
+			}
+			else
+			{
+				return $var;
+			}
+		}
+
+		function switch_encoding($var)
+		{
+			if(is_string($var))
+			{
+				switch($var)
+				{
+					case '8BIT':
+						return _8BIT;
+						break;
+					case 'BASE64':
+						return _BASE64;
+						break;
+					default:
+						return OTHER;
+						break;
+				}
+			}
+			elseif(is_int($var))
+			{
+				switch($var)
+				{
+					case _8BIT:
+						return '8BIT';
+						break;
+					case _BASE64:
+						return 'BASE64';
+						break;
+					case OTHER:
+						return 'OTHER';
+						break;
 				}
 			}
 			else
 			{
-				$this->set_var($dtime,'hour',0);
-				$this->set_var($dtime,'min',0);
-				$this->set_var($dtime,'sec',0);
-				if($this->api)
+				return $var;
+			}
+		}
+
+		function switch_fbtype($var)
+		{
+			if(is_string($var))
+			{
+				switch($var)
 				{
-					$dtime['hour'] -= $GLOBALS['phpgw_info']['users']['common']['tz_offset'];
-					if($dtime['hour'] < 0)
-					{
-						$dtime['mday'] -= 1;
-						$dtime['hour'] = 24 - $dtime['hour'];
-					}
-					elseif($dtime['hour'] >= 24)
-					{
-						$dtime['mday'] += 1;
-						$dtime['hour'] = $dtime['hour'] - 24;
-					}
+					case 'FREE':
+						return FREE;
+						break;
+					case 'BUSY':
+						return BUSY;
+						break;
+					case 'BUSY-UNAVAILABLE':
+						return BUSY_UNAVAILABLE;
+						break;
+					case 'BUSY-TENTATIVE':
+						return BUSY_TENTATIVE;
+						break;
+					default:
+						return OTHER;
+						break;
 				}
 			}
-			$this->debug('DATETIME : '._debug_array($dtime,False));
-			return $dtime;
-		}
-		elseif(is_array($var))
-		{
-			return date('Ymd\THis\Z',mktime($var['hour'],$var['min'],$var['sec'],$var['month'],$var['mday'],$var['year']));
-		}
-		else
-		{
-			return $var;
-		}
-	}
-
-	function switch_encoding($var)
-	{
-		if(is_string($var))
-		{
-			switch($var)
+			elseif(is_int($var))
 			{
-				case '8BIT':
-					return _8BIT;
-					break;
-				case 'BASE64':
-					return _BASE64;
-					break;
-				default:
-					return OTHER;
-					break;
-			}
-		}
-		elseif(is_int($var))
-		{
-			switch($var)
-			{
-				case _8BIT:
-					return '8BIT';
-					break;
-				case _BASE64:
-					return 'BASE64';
-					break;
-				case OTHER:
-					return 'OTHER';
-					break;
-			}
-		}
-		else
-		{
-			return $var;
-		}
-	}
-
-	function switch_fbtype($var)
-	{
-		if(is_string($var))
-		{
-			switch($var)
-			{
-				case 'FREE':
-					return FREE;
-					break;
-				case 'BUSY':
-					return BUSY;
-					break;
-				case 'BUSY-UNAVAILABLE':
-					return BUSY_UNAVAILABLE;
-					break;
-				case 'BUSY-TENTATIVE':
-					return BUSY_TENTATIVE;
-					break;
-				default:
-					return OTHER;
-					break;
-			}
-		}
-		elseif(is_int($var))
-		{
-			switch($var)
-			{
-				case FREE:
-					return 'FREE';
-					break;
-				case BUSY:
-					return 'BUSY';
-					break;
-				case BUSY_UNAVAILABLE:
-					return 'BUSY-UNAVAILABLE';
-					break;
-				case BUSY_TENTATIVE:
-					return 'BUSY-TENTATIVE';
-					break;
-				default:
-					return 'OTHER';
-					break;
-			}
-		}
-		else
-		{
-			return $var;
-		}
-	}	
-
-	function switch_freq($var)
-	{
-		if(is_string($var))
-		{
-			switch($var)
-			{
-				case 'SECONDLY':
-					return SECONDLY;
-					break;
-				case 'MINUTELY':
-					return MINUTELY;
-					break;
-				case 'HOURLY':
-					return HOURLY;
-					break;
-				case 'DAILY':
-					return DAILY;
-					break;
-				case 'WEEKLY':
-					return WEEKLY;
-					break;
-				case 'MONTHLY':
-					return MONTHLY;
-					break;
-				case 'YEARLY':
-					return YEARLY;
-					break;
-			}
-		}
-		elseif(is_int($var))
-		{
-			switch($var)
-			{
-				case SECONDLY:
-					return 'SECONDLY';
-					break;
-				case MINUTELY:
-					return 'MINUTELY';
-					break;
-				case HOURLY:
-					return 'HOURLY';
-					break;
-				case DAILY:
-					return 'DAILY';
-					break;
-				case WEEKLY:
-					return 'WEEKLY';
-					break;
-				case MONTHLY:
-					return 'MONTHLY';
-					break;
-				case YEARLY:
-					return 'YEARLY';
-					break;
-			}
-		}
-		else
-		{
-			return $var;
-		}
-	}
-
-	function switch_mailto($var)
-	{
-		if(is_string($var))
-		{
-			if(strpos(' '.$var,':'))
-			{
-				$parts = explode(':',$var);
-				$var = $parts[1];
-			}
-		
-			$parts = explode('@',$var);
-			$this->debug("Count of mailto parts : ".count($parts));
-			if(count($parts) == 2)
-			{
-				$this->debug("Splitting ".$parts[0]." @ ".$parts[1]);
-				$temp_address = Array();
-				$temp_address['user'] = $parts[0];
-				$temp_address['host'] = $parts[1];
-				return $temp_address;
+				switch($var)
+				{
+					case FREE:
+						return 'FREE';
+						break;
+					case BUSY:
+						return 'BUSY';
+						break;
+					case BUSY_UNAVAILABLE:
+						return 'BUSY-UNAVAILABLE';
+						break;
+					case BUSY_TENTATIVE:
+						return 'BUSY-TENTATIVE';
+						break;
+					default:
+						return 'OTHER';
+						break;
+				}
 			}
 			else
 			{
-				return False;
+				return $var;
 			}
 		}
-		elseif(is_array($var))
-		{
-//			return 'MAILTO:'.$var['user'].'@'.$var['host'];
-			return $var['user'].'@'.$var['host'];
-		}
-	}
 
-	function switch_partstat($var)
-	{
-//		$this->debug_str = True;
-		$this->debug('PARTSTAT = '.$var);
-//		$this->debug_str = False;
-		if(is_string($var))
+		function switch_freq($var)
 		{
-			switch($var)
+			if(is_string($var))
 			{
-				case 'NEEDS-ACTION':
-				   return 0; // NEEDS_ACTION;
-					break;
-				case 'ACCEPTED':
-				   return 1; // ACCEPTED;
-					break;
-				case 'DECLINED':
-				   return 2; // DECLINED;
-					break;
-				case 'TENTATIVE':
-				   return 3; // TENTATIVE;
-					break;
-				case 'DELEGATED':
-					return 4; // DELEGATED;
-					break;
-				case 'COMPLETED':
-					return 5; // COMPLETED;
-					break;
-				case 'IN-PROCESS':
-					return 6; // IN_PROCESS;
-					break;
-				default:
-					return 99; // OTHER;
-					break;
-			}
-		}
-		elseif(is_int($var))
-		{
-			switch(intval($var))
-			{
-			case 0: // NEEDS_ACTION:
-					return 'NEEDS-ACTION';
-					break;
-			case 1: //  ACCEPTED:
-					return 'ACCEPTED';
-					break;
-			case 2: // DECLINED:
-					return 'DECLINED';
-					break;
-			case 3: // TENTATIVE:
-					return 'TENTATIVE';
-					break;
-			case 4: // DELEGATED:
-					return 'DELEGATED';
-					break;
-			case 5: // COMPLETED:
-					return 'COMPLETED';
-					break;
-			case 6: // IN_PROCESS:
-					return 'IN-PROCESS';
-					break;
-				default:
-					return 'X-OTHER';
-					break;
-			}
-		}
-		else
-		{
-			return $var;
-		}
-	}
-
-	function switch_range($var)
-	{
-		if(is_string($var))
-		{
-			switch($var)
-			{
-				case 'THISANDPRIOR':
-					return THISANDPRIOR;
-					break;
-				case 'THISANDFUTURE':
-					return THISANDFUTURE;
-					break;
-			}
-		}
-		elseif(is_int($var))
-		{
-			switch($var)
-			{
-				case THISANDPRIOR:
-					return 'THISANDPRIOR';
-					break;
-				case THISANDFUTURE:
-					return 'THISANDFUTURE';
-					break;
-			}
-		}
-		else
-		{
-			return $var;
-		}
-	}
-
-	function switch_related($var)
-	{
-		if(is_string($var))
-		{
-			switch($var)
-			{
-				case 'START':
-					return START;
-					break;
-				case 'END':
-					return END;
-					break;
-			}
-		}
-		elseif(is_int($var))
-		{
-			switch($var)
-			{
-				case START:
-					return 'START';
-					break;
-				case END:
-					return 'END';
-					break;
-			}
-		}
-		else
-		{
-			return $var;
-		}
-	}
-
-	function switch_reltype($var)
-	{
-		if(is_string($var))
-		{
-			switch($var)
-			{
-				case 'PARENT':
-					return PARENT;
-					break;
-				case 'CHILD':
-					return CHILD;
-					break;
-				case 'SIBLING':
-					return SIBLING;
-					break;
-			}
-		}
-		elseif(is_int($var))
-		{
-			switch($var)
-			{
-				case PARENT:
-					return 'PARENT';
-					break;
-				case CHILD:
-					return 'CHILD';
-					break;
-				case SIBLING:
-					return 'SIBLING';
-					break;
-			}
-		}
-		else
-		{
-			return $var;
-		}
-	}
-
-	function switch_role($var)
-	{
-		if(is_string($var))
-		{
-			switch($var)
-			{
-				case 'NONE':
-					return NONE;
-					break;
-				case 'CHAIR':
-					return CHAIR;
-					break;
-				case 'REQ-PARTICIPANT':
-					return REQ_PARTICIPANT;
-					break;
-				case 'OPT-PARTICIPANT':
-					return OPT_PARTICIPANT;
-					break;
-				case 'NON-PARTICIPANT':
-					return NON_PARTICIPANT;
-					break;
-			}
-		}
-		elseif(is_int($var))
-		{
-			switch($var)
-			{
-				case NONE:
-					return 'NONE';
-					break;
-				case CHAIR:
-					return 'CHAIR';
-					break;
-				case REQ_PARTICIPANT:
-					return 'REQ-PARTICIPANT';
-					break;
-				case OPT_PARTICIPANT:
-					return 'OPT-PARTICIPANT';
-					break;
-				case NON_PARTICIPANT:
-					return 'NON-PARTICIPANT';
-					break;
-			}
-		}
-		else
-		{
-			return $var;
-		}
-	}
-
-	function switch_rsvp($var)
-	{
-		if(is_string($var))
-		{
-			if($var == 'TRUE')
-			{
-				return 1;
-			}
-			elseif($var == 'FALSE')
-			{
-				return 0;
-			}
-		}
-		elseif(is_int($var) || $var == False)
-		{
-			if($var == 1)
-			{
-				return 'TRUE';
-			}
-			elseif($var == 0)
-			{
-				return 'FALSE';
-			}
-		}
-		else
-		{
-			return $var;
-		}
-	}
-
-	function switch_transp($var)
-	{
-		if(is_string($var))
-		{
-			switch($var)
-			{
-				case 'TRANSPARENT':
-					return TRANSPARENT;
-					break;
-				case 'OPAQUE':
-					return OPAQUE;
-					break;
-			}
-		}
-		elseif(is_int($var))
-		{
-			switch($var)
-			{
-				case TRANSPARENT:
-					return 'TRANSPARENT';
-					break;
-				case OPAQUE:
-					return 'OPAQUE';
-					break;
-			}
-		}
-		else
-		{
-			return $var;
-		}
-	}
-
-	/*
-	 * The brunt of the class
-	 */	
-
-	function parse($ical_text)
-	{
-
-		$begin_regexp = '^';
-		$semi_colon_regexp = '[\;\:]';
-		$colon_regexp = '[\:]';
-		$catch_all_regexp = '(.*)';
-		$end_regexp = '$';
-		$property_regexp = $begin_regexp.'([A-Z\-]*)'.$semi_colon_regexp.$catch_all_regexp.$end_regexp;
-		$param_regexp = $begin_regexp.$catch_all_regexp.':'.$catch_all_regexp.$end_regexp;
-
-		$mode = 'none';
-		$text = $this->read_line_unfold($ical_text);
-		while($text)
-		{
-//			if(strlen($ical_text[$i]) > 75)
-//			{
-//				continue;
-//			}
-
-			ereg($property_regexp,$text,$temp);
-			$majortype = str_replace('-','_',strtolower($temp[1]));
-			$value = chop($temp[2]);
-
-			if($mode != 'none' && ($majortype != 'begin' && $majortype != 'end'))
-			{
-				$this->debug('PARSE:MAJORTYPE : '.$majortype);
-				if(isset($this->property[$majortype]))
+				switch($var)
 				{
-					$state = @$this->property[$majortype]["$mode"]['state'];
-					$type = @$this->property[$majortype]['type'];
-					$multiples = @$this->property[$majortype]["$mode"]['multiples'];
-					$do_to_text = @$this->property[$majortype]['to_text'];
+					case 'SECONDLY':
+						return SECONDLY;
+						break;
+					case 'MINUTELY':
+						return MINUTELY;
+						break;
+					case 'HOURLY':
+						return HOURLY;
+						break;
+					case 'DAILY':
+						return DAILY;
+						break;
+					case 'WEEKLY':
+						return WEEKLY;
+						break;
+					case 'MONTHLY':
+						return MONTHLY;
+						break;
+					case 'YEARLY':
+						return YEARLY;
+						break;
 				}
-				elseif(substr($majortype,0,2) == 'x_')
+			}
+			elseif(is_int($var))
+			{
+				switch($var)
 				{
-					$state = 'optional';
-					$type = 'xtype';
-					$multiples = True;
-					$do_to_test = True;
+					case SECONDLY:
+						return 'SECONDLY';
+						break;
+					case MINUTELY:
+						return 'MINUTELY';
+						break;
+					case HOURLY:
+						return 'HOURLY';
+						break;
+					case DAILY:
+						return 'DAILY';
+						break;
+					case WEEKLY:
+						return 'WEEKLY';
+						break;
+					case MONTHLY:
+						return 'MONTHLY';
+						break;
+					case YEARLY:
+						return 'YEARLY';
+						break;
+				}
+			}
+			else
+			{
+				return $var;
+			}
+		}
+
+		function switch_mailto($var)
+		{
+			if(is_string($var))
+			{
+				if(strpos(' '.$var,':'))
+				{
+					$parts = explode(':',$var);
+					$var = $parts[1];
+				}
+
+				$parts = explode('@',$var);
+				$this->debug("Count of mailto parts : ".count($parts));
+				if(count($parts) == 2)
+				{
+					$this->debug("Splitting ".$parts[0]." @ ".$parts[1]);
+					$temp_address = Array();
+					$temp_address['user'] = $parts[0];
+					$temp_address['host'] = $parts[1];
+					return $temp_address;
 				}
 				else
 				{
-					$state = '';
+					return False;
+				}
+			}
+			elseif(is_array($var))
+			{
+//				return 'MAILTO:'.$var['user'].'@'.$var['host'];
+				return $var['user'].'@'.$var['host'];
+			}
+		}
+
+		function switch_partstat($var)
+		{
+//			$this->debug_str = True;
+			$this->debug('PARTSTAT = '.$var);
+//			$this->debug_str = False;
+			if(is_string($var))
+			{
+				switch($var)
+				{
+					case 'NEEDS-ACTION':
+						return 0; // NEEDS_ACTION;
+						break;
+					case 'ACCEPTED':
+						return 1; // ACCEPTED;
+						break;
+					case 'DECLINED':
+						return 2; // DECLINED;
+						break;
+					case 'TENTATIVE':
+						return 3; // TENTATIVE;
+						break;
+					case 'DELEGATED':
+						return 4; // DELEGATED;
+						break;
+					case 'COMPLETED':
+						return 5; // COMPLETED;
+						break;
+					case 'IN-PROCESS':
+						return 6; // IN_PROCESS;
+						break;
+					default:
+						return 99; // OTHER;
+						break;
+				}
+			}
+			elseif(is_int($var))
+			{
+				switch((int)$var)
+				{
+					case 0: // NEEDS_ACTION:
+						return 'NEEDS-ACTION';
+						break;
+					case 1: //  ACCEPTED:
+						return 'ACCEPTED';
+						break;
+					case 2: // DECLINED:
+						return 'DECLINED';
+						break;
+					case 3: // TENTATIVE:
+						return 'TENTATIVE';
+						break;
+					case 4: // DELEGATED:
+						return 'DELEGATED';
+						break;
+					case 5: // COMPLETED:
+						return 'COMPLETED';
+						break;
+					case 6: // IN_PROCESS:
+						return 'IN-PROCESS';
+						break;
+					default:
+						return 'X-OTHER';
+						break;
 				}
 			}
 			else
 			{
-				$state = 'required';
+				return $var;
 			}
+		}
 
-                        if($majortype == 'duration')
-                        {
-                                // Unset dur var
-                                unset($dur);
-
-                                // Split «DURATION»
-                                list($_f_["day_raw"], $_f_["time_raw"]) = split("T", substr($value, 1, strlen($value)-1) );
-
-                                /* Datecode */
-                                if( isset($_f_["day_raw"]) OR $_f_["day_raw"] )
-                                {
-                                        // Days
-                                        if(ereg("D", $_f_["day_raw"]))
-                                                $dur["days"] = eregi_replace("([0-9]+)D(.*)", "\\1", $_f_["day_raw"]);
-
-                                        // Weeks
-                                        if(ereg("W", $_f_["day_raw"]))
-                                                $dur["weeks"] = eregi_replace("([^|.*]+D)?([0-9]+)W", "\\2", $_f_["day_raw"]);
-                                }
-
-                                /* Timecode */
-                                if( isset($_f_["time_raw"]) OR $_f_["time_raw"] )
-                                {
-                                        // Hours
-                                        if(ereg("H", $_f_["time_raw"]))
-                                                $dur["hours"] = eregi_replace("([0-9]+)H(.*)", "\\1", $_f_["time_raw"]);
-
-                                        // Minutes
-                                        /* If you find better, contact me very quickly :) */
-                                        if(ereg("M", $_f_["time_raw"]) )
-                                                $dur["minutes"] = eregi_replace("([^|.*]+H)?([0-9]+)M(.*)", "\\2", $_f_["time_raw"]);
-
-                                        // Seconds
-                                        /* Same comment :) */
-                                        if(ereg("S", $_f_["time_raw"]) )
-                                                $dur["seconds"] = eregi_replace("([^|.*]+M)?([0-9]+)S(.*)", "\\2", $_f_["time_raw"]);
-                                }
-
-                                $dur["raw"] = Array(
-                                                        "timecode" => $_f_["time_raw"],
-                                                        "datecode" => $_f_["day_raw"],
-                                                        "all"      => $value );
-                                // Add new parameters in Event
-                                $this->set_var($event, $majortype, $dur);
-                        }
-
-
-			if($majortype == 'begin')
+		function switch_range($var)
+		{
+			if(is_string($var))
 			{
-				$tmode = $mode;
-				$mode = strtolower($value);
-				switch(strtolower($value))
+				switch($var)
 				{
-					case 'daylight':
-					case 'standard':
-						$t_event = Array();
-						$t_event = $event;
-						$event = Array();
+					case 'THISANDPRIOR':
+						return THISANDPRIOR;
 						break;
-					case 'valarm':
-						if($tmode == 'vevent' || $tmode == 'vtodo')
-						{
-							$t_event = $event;
-							unset($event);
-							$event = Array();
-						}
-						else
-						{
-							$mode = $tmode;
-						}
-						break;
-					case 'vcalendar':
-						$ical = $this->new_ical();
-						break;
-					case 'vevent':
-					case 'vfreebusy':
-					case 'vjournal':
-					case 'vtimezone':
-					case 'vtodo':
-						$event = Array();
-						break;
-				}
-				$event['type'] = strtolower($value);
-			}
-			elseif($majortype == 'end')
-			{
-				$mode = 'none';
-				switch(strtolower($value))
-				{
-					case 'daylight':
-					case 'standard':
-						$tzdata[] = $event;
-						unset($event);
-						$event = $t_event;
-						unset($t_event);
-						$mode = 'vtimezone';
-						break;
-					case 'valarm':
-						$alarm[] = $event;
-						unset($event);
-						$event = $t_event;
-						unset($t_event);
-						$mode = $tmode;
-						break;
-					case 'vevent':
-						if(!empty($alarm))
-						{
-							$event['alarm'] = $alarm;
-							unset($alarm);
-						}
-						$this->event[] = $event;
-						unset($event);
-						break;
-					case 'vfreebusy':
-						$this->freebusy[] = $event;
-						unset($event);
-						break;
-					case 'vjournal':
-						$this->journal[] = $event;
-						unset($event);
-						break;
-					case 'vtimezone':
-						if(!empty($tzdata))
-						{
-							$event['tzdata'] = $tzdata;
-							unset($tzdata);
-						}
-						$this->timezone[] = $event;
-						unset($event);
-						break;
-					case 'vtodo':
-						if(!empty($alarm))
-						{
-							$event['alarm'] = $alarm;
-							unset($alarm);
-						}
-						$this->todo[] = $event['alarm'];
-						unset($event);
-						break;
-					case 'vcalendar':
-						$this->ical = $ical;
-						$this->ical['event'] = $this->event;
-						$this->ical['freebusy'] = $this->freebusy;
-						$this->ical['journal'] = $this->journal;
-						$this->ical['timezone'] = $this->timezone;
-						$this->ical['todo'] = $this->todo;
-						break 2;
-				}
-			}
-			elseif($majortype == 'prodid' || $majortype == 'version' || $majortype == 'method' || $majortype == 'calscale')
-			{
-				$this->parse_parameters($ical,$majortype,$this->from_text($value));
-			}
-			elseif($state == 'optional' || $state == 'required')
-			{
-				$this->debug('Mode : '.$mode.' Majortype : '.$majortype);
-				if($do_to_text)
-				{
-					$value = $this->from_text($value);
-				}
-				switch($type)
-				{
-					case 'text':
-						$this->parse_parameters($event,$majortype,$value);
-						break;
-					case 'recur':
-					case 'date-time':
-					case 'cal-address':
-						$this->parse_value($event,$majortype,$value,$mode);
-						break;
-					case 'integer':
-						if($multiples)
-						{
-							$event[$majortype][] = intval($value);
-						}
-						else
-						{
-							$this->set_var($event,$majortype,intval($value));
-						}
-						break;
-					case 'float':
-						$event->$majortype = new class_geo;
-						$this->parse_geo($event->$majortype,$value);
-						break;
-					case 'utc-offset':
-						$this->set_var($event,$majortype,intval($value));
-						break;
-					case 'uri':
-						$new_var = Array();
-						$this->parse_parameters($new_var,$majortype,$value);
-						if($multiples)
-						{
-							switch($mode)
-							{
-								case 'valarm':
-									$alarm['attach'][] = $new_var;
-									break;
-								default:
-									$event[$majortype][] = $new_var;
-									break;
-							}
-						}
-						else
-						{
-							$event[$majortype] = $new_var;
-						}
-						unset($new_var);
-						break;
-					case 'xtype':
-						$this->parse_xtype($event,$majortype,$value);
+					case 'THISANDFUTURE':
+						return THISANDFUTURE;
 						break;
 				}
 			}
+			elseif(is_int($var))
+			{
+				switch($var)
+				{
+					case THISANDPRIOR:
+						return 'THISANDPRIOR';
+						break;
+					case THISANDFUTURE:
+						return 'THISANDFUTURE';
+						break;
+				}
+			}
+			else
+			{
+				return $var;
+			}
+		}
+
+		function switch_related($var)
+		{
+			if(is_string($var))
+			{
+				switch($var)
+				{
+					case 'START':
+						return START;
+						break;
+					case 'END':
+						return END;
+						break;
+				}
+			}
+			elseif(is_int($var))
+			{
+				switch($var)
+				{
+					case START:
+						return 'START';
+						break;
+					case END:
+						return 'END';
+						break;
+				}
+			}
+			else
+			{
+				return $var;
+			}
+		}
+
+		function switch_reltype($var)
+		{
+			if(is_string($var))
+			{
+				switch($var)
+				{
+					case 'PARENT':
+						return PARENT;
+						break;
+					case 'CHILD':
+						return CHILD;
+						break;
+					case 'SIBLING':
+						return SIBLING;
+						break;
+				}
+			}
+			elseif(is_int($var))
+			{
+				switch($var)
+				{
+					case PARENT:
+						return 'PARENT';
+						break;
+					case CHILD:
+						return 'CHILD';
+						break;
+					case SIBLING:
+						return 'SIBLING';
+						break;
+				}
+			}
+			else
+			{
+				return $var;
+			}
+		}
+
+		function switch_role($var)
+		{
+			if(is_string($var))
+			{
+				switch($var)
+				{
+					case 'NONE':
+						return NONE;
+						break;
+					case 'CHAIR':
+						return CHAIR;
+						break;
+					case 'REQ-PARTICIPANT':
+						return REQ_PARTICIPANT;
+						break;
+					case 'OPT-PARTICIPANT':
+						return OPT_PARTICIPANT;
+						break;
+					case 'NON-PARTICIPANT':
+						return NON_PARTICIPANT;
+						break;
+				}
+			}
+			elseif(is_int($var))
+			{
+				switch($var)
+				{
+					case NONE:
+						return 'NONE';
+						break;
+					case CHAIR:
+						return 'CHAIR';
+						break;
+					case REQ_PARTICIPANT:
+						return 'REQ-PARTICIPANT';
+						break;
+					case OPT_PARTICIPANT:
+						return 'OPT-PARTICIPANT';
+						break;
+					case NON_PARTICIPANT:
+						return 'NON-PARTICIPANT';
+						break;
+				}
+			}
+			else
+			{
+				return $var;
+			}
+		}
+
+		function switch_rsvp($var)
+		{
+			if(is_string($var))
+			{
+				if($var == 'TRUE')
+				{
+					return 1;
+				}
+				elseif($var == 'FALSE')
+				{
+					return 0;
+				}
+			}
+			elseif(is_int($var) || $var == False)
+			{
+				if($var == 1)
+				{
+					return 'TRUE';
+				}
+				elseif($var == 0)
+				{
+					return 'FALSE';
+				}
+			}
+			else
+			{
+				return $var;
+			}
+		}
+
+		function switch_transp($var)
+		{
+			if(is_string($var))
+			{
+				switch($var)
+				{
+					case 'TRANSPARENT':
+						return TRANSPARENT;
+						break;
+					case 'OPAQUE':
+						return OPAQUE;
+						break;
+				}
+			}
+			elseif(is_int($var))
+			{
+				switch($var)
+				{
+					case TRANSPARENT:
+						return 'TRANSPARENT';
+						break;
+					case OPAQUE:
+						return 'OPAQUE';
+						break;
+				}
+			}
+			else
+			{
+				return $var;
+			}
+		}
+
+		/*
+		 * The brunt of the class
+		 */
+
+		function parse($ical_text)
+		{
+			$begin_regexp = '^';
+			$semi_colon_regexp = '[\;\:]';
+			$colon_regexp = '[\:]';
+			$catch_all_regexp = '(.*)';
+			$end_regexp = '$';
+			$property_regexp = $begin_regexp.'([A-Z\-]*)'.$semi_colon_regexp.$catch_all_regexp.$end_regexp;
+			$param_regexp = $begin_regexp.$catch_all_regexp.':'.$catch_all_regexp.$end_regexp;
+
+			$mode = 'none';
 			$text = $this->read_line_unfold($ical_text);
-		}
-		return $this->ical;
-	}
-
-	function build_ical($ical)
-	{
-		$var = Array(
-			'timezone',
-			'event',
-			'todo',
-			'journal',
-			'freebusy'
-		);
-
-		$str = 'BEGIN:VCALENDAR'."\r\n";
-		$str .= $this->fold('PRODID'.$this->build_text($ical['prodid'],'prodid'));
-		$str .= $this->fold('VERSION'.$this->build_text($ical['version'],'version'));
-		$str .= $this->fold('METHOD'.$this->build_text($ical['method'],'method'));
-		while(list($key,$vtype) = each($var))
-		{
-			if($ical[$vtype])
+			while($text)
 			{
-				for($i=0;$i<count($ical[$vtype]);$i++)
+//				if(strlen($ical_text[$i]) > 75)
+//				{
+//					continue;
+//				}
+
+				ereg($property_regexp,$text,$temp);
+				$majortype = str_replace('-','_',strtolower($temp[1]));
+				$value = chop($temp[2]);
+
+				if($mode != 'none' && ($majortype != 'begin' && $majortype != 'end'))
 				{
-					$str .= 'BEGIN:V'.strtoupper($vtype)."\r\n";
-					$str .= $this->build_card_internals('v'.$vtype,$ical[$vtype][$i]);
-					$str .= 'END:V'.strtoupper($vtype)."\r\n";
+					$this->debug('PARSE:MAJORTYPE : '.$majortype);
+					if(isset($this->property[$majortype]))
+					{
+						$state = @$this->property[$majortype]["$mode"]['state'];
+						$type = @$this->property[$majortype]['type'];
+						$multiples = @$this->property[$majortype]["$mode"]['multiples'];
+						$do_to_text = @$this->property[$majortype]['to_text'];
+					}
+					elseif(substr($majortype,0,2) == 'x_')
+					{
+						$state = 'optional';
+						$type = 'xtype';
+						$multiples = True;
+						$do_to_test = True;
+					}
+					else
+					{
+						$state = '';
+					}
+				}
+				else
+				{
+					$state = 'required';
+				}
+
+				if($majortype == 'duration')
+				{
+					// Unset dur var
+					unset($dur);
+
+					// Split «DURATION»
+					list($_f_['day_raw'], $_f_['time_raw']) = split('T', substr($value, 1, strlen($value)-1));
+
+					/* Datecode */
+					if(isset($_f_['day_raw']) OR $_f_['day_raw'])
+					{
+						// Days
+//						if(ereg('D', $_f_['day_raw']))
+						if(strstr($_f_['day_raw'],'D'))
+						{
+							$dur['days'] = eregi_replace("([0-9]+)D(.*)", "\\1", $_f_['day_raw']);
+						}
+
+						// Weeks
+//						if(ereg("W", $_f_["day_raw"]))
+						if(strstr($_f_['day_raw'],'W'))
+						{
+							$dur['weeks'] = eregi_replace("([^|.*]+D)?([0-9]+)W", "\\2", $_f_['day_raw']);
+						}
+					}
+
+					/* Timecode */
+					if(isset($_f_['time_raw']) OR $_f_['time_raw'])
+					{
+						// Hours
+//						if(ereg("H", $_f_["time_raw"]))
+						if(strstr($_f_['time_raw'],'H'))
+						{
+							$dur['hours'] = eregi_replace("([0-9]+)H(.*)", "\\1", $_f_['time_raw']);
+						}
+
+						// Minutes
+						/* If you find better, contact me very quickly :) */
+//						if(ereg("M", $_f_["time_raw"]))
+						if(strstr($_f_['time_raw'],'M'))
+						{
+							$dur['minutes'] = eregi_replace("([^|.*]+H)?([0-9]+)M(.*)", "\\2", $_f_['time_raw']);
+						}
+
+						// Seconds
+						/* Same comment :) */
+//						if(ereg("S", $_f_["time_raw"]) )
+						if(strstr($_f_['time_raw'],'S'))
+						{
+							$dur['seconds'] = eregi_replace("([^|.*]+M)?([0-9]+)S(.*)", "\\2", $_f_['time_raw']);
+						}
+					}
+
+					$dur['raw'] = Array(
+						'timecode' => $_f_['time_raw'],
+						'datecode' => $_f_['day_raw'],
+						'all'      => $value
+					);
+					// Add new parameters in Event
+					$this->set_var($event, $majortype, $dur);
+				}
+
+				if($majortype == 'begin')
+				{
+					$tmode = $mode;
+					$mode = strtolower($value);
+					switch(strtolower($value))
+					{
+						case 'daylight':
+						case 'standard':
+							$t_event = Array();
+							$t_event = $event;
+							$event = Array();
+							break;
+						case 'valarm':
+							if($tmode == 'vevent' || $tmode == 'vtodo')
+							{
+								$t_event = $event;
+								unset($event);
+								$event = Array();
+							}
+							else
+							{
+								$mode = $tmode;
+							}
+							break;
+						case 'vcalendar':
+							$ical = $this->new_ical();
+							break;
+						case 'vevent':
+						case 'vfreebusy':
+						case 'vjournal':
+						case 'vtimezone':
+						case 'vtodo':
+							$event = Array();
+							break;
+					}
+					$event['type'] = strtolower($value);
+				}
+				elseif($majortype == 'end')
+				{
+					$mode = 'none';
+					switch(strtolower($value))
+					{
+						case 'daylight':
+						case 'standard':
+							$tzdata[] = $event;
+							unset($event);
+							$event = $t_event;
+							unset($t_event);
+							$mode = 'vtimezone';
+							break;
+						case 'valarm':
+							$alarm[] = $event;
+							unset($event);
+							$event = $t_event;
+							unset($t_event);
+							$mode = $tmode;
+							break;
+						case 'vevent':
+							if(!empty($alarm))
+							{
+								$event['alarm'] = $alarm;
+								unset($alarm);
+							}
+							$this->event[] = $event;
+							unset($event);
+							break;
+						case 'vfreebusy':
+							$this->freebusy[] = $event;
+							unset($event);
+							break;
+						case 'vjournal':
+							$this->journal[] = $event;
+							unset($event);
+							break;
+						case 'vtimezone':
+							if(!empty($tzdata))
+							{
+								$event['tzdata'] = $tzdata;
+								unset($tzdata);
+							}
+							$this->timezone[] = $event;
+							unset($event);
+							break;
+						case 'vtodo':
+							if(!empty($alarm))
+							{
+								$event['alarm'] = $alarm;
+								unset($alarm);
+							}
+							$this->todo[] = $event['alarm'];
+							unset($event);
+							break;
+						case 'vcalendar':
+							$this->ical = $ical;
+							$this->ical['event'] = $this->event;
+							$this->ical['freebusy'] = $this->freebusy;
+							$this->ical['journal'] = $this->journal;
+							$this->ical['timezone'] = $this->timezone;
+							$this->ical['todo'] = $this->todo;
+							break 2;
+					}
+				}
+				elseif($majortype == 'prodid' || $majortype == 'version' || $majortype == 'method' || $majortype == 'calscale')
+				{
+					$this->parse_parameters($ical,$majortype,$this->from_text($value));
+				}
+				elseif($state == 'optional' || $state == 'required')
+				{
+					$this->debug('Mode : '.$mode.' Majortype : '.$majortype);
+					if($do_to_text)
+					{
+						$value = $this->from_text($value);
+					}
+					switch($type)
+					{
+						case 'text':
+							$this->parse_parameters($event,$majortype,$value);
+							break;
+						case 'recur':
+						case 'date-time':
+						case 'cal-address':
+							$this->parse_value($event,$majortype,$value,$mode);
+							break;
+						case 'integer':
+							if($multiples)
+							{
+								$event[$majortype][] = (int)$value;
+							}
+							else
+							{
+								$this->set_var($event,$majortype,(int)$value);
+							}
+							break;
+						case 'float':
+							$event->$majortype = new class_geo;
+							$this->parse_geo($event->$majortype,$value);
+							break;
+						case 'utc-offset':
+							$this->set_var($event,$majortype,(int)$value);
+							break;
+						case 'uri':
+							$new_var = Array();
+							$this->parse_parameters($new_var,$majortype,$value);
+							if($multiples)
+							{
+								switch($mode)
+								{
+									case 'valarm':
+										$alarm['attach'][] = $new_var;
+										break;
+									default:
+										$event[$majortype][] = $new_var;
+										break;
+								}
+							}
+							else
+							{
+								$event[$majortype] = $new_var;
+							}
+							unset($new_var);
+							break;
+						case 'xtype':
+							$this->parse_xtype($event,$majortype,$value);
+							break;
+					}
+				}
+				$text = $this->read_line_unfold($ical_text);
+			}
+			return $this->ical;
+		}
+
+		function build_ical($ical)
+		{
+			$var = Array(
+				'timezone',
+				'event',
+				'todo',
+				'journal',
+				'freebusy'
+			);
+
+			$str = 'BEGIN:VCALENDAR'."\r\n";
+			$str .= $this->fold('PRODID'.$this->build_text($ical['prodid'],'prodid'));
+			$str .= $this->fold('VERSION'.$this->build_text($ical['version'],'version'));
+			$str .= $this->fold('METHOD'.$this->build_text($ical['method'],'method'));
+			while(list($key,$vtype) = each($var))
+			{
+				if($ical[$vtype])
+				{
+					for($i=0;$i<count($ical[$vtype]);$i++)
+					{
+						$str .= 'BEGIN:V'.strtoupper($vtype)."\r\n";
+						$str .= $this->build_card_internals('v'.$vtype,$ical[$vtype][$i]);
+						$str .= 'END:V'.strtoupper($vtype)."\r\n";
+					}
 				}
 			}
-		}
-		$str .= 'END:VCALENDAR'."\r\n";
+			$str .= 'END:VCALENDAR'."\r\n";
 
-		return $str;
-	}
+			return $str;
+		}
 
 		function switch_to_phpgw_status($partstat)
 		{
@@ -2928,7 +2939,7 @@ class boicalendar
 					{
 						if($this->is_owner($ical['attendee'][$j]))
 						{
-							$so_event->add_attribute('participants',$this->switch_to_phpgw_status($ical['attendee'][$j]['partstat']),intval($GLOBALS['phpgw_info']['user']['account_id']));
+							$so_event->add_attribute('participants',$this->switch_to_phpgw_status($ical['attendee'][$j]['partstat']),(int)$GLOBALS['phpgw_info']['user']['account_id']);
 						}
 					}
 				}
@@ -2988,7 +2999,7 @@ class boicalendar
 						)
 					)
 				);
-				$GLOBALS['phpwg']->common->phpgw_exit();				
+				$GLOBALS['phpwg']->common->phpgw_exit();
 			}
 
 			if(!is_object($GLOBALS['uicalendar']))
@@ -3005,14 +3016,14 @@ class boicalendar
 			{
 				$so_event = $GLOBALS['uicalendar']->bo->so;
 			}
-		
+
 			$datetime_vars = Array(
 				'start'	=> 'dtstart',
 				'end'	=> 'dtend',
 				'modtime'	=> 'dtstamp',
 				'modtime'	=> 'last_modified'
 			);
-			
+
 			$date_array = Array(
 				'Y'	=> 'year',
 				'm'	=> 'month',
@@ -3102,7 +3113,7 @@ class boicalendar
 							@reset($date_array);
 							while(list($key,$var) = each($date_array))
 							{
-								$event[$e_datevar][$var] = intval(date($key,$temp_time));
+								$event[$e_datevar][$var] = (int)(date($key,$temp_time));
 							}
 							$so_event->set_date($e_datevar,$event[$e_datevar]['year'],$event[$e_datevar]['month'],$event[$e_datevar]['mday'],$event[$e_datevar]['hour'],$event[$e_datevar]['min'],$event[$e_datevar]['sec']);
 						}
@@ -3161,91 +3172,90 @@ class boicalendar
 // recur_enddate
 						if(isset($ical['event'][$i]['rrule']['until']))
 						{
-							$recur_enddate['year'] = intval($ical['event'][$i]['rrule']['until']['year']);
-							$recur_enddate['month'] = intval($ical['event'][$i]['rrule']['until']['month']);
-							$recur_enddate['mday'] = intval($ical['event'][$i]['rrule']['until']['mday']);
+							$recur_enddate['year']  = (int)($ical['event'][$i]['rrule']['until']['year']);
+							$recur_enddate['month'] = (int)($ical['event'][$i]['rrule']['until']['month']);
+							$recur_enddate['mday']  = (int)($ical['event'][$i]['rrule']['until']['mday']);
 						}
-                                                elseif( isset($ical['event'][$i]['duration']) )
-                                                {
-                                                        // Create timecode for strtotime
-                                                        $ptimer = mktime($ical['event'][$i]['dtstart']['hour'],
-                                                                         $ical['event'][$i]['dtstart']['min'],
-                                                                         $ical['event'][$i]['dtstart']['sec'],
-                                                                         $ical['event'][$i]['dtstart']['month'],
-                                                                         $ical['event'][$i]['dtstart']['mday'],
-                                                                         $ical['event'][$i]['dtstart']['year']
-                                                                        );
+						elseif( isset($ical['event'][$i]['duration']) )
+						{
+							// Create timecode for strtotime
+							$ptimer = mktime($ical['event'][$i]['dtstart']['hour'],
+							$ical['event'][$i]['dtstart']['min'],
+							$ical['event'][$i]['dtstart']['sec'],
+							$ical['event'][$i]['dtstart']['month'],
+							$ical['event'][$i]['dtstart']['mday'],
+							$ical['event'][$i]['dtstart']['year']
+						);
 
+						/*  -- Fixbug --
+						* if "DURATION" has 1 day (for example).
+						* Event takes places between the first date
+						* (this define in "start" tag) and next day  :(
+							* This "fix" destroy one day and set hours as "23" and minutes as "59"
+							*/
 
-                                                        /*  -- Fixbug --
-                                                         * if "DURATION" has 1 day (for example).
-                                                         * Event takes places between the first date
-                                                         * (this define in "start" tag) and next day  :(
-                                                         * This "fix" destroy one day and set hours as "23" and minutes as "59"
-                                                         */
+							// Weeks::Day--
+							if(     $ical['event'][$i]['duration']['weeks']
+							AND
+							( $ical['event'][$i]['duration']['hours'] == 0 )
+							AND
+							( $ical['event'][$i]['duration']['minutes'] == 0 )
+						)
+						{
+							$ical['event'][$i]['duration']['days'] = (
+								$ical['event'][$i]['duration']['days'] +
+								($ical['event'][$i]['duration']['weeks']*7))-1;
+								unset($ical['event'][$i]['duration']['weeks']);
+								$ical['event'][$i]['duration']['hours'] = "23";
+								$ical['event'][$i]['duration']['minutes'] = "59";
+								$ical['event'][$i]['duration']['seconds'] = "59";
+							}
+							// Days::Day--
+							if(
+								$ical['event'][$i]['duration']['days']
+								AND
+								( $ical['event'][$i]['duration']['hours'] == 0 )
+								AND
+								( $ical['event'][$i]['duration']['minutes'] == 0 )
+							)
+							{
+								$ical['event'][$i]['duration']['days']--;
+								$ical['event'][$i]['duration']['hours'] = "23";
+								$ical['event'][$i]['duration']['minutes'] = "59";
+								$ical['event'][$i]['duration']['seconds'] = "59";
+							}
 
-                                                        // Weeks::Day--
-                                                        if(     $ical['event'][$i]['duration']['weeks']
-                                                                AND
-                                                                ( $ical['event'][$i]['duration']['hours'] == 0 )
-                                                                        AND
-                                                                ( $ical['event'][$i]['duration']['minutes'] == 0 )
-                                                          )
-                                                        {
-                                                                $ical['event'][$i]['duration']['days'] = (
-                                                                        $ical['event'][$i]['duration']['days'] +
-                                                                        ($ical['event'][$i]['duration']['weeks']*7))-1;
-                                                                unset($ical['event'][$i]['duration']['weeks']);
-                                                                $ical['event'][$i]['duration']['hours'] = "23";
-                                                                $ical['event'][$i]['duration']['minutes'] = "59";
-                                                                $ical['event'][$i]['duration']['seconds'] = "59";
-                                                        }
-                                                        // Days::Day--
-                                                        if(
-                                                                $ical['event'][$i]['duration']['days']
-                                                                AND
-                                                                ( $ical['event'][$i]['duration']['hours'] == 0 )
-                                                                        AND
-                                                                ( $ical['event'][$i]['duration']['minutes'] == 0 )
-                                                          )
-                                                        {
-                                                                $ical['event'][$i]['duration']['days']--;
-                                                                $ical['event'][$i]['duration']['hours'] = "23";
-                                                                $ical['event'][$i]['duration']['minutes'] = "59";
-                                                                $ical['event'][$i]['duration']['seconds'] = "59";
-                                                        }
+							// Create string contains datetime for strtotime
+							$pdate = "+";
+							if( isset($ical['event'][$i]['duration']['weeks']) )
+							$pdate .= $ical['event'][$i]['duration']['weeks'] . " weeks ";
+							if( isset($ical['event'][$i]['duration']['days']) )
+							$pdate .= $ical['event'][$i]['duration']['days'] . " days ";
+							if( isset($ical['event'][$i]['duration']['hours']) )
+							$pdate .= $ical['event'][$i]['duration']['hours'] . " hours ";
+							if( isset($ical['event'][$i]['duration']['minutes']) )
+							$pdate .= $ical['event'][$i]['duration']['minutes'] . " minutes ";
+							if( isset($ical['event'][$i]['duration']['seconds']) )
+							$pdate .= $ical['event'][$i]['duration']['seconds'] . " seconds ";
 
-                                                        // Create string contains datetime for strtotime
-                                                        $pdate = "+";
-                                                        if( isset($ical['event'][$i]['duration']['weeks']) )
-                                                                $pdate .= $ical['event'][$i]['duration']['weeks'] . " weeks ";
-                                                        if( isset($ical['event'][$i]['duration']['days']) )
-                                                                $pdate .= $ical['event'][$i]['duration']['days'] . " days ";
-                                                        if( isset($ical['event'][$i]['duration']['hours']) )
-                                                                $pdate .= $ical['event'][$i]['duration']['hours'] . " hours ";
-                                                        if( isset($ical['event'][$i]['duration']['minutes']) )
-                                                                $pdate .= $ical['event'][$i]['duration']['minutes'] . " minutes ";
-                                                        if( isset($ical['event'][$i]['duration']['seconds']) )
-                                                                $pdate .= $ical['event'][$i]['duration']['seconds'] . " seconds ";
+							// What is datetime in 2192 ?
+							$enddate = strtotime($pdate, $ptimer);
+							list(   $recur_enddate['year'],
+							$recur_enddate['month'],
+							$recur_enddate['mday'],
+							$recur_enddate['hour'],
+							$recur_enddate['min'],
+							$recur_enddate['sec'] ) = split(":", date("Y:m:d:H:i:s", $enddate));
 
-                                                        // What is datetime in 2192 ?
-                                                        $enddate = strtotime($pdate, $ptimer);
-                                                        list(   $recur_enddate['year'],
-                                                                $recur_enddate['month'],
-                                                                $recur_enddate['mday'],
-                                                                $recur_enddate['hour'],
-                                                                $recur_enddate['min'],
-                                                                $recur_enddate['sec'] ) = split(":", date("Y:m:d:H:i:s", $enddate));
+							// Set End of event
+							$so_event->set_end(     $recur_enddate['year'],
+							$recur_enddate['month'],
+							$recur_enddate['mday'],
+							$recur_enddate['hour'],
+							$recur_enddate['min'],
+							$recur_enddate['sec']);
 
-                                                        // Set End of event
-                                                        $so_event->set_end(     $recur_enddate['year'],
-                                                                                $recur_enddate['month'],
-                                                                                $recur_enddate['mday'],
-                                                                                $recur_enddate['hour'],
-                                                                                $recur_enddate['min'],
-                                                                                $recur_enddate['sec']);
-
-                                                }
+						}
 						else
 						{
 							$recur_enddate['year'] = 0;
@@ -3283,7 +3293,7 @@ class boicalendar
 						}
 						else
 						{
-							$interval = intval($ical['event'][$i]['rrule']['interval']);
+							$interval = (int)$ical['event'][$i]['rrule']['interval'];
 						}
 // recur_type
 						switch($ical['event'][$i]['rrule']['freq'])
@@ -3308,17 +3318,17 @@ class boicalendar
 						$so_event->set_recur_none();
 					}
 
-// Owner				
+// Owner
 					if(!isset($ical['event'][$i]['organizer']) || (isset($ical['event'][$i]['organizer']) && $this->is_owner($ical['event'][$i]['organizer'])))
 					{
 						$so_event->add_attribute('owner',$GLOBALS['phpgw_info']['user']['account_id']);
-						$so_event->add_attribute('participants','A',intval($GLOBALS['phpgw_info']['user']['account_id']));
+						$so_event->add_attribute('participants','A',(int)$GLOBALS['phpgw_info']['user']['account_id']);
 					}
 					else
 					{
 //owner
 					}
-				
+
 					$event = $so_event->get_cached_event();
 					$so_event->add_entry($event);
 //					$event = $so_event->get_cached_event();
@@ -3348,7 +3358,7 @@ class boicalendar
 			);
 
 			$cats = CreateObject('phpgwapi.categories');
-			
+
 			include(PHPGW_SERVER_ROOT.'/calendar/setup/setup.inc.php');
 			if(!is_array($event_id))
 			{
@@ -3386,7 +3396,7 @@ class boicalendar
 			{
 				$so_event = $GLOBALS['uicalendar']->bo->so;
 			}
-		
+
 			while(list($key,$value) = each($ids))
 			{
 				$ical_event = Array();
@@ -3407,7 +3417,7 @@ class boicalendar
 				// use system's date info for caluculating local timezone's offset in minutes
 				//
 				$gmt_offset = date('O',$GLOBALS['phpgw']->datetime->users_localtime);  // offset to GMT
-				$offset = intval(substr($gmt_offset, 1, 2)) * 60 + intval(substr($gmt_offset, 3, 2));
+				$offset = (int)(substr($gmt_offset, 1, 2)) * 60 + (int)(substr($gmt_offset, 3, 2));
 				if ($offset > 0)
 				{
 					$event['start']['min']   -= $offset;
@@ -3416,7 +3426,7 @@ class boicalendar
 				}
 
 				$ical_event['priority'] = $event['priority'];
-				$ical_event['class'] = intval($event['public']);
+				$ical_event['class'] = (int)$event['public'];
 				$dtstart_mktime = $so_event->maketime($event['start']);
 				$this->parse_value($ical_event,'dtstart',date('Ymd\THis\Z',$dtstart_mktime),'vevent');
 				$dtend_mktime = $so_event->maketime($event['end']);
@@ -3431,7 +3441,7 @@ class boicalendar
 						$this->set_var($ical_event[$ical_value],'value',$event[$event_value]);
 					}
 				}
-				
+
 				if ($event['category'])
 				{
 					$cats->categories(0,'calendar');
@@ -3458,7 +3468,7 @@ class boicalendar
 						$GLOBALS['phpgw']->accounts->get_account_name($part,$lid,$fname,$lname);
 						$name = $fname.' '.$lname;
 
-						$owner_status = $this->switch_partstat(intval($this->switch_phpgw_status($event['participants'][$part])));
+						$owner_status = $this->switch_partstat((int)$this->switch_phpgw_status($event['participants'][$part]));
 
 						$mail_prefs = $GLOBALS['phpgw']->preferences->create_email_preferences($part);
 						$mailto = $mail_prefs['email']['address'];
diff --git a/calendar/inc/class.calendar_holiday.inc.php b/calendar/inc/class.calendar_holiday.inc.php
index 84175ac63d..0320875650 100755
--- a/calendar/inc/class.calendar_holiday.inc.php
+++ b/calendar/inc/class.calendar_holiday.inc.php
@@ -12,310 +12,303 @@
 
 	/* $Id$ */
 
-class calendar_holiday
-{
-	var $db;
-	var $year;
-	var $tz_offset;
-	var $holidays = Array();
-	var $index = Array();
-	var $users = Array();
-	var $datetime;
-
-	function calendar_holiday($owner='')
+	class calendar_holiday
 	{
-		global $phpgw, $phpgw_info;
+		var $db;
+		var $year;
+		var $tz_offset;
+		var $holidays = Array();
+		var $index = Array();
+		var $users = Array();
+		var $datetime;
 
-		$this->datetime = CreateObject('phpgwapi.datetime');
-		$this->db = $phpgw->db;
-		if(@$phpgw_info['user']['preferences']['common']['country'])
+		function calendar_holiday($owner='')
 		{
-			$this->users['user'] = $phpgw_info['user']['preferences']['common']['country'];
-		}
-		else
-		{
-			$this->users['user'] = 'US';
-		}		
-		$owner_id = get_account_id($owner);
-		if($owner_id != $phpgw_info['user']['account_id'])
-		{
-			$owner_pref = CreateObject('phpgwapi.preferences',$owner_id);
-			$owner_prefs = $owner_pref->read_repository();
-			if(isset($owner_prefs['calendar']['locale']) && $owner_prefs['common']['country'])
+			$this->datetime = CreateObject('phpgwapi.datetime');
+			$this->db = $GLOBALS['phpgw']->db;
+			if(@$GLOBALS['phpgw_info']['user']['preferences']['common']['country'])
 			{
-				$this->users['owner'] = $owner_prefs['common']['country'];
+				$this->users['user'] = $GLOBALS['phpgw_info']['user']['preferences']['common']['country'];
 			}
 			else
 			{
-				$this->users['owner'] = 'US';
+				$this->users['user'] = 'US';
 			}
-				
-		}
-		if($phpgw_info['server']['auto_load_holidays'] == True)
-		{
-			while(list($key,$value) = each($this->users))
+			$owner_id = get_account_id($owner);
+			if($owner_id != $GLOBALS['phpgw_info']['user']['account_id'])
 			{
-				$this->is_network_load_needed($value);
-			}
-		}
-	}
-
-	function is_network_load_needed($locale)
-	{
-		$sql = "SELECT count(*) FROM phpgw_cal_holidays WHERE locale='".$locale."'";
-		$this->db->query($sql,__LINE__,__FILE__);
-		$this->db->next_record();
-		$rows = $this->db->f(0);
-		if($rows==0)
-		{
-			$this->load_from_network($locale);
-		}
-	}
-
-	function save_holiday($holiday)
-	{
-		if(isset($holiday['hol_id']) && $holiday['hol_id'])
-		{
-//			echo "Updating LOCALE='".$holiday['locale']."' NAME='".$holiday['name']."' extra=(".$holiday['mday'].'/'.$holiday['month_num'].'/'.$holiday['occurence'].'/'.$holiday['dow'].'/'.$holiday['observance_rule'].")<br>\n";
-			$sql = "UPDATE phpgw_cal_holidays SET name='".$holiday['name']."', mday=".$holiday['mday'].', month_num='.$holiday['month_num'].', occurence='.$holiday['occurence'].', dow='.$holiday['dow'].', observance_rule='.intval($holiday['observance_rule']).' WHERE hol_id='.$holiday['hol_id'];
-		}
-		else
-		{
-//			echo "Inserting LOCALE='".$holiday['locale']."' NAME='".$holiday['name']."' extra=(".$holiday['mday'].'/'.$holiday['month_num'].'/'.$holiday['occurence'].'/'.$holiday['dow'].'/'.$holiday['observance_rule'].")<br>\n";
-			$sql = 'INSERT INTO phpgw_cal_holidays(locale,name,mday,month_num,occurence,dow,observance_rule) '
-					. "VALUES('".strtoupper($holiday['locale'])."','".$holiday['name']."',".$holiday['mday'].','.$holiday['month_num'].','.$holiday['occurence'].','.$holiday['dow'].','.intval($holiday['observance_rule']).")";
-		}
-		$this->db->query($sql,__LINE__,__FILE__);
-	}
-
-	function delete_holiday($id)
-	{
-		$sql = 'DELETE FROM phpgw_cal_holidays WHERE hol_id='.$id;
-		$this->db->query($sql,__LINE__,__FILE__);
-	}
-
-	function delete_locale($locale)
-	{
-		$sql = "DELETE FROM phpgw_cal_holidays WHERE locale='".$locale."'";
-		$this->db->query($sql,__LINE__,__FILE__);
-	}
-
-	function load_from_network($locale)
-	{
-		global $phpgw_info, $HTTP_HOST, $SERVER_PORT;
-		
-		@set_time_limit(0);
-
-		// get the file that contains the calendar events for your locale
-		// "http://www.phpgroupware.org/headlines.rdf";
-		$network = CreateObject('phpgwapi.network');
-		if(isset($phpgw_info['server']['holidays_url_path']) && $phpgw_info['server']['holidays_url_path'] != 'localhost')
-		{
-			$load_from = $phpgw_info['server']['holidays_url_path'];
-		}
-		else
-		{
-			$pos = strpos(' '.$phpgw_info['server']['webserver_url'],$HTTP_HOST);
-			if($pos == 0)
-			{
-				switch($SERVER_PORT)
+				$owner_pref = CreateObject('phpgwapi.preferences',$owner_id);
+				$owner_prefs = $owner_pref->read_repository();
+				if(isset($owner_prefs['calendar']['locale']) && $owner_prefs['common']['country'])
 				{
-					case 80:
-						$http_protocol = 'http://';
-						break;
-					case 443:
-						$http_protocol = 'https://';
-						break;
-				}
-				$server_host = $http_protocol.$HTTP_HOST.$phpgw_info['server']['webserver_url'];
-			}
-			else
-			{
-				$server_host = $phpgw_info['server']['webserver_url'];
-			}
-			$load_from = $server_host.'/calendar/setup';
-		}
-//		echo 'Loading from: '.$load_from.'/holidays.'.strtoupper($locale)."<br>\n";
-		$lines = $network->gethttpsocketfile($load_from.'/holidays.'.strtoupper($locale));
-		if (!$lines) return false;
-		$c_lines = count($lines);
-		for($i=0;$i<$c_lines;$i++)
-		{
-//			echo 'Line #'.$i.' : '.$lines[$i]."<br>\n";
-			$holiday = explode("\t",$lines[$i]);
-			if(count($holiday) == 7)
-			{
-				$holiday['locale'] = $holiday[0];
-				$holiday['name'] = addslashes($holiday[1]);
-				$holiday['mday'] = intval($holiday[2]);
-				$holiday['month_num'] = intval($holiday[3]);
-				$holiday['occurence'] = intval($holiday[4]);
-				$holiday['dow'] = intval($holiday[5]);
-				$holiday['observance_rule'] = intval($holiday[6]);
-				$holiday['hol_id'] = 0;
-				$this->save_holiday($holiday);
-			}
-		}
-	}
-
-	function read_holiday()
-	{
-		global $phpgw, $phpgw_info;
-
-		$this->year = intval($phpgw->calendar->tempyear);
-		
-		$sql = $this->build_holiday_query();
-		if($sql == False)
-		{	return False;
-		}
-		$this->holidays = Null;
-		$this->db->query($sql,__LINE__,__FILE__);
-
-		$i = 0;
-		$temp_locale = $phpgw_info['user']['preferences']['common']['country'];
-		while($this->db->next_record())
-		{
-			$this->index[$this->db->f('hol_id')] = $i;
-			$this->holidays[$i]['locale'] = $this->db->f('locale');
-			$this->holidays[$i]['name'] = $phpgw->strip_html($this->db->f('name'));
-			$this->holidays[$i]['day'] = intval($this->db->f('mday'));
-			$this->holidays[$i]['month'] = intval($this->db->f('month_num'));
-			$this->holidays[$i]['occurence'] = intval($this->db->f('occurence'));
-			$this->holidays[$i]['dow'] = intval($this->db->f('dow'));
-			$this->holidays[$i]['observance_rule'] = $this->db->f('observance_rule');
-			if(count($this->users) == 2 && $this->users[0] != $this->users[1])
-			{
-				if($this->holidays[$i]['locale'] == $this->users[1])
-				{
-					$this->holidays[$i]['owner'] = 'user';
+					$this->users['owner'] = $owner_prefs['common']['country'];
 				}
 				else
 				{
-					$this->holidays[$i]['owner'] = 'owner';
+					$this->users['owner'] = 'US';
 				}
 			}
+			if($GLOBALS['phpgw_info']['server']['auto_load_holidays'] == True)
+			{
+				while(list($key,$value) = each($this->users))
+				{
+					$this->is_network_load_needed($value);
+				}
+			}
+		}
+
+		function is_network_load_needed($locale)
+		{
+			$sql = "SELECT count(*) FROM phpgw_cal_holidays WHERE locale='".$locale."'";
+			$this->db->query($sql,__LINE__,__FILE__);
+			$this->db->next_record();
+			$rows = $this->db->f(0);
+			if($rows==0)
+			{
+				$this->load_from_network($locale);
+			}
+		}
+
+		function save_holiday($holiday)
+		{
+			if(isset($holiday['hol_id']) && $holiday['hol_id'])
+			{
+	//			echo "Updating LOCALE='".$holiday['locale']."' NAME='".$holiday['name']."' extra=(".$holiday['mday'].'/'.$holiday['month_num'].'/'.$holiday['occurence'].'/'.$holiday['dow'].'/'.$holiday['observance_rule'].")<br>\n";
+				$sql = "UPDATE phpgw_cal_holidays SET name='".$holiday['name']."', mday=".$holiday['mday'].', month_num='.$holiday['month_num'].', occurence='.$holiday['occurence'].', dow='.$holiday['dow'].', observance_rule='.(int)$holiday['observance_rule'].' WHERE hol_id='.$holiday['hol_id'];
+			}
 			else
 			{
-				$this->holidays[$i]['owner'] = 'user';		
+	//			echo "Inserting LOCALE='".$holiday['locale']."' NAME='".$holiday['name']."' extra=(".$holiday['mday'].'/'.$holiday['month_num'].'/'.$holiday['occurence'].'/'.$holiday['dow'].'/'.$holiday['observance_rule'].")<br>\n";
+				$sql = 'INSERT INTO phpgw_cal_holidays(locale,name,mday,month_num,occurence,dow,observance_rule) '
+					. "VALUES('".strtoupper($holiday['locale'])."','".$holiday['name']."',".$holiday['mday'].','.$holiday['month_num'].','.$holiday['occurence'].','.$holiday['dow'].','.(int)$holiday['observance_rule'].")";
 			}
-			$c = $i;
-			$phpgw_info['user']['preferences']['common']['country'] = $this->holidays[$i]['locale'];
-			$holidaycalc = CreateObject('calendar.holidaycalc');
-			$this->holidays[$i]['date'] = $holidaycalc->calculate_date($this->holidays[$i], $this->holidays, $this->year, $this->datetime, $c);
-			unset($holidaycalc);
-			if($c != $i)
+			$this->db->query($sql,__LINE__,__FILE__);
+		}
+
+		function delete_holiday($id)
+		{
+			$sql = 'DELETE FROM phpgw_cal_holidays WHERE hol_id='.$id;
+			$this->db->query($sql,__LINE__,__FILE__);
+		}
+
+		function delete_locale($locale)
+		{
+			$sql = "DELETE FROM phpgw_cal_holidays WHERE locale='".$locale."'";
+			$this->db->query($sql,__LINE__,__FILE__);
+		}
+
+		function load_from_network($locale)
+		{
+			@set_time_limit(0);
+
+			// get the file that contains the calendar events for your locale
+			// "http://www.phpgroupware.org/headlines.rdf";
+			$network = CreateObject('phpgwapi.network');
+			if(isset($GLOBALS['phpgw_info']['server']['holidays_url_path']) && $GLOBALS['phpgw_info']['server']['holidays_url_path'] != 'localhost')
 			{
-				$i = $c;
+				$load_from = $GLOBALS['phpgw_info']['server']['holidays_url_path'];
 			}
-			$i++;
-		}
-		$this->holidays = $this->sort_by_date($this->holidays);
-		$phpgw_info['user']['preferences']['common']['country'] = $temp_locale;
-		return $this->holidays;
-	}
-
-	function build_list_for_submission($locale)
-	{
-		global $phpgw;
-		
-		$i = -1;
-		$this->db->query("SELECT * FROM phpgw_cal_holidays WHERE locale='".$locale."'");
-		while($this->db->next_record())
-		{
-			$i++;
-			$holidays[$i]['locale'] = $this->db->f('locale');
-			$holidays[$i]['name'] = $phpgw->strip_html($this->db->f('name'));
-			$holidays[$i]['day'] = intval($this->db->f('mday'));
-			$holidays[$i]['month'] = intval($this->db->f('month_num'));
-			$holidays[$i]['occurence'] = intval($this->db->f('occurence'));
-			$holidays[$i]['dow'] = intval($this->db->f('dow'));
-			$holidays[$i]['observance_rule'] = $this->db->f('observance_rule');
-		}
-		return $holidays;
-	}
-
-	function build_holiday_query()
-	{
-		if(!isset($this->users) || count($this->users) == 0)
-		{
-			return False;
-		}
-		$sql = 'SELECT * FROM phpgw_cal_holidays WHERE locale in (';
-		$find_it = '';
-		reset($this->users);
-		while(list($key,$value) = each($this->users))
-		{
-			if($find_it)
+			else
 			{
-				$find_it .= ',';
-			}
-			$find_it .= "'".$value."'";
-		}
-		$sql .= $find_it.')';
-
-		return $sql;
-	}
-
-	function sort_by_date($holidays)
-	{
-		$c_holidays = count($holidays);
-		for($outer_loop=0;$outer_loop<($c_holidays - 1);$outer_loop++)
-		{
-			$outer_date = $holidays[$outer_loop]['date'];
-			for($inner_loop=$outer_loop;$inner_loop<$c_holidays;$inner_loop++)
-			{
-				$inner_date = $holidays[$inner_loop]['date'];
-				if($outer_date > $inner_date)
+				$pos = strpos(' '.$GLOBALS['phpgw_info']['server']['webserver_url'],$_SERVER['HTTP_HOST']);
+				if($pos == 0)
 				{
-					$temp = $holidays[$inner_loop];
-					$holidays[$inner_loop] = $holidays[$outer_loop];
-					$holidays[$outer_loop] = $temp;
+					switch($_SERVER['SERVER_PORT'])
+					{
+						case 80:
+							$http_protocol = 'http://';
+							break;
+						case 443:
+							$http_protocol = 'https://';
+							break;
+					}
+					$server_host = $http_protocol.$_SERVER['HTTP_HOST'].$GLOBALS['phpgw_info']['server']['webserver_url'];
+				}
+				else
+				{
+					$server_host = $GLOBALS['phpgw_info']['server']['webserver_url'];
+				}
+				$load_from = $server_host.'/calendar/setup';
+			}
+	//		echo 'Loading from: '.$load_from.'/holidays.'.strtoupper($locale)."<br>\n";
+			$lines = $network->gethttpsocketfile($load_from.'/holidays.'.strtoupper($locale));
+			if(!$lines)
+			{
+				return False;
+			}
+			$c_lines = count($lines);
+			for($i=0;$i<$c_lines;$i++)
+			{
+	//			echo 'Line #'.$i.' : '.$lines[$i]."<br>\n";
+				$holiday = explode("\t",$lines[$i]);
+				if(count($holiday) == 7)
+				{
+					$holiday['locale'] = $holiday[0];
+					$holiday['name'] = addslashes($holiday[1]);
+					$holiday['mday'] = (int)$holiday[2];
+					$holiday['month_num'] = (int)$holiday[3];
+					$holiday['occurence'] = (int)$holiday[4];
+					$holiday['dow'] = (int)$holiday[5];
+					$holiday['observance_rule'] = (int)$holiday[6];
+					$holiday['hol_id'] = 0;
+					$this->save_holiday($holiday);
 				}
 			}
 		}
-		return $holidays;
-	}
-	
-	function find_date($date)
-	{
-		global $phpgw;
 
-		if($this->holidays == Null)
+		function read_holiday()
 		{
-			return False;
-		}
-		
-		$c_holidays = count($this->holidays);
-		for($i=0;$i<$c_holidays;$i++)
-		{
-			if($this->holidays[$i]['date'] > $date)
+			$this->year = (int)$GLOBALS['phpgw']->calendar->tempyear;
+
+			$sql = $this->build_holiday_query();
+			if($sql == False)
 			{
-				$i = $c_holidays + 1;
+				return False;
 			}
-			elseif($this->holidays[$i]['date'] == $date)
+			$this->holidays = Null;
+			$this->db->query($sql,__LINE__,__FILE__);
+
+			$i = 0;
+			$temp_locale = $GLOBALS['phpgw_info']['user']['preferences']['common']['country'];
+			while($this->db->next_record())
 			{
-				$return_value[] = $i;
+				$this->index[$this->db->f('hol_id')] = $i;
+				$this->holidays[$i]['locale'] = $this->db->f('locale');
+				$this->holidays[$i]['name'] = $GLOBALS['phpgw']->strip_html($this->db->f('name'));
+				$this->holidays[$i]['day'] = (int)$this->db->f('mday');
+				$this->holidays[$i]['month'] = (int)$this->db->f('month_num');
+				$this->holidays[$i]['occurence'] = (int)$this->db->f('occurence');
+				$this->holidays[$i]['dow'] = (int)$this->db->f('dow');
+				$this->holidays[$i]['observance_rule'] = $this->db->f('observance_rule');
+				if(count($this->users) == 2 && $this->users[0] != $this->users[1])
+				{
+					if($this->holidays[$i]['locale'] == $this->users[1])
+					{
+						$this->holidays[$i]['owner'] = 'user';
+					}
+					else
+					{
+						$this->holidays[$i]['owner'] = 'owner';
+					}
+				}
+				else
+				{
+					$this->holidays[$i]['owner'] = 'user';
+				}
+				$c = $i;
+				$GLOBALS['phpgw_info']['user']['preferences']['common']['country'] = $this->holidays[$i]['locale'];
+				$holidaycalc = CreateObject('calendar.holidaycalc');
+				$this->holidays[$i]['date'] = $holidaycalc->calculate_date($this->holidays[$i], $this->holidays, $this->year, $this->datetime, $c);
+				unset($holidaycalc);
+				if($c != $i)
+				{
+					$i = $c;
+				}
+				$i++;
+			}
+			$this->holidays = $this->sort_by_date($this->holidays);
+			$GLOBALS['phpgw_info']['user']['preferences']['common']['country'] = $temp_locale;
+			return $this->holidays;
+		}
+
+		function build_list_for_submission($locale)
+		{
+			$i = -1;
+			$this->db->query("SELECT * FROM phpgw_cal_holidays WHERE locale='".$locale."'");
+			while($this->db->next_record())
+			{
+				$i++;
+				$holidays[$i]['locale'] = $this->db->f('locale');
+				$holidays[$i]['name']   = $GLOBALS['phpgw']->strip_html($this->db->f('name'));
+				$holidays[$i]['day']    = (int)$this->db->f('mday');
+				$holidays[$i]['month']  = (int)$this->db->f('month_num');
+				$holidays[$i]['occurence'] = (int)$this->db->f('occurence');
+				$holidays[$i]['dow']    = (int)$this->db->f('dow');
+				$holidays[$i]['observance_rule'] = $this->db->f('observance_rule');
+			}
+			return $holidays;
+		}
+
+		function build_holiday_query()
+		{
+			if(!isset($this->users) || count($this->users) == 0)
+			{
+				return False;
+			}
+			$sql = 'SELECT * FROM phpgw_cal_holidays WHERE locale in (';
+			$find_it = '';
+			reset($this->users);
+			while(list($key,$value) = each($this->users))
+			{
+				if($find_it)
+				{
+					$find_it .= ',';
+				}
+				$find_it .= "'".$value."'";
+			}
+			$sql .= $find_it.')';
+
+			return $sql;
+		}
+
+		function sort_by_date($holidays)
+		{
+			$c_holidays = count($holidays);
+			for($outer_loop=0;$outer_loop<($c_holidays - 1);$outer_loop++)
+			{
+				$outer_date = $holidays[$outer_loop]['date'];
+				for($inner_loop=$outer_loop;$inner_loop<$c_holidays;$inner_loop++)
+				{
+					$inner_date = $holidays[$inner_loop]['date'];
+					if($outer_date > $inner_date)
+					{
+						$temp = $holidays[$inner_loop];
+						$holidays[$inner_loop] = $holidays[$outer_loop];
+						$holidays[$outer_loop] = $temp;
+					}
+				}
+			}
+			return $holidays;
+		}
+
+		function find_date($date)
+		{
+			if($this->holidays == Null)
+			{
+				return False;
+			}
+
+			$c_holidays = count($this->holidays);
+			for($i=0;$i<$c_holidays;$i++)
+			{
+				if($this->holidays[$i]['date'] > $date)
+				{
+					$i = $c_holidays + 1;
+				}
+				elseif($this->holidays[$i]['date'] == $date)
+				{
+					$return_value[] = $i;
+				}
+			}
+	//		echo 'Searching for '.$GLOBALS['phpgw']->common->show_date($date).'  Found = '.count($return_value)."<br>\n";
+			if(isset($return_value))
+			{
+				return $return_value;
+			}
+			else
+			{
+				return False;
 			}
 		}
-//		echo 'Searching for '.$phpgw->common->show_date($date).'  Found = '.count($return_value)."<br>\n";
-		if(isset($return_value))
+
+		function get_holiday($index)
 		{
-			return $return_value;
+			return $this->holidays[$index];
 		}
-		else
+
+		function get_name($id)
 		{
-			return False;
+			return $this->holidays[$id]['name'];
 		}
 	}
-
-	function get_holiday($index)
-	{
-		return $this->holidays[$index];
-	}
-
-	function get_name($id)
-	{
-		return $this->holidays[$id]['name'];
-	}
-}
 ?>
diff --git a/calendar/inc/class.calendar_icap.inc.php b/calendar/inc/class.calendar_icap.inc.php
index b0afb25314..f3e68f1e84 100755
--- a/calendar/inc/class.calendar_icap.inc.php
+++ b/calendar/inc/class.calendar_icap.inc.php
@@ -12,334 +12,330 @@
 
   /* $Id$ */
 
-if (isset($phpgw_info['flags']['included_classes']['calendar_']) && 
-    $phpgw_info['flags']['included_classes']['calendar_'] == True)
-{
-	return;
-}
-
-$phpgw_info['flags']['included_classes']['calendar_'] = True;
-
-class calendar_ extends calendar__
-{
-	function open($calendar='',$user='',$passwd='',$options='')
+	if (isset($GLOBALS['phpgw_info']['flags']['included_classes']['calendar_']) &&
+		$GLOBALS['phpgw_info']['flags']['included_classes']['calendar_'] == True)
 	{
-		global $phpgw, $phpgw_info;
-
-		if($user=='')
-		{
-			$user = $phpgw_info['user']['account_lid'];
-		}
-		elseif(is_int($user)) 
-		{
-			$this->user = $phpgw->accounts->id2name($user);
-		}
-		elseif(is_string($user))
-		{
-			$this->user = $user;
-		}
-		if($options != '')
-		{
-			$this->stream = mcal_open('{'.$phpgw_info['server']['icap_server'].'/'.$phpgw_info['server']['icap_type'].'}'.$calendar,$this->user,$passwd,$options);
-		}
-		else
-		{
-			$this->stream = mcal_open('{'.$phpgw_info['server']['icap_server'].'/'.$phpgw_info['server']['icap_type'].'}'.$calendar,$this->user,$passwd);
-		}
+		return;
 	}
 
-	function popen($calendar='',$user='',$passwd='',$options='')
+	$GLOBALS['phpgw_info']['flags']['included_classes']['calendar_'] = True;
+
+	class calendar_ extends calendar__
 	{
-		global $phpgw, $phpgw_info;
-
-		if($user=='')
+		function open($calendar='',$user='',$passwd='',$options='')
 		{
-			$this->user = $phpgw_info['user']['account_lid'];
-		}
-		elseif(is_int($user)) 
-		{
-			$this->user = $phpgw->accounts->id2name($user);
-		}
-		elseif(is_string($user))
-		{
-			$this->user = $user;
-		}
-		if($options != '')
-		{
-			$this->stream = mcal_popen('{'.$phpgw_info['server']['icap_server'].'/'.$phpgw_info['server']['icap_type'].'}'.$calendar,$this->user,$passwd,$options);
-		}
-		else
-		{
-			$this->stream = mcal_popen('{'.$phpgw_info['server']['icap_server'].'/'.$phpgw_info['server']['icap_type'].'}'.$calendar,$this->user,$passwd);
-		}
-	}
-
-	function reopen($calendar,$options='')
-	{
-		if($options != '')
-		{
-			$this->stream = mcal_reopen($calendar,$options);
-		}
-		else
-		{
-			$this->stream = mcal_reopen($calendar);
-		}
-	}
-
-	function close($options='')
-	{
-		if($options != '')
-		{
-			return mcal_close($this->stream,$options);
-		}
-		else
-		{
-			return mcal_close($this->stream);
-		}
-	}
-
-	function create_calendar($calendar)
-	{
-		return mcal_create_calendar($this->stream,$calendar);
-	}
-
-	function rename_calendar($old_name,$new_name)
-	{
-		return mcal_rename_calendar($this->stream,$old_name,$new_name);
-	}
-
-	function delete_calendar($calendar)
-	{
-		return mcal_delete_calendar($this->stream,$calendar);
-	}
-
-	function fetch_event($event_id,$options='')
-	{
-		if(!isset($this->stream))
-		{
-			return False;
-		}
-	
-		$this->event = CreateObject('calendar.calendar_item');
-	  
-		if($options != '')
-		{
-			$this->event = mcal_fetch_event($this->stream,$event_id,$options);
-		}
-		else
-		{
-			$this->event = mcal_fetch_event($this->stream,$event_id);
-		}
-
-		// Need to load the $this->event variable with the $event structure from
-		// the mcal_fetch_event() call
-		// Use http://www.php.net/manual/en/function.mcal-fetch-event.php as the reference
-		// This only needs legacy support
-		
-		return $this->event;
-	}
-
-	function list_events($startYear,$startMonth,$startDay,$endYear='',$endMonth='',$endYear='')
-	{
-		if($endYear != '' && $endMonth != '' && $endDay != '')
-		{
-			$events = mcal_list_events($this->stream,$startYear,$startMonth,$startDay,$endYear,$endMonth,$endYear);
-		}
-		else
-		{
-			$events = mcal_list_events($this->stream,$startYear,$startMonth,$startDay);
-		}
-
-		return $events;
-	}
-
-	function append_event()
-	{
-		return mcal_append_event($this->stream);
-	}
-
-	function store_event()
-	{
-		return mcal_store_event($this->stream);
-	}
-
-	function delete_event($event_id)
-	{
-		return mcal_delete_event($this->stream,$event_id);
-	}
-
-	function snooze($event_id)
-	{
-		return mcal_snooze($this->stream,$event_id);
-	}
-
-	function list_alarms($begin_year='',$begin_month='',$begin_day='',$end_year='',$end_month='',$end_day='')
-	{
-		if($end_day == '')
-		{
-			if($end_month == '')
+			if($user=='')
 			{
-				if($end_year == '')
+				$user = $GLOBALS['phpgw_info']['user']['account_lid'];
+			}
+			elseif(is_int($user))
+			{
+				$this->user = $GLOBALS['phpgw']->accounts->id2name($user);
+			}
+			elseif(is_string($user))
+			{
+				$this->user = $user;
+			}
+			if($options != '')
+			{
+				$this->stream = mcal_open('{'.$GLOBALS['phpgw_info']['server']['icap_server'].'/'.$GLOBALS['phpgw_info']['server']['icap_type'].'}'.$calendar,$this->user,$passwd,$options);
+			}
+			else
+			{
+				$this->stream = mcal_open('{'.$GLOBALS['phpgw_info']['server']['icap_server'].'/'.$GLOBALS['phpgw_info']['server']['icap_type'].'}'.$calendar,$this->user,$passwd);
+			}
+		}
+
+		function popen($calendar='',$user='',$passwd='',$options='')
+		{
+			if($user=='')
+			{
+				$this->user = $GLOBALS['phpgw_info']['user']['account_lid'];
+			}
+			elseif(is_int($user))
+			{
+				$this->user = $GLOBALS['phpgw']->accounts->id2name($user);
+			}
+			elseif(is_string($user))
+			{
+				$this->user = $user;
+			}
+			if($options != '')
+			{
+				$this->stream = mcal_popen('{'.$GLOBALS['phpgw_info']['server']['icap_server'].'/'.$GLOBALS['phpgw_info']['server']['icap_type'].'}'.$calendar,$this->user,$passwd,$options);
+			}
+			else
+			{
+				$this->stream = mcal_popen('{'.$GLOBALS['phpgw_info']['server']['icap_server'].'/'.$GLOBALS['phpgw_info']['server']['icap_type'].'}'.$calendar,$this->user,$passwd);
+			}
+		}
+
+		function reopen($calendar,$options='')
+		{
+			if($options != '')
+			{
+				$this->stream = mcal_reopen($calendar,$options);
+			}
+			else
+			{
+				$this->stream = mcal_reopen($calendar);
+			}
+		}
+
+		function close($options='')
+		{
+			if($options != '')
+			{
+				return mcal_close($this->stream,$options);
+			}
+			else
+			{
+				return mcal_close($this->stream);
+			}
+		}
+
+		function create_calendar($calendar)
+		{
+			return mcal_create_calendar($this->stream,$calendar);
+		}
+
+		function rename_calendar($old_name,$new_name)
+		{
+			return mcal_rename_calendar($this->stream,$old_name,$new_name);
+		}
+
+		function delete_calendar($calendar)
+		{
+			return mcal_delete_calendar($this->stream,$calendar);
+		}
+
+		function fetch_event($event_id,$options='')
+		{
+			if(!isset($this->stream))
+			{
+				return False;
+			}
+
+			$this->event = CreateObject('calendar.calendar_item');
+
+			if($options != '')
+			{
+				$this->event = mcal_fetch_event($this->stream,$event_id,$options);
+			}
+			else
+			{
+				$this->event = mcal_fetch_event($this->stream,$event_id);
+			}
+
+			// Need to load the $this->event variable with the $event structure from
+			// the mcal_fetch_event() call
+			// Use http://www.php.net/manual/en/function.mcal-fetch-event.php as the reference
+			// This only needs legacy support
+
+			return $this->event;
+		}
+
+		function list_events($startYear,$startMonth,$startDay,$endYear='',$endMonth='',$endYear='')
+		{
+			if($endYear != '' && $endMonth != '' && $endDay != '')
+			{
+				$events = mcal_list_events($this->stream,$startYear,$startMonth,$startDay,$endYear,$endMonth,$endYear);
+			}
+			else
+			{
+				$events = mcal_list_events($this->stream,$startYear,$startMonth,$startDay);
+			}
+
+			return $events;
+		}
+
+		function append_event()
+		{
+			return mcal_append_event($this->stream);
+		}
+
+		function store_event()
+		{
+			return mcal_store_event($this->stream);
+		}
+
+		function delete_event($event_id)
+		{
+			return mcal_delete_event($this->stream,$event_id);
+		}
+
+		function snooze($event_id)
+		{
+			return mcal_snooze($this->stream,$event_id);
+		}
+
+		function list_alarms($begin_year='',$begin_month='',$begin_day='',$end_year='',$end_month='',$end_day='')
+		{
+			if($end_day == '')
+			{
+				if($end_month == '')
 				{
-					if($begin_day == '')
+					if($end_year == '')
 					{
-						if($begin_month == '')
+						if($begin_day == '')
 						{
-							if($begin_year == '')
+							if($begin_month == '')
 							{
-								return mcal_list_alarms($this->stream);
+								if($begin_year == '')
+								{
+									return mcal_list_alarms($this->stream);
+								}
+								else
+								{
+									return mcal_list_alarms($this->stream,$begin_year);
+								}
 							}
 							else
 							{
-								return mcal_list_alarms($this->stream,$begin_year);
+								return mcal_list_alarms($this->stream,$begin_year,$begin_month);
 							}
 						}
 						else
 						{
-							return mcal_list_alarms($this->stream,$begin_year,$begin_month);
+							return mcal_list_alarms($this->stream,$begin_year,$begin_month,$begin_day);
 						}
 					}
 					else
 					{
-						return mcal_list_alarms($this->stream,$begin_year,$begin_month,$begin_day);
+						return mcal_list_alarms($this->stream,$begin_year,$begin_month,$begin_day,$end_year);
 					}
 				}
 				else
 				{
-					return mcal_list_alarms($this->stream,$begin_year,$begin_month,$begin_day,$end_year);
+					return mcal_list_alarms($this->stream,$begin_year,$begin_month,$begin_day,$end_year,$end_month);
 				}
 			}
 			else
 			{
-				return mcal_list_alarms($this->stream,$begin_year,$begin_month,$begin_day,$end_year,$end_month);
+				return mcal_list_alarms($this->stream,$begin_year,$begin_month,$begin_day,$end_year,$end_month,$end_day);
 			}
 		}
-		else
+
+		function event_init()
 		{
-			return mcal_list_alarms($this->stream,$begin_year,$begin_month,$begin_day,$end_year,$end_month,$end_day);
+			$this->event = CreateObject('calendar.calendar_item');
+			return mcal_event_init($this->stream);
+		}
+
+		function set_category($category='')
+		{
+			calendar__::set_category($category);
+			return mcal_event_set_category($this->stream,$category);
+		}
+
+		function set_title($title='')
+		{
+			calendar__::set_title($title);
+			return mcal_event_set_title($this->stream,$title);
+		}
+
+		function set_description($description='')
+		{
+			calendar__::set_description($description);
+			return mcal_event_set_description($this->stream,$description);
+		}
+
+		function set_start($year,$month,$day=0,$hour=0,$min=0,$sec=0)
+		{
+			calendar__::set_start($year,$month,$day,$hour,$min,$sec);
+			return mcal_event_set_start($this->stream,$year,$month,$day,$hour,$min,$sec);
+		}
+
+		function set_end($year,$month,$day=0,$hour=0,$min=0,$sec=0)
+		{
+			calendar__::set_end($year,$month,$day,$hour,$min,$sec);
+			return mcal_event_set_end($this->stream,$year,$month,$day,$hour,$min,$sec);
+		}
+
+		function set_alarm($alarm)
+		{
+			calendar__::set_alarm($alarm);
+			return mcal_event_set_alarm ($this->stream,$alarm);
+		}
+
+		function set_class($class)
+		{
+			calendar__::set_class($class);
+			return mcal_event_set_class($this->stream,$class);
+		}
+
+		// The function definition doesn't look correct...
+		// Need more information for this function
+		function next_recurrence($weekstart,$next)
+		{
+			return mcal_next_recurrence($this->stream,$weekstart,$next);
+		}
+
+		function set_recur_none()
+		{
+			calendar__::set_recur_none();
+			return mcal_event_set_recur_none($this->stream);
+		}
+
+		function set_recur_daily($year,$month,$day,$interval)
+		{
+			calendar__::set_recur_daily($year,$month,$day,$interval);
+			return mcal_event_set_recur_daily($this->stream,$year,$month,$day,$interval);
+		}
+
+		function set_recur_weekly($year,$month,$day,$interval,$weekdays)
+		{
+			calendar__::set_recur_weekly($year,$month,$day,$interval,$weekdays);
+			return mcal_event_set_recur_weekly($this->stream,$year,$month,$day,$interval,$weekdays);
+		}
+
+		function set_recur_monthly_mday($year,$month,$day,$interval)
+		{
+			calendar__::set_recur_monthly_mday($year,$month,$day,$interval);
+			return mcal_event_set_recur_monthly_mday($this->stream,$year,$month,$day,$interval);
+		}
+
+		function set_recur_monthly_wday($year,$month,$day,$interval)
+		{
+			calendar__::set_recur_monthly_wday($year,$month,$day,$interval);
+			return mcal_event_set_recur_monthly_wday($this->stream,$year,$month,$day,$interval);
+		}
+
+		function set_recur_yearly($year,$month,$day,$interval)
+		{
+			calendar__::set_recur_yearly($year,$month,$day,$interval);
+			return mcal_event_set_recur_yearly($this->stream,$year,$month,$day,$interval);
+		}
+
+		function fetch_current_stream_event()
+		{
+			$this->event = mcal_fetch_current_stream_event($this->stream);
+			return $this->event
+		}
+
+		function add_attribute($attribute,$value)
+		{
+			calendar__::add_attribute($attribute,$value);
+			return mcal_event_add_attribute($this->stream,$attribute,$value);
+		}
+
+		function expunge()
+		{
+			return mcal_expunge($this->stream);
+		}
+
+		/**************** Local functions for ICAL based Calendar *****************/
+
+		function set_status($id,$owner,$status)
+		{
+			$status_code_short = Array(
+				REJECTED =>	'R',
+				NO_RESPONSE	=> 'U',
+				TENTATIVE	=>	'T',
+				ACCEPTED	=>	'A'
+			);
+			$this->add_attribute('status['.$owner.']',$status_code_short[$status]);
+	//		$this->stream->query("UPDATE calendar_entry_user SET cal_status='".$status_code_short[$status]."' WHERE cal_id=".$id." AND cal_login=".$owner,__LINE__,__FILE__);
+			return True;
 		}
 	}
-	
-	function event_init()
-	{
-		$this->event = CreateObject('calendar.calendar_item');
-		return mcal_event_init($this->stream);
-	}
-
-	function set_category($category='')
-	{
-		calendar__::set_category($category);
-		return mcal_event_set_category($this->stream,$category);
-	}
-	
-	function set_title($title='')
-	{
-		calendar__::set_title($title);
-		return mcal_event_set_title($this->stream,$title);
-	}
-
-	function set_description($description='')
-	{
-		calendar__::set_description($description);
-		return mcal_event_set_description($this->stream,$description);
-	}
-
-	function set_start($year,$month,$day=0,$hour=0,$min=0,$sec=0)
-	{
-		calendar__::set_start($year,$month,$day,$hour,$min,$sec);
-		return mcal_event_set_start($this->stream,$year,$month,$day,$hour,$min,$sec);
-	}
-
-	function set_end($year,$month,$day=0,$hour=0,$min=0,$sec=0)
-	{
-		calendar__::set_end($year,$month,$day,$hour,$min,$sec);
-		return mcal_event_set_end($this->stream,$year,$month,$day,$hour,$min,$sec);
-	}
-
-	function set_alarm($alarm)
-	{
-		calendar__::set_alarm($alarm);
-		return mcal_event_set_alarm ($this->stream,$alarm);
-	}
-
-	function set_class($class)
-	{
-		calendar__::set_class($class);
-		return mcal_event_set_class($this->stream,$class);
-	}
-
-	// The function definition doesn't look correct...
-	// Need more information for this function
-	function next_recurrence($weekstart,$next)
-	{
-		return mcal_next_recurrence($this->stream,$weekstart,$next);
-	}
-
-	function set_recur_none()
-	{
-		calendar__::set_recur_none();
-		return mcal_event_set_recur_none($this->stream);
-	}
-
-	function set_recur_daily($year,$month,$day,$interval)
-	{
-		calendar__::set_recur_daily($year,$month,$day,$interval);
-		return mcal_event_set_recur_daily($this->stream,$year,$month,$day,$interval);
-	}
-	
-	function set_recur_weekly($year,$month,$day,$interval,$weekdays)
-	{
-		calendar__::set_recur_weekly($year,$month,$day,$interval,$weekdays);
-		return mcal_event_set_recur_weekly($this->stream,$year,$month,$day,$interval,$weekdays);
-	}
-
-	function set_recur_monthly_mday($year,$month,$day,$interval)
-	{
-		calendar__::set_recur_monthly_mday($year,$month,$day,$interval);
-		return mcal_event_set_recur_monthly_mday($this->stream,$year,$month,$day,$interval);
-	}
-	
-	function set_recur_monthly_wday($year,$month,$day,$interval)
-	{
-		calendar__::set_recur_monthly_wday($year,$month,$day,$interval);
-		return mcal_event_set_recur_monthly_wday($this->stream,$year,$month,$day,$interval);
-	}
-
-	function set_recur_yearly($year,$month,$day,$interval)
-	{
-		calendar__::set_recur_yearly($year,$month,$day,$interval);
-		return mcal_event_set_recur_yearly($this->stream,$year,$month,$day,$interval);
-	}
-
-	function fetch_current_stream_event()
-	{
-		$this->event = mcal_fetch_current_stream_event($this->stream);
-		return $this->event
-	}
-
-	function add_attribute($attribute,$value)
-	{
-		calendar__::add_attribute($attribute,$value);
-		return mcal_event_add_attribute($this->stream,$attribute,$value);
-	}
-
-	function expunge()
-	{
-		return mcal_expunge($this->stream);
-	}
-
-	/**************** Local functions for ICAL based Calendar *****************/
-	
-	function set_status($id,$owner,$status)
-	{
-		$status_code_short = Array(
-			REJECTED =>	'R',
-			NO_RESPONSE	=> 'U',
-			TENTATIVE	=>	'T',
-			ACCEPTED	=>	'A'
-		);
-		$this->add_attribute('status['.$owner.']',$status_code_short[$status]);
-//		$this->stream->query("UPDATE calendar_entry_user SET cal_status='".$status_code_short[$status]."' WHERE cal_id=".$id." AND cal_login=".$owner,__LINE__,__FILE__);
-		return True;
-	}
-}
diff --git a/calendar/inc/class.holidaycalc_JP.inc.php b/calendar/inc/class.holidaycalc_JP.inc.php
index 3e30457669..f7fcc37927 100755
--- a/calendar/inc/class.holidaycalc_JP.inc.php
+++ b/calendar/inc/class.holidaycalc_JP.inc.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
   /**************************************************************************\
   * phpGroupWare - holidaycalc_JP                                            *
   * http://www.phpgroupware.org                                              *
@@ -13,141 +13,141 @@
 
   /* $Id$ */
 
-class holidaycalc {
-
-	function calculate_date($holiday, &$holidays, $year, &$i)
+	class holidaycalc
 	{
-		static	$cached_month;
-		static	$cached_day;
-		static	$cached_observance_rule;
-
-		if ($holiday['day'] == 0 && $holiday['dow'] != 0 && $holiday['occurence'] != 0)
+		function calculate_date($holiday, &$holidays, $year, &$i)
 		{
-			$dow = $GLOBALS['phpgw']->datetime->day_of_week($year, $holiday['month'], 1);
-			$dayshift = (($holiday['dow'] + 7) - $dow) % 7;
-			$day = ($holiday['occurence'] - 1) * 7 + $dayshift + 1;
+			static	$cached_month;
+			static	$cached_day;
+			static	$cached_observance_rule;
 
-			// Happy monday law.
-			if ($holiday['month'] == 1)
+			if ($holiday['day'] == 0 && $holiday['dow'] != 0 && $holiday['occurence'] != 0)
 			{
-				if ($year < 2000) 
+				$dow = $GLOBALS['phpgw']->datetime->day_of_week($year, $holiday['month'], 1);
+				$dayshift = (($holiday['dow'] + 7) - $dow) % 7;
+				$day = ($holiday['occurence'] - 1) * 7 + $dayshift + 1;
+
+				// Happy monday law.
+				if ($holiday['month'] == 1)
 				{
-					$day = 15;
+					if ($year < 2000)
+					{
+						$day = 15;
+					}
+				}
+				elseif ($holiday['month'] == 7)
+				{
+					if ($year < 2003)
+					{
+						$day = 20;
+					}
+				}
+				elseif ($holiday['month'] == 9)
+				{
+					if ($year < 2003)
+					{
+						$day = 15;
+					}
+				}
+				elseif ($holiday['month'] == 10)
+				{
+					if ($year < 2000)
+					{
+						$day = 10;
+					}
 				}
 			}
-			elseif ($holiday['month'] == 7)
+			elseif ($holiday['day'] == 0 && $holiday['dow'] == 0 && $holiday['occurence'] == 0)
 			{
-				if ($year < 2003)
+				// For the next generation.
+				// over 2151, please set $factor...
+				if ($holiday['month'] == 3)
 				{
-					$day = 20;
+					// for Vernal Equinox
+					if ($year >= 1980 && $year <= 2099)
+					{
+						$factor = 20.8431;
+					}
+					elseif ($year >= 2100 && $year <= 2150)
+					{
+						$factor = 21.851;
+					}
 				}
+				elseif ($holiday['month'] == 9)
+				{
+					// for Autumnal Equinox
+					if ($year >= 1980 && $year <= 2099)
+					{
+						$factor = 23.2488;
+					}
+					elseif ($year >= 2100 && $year <= 2150)
+					{
+						$factor = 24.2488;
+					}
+				}
+
+				$day = (int)($factor + 0.242194 * ($year - 1980)
+					- (int)(($year - 1980) / 4));
 			}
-			elseif ($holiday['month'] == 9)
+			else
 			{
-				if ($year < 2003)
-				{
-					$day = 15;
-				}
+				// normal holiday
+				$day = $holiday['day'];
 			}
-			elseif ($holiday['month'] == 10)
+
+			if ($year >= 1985 && $holiday['month'] == $cached_month && $day == $cached_day + 2 && $cached_observance_rule == True && $holiday['observance_rule'] == True)
 			{
-				if ($year < 2000)
+				$pdow = $GLOBALS['phpgw']->datetime->day_of_week($year,$holiday['month'],$day-1);
+				if ($pdow != 0)
 				{
-					$day = 10;
-				}
-			}
-		}
-		elseif ($holiday['day'] == 0 && $holiday['dow'] == 0 && $holiday['occurence'] == 0)
-		{
-			// For the next generation.
-			// over 2151, please set $factor...
-			if ($holiday['month'] == 3)
-			{
-				// for Vernal Equinox
-				if ($year >= 1980 && $year <= 2099)
-				{
-					$factor = 20.8431;
-				}
-				elseif ($year >= 2100 && $year <= 2150)
-				{
-					$factor = 21.851;
-				}
-			}
-			elseif ($holiday['month'] == 9)
-			{
-				// for Autumnal Equinox
-				if ($year >= 1980 && $year <= 2099)
-				{
-					$factor = 23.2488;
-				}
-				elseif ($year >= 2100 && $year <= 2150)
-				{
-					$factor = 24.2488;
+					$addcnt = count($holidays) + 1;
+					$holidays[$addcnt]['locale'] = $holiday['locale'];
+					if ($pdow == 1)
+					{
+						$holidays[$addcnt]['name'] = lang('overlap holiday');
+					}
+					else
+					{
+						$holidays[$addcnt]['name'] = lang('people holiday');
+					}
+					$holidays[$addcnt]['day'] = $day - 1;
+					$holidays[$addcnt]['month'] = $holiday['month'];
+					$holidays[$addcnt]['occurence'] = 0;
+					$holidays[$addcnt]['dow'] = 0;
+					$holidays[$addcnt]['date'] = mktime(0,0,0,$holiday['month'],$day-1,$year);
+					$holidays[$addcnt]['observance_rule'] = 0;
 				}
 			}
 
-			$day = (int)($factor + 0.242194 * ($year - 1980)
-			     - (int)(($year - 1980) / 4));
-		}
-		else
-		{
-			// normal holiday
-			$day = $holiday['day'];
-		}
+			$cached_month = $holiday['month'];
+			$cached_day = $day;
+			$cached_observance_rule = $holiday['observance_rule'];
 
-		if ($year >= 1985 && $holiday['month'] == $cached_month && $day == $cached_day + 2 && $cached_observance_rule == True && $holiday['observance_rule'] == True)
-		{
-			$pdow = $GLOBALS['phpgw']->datetime->day_of_week($year,$holiday['month'],$day-1);
-			if ($pdow != 0)
+			if ($year >= 1985 && $holiday['month'] == 5 && $day == 3)
 			{
-				$addcnt = count($holidays) + 1;
-				$holidays[$addcnt]['locale'] = $holiday['locale'];
-				if ($pdow == 1)
+				;
+			}
+			elseif ($holiday['observance_rule'] == True)
+			{
+				$dow = $GLOBALS['phpgw']->datetime->day_of_week($year,$holiday['month'],$day);
+				// This now calulates Observed holidays and creates a new entry for them.
+				if($dow == 0)
 				{
+					$addcnt = count($holidays) + 1;
+					$holidays[$addcnt]['locale'] = $holiday['locale'];
 					$holidays[$addcnt]['name'] = lang('overlap holiday');
+					$holidays[$addcnt]['day'] = $day + 1;
+					$holidays[$addcnt]['month'] = $holiday['month'];
+					$holidays[$addcnt]['occurence'] = $holiday['occurence'];
+					$holidays[$addcnt]['dow'] = $holiday['dow'];
+					$holidays[$addcnt]['date'] = mktime(0,0,0,$holiday['month'],$day+1,$year);
+					$holidays[$addcnt]['observance_rule'] = 0;
 				}
-				else
-				{
-					$holidays[$addcnt]['name'] = lang('people holiday');
-				}
-				$holidays[$addcnt]['day'] = $day - 1;
-				$holidays[$addcnt]['month'] = $holiday['month'];
-				$holidays[$addcnt]['occurence'] = 0;
-				$holidays[$addcnt]['dow'] = 0;
-				$holidays[$addcnt]['date'] = mktime(0,0,0,$holiday['month'],$day-1,$year);
-				$holidays[$addcnt]['observance_rule'] = 0;
 			}
+
+			$date = mktime(0,0,0,$holiday['month'],$day,$year);
+
+			return $date;
 		}
-
-		$cached_month = $holiday['month'];
-		$cached_day = $day;
-		$cached_observance_rule = $holiday['observance_rule'];
-
-		if ($year >= 1985 && $holiday['month'] == 5 && $day == 3)
-		{
-			;
-		}
-		elseif ($holiday['observance_rule'] == True)
-		{
-			$dow = $GLOBALS['phpgw']->datetime->day_of_week($year,$holiday['month'],$day);
-			// This now calulates Observed holidays and creates a new entry for them.
-			if($dow == 0)
-			{
-				$addcnt = count($holidays) + 1;
-				$holidays[$addcnt]['locale'] = $holiday['locale'];
-				$holidays[$addcnt]['name'] = lang('overlap holiday');
-				$holidays[$addcnt]['day'] = $day + 1;
-				$holidays[$addcnt]['month'] = $holiday['month'];
-				$holidays[$addcnt]['occurence'] = $holiday['occurence'];
-				$holidays[$addcnt]['dow'] = $holiday['dow'];
-				$holidays[$addcnt]['date'] = mktime(0,0,0,$holiday['month'],$day+1,$year);
-				$holidays[$addcnt]['observance_rule'] = 0;
-			}
-		}
-
-		$date = mktime(0,0,0,$holiday['month'],$day,$year);
-
-		return $date;
 	}
-}
 ?>
diff --git a/calendar/inc/class.holidaycalc_US.inc.php b/calendar/inc/class.holidaycalc_US.inc.php
index 1c65cfdd84..aee01c8720 100755
--- a/calendar/inc/class.holidaycalc_US.inc.php
+++ b/calendar/inc/class.holidaycalc_US.inc.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
   /**************************************************************************\
   * phpGroupWare - holidaycalc_US                                            *
   * http://www.phpgroupware.org                                              *
@@ -13,73 +13,73 @@
 
   /* $Id$ */
 
-class holidaycalc {
-
-	function calculate_date($holiday, &$holidays, $year, &$i)
+	class holidaycalc
 	{
-//		if($holiday['day'] == 0 && $holiday['dow'] != 0 && $holiday['occurence'] != 0)
-		if($holiday['day'] == 0 && $holiday['occurence'] != 0)
+		function calculate_date($holiday, &$holidays, $year, &$i)
 		{
-			if($holiday['occurence'] != 99)
+	//		if($holiday['day'] == 0 && $holiday['dow'] != 0 && $holiday['occurence'] != 0)
+			if($holiday['day'] == 0 && $holiday['occurence'] != 0)
 			{
-				$dow = $GLOBALS['phpgw']->datetime->day_of_week($year,$holiday['month'],1);
-				$day = (((7 * $holiday['occurence']) - 6) + ((($holiday['dow'] + 7) - $dow) % 7));
-				$day += ($day < 1 ? 7 : 0);
-				// What is the point of this?  
-				// Add 7 when the holiday falls on a Monday???
-				//$day += ($holiday['dow']==1 ? 7 : 0);
-
-				// Sometimes the 5th occurance of a weekday (ie the 5th monday)
-				// can spill over to the next month.  This prevents that.  
-				$ld = $GLOBALS['phpgw']->datetime->days_in_month($holiday['month'],$year);
-				if ($day > $ld)
+				if($holiday['occurence'] != 99)
 				{
-					return;
+					$dow = $GLOBALS['phpgw']->datetime->day_of_week($year,$holiday['month'],1);
+					$day = (((7 * $holiday['occurence']) - 6) + ((($holiday['dow'] + 7) - $dow) % 7));
+					$day += ($day < 1 ? 7 : 0);
+					// What is the point of this?
+					// Add 7 when the holiday falls on a Monday???
+					//$day += ($holiday['dow']==1 ? 7 : 0);
+
+					// Sometimes the 5th occurance of a weekday (ie the 5th monday)
+					// can spill over to the next month.  This prevents that.
+					$ld = $GLOBALS['phpgw']->datetime->days_in_month($holiday['month'],$year);
+					if ($day > $ld)
+					{
+						return;
+					}
+				}
+				else
+				{
+					$ld = $GLOBALS['phpgw']->datetime->days_in_month($holiday['month'],$year);
+					$dow = $GLOBALS['phpgw']->datetime->day_of_week($year,$holiday['month'],$ld);
+					$day = $ld - (($dow + 7) - $holiday['dow']) % 7 ;
 				}
 			}
 			else
 			{
-				$ld = $GLOBALS['phpgw']->datetime->days_in_month($holiday['month'],$year);
-				$dow = $GLOBALS['phpgw']->datetime->day_of_week($year,$holiday['month'],$ld);
-				$day = $ld - (($dow + 7) - $holiday['dow']) % 7 ;
-			}
-		}
-		else
-		{
-			$day = $holiday['day'];
-			if($holiday['observance_rule'] == True)
-			{
-				$dow = $GLOBALS['phpgw']->datetime->day_of_week($year,$holiday['month'],$day);
-				// This now calulates Observed holidays and creates a new entry for them.
-				if($dow == 0)
+				$day = $holiday['day'];
+				if($holiday['observance_rule'] == True)
 				{
-					$i++;
-					$holidays[$i]['locale'] = $holiday['locale'];
-					$holidays[$i]['name'] = $holiday['name'].' (Observed)';
-					$holidays[$i]['day'] = $holiday['day'] + 1;
-					$holidays[$i]['month'] = $holiday['month'];
-					$holidays[$i]['occurence'] = $holiday['occurence'];
-					$holidays[$i]['dow'] = $holiday['dow'];
-					$holidays[$i]['date'] = mktime(0,0,0,$holiday['month'],$day+1,$year);
-					$holidays[$i]['obervance_rule'] = 0;
-				}
-				elseif($dow == 6)
-				{
-					$i++;
-					$holidays[$i]['locale'] = $holiday['locale'];
-					$holidays[$i]['name'] = $holiday['name'].' (Observed)';
-					$holidays[$i]['day'] = $holiday['day'] - 1;
-					$holidays[$i]['month'] = $holiday['month'];
-					$holidays[$i]['occurence'] = $holiday['occurence'];
-					$holidays[$i]['dow'] = $holiday['dow'];
-					$holidays[$i]['date'] = mktime(0,0,0,$holiday['month'],$day-1,$year);
-					$holidays[$i]['obervance_rule'] = 0;
+					$dow = $GLOBALS['phpgw']->datetime->day_of_week($year,$holiday['month'],$day);
+					// This now calulates Observed holidays and creates a new entry for them.
+					if($dow == 0)
+					{
+						$i++;
+						$holidays[$i]['locale'] = $holiday['locale'];
+						$holidays[$i]['name'] = $holiday['name'].' (Observed)';
+						$holidays[$i]['day'] = $holiday['day'] + 1;
+						$holidays[$i]['month'] = $holiday['month'];
+						$holidays[$i]['occurence'] = $holiday['occurence'];
+						$holidays[$i]['dow'] = $holiday['dow'];
+						$holidays[$i]['date'] = mktime(0,0,0,$holiday['month'],$day+1,$year);
+						$holidays[$i]['obervance_rule'] = 0;
+					}
+					elseif($dow == 6)
+					{
+						$i++;
+						$holidays[$i]['locale'] = $holiday['locale'];
+						$holidays[$i]['name'] = $holiday['name'].' (Observed)';
+						$holidays[$i]['day'] = $holiday['day'] - 1;
+						$holidays[$i]['month'] = $holiday['month'];
+						$holidays[$i]['occurence'] = $holiday['occurence'];
+						$holidays[$i]['dow'] = $holiday['dow'];
+						$holidays[$i]['date'] = mktime(0,0,0,$holiday['month'],$day-1,$year);
+						$holidays[$i]['obervance_rule'] = 0;
+					}
 				}
 			}
-		}
-		$date = mktime(0,0,0,$holiday['month'],$day,$year);
+			$date = mktime(0,0,0,$holiday['month'],$day,$year);
 
-		return $date;
+			return $date;
+		}
 	}
-}
 ?>
diff --git a/calendar/inc/class.socalendar.inc.php b/calendar/inc/class.socalendar.inc.php
index 53caf33eeb..dc7b2ff977 100755
--- a/calendar/inc/class.socalendar.inc.php
+++ b/calendar/inc/class.socalendar.inc.php
@@ -55,7 +55,7 @@
 
 		function open_box($owner)
 		{
-			$this->cal->open('INBOX',intval($owner));
+			$this->cal->open('INBOX',(int)$owner);
 		}
 
 		function maketime($time)
@@ -90,7 +90,7 @@
 				$owner_id = $this->is_group ? $this->g_owner : $this->owner;
 			}
 			if($GLOBALS['phpgw_info']['server']['calendar_type'] != 'sql' ||
-			   !count($owner_id))	// happens with empty groups
+				!count($owner_id))	// happens with empty groups
 			{
 				return Array();
 			}
@@ -130,7 +130,7 @@
 				$members[] = $this->owner;
 			}
 			$sql = 'AND (phpgw_cal_user.cal_login IN ('.implode(',',$members).')) AND '.
-				'(phpgw_cal_user.cal_login='.intval($this->owner).' OR phpgw_cal.is_public=1) AND (';
+				'(phpgw_cal_user.cal_login=' . (int)$this->owner . ' OR phpgw_cal.is_public=1) AND (';
 
 			$words = split(' ',$keywords);
 			foreach($words as $i => $word)
@@ -286,7 +286,7 @@
 				{
 					while($this->cal->next_record())
 					{
-						$arr[] = intval($this->cal->f('datetime'));
+						$arr[] = (int)$this->cal->f('datetime');
 					}
 				}
 				if(count($arr) == 0)
diff --git a/calendar/inc/class.socalendar__.inc.php b/calendar/inc/class.socalendar__.inc.php
index 8adb8823d2..aa54f4bce0 100755
--- a/calendar/inc/class.socalendar__.inc.php
+++ b/calendar/inc/class.socalendar__.inc.php
@@ -14,187 +14,187 @@
 
 	/* $Id$ */
 
-if (@$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar__'])
-{
-	return;
-}
-
-$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar__'] = True;
-
-/*	include(PHPGW_SERVER_ROOT.'/calendar/setup/setup.inc.php');	*/
-
-if(extension_loaded('mcal') == False)
-{
-	define('MCAL_RECUR_NONE',0);
-	define('MCAL_RECUR_DAILY',1);
-	define('MCAL_RECUR_WEEKLY',2);
-	define('MCAL_RECUR_MONTHLY_MDAY',3);
-	define('MCAL_RECUR_MONTHLY_WDAY',4);
-	define('MCAL_RECUR_YEARLY',5);
-	
-	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);
-}
-
-define('MSG_DELETED',0);
-define('MSG_MODIFIED',1);
-define('MSG_ADDED',2);
-define('MSG_REJECTED',3);
-define('MSG_TENTATIVE',4);
-define('MSG_ACCEPTED',5);
-define('MSG_ALARM',6);
-
-define('REJECTED',0);
-define('NO_RESPONSE',1);
-define('TENTATIVE',2);
-define('ACCEPTED',3);
-
-class socalendar__
-{
-	var $event;
-	var $stream;
-	var $user;
-	var $users_status;
-	var $debug = False;
-//	var $debug = True;
-
-	function socalendar__()
+	if (@$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar__'])
 	{
+		return;
 	}
 
-	function maketime($time)
+	$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar__'] = True;
+
+	/*	include(PHPGW_SERVER_ROOT.'/calendar/setup/setup.inc.php');	*/
+
+	if(extension_loaded('mcal') == False)
 	{
-		return mktime($time['hour'],$time['min'],$time['sec'],$time['month'],$time['mday'],$time['year']);
+		define('MCAL_RECUR_NONE',0);
+		define('MCAL_RECUR_DAILY',1);
+		define('MCAL_RECUR_WEEKLY',2);
+		define('MCAL_RECUR_MONTHLY_MDAY',3);
+		define('MCAL_RECUR_MONTHLY_WDAY',4);
+		define('MCAL_RECUR_YEARLY',5);
+		
+		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);
 	}
 
-	function get_cached_event()
-	{
-		return $this->event;
-	}
+	define('MSG_DELETED',0);
+	define('MSG_MODIFIED',1);
+	define('MSG_ADDED',2);
+	define('MSG_REJECTED',3);
+	define('MSG_TENTATIVE',4);
+	define('MSG_ACCEPTED',5);
+	define('MSG_ALARM',6);
 
-	function event_init()
-	{
-		$this->event = Array();
-		$this->add_attribute('owner',intval($this->user));
-	}
+	define('REJECTED',0);
+	define('NO_RESPONSE',1);
+	define('TENTATIVE',2);
+	define('ACCEPTED',3);
 
-	function set_category($category='')
+	class socalendar__
 	{
-		$this->add_attribute('category',$category);
-	}
+		var $event;
+		var $stream;
+		var $user;
+		var $users_status;
+		var $debug = False;
+	//	var $debug = True;
 
-	function set_title($title='')
-	{
-		$this->add_attribute('title',$title);
-	}
-
-	function set_description($description='')
-	{
-		$this->add_attribute('description',$description);
-	}
-
-	function set_date($element,$year,$month,$day=0,$hour=0,$min=0,$sec=0)
-	{
-		$this->add_attribute($element,intval($year),'year');
-		$this->add_attribute($element,intval($month),'month');
-		$this->add_attribute($element,intval($day),'mday');
-		$this->add_attribute($element,intval($hour),'hour');
-		$this->add_attribute($element,intval($min),'min');
-		$this->add_attribute($element,intval($sec),'sec');
-		$this->add_attribute($element,0,'alarm');
-	}
-
-	function set_start($year,$month,$day=0,$hour=0,$min=0,$sec=0)
-	{
-		$this->set_date('start',$year,$month,$day,$hour,$min,$sec);
-	}
-
-	function set_end($year,$month,$day=0,$hour=0,$min=0,$sec=0)
-	{
-		$this->set_date('end',$year,$month,$day,$hour,$min,$sec);
-	}
-
-	function set_alarm($alarm)
-	{
-		$this->add_attribute('alarm',intval($alarm));
-	}
-
-	function set_class($class)
-	{
-		$this->add_attribute('public',$class);
-	}
-
-	function set_common_recur($year=0,$month=0,$day=0,$interval=0)
-	{
-		$this->add_attribute('recur_interval',intval($interval));
-		$this->set_date('recur_enddate',$year,$month,$day,0,0,0);
-		$this->add_attribute('recur_data',0);
-	}
-
-	function set_recur_none()
-	{
-		$this->set_common_recur(0,0,0,0);
-		$this->add_attribute('recur_type',MCAL_RECUR_NONE);
-	}
-
-	function set_recur_daily($year,$month,$day,$interval)
-	{
-		$this->set_common_recur(intval($year),intval($month),intval($day),$interval);
-		$this->add_attribute('recur_type',MCAL_RECUR_DAILY);
-	}
-
-	function set_recur_weekly($year,$month,$day,$interval,$weekdays)
-	{
-		$this->set_common_recur(intval($year),intval($month),intval($day),$interval);
-		$this->add_attribute('recur_type',MCAL_RECUR_WEEKLY);
-		$this->add_attribute('recur_data',intval($weekdays));
-	}
-
-	function set_recur_monthly_mday($year,$month,$day,$interval)
-	{
-		$this->set_common_recur(intval($year),intval($month),intval($day),$interval);
-		$this->add_attribute('recur_type',MCAL_RECUR_MONTHLY_MDAY);
-	}
-	
-	function set_recur_monthly_wday($year,$month,$day,$interval)
-	{
-		$this->set_common_recur(intval($year),intval($month),intval($day),$interval);
-		$this->add_attribute('recur_type',MCAL_RECUR_MONTHLY_WDAY);
-	}
-	
-	function set_recur_yearly($year,$month,$day,$interval)
-	{
-		$this->set_common_recur(intval($year),intval($month),intval($day),$interval);
-		$this->add_attribute('recur_type',MCAL_RECUR_YEARLY);
-	}
-
-	function fetch_current_stream_event()
-	{
-		return $this->fetch_event($this->event['id']);
-	}
-	
-	function add_attribute($attribute,$value,$element='**(**')
-	{
-		if(is_array($value))
+		function socalendar__()
 		{
-			reset($value);
 		}
-		if($element!='**(**')
+
+		function maketime($time)
 		{
-			$this->event[$attribute][$element] = $value;
+			return mktime($time['hour'],$time['min'],$time['sec'],$time['month'],$time['mday'],$time['year']);
 		}
-		else
+
+		function get_cached_event()
 		{
-			$this->event[$attribute] = $value;
+			return $this->event;
+		}
+
+		function event_init()
+		{
+			$this->event = Array();
+			$this->add_attribute('owner',(int)$this->user);
+		}
+
+		function set_category($category='')
+		{
+			$this->add_attribute('category',$category);
+		}
+
+		function set_title($title='')
+		{
+			$this->add_attribute('title',$title);
+		}
+
+		function set_description($description='')
+		{
+			$this->add_attribute('description',$description);
+		}
+
+		function set_date($element,$year,$month,$day=0,$hour=0,$min=0,$sec=0)
+		{
+			$this->add_attribute($element,(int)$year,'year');
+			$this->add_attribute($element,(int)$month,'month');
+			$this->add_attribute($element,(int)$day,'mday');
+			$this->add_attribute($element,(int)$hour,'hour');
+			$this->add_attribute($element,(int)$min,'min');
+			$this->add_attribute($element,(int)$sec,'sec');
+			$this->add_attribute($element,0,'alarm');
+		}
+
+		function set_start($year,$month,$day=0,$hour=0,$min=0,$sec=0)
+		{
+			$this->set_date('start',$year,$month,$day,$hour,$min,$sec);
+		}
+
+		function set_end($year,$month,$day=0,$hour=0,$min=0,$sec=0)
+		{
+			$this->set_date('end',$year,$month,$day,$hour,$min,$sec);
+		}
+
+		function set_alarm($alarm)
+		{
+			$this->add_attribute('alarm',(int)$alarm);
+		}
+
+		function set_class($class)
+		{
+			$this->add_attribute('public',$class);
+		}
+
+		function set_common_recur($year=0,$month=0,$day=0,$interval=0)
+		{
+			$this->add_attribute('recur_interval',(int)$interval);
+			$this->set_date('recur_enddate',$year,$month,$day,0,0,0);
+			$this->add_attribute('recur_data',0);
+		}
+
+		function set_recur_none()
+		{
+			$this->set_common_recur(0,0,0,0);
+			$this->add_attribute('recur_type',MCAL_RECUR_NONE);
+		}
+
+		function set_recur_daily($year,$month,$day,$interval)
+		{
+			$this->set_common_recur((int)$year,(int)$month,(int)$day,$interval);
+			$this->add_attribute('recur_type',MCAL_RECUR_DAILY);
+		}
+
+		function set_recur_weekly($year,$month,$day,$interval,$weekdays)
+		{
+			$this->set_common_recur((int)$year,(int)$month,(int)$day,$interval);
+			$this->add_attribute('recur_type',MCAL_RECUR_WEEKLY);
+			$this->add_attribute('recur_data',(int)$weekdays);
+		}
+
+		function set_recur_monthly_mday($year,$month,$day,$interval)
+		{
+			$this->set_common_recur((int)$year,(int)$month,(int)$day,$interval);
+			$this->add_attribute('recur_type',MCAL_RECUR_MONTHLY_MDAY);
+		}
+		
+		function set_recur_monthly_wday($year,$month,$day,$interval)
+		{
+			$this->set_common_recur((int)$year,(int)$month,(int)$day,$interval);
+			$this->add_attribute('recur_type',MCAL_RECUR_MONTHLY_WDAY);
+		}
+		
+		function set_recur_yearly($year,$month,$day,$interval)
+		{
+			$this->set_common_recur((int)$year,(int)$month,(int)$day,$interval);
+			$this->add_attribute('recur_type',MCAL_RECUR_YEARLY);
+		}
+
+		function fetch_current_stream_event()
+		{
+			return $this->fetch_event($this->event['id']);
+		}
+		
+		function add_attribute($attribute,$value,$element='**(**')
+		{
+			if(is_array($value))
+			{
+				reset($value);
+			}
+			if($element!='**(**')
+			{
+				$this->event[$attribute][$element] = $value;
+			}
+			else
+			{
+				$this->event[$attribute] = $value;
+			}
 		}
 	}
-}
diff --git a/calendar/inc/class.socalendar_sql.inc.php b/calendar/inc/class.socalendar_sql.inc.php
index 8288957a7d..ed41a28e4e 100755
--- a/calendar/inc/class.socalendar_sql.inc.php
+++ b/calendar/inc/class.socalendar_sql.inc.php
@@ -15,861 +15,861 @@
 
   /* $Id$ */
 
-if (@$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar_'])
-{
-	return;
-}
-
-$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar_'] = True;
-
-class socalendar_ extends socalendar__
-{
-	var $deleted_events = Array();
-	
-	var $cal_event;
-	var $today = Array('raw','day','month','year','full','dow','dm','bd');
-
-	function socalendar_()
+	if (@$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar_'])
 	{
-		$this->socalendar__();
-		
-		if (!is_object($GLOBALS['phpgw']->asyncservice))
+		return;
+	}
+
+	$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar_'] = True;
+
+	class socalendar_ extends socalendar__
+	{
+		var $deleted_events = Array();
+
+		var $cal_event;
+		var $today = Array('raw','day','month','year','full','dow','dm','bd');
+
+		function socalendar_()
 		{
-			$GLOBALS['phpgw']->asyncservice = CreateObject('phpgwapi.asyncservice');
-		}
-		$this->async = &$GLOBALS['phpgw']->asyncservice;
-	}
+			$this->socalendar__();
 
-	function open($calendar='',$user='',$passwd='',$options='')
-	{
-		if($user=='')
-		{
-//			settype($user,'integer');
-			$this->user = $GLOBALS['phpgw_info']['user']['account_id'];
-		}
-		elseif(is_int($user)) 
-		{
-			$this->user = $user;
-		}
-		elseif(is_string($user))
-		{
-			$this->user = $GLOBALS['phpgw']->accounts->name2id($user);
-		}
-
-		$this->stream = $GLOBALS['phpgw']->db;
-		return $this->stream;
-	}
-
-	function popen($calendar='',$user='',$passwd='',$options='')
-	{
-		return $this->open($calendar,$user,$passwd,$options);
-	}
-
-	function reopen($calendar,$options='')
-	{
-		return $this->stream;
-	}
-
-	function close($options='')
-	{
-		return True;
-	}
-
-	function create_calendar($calendar='')
-	{
-		return $calendar;
-	}
-
-	function rename_calendar($old_name='',$new_name='')
-	{
-		return $new_name;
-	}
-    
-	function delete_calendar($calendar='')
-	{
-		$this->stream->query('SELECT cal_id FROM phpgw_cal WHERE owner='.intval($calendar),__LINE__,__FILE__);
-		if($this->stream->num_rows())
-		{
-			while($this->stream->next_record())
+			if (!is_object($GLOBALS['phpgw']->asyncservice))
 			{
-				$this->delete_event(intval($this->stream->f('cal_id')));
+				$GLOBALS['phpgw']->asyncservice = CreateObject('phpgwapi.asyncservice');
 			}
-			$this->expunge();
+			$this->async = &$GLOBALS['phpgw']->asyncservice;
 		}
-		$this->stream->lock(array('phpgw_cal_user'));
-		$this->stream->query('DELETE FROM phpgw_cal_user WHERE cal_login='.intval($calendar),__LINE__,__FILE__);
-		$this->stream->unlock();
-			
-		return $calendar;
-	}
 
-	/*!
-	@function read_alarms
-	@abstract read the alarms of a calendar-event specified by $cal_id
-	@returns array of alarms with alarm-id as key
-	@note the alarm-id is a string of 'cal:'.$cal_id.':'.$alarm_nr, it is used as the job-id too
-	*/
-	function read_alarms($cal_id)
-	{
-		$alarms = array();
-
-		if ($jobs = $this->async->read('cal:'.intval($cal_id).':%'))
+		function open($calendar='',$user='',$passwd='',$options='')
 		{
-			foreach($jobs as $id => $job)
+			if($user=='')
 			{
-				$alarm         = $job['data'];	// text, enabled
-				$alarm['id']   = $id;
-				$alarm['time'] = $job['next'];
-
-				$alarms[$id] = $alarm;
+	//			settype($user,'integer');
+				$this->user = $GLOBALS['phpgw_info']['user']['account_id'];
 			}
-		}
-		return $alarms;
-	}
-
-	/*!
-	@function read_alarm
-	@abstract read a single alarm specified by it's $id
-	@returns array with data of the alarm
-	@note the alarm-id is a string of 'cal:'.$cal_id.':'.$alarm_nr, it is used as the job-id too
-	*/
-	function read_alarm($id)
-	{
-		if (!($jobs = $this->async->read($id)))
-		{
-			return False;
-		}
-		list($id,$job) = each($jobs);
-		$alarm         = $job['data'];	// text, enabled
-		$alarm['id']   = $id;
-		$alarm['time'] = $job['next'];
-
-		//echo "<p>read_alarm('$id')="; print_r($alarm); echo "</p>\n";
-		return $alarm;
-	}
-
-	/*!
-	@function save_alarm
-	@abstract saves a new or updated alarm
-	@syntax save_alarm($cal_id,$alarm,$id=False)
-	@param $cal_id Id of the calendar-entry
-	@param $alarm array with fields: text, owner, enabled, ..
-	@returns the id of the alarm
-	*/
-	function save_alarm($cal_id,$alarm)
-	{
-		//echo "<p>save_alarm(cal_id=$cal_id, alarm="; print_r($alarm); echo ")</p>\n";
-		if (!($id = $alarm['id']))
-		{
-			$alarms = $this->read_alarms($cal_id);	// find a free alarm#
-			$n = count($alarms);
-			do
+			elseif(is_int($user))
 			{
-				$id = 'cal:'.intval($cal_id).':'.$n;
-				++$n;
+				$this->user = $user;
 			}
-			while (@isset($alarms[$id]));
-		}
-		else
-		{
-			$this->async->cancel_timer($id);
-		}
-		$alarm['cal_id'] = $cal_id;		// we need the back-reference
-
-		if (!$this->async->set_timer($alarm['time'],$id,'calendar.bocalendar.send_alarm',$alarm))
-		{
-			return False;
-		}
-		return $id;
-	}
-	
-	/*!
-	@function delete_alarms($cal_id)
-	@abstract delete all alarms of a calendar-entry
-	@returns the number of alarms deleted
-	*/
-	function delete_alarms($cal_id)
-	{
-		$alarms = $this->read_alarms($cal_id);
-		
-		foreach($alarms as $id => $alarm)
-		{
-			$this->async->cancel_timer($id);
-		}
-		return count($alarms);
-	}
-	
-	/*!
-	@function delete_alarm($id)
-	@abstract delete one alarms identified by its id
-	@returns the number of alarms deleted
-	*/
-	function delete_alarm($id)
-	{
-		return $this->async->cancel_timer($id);
-	}
-
-	function fetch_event($event_id,$options='')
-	{
-		if(!isset($this->stream))
-		{
-			return False;
-		}
-
-		$event_id = intval($event_id);
-
-		$this->stream->lock(array('phpgw_cal','phpgw_cal_user','phpgw_cal_repeats','phpgw_cal_extra'/* OLD-ALARM,'phpgw_cal_alarm'*/));
-
-		$this->stream->query('SELECT * FROM phpgw_cal WHERE cal_id='.$event_id,__LINE__,__FILE__);
-		
-		if($this->stream->num_rows() > 0)
-		{
-			$this->event_init();
-			
-			$this->stream->next_record();
-			// Load the calendar event data from the db into $event structure
-			// Use http://www.php.net/manual/en/function.mcal-fetch-event.php as the reference
-			$this->add_attribute('owner',intval($this->stream->f('owner')));
-			$this->add_attribute('id',intval($this->stream->f('cal_id')));
-			$this->set_class(intval($this->stream->f('is_public')));
-			$this->set_category($this->stream->f('category'));
-			$this->set_title(stripslashes($GLOBALS['phpgw']->strip_html($this->stream->f('title'))));
-			$this->set_description(stripslashes($GLOBALS['phpgw']->strip_html($this->stream->f('description'))));
-			$this->add_attribute('uid',$GLOBALS['phpgw']->strip_html($this->stream->f('uid')));
-			$this->add_attribute('location',stripslashes($GLOBALS['phpgw']->strip_html($this->stream->f('location'))));
-			$this->add_attribute('reference',intval($this->stream->f('reference')));
-			
-			// This is the preferred method once everything is normalized...
-			//$this->event->alarm = intval($this->stream->f('alarm'));
-			// But until then, do it this way...
-		//Legacy Support (New)
-
-			$datetime = $GLOBALS['phpgw']->datetime->localdates($this->stream->f('datetime'));
-			$this->set_start($datetime['year'],$datetime['month'],$datetime['day'],$datetime['hour'],$datetime['minute'],$datetime['second']);
-
-			$datetime = $GLOBALS['phpgw']->datetime->localdates($this->stream->f('mdatetime'));
-			$this->set_date('modtime',$datetime['year'],$datetime['month'],$datetime['day'],$datetime['hour'],$datetime['minute'],$datetime['second']);
-
-			$datetime = $GLOBALS['phpgw']->datetime->localdates($this->stream->f('edatetime'));
-			$this->set_end($datetime['year'],$datetime['month'],$datetime['day'],$datetime['hour'],$datetime['minute'],$datetime['second']);
-
-		//Legacy Support
-			$this->add_attribute('priority',intval($this->stream->f('priority')));
-			if($this->stream->f('cal_group') || $this->stream->f('groups') != 'NULL')
+			elseif(is_string($user))
 			{
-				$groups = explode(',',$this->stream->f('groups'));
-				for($j=1;$j<count($groups) - 1;$j++)
-				{
-					$this->add_attribute('groups',$groups[$j],$j-1);
-				}
+				$this->user = $GLOBALS['phpgw']->accounts->name2id($user);
 			}
-			
-			$this->stream->query('SELECT * FROM phpgw_cal_repeats WHERE cal_id='.$event_id,__LINE__,__FILE__);
-			if($this->stream->num_rows())
-			{
-				$this->stream->next_record();
 
-				$this->add_attribute('recur_type',intval($this->stream->f('recur_type')));
-				$this->add_attribute('recur_interval',intval($this->stream->f('recur_interval')));
-				$enddate = $this->stream->f('recur_enddate');
-				if($enddate != 0 && $enddate != Null)
-				{
-					$datetime = $GLOBALS['phpgw']->datetime->localdates($enddate);
-					$this->add_attribute('recur_enddate',$datetime['year'],'year');
-					$this->add_attribute('recur_enddate',$datetime['month'],'month');
-					$this->add_attribute('recur_enddate',$datetime['day'],'mday');
-					$this->add_attribute('recur_enddate',$datetime['hour'],'hour');
-					$this->add_attribute('recur_enddate',$datetime['minute'],'min');
-					$this->add_attribute('recur_enddate',$datetime['second'],'sec');
-				}
-				else
-				{
-					$this->add_attribute('recur_enddate',0,'year');
-					$this->add_attribute('recur_enddate',0,'month');
-					$this->add_attribute('recur_enddate',0,'mday');
-					$this->add_attribute('recur_enddate',0,'hour');
-					$this->add_attribute('recur_enddate',0,'min');
-					$this->add_attribute('recur_enddate',0,'sec');
-				}
-				$this->add_attribute('recur_enddate',0,'alarm');
-				if($this->debug)
-				{
-					echo 'Event ID#'.$this->event['id'].' : Enddate = '.$enddate."<br>\n";
-				}
-				$this->add_attribute('recur_data',$this->stream->f('recur_data'));
+			$this->stream = $GLOBALS['phpgw']->db;
+			return $this->stream;
+		}
 
-				$exception_list = $this->stream->f('recur_exception');
-				$exceptions = Array();
-				if(strpos(' '.$exception_list,','))
-				{
-					$exceptions = explode(',',$exception_list);
-				}
-				elseif($exception_list != '')
-				{
-					$exceptions[]= $exception_list;
-				}
-				$this->add_attribute('recur_exception',$exceptions);
-			}
-			
-		//Legacy Support
-			$this->stream->query('SELECT * FROM phpgw_cal_user WHERE cal_id='.$event_id,__LINE__,__FILE__);
+		function popen($calendar='',$user='',$passwd='',$options='')
+		{
+			return $this->open($calendar,$user,$passwd,$options);
+		}
+
+		function reopen($calendar,$options='')
+		{
+			return $this->stream;
+		}
+
+		function close($options='')
+		{
+			return True;
+		}
+
+		function create_calendar($calendar='')
+		{
+			return $calendar;
+		}
+
+		function rename_calendar($old_name='',$new_name='')
+		{
+			return $new_name;
+		}
+
+		function delete_calendar($calendar='')
+		{
+			$this->stream->query('SELECT cal_id FROM phpgw_cal WHERE owner='.(int)$calendar,__LINE__,__FILE__);
 			if($this->stream->num_rows())
 			{
 				while($this->stream->next_record())
 				{
-					if(intval($this->stream->f('cal_login')) == intval($this->user))
-					{
-						$this->add_attribute('users_status',$this->stream->f('cal_status'));
-					}
-					$this->add_attribute('participants',$this->stream->f('cal_status'),intval($this->stream->f('cal_login')));
+					$this->delete_event((int)$this->stream->f('cal_id'));
 				}
+				$this->expunge();
 			}
+			$this->stream->lock(array('phpgw_cal_user'));
+			$this->stream->query('DELETE FROM phpgw_cal_user WHERE cal_login='.(int)$calendar,__LINE__,__FILE__);
+			$this->stream->unlock();
 
-		// Custom fields
-			$this->stream->query('SELECT * FROM phpgw_cal_extra WHERE cal_id='.$event_id,__LINE__,__FILE__);
-			if($this->stream->num_rows())
+			return $calendar;
+		}
+
+		/*!
+		@function read_alarms
+		@abstract read the alarms of a calendar-event specified by $cal_id
+		@returns array of alarms with alarm-id as key
+		@note the alarm-id is a string of 'cal:'.$cal_id.':'.$alarm_nr, it is used as the job-id too
+		*/
+		function read_alarms($cal_id)
+		{
+			$alarms = array();
+
+			if ($jobs = $this->async->read('cal:'.(int)$cal_id.':%'))
 			{
-				while($this->stream->next_record())
+				foreach($jobs as $id => $job)
 				{
-					$this->add_attribute('#'.$this->stream->f('cal_extra_name'),$this->stream->f('cal_extra_value'));
+					$alarm         = $job['data'];	// text, enabled
+					$alarm['id']   = $id;
+					$alarm['time'] = $job['next'];
+
+					$alarms[$id] = $alarm;
 				}
 			}
+			return $alarms;
+		}
 
-/* OLD-ALARM
-			if($this->event['reference'])
+		/*!
+		@function read_alarm
+		@abstract read a single alarm specified by it's $id
+		@returns array with data of the alarm
+		@note the alarm-id is a string of 'cal:'.$cal_id.':'.$alarm_nr, it is used as the job-id too
+		*/
+		function read_alarm($id)
+		{
+			if (!($jobs = $this->async->read($id)))
 			{
-				// What is event['reference']???
-				$alarm_cal_id = $event_id.','.$this->event['reference'];
+				return False;
+			}
+			list($id,$job) = each($jobs);
+			$alarm         = $job['data'];	// text, enabled
+			$alarm['id']   = $id;
+			$alarm['time'] = $job['next'];
+
+			//echo "<p>read_alarm('$id')="; print_r($alarm); echo "</p>\n";
+			return $alarm;
+		}
+
+		/*!
+		@function save_alarm
+		@abstract saves a new or updated alarm
+		@syntax save_alarm($cal_id,$alarm,$id=False)
+		@param $cal_id Id of the calendar-entry
+		@param $alarm array with fields: text, owner, enabled, ..
+		@returns the id of the alarm
+		*/
+		function save_alarm($cal_id,$alarm)
+		{
+			//echo "<p>save_alarm(cal_id=$cal_id, alarm="; print_r($alarm); echo ")</p>\n";
+			if (!($id = $alarm['id']))
+			{
+				$alarms = $this->read_alarms($cal_id);	// find a free alarm#
+				$n = count($alarms);
+				do
+				{
+					$id = 'cal:'.(int)$cal_id.':'.$n;
+					++$n;
+				}
+				while (@isset($alarms[$id]));
 			}
 			else
 			{
-				$alarm_cal_id = $event_id;
+				$this->async->cancel_timer($id);
+			}
+			$alarm['cal_id'] = $cal_id;		// we need the back-reference
+
+			if (!$this->async->set_timer($alarm['time'],$id,'calendar.bocalendar.send_alarm',$alarm))
+			{
+				return False;
+			}
+			return $id;
+		}
+
+		/*!
+		@function delete_alarms($cal_id)
+		@abstract delete all alarms of a calendar-entry
+		@returns the number of alarms deleted
+		*/
+		function delete_alarms($cal_id)
+		{
+			$alarms = $this->read_alarms($cal_id);
+
+			foreach($alarms as $id => $alarm)
+			{
+				$this->async->cancel_timer($id);
+			}
+			return count($alarms);
+		}
+
+		/*!
+		@function delete_alarm($id)
+		@abstract delete one alarms identified by its id
+		@returns the number of alarms deleted
+		*/
+		function delete_alarm($id)
+		{
+			return $this->async->cancel_timer($id);
+		}
+
+		function fetch_event($event_id,$options='')
+		{
+			if(!isset($this->stream))
+			{
+				return False;
 			}
 
-			//echo '<!-- cal_id='.$alarm_cal_id.' -->'."\n";
-			//$this->stream->query('SELECT * FROM phpgw_cal_alarm WHERE cal_id in ('.$alarm_cal_id.') AND cal_owner='.$this->user,__LINE__,__FILE__);
-			$this->stream->query('SELECT * FROM phpgw_cal_alarm WHERE cal_id='.$event_id.' AND cal_owner='.$this->user,__LINE__,__FILE__);
-			if($this->stream->num_rows())
+			$event_id = (int)$event_id;
+
+			$this->stream->lock(array('phpgw_cal','phpgw_cal_user','phpgw_cal_repeats','phpgw_cal_extra'/* OLD-ALARM,'phpgw_cal_alarm'*/));
+
+			$this->stream->query('SELECT * FROM phpgw_cal WHERE cal_id='.$event_id,__LINE__,__FILE__);
+
+			if($this->stream->num_rows() > 0)
 			{
-				while($this->stream->next_record())
+				$this->event_init();
+
+				$this->stream->next_record();
+				// Load the calendar event data from the db into $event structure
+				// Use http://www.php.net/manual/en/function.mcal-fetch-event.php as the reference
+				$this->add_attribute('owner',(int)$this->stream->f('owner'));
+				$this->add_attribute('id',(int)$this->stream->f('cal_id'));
+				$this->set_class((int)$this->stream->f('is_public'));
+				$this->set_category($this->stream->f('category'));
+				$this->set_title(stripslashes($GLOBALS['phpgw']->strip_html($this->stream->f('title'))));
+				$this->set_description(stripslashes($GLOBALS['phpgw']->strip_html($this->stream->f('description'))));
+				$this->add_attribute('uid',$GLOBALS['phpgw']->strip_html($this->stream->f('uid')));
+				$this->add_attribute('location',stripslashes($GLOBALS['phpgw']->strip_html($this->stream->f('location'))));
+				$this->add_attribute('reference',(int)$this->stream->f('reference'));
+
+				// This is the preferred method once everything is normalized...
+				//$this->event->alarm = (int)$this->stream->f('alarm');
+				// But until then, do it this way...
+				//Legacy Support (New)
+
+				$datetime = $GLOBALS['phpgw']->datetime->localdates($this->stream->f('datetime'));
+				$this->set_start($datetime['year'],$datetime['month'],$datetime['day'],$datetime['hour'],$datetime['minute'],$datetime['second']);
+
+				$datetime = $GLOBALS['phpgw']->datetime->localdates($this->stream->f('mdatetime'));
+				$this->set_date('modtime',$datetime['year'],$datetime['month'],$datetime['day'],$datetime['hour'],$datetime['minute'],$datetime['second']);
+
+				$datetime = $GLOBALS['phpgw']->datetime->localdates($this->stream->f('edatetime'));
+				$this->set_end($datetime['year'],$datetime['month'],$datetime['day'],$datetime['hour'],$datetime['minute'],$datetime['second']);
+
+			//Legacy Support
+				$this->add_attribute('priority',(int)$this->stream->f('priority'));
+				if($this->stream->f('cal_group') || $this->stream->f('groups') != 'NULL')
 				{
-					$this->event['alarm'][] = Array(
-						'id'		=> intval($this->stream->f('alarm_id')),
-						'time'	=> intval($this->stream->f('cal_time')),
-						'text'	=> $this->stream->f('cal_text'),
-						'enabled'	=> intval($this->stream->f('alarm_enabled'))
-					);
+					$groups = explode(',',$this->stream->f('groups'));
+					for($j=1;$j<count($groups) - 1;$j++)
+					{
+						$this->add_attribute('groups',$groups[$j],$j-1);
+					}
+				}
+
+				$this->stream->query('SELECT * FROM phpgw_cal_repeats WHERE cal_id='.$event_id,__LINE__,__FILE__);
+				if($this->stream->num_rows())
+				{
+					$this->stream->next_record();
+
+					$this->add_attribute('recur_type',(int)$this->stream->f('recur_type'));
+					$this->add_attribute('recur_interval',(int)$this->stream->f('recur_interval'));
+					$enddate = $this->stream->f('recur_enddate');
+					if($enddate != 0 && $enddate != Null)
+					{
+						$datetime = $GLOBALS['phpgw']->datetime->localdates($enddate);
+						$this->add_attribute('recur_enddate',$datetime['year'],'year');
+						$this->add_attribute('recur_enddate',$datetime['month'],'month');
+						$this->add_attribute('recur_enddate',$datetime['day'],'mday');
+						$this->add_attribute('recur_enddate',$datetime['hour'],'hour');
+						$this->add_attribute('recur_enddate',$datetime['minute'],'min');
+						$this->add_attribute('recur_enddate',$datetime['second'],'sec');
+					}
+					else
+					{
+						$this->add_attribute('recur_enddate',0,'year');
+						$this->add_attribute('recur_enddate',0,'month');
+						$this->add_attribute('recur_enddate',0,'mday');
+						$this->add_attribute('recur_enddate',0,'hour');
+						$this->add_attribute('recur_enddate',0,'min');
+						$this->add_attribute('recur_enddate',0,'sec');
+					}
+					$this->add_attribute('recur_enddate',0,'alarm');
+					if($this->debug)
+					{
+						echo 'Event ID#'.$this->event['id'].' : Enddate = '.$enddate."<br>\n";
+					}
+					$this->add_attribute('recur_data',$this->stream->f('recur_data'));
+
+					$exception_list = $this->stream->f('recur_exception');
+					$exceptions = Array();
+					if(strpos(' '.$exception_list,','))
+					{
+						$exceptions = explode(',',$exception_list);
+					}
+					elseif($exception_list != '')
+					{
+						$exceptions[]= $exception_list;
+					}
+					$this->add_attribute('recur_exception',$exceptions);
+				}
+
+			//Legacy Support
+				$this->stream->query('SELECT * FROM phpgw_cal_user WHERE cal_id='.$event_id,__LINE__,__FILE__);
+				if($this->stream->num_rows())
+				{
+					while($this->stream->next_record())
+					{
+						if((int)$this->stream->f('cal_login') == (int)$this->user)
+						{
+							$this->add_attribute('users_status',$this->stream->f('cal_status'));
+						}
+						$this->add_attribute('participants',$this->stream->f('cal_status'),(int)$this->stream->f('cal_login'));
+					}
+				}
+
+			// Custom fields
+				$this->stream->query('SELECT * FROM phpgw_cal_extra WHERE cal_id='.$event_id,__LINE__,__FILE__);
+				if($this->stream->num_rows())
+				{
+					while($this->stream->next_record())
+					{
+						$this->add_attribute('#'.$this->stream->f('cal_extra_name'),$this->stream->f('cal_extra_value'));
+					}
+				}
+
+	/* OLD-ALARM
+				if($this->event['reference'])
+				{
+					// What is event['reference']???
+					$alarm_cal_id = $event_id.','.$this->event['reference'];
+				}
+				else
+				{
+					$alarm_cal_id = $event_id;
+				}
+
+				//echo '<!-- cal_id='.$alarm_cal_id.' -->'."\n";
+				//$this->stream->query('SELECT * FROM phpgw_cal_alarm WHERE cal_id in ('.$alarm_cal_id.') AND cal_owner='.$this->user,__LINE__,__FILE__);
+				$this->stream->query('SELECT * FROM phpgw_cal_alarm WHERE cal_id='.$event_id.' AND cal_owner='.$this->user,__LINE__,__FILE__);
+				if($this->stream->num_rows())
+				{
+					while($this->stream->next_record())
+					{
+						$this->event['alarm'][] = Array(
+							'id'		=> (int)$this->stream->f('alarm_id'),
+							'time'	=> (int)$this->stream->f('cal_time'),
+							'text'	=> $this->stream->f('cal_text'),
+							'enabled'	=> (int)$this->stream->f('alarm_enabled')
+						);
+					}
+				}
+	*/
+			}
+			else
+			{
+				$this->event = False;
+			}
+
+			$this->stream->unlock();
+
+			if ($this->event)
+			{
+				$this->event['alarm'] = $this->read_alarms($event_id);
+
+				if($this->event['reference'])
+				{
+					$this->event['alarm'] += $this->read_alarms($event_id);
 				}
 			}
-*/
+			return $this->event;
 		}
-		else
-		{
-			$this->event = False;
-		}
-      
-		$this->stream->unlock();
 
-		if ($this->event)
+		function list_events($startYear,$startMonth,$startDay,$endYear=0,$endMonth=0,$endDay=0,$extra='',$tz_offset=0,$owner_id=0)
 		{
-			$this->event['alarm'] = $this->read_alarms($event_id);
-
-			if($this->event['reference'])
+			if(!isset($this->stream))
 			{
-				$this->event['alarm'] += $this->read_alarms($event_id);
+				return False;
 			}
-		}
-		return $this->event;
-	}
 
-	function list_events($startYear,$startMonth,$startDay,$endYear=0,$endMonth=0,$endDay=0,$extra='',$tz_offset=0,$owner_id=0)
-	{
-		if(!isset($this->stream))
-		{
-			return False;
-		}
+			$datetime = mktime(0,0,0,$startMonth,$startDay,$startYear) - $tz_offset;
 
-		$datetime = mktime(0,0,0,$startMonth,$startDay,$startYear) - $tz_offset;
-		
-		$user_where = ' AND (phpgw_cal_user.cal_login in (';
-		if(is_array($owner_id) && count($owner_id))
-		{
-			$user_where .= implode(',',$owner_id);
-		}
-		else
-		{
-			$user_where .= $this->user;
-		}
-		$member_groups = $GLOBALS['phpgw']->accounts->membership($this->user);
-		@reset($member_groups);
-		while($member_groups != False && list($key,$group_info) = each($member_groups))
-		{
-			$member[] = $group_info['account_id'];
-		}
-		@reset($member);
-//		$user_where .= ','.implode(',',$member);
-		$user_where .= ')) ';
-
-		if($this->debug)
-		{
-			echo '<!-- '.$user_where.' -->'."\n";
-		}
-
-		$startDate = 'AND ( ( (phpgw_cal.datetime >= '.$datetime.') ';
-
-		$enddate = '';
-		if($endYear != 0 && $endMonth != 0 && $endDay != 0)
-		{
-			$edatetime = mktime(23,59,59,intval($endMonth),intval($endDay),intval($endYear)) - $tz_offset;
-			$endDate .= 'AND (phpgw_cal.edatetime <= '.$edatetime.') ) '
-				. 'OR ( (phpgw_cal.datetime <= '.$datetime.') '
-				. 'AND (phpgw_cal.edatetime >= '.$edatetime.') ) '
-				. 'OR ( (phpgw_cal.datetime >= '.$datetime.') '
-				. 'AND (phpgw_cal.datetime <= '.$edatetime.') '
-				. 'AND (phpgw_cal.edatetime >= '.$edatetime.') ) '
-				. 'OR ( (phpgw_cal.datetime <= '.$datetime.') '
-				. 'AND (phpgw_cal.edatetime >= '.$datetime.') '
-				. 'AND (phpgw_cal.edatetime <= '.$edatetime.') ';
-		}
-		$endDate .= ') ) ';
-
-		$order_by = 'ORDER BY phpgw_cal.datetime ASC, phpgw_cal.edatetime ASC, phpgw_cal.priority ASC';
-		if($this->debug)
-		{
-			echo "SQL : ".$user_where.$startDate.$endDate.$extra."<br>\n";
-		}
-		return $this->get_event_ids(False,$user_where.$startDate.$endDate.$extra.$order_by);
-	}
-
-	function append_event()
-	{
-		$this->save_event($this->event);
-		$this->send_update(MSG_ADDED,$this->event->participants,'',$this->event);
-		return $this->event['id'];
-	}
-
-	function store_event()
-	{
-		return $this->save_event(&$this->event);
-	}
-
-	function delete_event($event_id)
-	{
-		$this->deleted_events[] = $event_id;
-	}
-
-	function snooze($event_id)
-	{
-	//Turn off an alarm for an event
-	//Returns true. 
-	}
-
-	function list_alarms($begin_year='',$begin_month='',$begin_day='',$end_year='',$end_month='',$end_day='')
-	{
-	//Return a list of events that has an alarm triggered at the given datetime
-	//Returns an array of event ID's
-	}
-
-	// The function definition doesn't look correct...
-	// Need more information for this function
-	function next_recurrence($weekstart,$next)
-	{
-//		return next_recurrence (int stream, int weekstart, array next);
-	}
-
-	function expunge()
-	{
-		if(count($this->deleted_events) <= 0)
-		{
-			return 1;
-		}
-		$this_event = $this->event;
-		$locks = Array(
-			'phpgw_cal',
-			'phpgw_cal_user',
-			'phpgw_cal_repeats',
-			'phpgw_cal_extra'
-// OLD-ALARM			'phpgw_cal_alarm'
-		);
-		$this->stream->lock($locks);
-		foreach($this->deleted_events as $cal_id)
-		{
-			foreach ($locks as $table)
+			$user_where = ' AND (phpgw_cal_user.cal_login in (';
+			if(is_array($owner_id) && count($owner_id))
 			{
-				$this->stream->query('DELETE FROM '.$table.' WHERE cal_id='.$cal_id,__LINE__,__FILE__);
+				$user_where .= implode(',',$owner_id);
 			}
-		}
-		$this->stream->unlock();
+			else
+			{
+				$user_where .= $this->user;
+			}
+			$member_groups = $GLOBALS['phpgw']->accounts->membership($this->user);
+			@reset($member_groups);
+			while($member_groups != False && list($key,$group_info) = each($member_groups))
+			{
+				$member[] = $group_info['account_id'];
+			}
+			@reset($member);
+	//		$user_where .= ','.implode(',',$member);
+			$user_where .= ')) ';
 
-		foreach($this->deleted_events as $cal_id)
-		{
-			$this->delete_alarms($cal_id);
-		}
-		$this->deleted_events = array();
-
-		$this->event = $this_event;
-		return 1;
-	}
-	
-	/***************** Local functions for SQL based Calendar *****************/
-
-	function get_event_ids($search_repeats=False,$extra='',$search_extra=False)
-	{
-		$from = $where = ' ';
-		if($search_repeats)
-		{
-			$from  = ', phpgw_cal_repeats ';
-			$where = 'AND (phpgw_cal_repeats.cal_id = phpgw_cal.cal_id) ';
-		}
-		if($search_extra)
-		{
-			$from  .= 'LEFT JOIN phpgw_cal_extra ON phpgw_cal_extra.cal_id = phpgw_cal.cal_id ';
-		}
-
-		$sql = 'SELECT DISTINCT phpgw_cal.cal_id,'
-				. 'phpgw_cal.datetime,phpgw_cal.edatetime,'
-				. 'phpgw_cal.priority '
-				. 'FROM phpgw_cal, phpgw_cal_user'
-				. $from
-				. 'WHERE (phpgw_cal_user.cal_id = phpgw_cal.cal_id) '
-				. $where . $extra;
-
-		if($this->debug)
-		{
-			echo "FULL SQL : ".$sql."<br>\n";
-		}
-		
-		$this->stream->query($sql,__LINE__,__FILE__);
-
-		$retval = Array();
-		if($this->stream->num_rows() == 0)
-		{
 			if($this->debug)
 			{
-				echo "No records found!<br>\n";
+				echo '<!-- '.$user_where.' -->'."\n";
+			}
+
+			$startDate = 'AND ( ( (phpgw_cal.datetime >= '.$datetime.') ';
+
+			$enddate = '';
+			if($endYear != 0 && $endMonth != 0 && $endDay != 0)
+			{
+				$edatetime = mktime(23,59,59,(int)$endMonth,(int)$endDay,(int)$endYear) - $tz_offset;
+				$endDate .= 'AND (phpgw_cal.edatetime <= '.$edatetime.') ) '
+					. 'OR ( (phpgw_cal.datetime <= '.$datetime.') '
+					. 'AND (phpgw_cal.edatetime >= '.$edatetime.') ) '
+					. 'OR ( (phpgw_cal.datetime >= '.$datetime.') '
+					. 'AND (phpgw_cal.datetime <= '.$edatetime.') '
+					. 'AND (phpgw_cal.edatetime >= '.$edatetime.') ) '
+					. 'OR ( (phpgw_cal.datetime <= '.$datetime.') '
+					. 'AND (phpgw_cal.edatetime >= '.$datetime.') '
+					. 'AND (phpgw_cal.edatetime <= '.$edatetime.') ';
+			}
+			$endDate .= ') ) ';
+
+			$order_by = 'ORDER BY phpgw_cal.datetime ASC, phpgw_cal.edatetime ASC, phpgw_cal.priority ASC';
+			if($this->debug)
+			{
+				echo "SQL : ".$user_where.$startDate.$endDate.$extra."<br>\n";
+			}
+			return $this->get_event_ids(False,$user_where.$startDate.$endDate.$extra.$order_by);
+		}
+
+		function append_event()
+		{
+			$this->save_event($this->event);
+			$this->send_update(MSG_ADDED,$this->event->participants,'',$this->event);
+			return $this->event['id'];
+		}
+
+		function store_event()
+		{
+			return $this->save_event(&$this->event);
+		}
+
+		function delete_event($event_id)
+		{
+			$this->deleted_events[] = $event_id;
+		}
+
+		function snooze($event_id)
+		{
+		//Turn off an alarm for an event
+		//Returns true.
+		}
+
+		function list_alarms($begin_year='',$begin_month='',$begin_day='',$end_year='',$end_month='',$end_day='')
+		{
+		//Return a list of events that has an alarm triggered at the given datetime
+		//Returns an array of event ID's
+		}
+
+		// The function definition doesn't look correct...
+		// Need more information for this function
+		function next_recurrence($weekstart,$next)
+		{
+	//		return next_recurrence (int stream, int weekstart, array next);
+		}
+
+		function expunge()
+		{
+			if(count($this->deleted_events) <= 0)
+			{
+				return 1;
+			}
+			$this_event = $this->event;
+			$locks = Array(
+				'phpgw_cal',
+				'phpgw_cal_user',
+				'phpgw_cal_repeats',
+				'phpgw_cal_extra'
+	// OLD-ALARM			'phpgw_cal_alarm'
+			);
+			$this->stream->lock($locks);
+			foreach($this->deleted_events as $cal_id)
+			{
+				foreach ($locks as $table)
+				{
+					$this->stream->query('DELETE FROM '.$table.' WHERE cal_id='.$cal_id,__LINE__,__FILE__);
+				}
+			}
+			$this->stream->unlock();
+
+			foreach($this->deleted_events as $cal_id)
+			{
+				$this->delete_alarms($cal_id);
+			}
+			$this->deleted_events = array();
+
+			$this->event = $this_event;
+			return 1;
+		}
+
+		/***************** Local functions for SQL based Calendar *****************/
+
+		function get_event_ids($search_repeats=False,$extra='',$search_extra=False)
+		{
+			$from = $where = ' ';
+			if($search_repeats)
+			{
+				$from  = ', phpgw_cal_repeats ';
+				$where = 'AND (phpgw_cal_repeats.cal_id = phpgw_cal.cal_id) ';
+			}
+			if($search_extra)
+			{
+				$from  .= 'LEFT JOIN phpgw_cal_extra ON phpgw_cal_extra.cal_id = phpgw_cal.cal_id ';
+			}
+
+			$sql = 'SELECT DISTINCT phpgw_cal.cal_id,'
+					. 'phpgw_cal.datetime,phpgw_cal.edatetime,'
+					. 'phpgw_cal.priority '
+					. 'FROM phpgw_cal, phpgw_cal_user'
+					. $from
+					. 'WHERE (phpgw_cal_user.cal_id = phpgw_cal.cal_id) '
+					. $where . $extra;
+
+			if($this->debug)
+			{
+				echo "FULL SQL : ".$sql."<br>\n";
+			}
+
+			$this->stream->query($sql,__LINE__,__FILE__);
+
+			$retval = Array();
+			if($this->stream->num_rows() == 0)
+			{
+				if($this->debug)
+				{
+					echo "No records found!<br>\n";
+				}
+				return $retval;
+			}
+
+			while($this->stream->next_record())
+			{
+				$retval[] = (int)$this->stream->f('cal_id');
+			}
+			if($this->debug)
+			{
+				echo "Records found!<br>\n";
 			}
 			return $retval;
 		}
 
-		while($this->stream->next_record())
+		function save_event(&$event)
 		{
-			$retval[] = intval($this->stream->f('cal_id'));
-		}
-		if($this->debug)
-		{
-			echo "Records found!<br>\n";
-		}
-		return $retval;
-	}
-
-	function save_event(&$event)
-	{
-		$locks = Array(
-			'phpgw_cal',
-			'phpgw_cal_user',
-			'phpgw_cal_repeats',
-			'phpgw_cal_extra'
-// OLD-ALARM			'phpgw_cal_alarm'
-		);
-		$this->stream->lock($locks);
-		if($event['id'] == 0)
-		{
-			if(!$event['uid'])
+			$locks = Array(
+				'phpgw_cal',
+				'phpgw_cal_user',
+				'phpgw_cal_repeats',
+				'phpgw_cal_extra'
+	// OLD-ALARM			'phpgw_cal_alarm'
+			);
+			$this->stream->lock($locks);
+			if($event['id'] == 0)
 			{
-				if ($GLOBALS['phpgw_info']['server']['hostname'] != '')
+				if(!$event['uid'])
 				{
-					$id_suffix = $GLOBALS['phpgw_info']['server']['hostname'];
+					if ($GLOBALS['phpgw_info']['server']['hostname'] != '')
+					{
+						$id_suffix = $GLOBALS['phpgw_info']['server']['hostname'];
+					}
+					else
+					{
+						$id_suffix = $GLOBALS['phpgw']->common->randomstring(3).'local';
+					}
+					$parts = Array(
+						0 => 'title',
+						1 => 'description'
+					);
+					@reset($parts);
+					while(list($key,$field) = each($parts))
+					{
+						$part[$key] = substr($GLOBALS['phpgw']->crypto->encrypt($event[$field]),0,20);
+						if(!$GLOBALS['phpgw']->crypto->enabled)
+						{
+							$part[$key] = bin2hex(unserialize($part[$key]));
+						}
+					}
+					$event['uid'] = $part[0].'-'.$part[1].'@'.$id_suffix;
+				}
+				$this->stream->query('INSERT INTO phpgw_cal(uid,title,owner,priority,is_public,category) '
+					. "values('".$event['uid']."','".$this->stream->db_addslashes($event['title'])
+					. "',".(int)$event['owner'].','.(int)$event['priority'].','.(int)$event['public'].",'"
+					. $event['category']."')",__LINE__,__FILE__);
+				$event['id'] = $this->stream->get_last_insert_id('phpgw_cal','cal_id');
+			}
+
+			$date = $this->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset;
+			$enddate = $this->maketime($event['end']) - $GLOBALS['phpgw']->datetime->tz_offset;
+			$today = time() - $GLOBALS['phpgw']->datetime->tz_offset;
+
+			if($event['recur_type'] != MCAL_RECUR_NONE)
+			{
+				$type = 'M';
+			}
+			else
+			{
+				$type = 'E';
+			}
+
+			$sql = 'UPDATE phpgw_cal SET '
+					. 'owner='.(int)$event['owner'].', '
+					. 'datetime='.(int)$date.', '
+					. 'mdatetime='.(int)$today.', '
+					. 'edatetime='.(int)$enddate.', '
+					. 'priority='.(int)$event['priority'].', '
+					. "category='".$this->stream->db_addslashes($event['category'])."', "
+					. "cal_type='".$this->stream->db_addslashes($type)."', "
+					. 'is_public='.(int)$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='.(int)$event['reference'].' '
+					. 'WHERE cal_id='.(int)$event['id'];
+
+			$this->stream->query($sql,__LINE__,__FILE__);
+
+			$this->stream->query('DELETE FROM phpgw_cal_user WHERE cal_id='.(int)$event['id'],__LINE__,__FILE__);
+
+			@reset($event['participants']);
+			while (list($key,$value) = @each($event['participants']))
+			{
+				if((int)$key == $event['owner'])
+				{
+					$value = 'A';
+				}
+				$this->stream->query('INSERT INTO phpgw_cal_user(cal_id,cal_login,cal_status) '
+					. 'VALUES('.(int)$event['id'].','.(int)$key.",'".$this->stream->db_addslashes($value)."')",__LINE__,__FILE__);
+			}
+
+			if($event['recur_type'] != MCAL_RECUR_NONE)
+			{
+				if($event['recur_enddate']['month'] != 0 && $event['recur_enddate']['mday'] != 0 && $event['recur_enddate']['year'] != 0)
+				{
+					$end = $this->maketime($event['recur_enddate']) - $GLOBALS['phpgw']->datetime->tz_offset;
 				}
 				else
 				{
-					$id_suffix = $GLOBALS['phpgw']->common->randomstring(3).'local';
+					$end = 0;
 				}
-				$parts = Array(
-					0 => 'title',
-					1 => 'description'
-				);
-				@reset($parts);
-				while(list($key,$field) = each($parts))
+
+				$this->stream->query('SELECT count(cal_id) FROM phpgw_cal_repeats WHERE cal_id='.(int)$event['id'],__LINE__,__FILE__);
+				$this->stream->next_record();
+				$num_rows = $this->stream->f(0);
+				if($num_rows == 0)
 				{
-					$part[$key] = substr($GLOBALS['phpgw']->crypto->encrypt($event[$field]),0,20);
-					if(!$GLOBALS['phpgw']->crypto->enabled)
-					{
-						$part[$key] = bin2hex(unserialize($part[$key]));
-					}
+					$this->stream->query('INSERT INTO phpgw_cal_repeats(cal_id,recur_type,recur_enddate,recur_data,recur_interval) '
+						.'VALUES('.(int)$event['id'].','.$event['recur_type'].','.(int)$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='.(int)$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]:''))."' "
+						. 'WHERE cal_id='.$event['id'],__LINE__,__FILE__);
 				}
-				$event['uid'] = $part[0].'-'.$part[1].'@'.$id_suffix;
-			}
-			$this->stream->query('INSERT INTO phpgw_cal(uid,title,owner,priority,is_public,category) '
-				. "values('".$event['uid']."','".$this->stream->db_addslashes($event['title'])
-				. "',".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');
-		}
-
-		$date = $this->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset;
-		$enddate = $this->maketime($event['end']) - $GLOBALS['phpgw']->datetime->tz_offset;
-		$today = time() - $GLOBALS['phpgw']->datetime->tz_offset;
-
-		if($event['recur_type'] != MCAL_RECUR_NONE)
-		{
-			$type = 'M';
-		}
-		else
-		{
-			$type = 'E';
-		}
-
-		$sql = 'UPDATE phpgw_cal SET '
-				. '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='.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='.intval($event['id']),__LINE__,__FILE__);
-
-		@reset($event['participants']);
-		while (list($key,$value) = @each($event['participants']))
-		{
-			if(intval($key) == $event['owner'])
-			{
-				$value = 'A';
-			}
-			$this->stream->query('INSERT INTO phpgw_cal_user(cal_id,cal_login,cal_status) '
-				. 'VALUES('.intval($event['id']).','.intval($key).",'".$this->stream->db_addslashes($value)."')",__LINE__,__FILE__);
-		}
-
-		if($event['recur_type'] != MCAL_RECUR_NONE)
-		{
-			if($event['recur_enddate']['month'] != 0 && $event['recur_enddate']['mday'] != 0 && $event['recur_enddate']['year'] != 0)
-			{
-				$end = $this->maketime($event['recur_enddate']) - $GLOBALS['phpgw']->datetime->tz_offset;
 			}
 			else
 			{
-				$end = 0;
+				$this->stream->query('DELETE FROM phpgw_cal_repeats WHERE cal_id='.$event['id'],__LINE__,__FILE__);
+			}
+			// Custom fields
+			$this->stream->query('DELETE FROM phpgw_cal_extra WHERE cal_id='.$event['id'],__LINE__,__FILE__);
+
+			foreach($event as $name => $value)
+			{
+				if ($name[0] == '#' && strlen($value))
+				{
+					$this->stream->query('INSERT INTO phpgw_cal_extra (cal_id,cal_extra_name,cal_extra_value) '
+					. 'VALUES('.$event['id'].",'".addslashes(substr($name,1))."','".addslashes($value)."')",__LINE__,__FILE__);
+				}
+			}
+	/*
+			$alarmcount = count($event['alarm']);
+			if ($alarmcount > 1)
+			{
+				// this should never happen, $event['alarm'] should only be set
+				// if creating a new event and uicalendar only sets up 1 alarm
+				// the user must use "Alarm Management" to create/establish multiple
+				// alarms or to edit/change an alarm
+				echo '<!-- how did this happen, too many alarms -->'."\n";
+				$this->stream->unlock();
+				return True;
 			}
 
-			$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)
+			if ($alarmcount == 1)
 			{
-				$this->stream->query('INSERT INTO phpgw_cal_repeats(cal_id,recur_type,recur_enddate,recur_data,recur_interval) '
-					.'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='.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]:''))."' "
-					. 'WHERE cal_id='.$event['id'],__LINE__,__FILE__);
-			}
-		}
-		else
-		{
-			$this->stream->query('DELETE FROM phpgw_cal_repeats WHERE cal_id='.$event['id'],__LINE__,__FILE__);
-		}
-		// Custom fields
-		$this->stream->query('DELETE FROM phpgw_cal_extra WHERE cal_id='.$event['id'],__LINE__,__FILE__);
 
-		foreach($event as $name => $value)
-		{
-			if ($name[0] == '#' && strlen($value))
-			{
-				$this->stream->query('INSERT INTO phpgw_cal_extra (cal_id,cal_extra_name,cal_extra_value) '
-				. 'VALUES('.$event['id'].",'".addslashes(substr($name,1))."','".addslashes($value)."')",__LINE__,__FILE__);
+				list($key,$alarm) = @each($event['alarm']);
+
+				$this->stream->query('INSERT INTO phpgw_cal_alarm(cal_id,cal_owner,cal_time,cal_text,alarm_enabled) VALUES('.$event['id'].','.$event['owner'].','.$alarm['time'].",'".$alarm['text']."',".$alarm['enabled'].')',__LINE__,__FILE__);
+				$this->stream->query('SELECT LAST_INSERT_ID()');
+				$this->stream->next_record();
+				$alarm['id'] = $this->stream->f(0);
 			}
-		}
-/*
-		$alarmcount = count($event['alarm']);
-		if ($alarmcount > 1)
-		{
-			// this should never happen, $event['alarm'] should only be set
-			// if creating a new event and uicalendar only sets up 1 alarm
-			// the user must use "Alarm Management" to create/establish multiple
-			// alarms or to edit/change an alarm
-			echo '<!-- how did this happen, too many alarms -->'."\n";
+	*/
+			print_debug('Event Saved: ID #',$event['id']);
+
 			$this->stream->unlock();
+
+			if (is_array($event['alarm']))
+			{
+				foreach ($event['alarm'] as $alarm)	// this are all new alarms
+				{
+					$this->save_alarm($event['id'],$alarm);
+				}
+			}
+			$GLOBALS['phpgw_info']['cal_new_event_id'] = $event['id'];
 			return True;
 		}
 
-		if ($alarmcount == 1)
+		function get_alarm($cal_id)
 		{
+	/* OLD-ALARM
+			$this->stream->query('SELECT cal_time, cal_text FROM phpgw_cal_alarm WHERE cal_id='.$id.' AND cal_owner='.$this->user,__LINE__,__FILE__);
+			if($this->stream->num_rows())
+			{
+				while($this->stream->next_record())
+				{
+					$alarm[$this->stream->f('cal_time')] = $this->stream->f('cal_text');
+				}
+				@reset($alarm);
+				return $alarm;
+			}
+			else
+			{
+				return False;
+			}
+	*/
+			$alarms = $this->read_alarms($cal_id);
+			$ret = False;
 
-			list($key,$alarm) = @each($event['alarm']);
+			foreach($alarms as $alarm)
+			{
+				if ($alarm['owner'] == $this->user || !$alarm['owner'])
+				{
+					$ret[$alarm['time']] = $alarm['text'];
+				}
+			}
+			return $ret;
+		}
 
-			$this->stream->query('INSERT INTO phpgw_cal_alarm(cal_id,cal_owner,cal_time,cal_text,alarm_enabled) VALUES('.$event['id'].','.$event['owner'].','.$alarm['time'].",'".$alarm['text']."',".$alarm['enabled'].')',__LINE__,__FILE__);
+		function set_status($id,$owner,$status)
+		{
+			$status_code_short = Array(
+				REJECTED =>	'R',
+				NO_RESPONSE	=> 'U',
+				TENTATIVE	=>	'T',
+				ACCEPTED	=>	'A'
+			);
+
+			$this->stream->query("UPDATE phpgw_cal_user SET cal_status='".$status_code_short[$status]."' WHERE cal_id=".$id." AND cal_login=".$owner,__LINE__,__FILE__);
+	/* OLD-ALARM
+			if ($status == 'R')
+			{
+				$this->stream->query('UPDATE phpgw_cal_alarm set alarm_enabled=0 where cal_id='.$id.' and cal_owner='.$owner,__LINE__,__FILE__);
+			}
+	*/
+			return True;
+		}
+
+	// End of ICal style support.......
+
+		function group_search($owner=0)
+		{
+			$owner = ($owner==$GLOBALS['phpgw_info']['user']['account_id']?0:$owner);
+			$groups = substr($GLOBALS['phpgw']->common->sql_search('phpgw_cal.groups',(int)$owner),4);
+			if (!$groups)
+			{
+				return '';
+			}
+			else
+			{
+				return "(phpgw_cal.is_public=2 AND (". $groups .')) ';
+			}
+		}
+
+		function splittime_($time)
+		{
+			$temp = array('hour','minute','second','ampm');
+			$time = strrev($time);
+			$second = (int)strrev(substr($time,0,2));
+			$minute = (int)strrev(substr($time,2,2));
+			$hour   = (int)strrev(substr($time,4));
+			$temp['second'] = (int)$second;
+			$temp['minute'] = (int)$minute;
+			$temp['hour']   = (int)$hour;
+			$temp['ampm']   = '  ';
+
+			return $temp;
+		}
+
+		function date_to_epoch($d)
+		{
+			return $this->localdates(mktime(0,0,0,(int)(substr($d,4,2)),(int)(substr($d,6,2)),(int)(substr($d,0,4))));
+		}
+
+		function list_dirty_events($lastmod=-1,$repeats=false)
+		{
+			if(!isset($this->stream))
+			{
+				return False;
+			}
+			$lastmod = (int)  $lastmod;
+			$repeats = (bool) $repeats;
+
+			$user_where = " AND phpgw_cal_user.cal_login = $this->user";
+
+			$member_groups = $GLOBALS['phpgw']->accounts->membership($this->user);
+			@reset($member_groups);
+			while($member_groups != False && list($key,$group_info) = each($member_groups))
+			{
+				$member[] = $group_info['account_id'];
+			}
+			@reset($member);
+	//		$user_where .= ','.implode(',',$member);
+			//$user_where .= ')) ';
+
+			if($this->debug)
+			{
+				echo '<!-- '.$user_where.' -->'."\n";
+			}
+
+			if($lastmod > 0)
+			{
+				$wheremod = "AND mdatetime = $lastmod";
+			}
+
+			$order_by = ' ORDER BY phpgw_cal.cal_id ASC';
+			if($this->debug)
+			{
+				echo "SQL : ".$user_where.$wheremod.$extra."<br>\n";
+			}
+			return $this->get_event_ids($repeats,$user_where.$wheremod.$extra.$order_by);
+		}
+
+	/* OLD-ALARM
+		function add_alarm($eventid,$alarm,$owner)
+		{
+			$this->stream->query('INSERT INTO phpgw_cal_alarm(cal_id,cal_owner,cal_time,cal_text,alarm_enabled) VALUES('.$eventid.','.$owner.','.$alarm['time'].",'".$alarm['text']."',1)",__LINE__,__FILE__);
 			$this->stream->query('SELECT LAST_INSERT_ID()');
 			$this->stream->next_record();
-			$alarm['id'] = $this->stream->f(0);
+			return($this->stream->f(0));
 		}
-*/
-		print_debug('Event Saved: ID #',$event['id']);
-
-		$this->stream->unlock();
-
-		if (is_array($event['alarm']))
+		function delete_alarm($alarmid)
 		{
-			foreach ($event['alarm'] as $alarm)	// this are all new alarms
-			{
-				$this->save_alarm($event['id'],$alarm);
-			}
+			$this->stream->query('DELETE FROM phpgw_cal_alarm WHERE alarm_id='.$alarmid,__LINE__,__FILE__);
 		}
-		$GLOBALS['phpgw_info']['cal_new_event_id'] = $event['id']; 
-		return True;
+	*/
 	}
-
-	function get_alarm($cal_id)
-	{
-/* OLD-ALARM		
-		$this->stream->query('SELECT cal_time, cal_text FROM phpgw_cal_alarm WHERE cal_id='.$id.' AND cal_owner='.$this->user,__LINE__,__FILE__);
-		if($this->stream->num_rows())
-		{
-			while($this->stream->next_record())
-			{
-				$alarm[$this->stream->f('cal_time')] = $this->stream->f('cal_text');
-			}
-			@reset($alarm);
-			return $alarm;
-		}
-		else
-		{
-			return False;
-		}
-*/
-		$alarms = $this->read_alarms($cal_id);
-		$ret = False;
-
-		foreach($alarms as $alarm)
-		{
-			if ($alarm['owner'] == $this->user || !$alarm['owner'])
-			{
-				$ret[$alarm['time']] = $alarm['text'];
-			}
-		}
-		return $ret;
-	}
-
-	function set_status($id,$owner,$status)
-	{
-		$status_code_short = Array(
-			REJECTED =>	'R',
-			NO_RESPONSE	=> 'U',
-			TENTATIVE	=>	'T',
-			ACCEPTED	=>	'A'
-		);
-		
-		$this->stream->query("UPDATE phpgw_cal_user SET cal_status='".$status_code_short[$status]."' WHERE cal_id=".$id." AND cal_login=".$owner,__LINE__,__FILE__);
-/* OLD-ALARM
-		if ($status == 'R')
-		{
-			$this->stream->query('UPDATE phpgw_cal_alarm set alarm_enabled=0 where cal_id='.$id.' and cal_owner='.$owner,__LINE__,__FILE__);
-		}
-*/
-		return True;
-	}
-	
-// End of ICal style support.......
-
-	function group_search($owner=0)
-	{
-		$owner = ($owner==$GLOBALS['phpgw_info']['user']['account_id']?0:$owner);
-		$groups = substr($GLOBALS['phpgw']->common->sql_search('phpgw_cal.groups',intval($owner)),4);
-		if (!$groups)
-		{
-			return '';
-		}
-		else
-		{
-			return "(phpgw_cal.is_public=2 AND (". $groups .')) ';
-		}
-	}
-
-	function splittime_($time)
-	{
-		$temp = array('hour','minute','second','ampm');
-		$time = strrev($time);
-		$second = (int)strrev(substr($time,0,2));
-		$minute = (int)strrev(substr($time,2,2));
-		$hour   = (int)strrev(substr($time,4));
-		$temp['second'] = (int)$second;
-		$temp['minute'] = (int)$minute;
-		$temp['hour']   = (int)$hour;
-		$temp['ampm']   = '  ';
-
-		return $temp;
-	}
-
-	function date_to_epoch($d)
-	{
-		return $this->localdates(mktime(0,0,0,intval(substr($d,4,2)),intval(substr($d,6,2)),intval(substr($d,0,4))));
-	}
-
-	function list_dirty_events($lastmod=-1,$repeats=false)
-	{
-		if(!isset($this->stream))
-		{
-			return False;
-		}
-		$lastmod = intval($lastmod);
-		$repeats = (bool) $repeats;
-
-		$user_where = " AND phpgw_cal_user.cal_login = $this->user";
-
-		$member_groups = $GLOBALS['phpgw']->accounts->membership($this->user);
-		@reset($member_groups);
-		while($member_groups != False && list($key,$group_info) = each($member_groups))
-		{
-			$member[] = $group_info['account_id'];
-		}
-		@reset($member);
-//		$user_where .= ','.implode(',',$member);
-		//$user_where .= ')) ';
-
-		if($this->debug)
-		{
-			echo '<!-- '.$user_where.' -->'."\n";
-		}
-
-		if($lastmod > 0)
-		{
-			$wheremod = "AND mdatetime = $lastmod"; 
-		}
-		
-		$order_by = ' ORDER BY phpgw_cal.cal_id ASC';
-		if($this->debug)
-		{
-			echo "SQL : ".$user_where.$wheremod.$extra."<br>\n";
-		}
-		return $this->get_event_ids($repeats,$user_where.$wheremod.$extra.$order_by);
-	}
-
-/* OLD-ALARM
-	function add_alarm($eventid,$alarm,$owner)
-	{
-		$this->stream->query('INSERT INTO phpgw_cal_alarm(cal_id,cal_owner,cal_time,cal_text,alarm_enabled) VALUES('.$eventid.','.$owner.','.$alarm['time'].",'".$alarm['text']."',1)",__LINE__,__FILE__);
-		$this->stream->query('SELECT LAST_INSERT_ID()');
-		$this->stream->next_record();
-		return($this->stream->f(0));
-	}
-	function delete_alarm($alarmid)
-	{
-		$this->stream->query('DELETE FROM phpgw_cal_alarm WHERE alarm_id='.$alarmid,__LINE__,__FILE__);
-	}
-*/
-}
diff --git a/calendar/inc/class.soholiday.inc.php b/calendar/inc/class.soholiday.inc.php
index 66ee81f435..63332b311e 100755
--- a/calendar/inc/class.soholiday.inc.php
+++ b/calendar/inc/class.soholiday.inc.php
@@ -31,7 +31,7 @@
 				{
 					echo "Updating LOCALE='".$holiday['locale']."' NAME='".$holiday['name']."' extra=(".$holiday['mday'].'/'.$holiday['month_num'].'/'.$holiday['occurence'].'/'.$holiday['dow'].'/'.$holiday['observance_rule'].")<br>\n";
 				}
-				$sql = "UPDATE phpgw_cal_holidays SET name='".$holiday['name']."', mday=".$holiday['mday'].', month_num='.$holiday['month_num'].', occurence='.$holiday['occurence'].', dow='.$holiday['dow'].', observance_rule='.intval($holiday['observance_rule']).' WHERE hol_id='.$holiday['hol_id'];
+				$sql = "UPDATE phpgw_cal_holidays SET name='".$holiday['name']."', mday=".$holiday['mday'].', month_num='.$holiday['month_num'].', occurence='.$holiday['occurence'].', dow='.$holiday['dow'].', observance_rule='.(int)$holiday['observance_rule'].' WHERE hol_id='.$holiday['hol_id'];
 			}
 			else
 			{
@@ -40,7 +40,7 @@
 					echo "Inserting LOCALE='".$holiday['locale']."' NAME='".$holiday['name']."' extra=(".$holiday['mday'].'/'.$holiday['month_num'].'/'.$holiday['occurence'].'/'.$holiday['dow'].'/'.$holiday['observance_rule'].")<br>\n";
 				}
 				$sql = 'INSERT INTO phpgw_cal_holidays(locale,name,mday,month_num,occurence,dow,observance_rule) '
-					. "VALUES('".strtoupper($holiday['locale'])."','".$holiday['name']."',".$holiday['mday'].','.$holiday['month_num'].','.$holiday['occurence'].','.$holiday['dow'].','.intval($holiday['observance_rule']).")";
+					. "VALUES('".strtoupper($holiday['locale'])."','".$holiday['name']."',".$holiday['mday'].','.$holiday['month_num'].','.$holiday['occurence'].','.$holiday['dow'].','.(int)$holiday['observance_rule'].")";
 			}
 			$this->db->query($sql,__LINE__,__FILE__);
 		}
@@ -53,10 +53,10 @@
 					'index'			=> $this->db->f('hol_id'),
 					'locale'		=> $this->db->f('locale'),
 					'name'			=> $GLOBALS['phpgw']->strip_html($this->db->f('name')),
-					'day'			=> intval($this->db->f('mday')),
-					'month'			=> intval($this->db->f('month_num')),
-					'occurence'		=> intval($this->db->f('occurence')),
-					'dow'			=> intval($this->db->f('dow')),
+					'day'			=> (int)$this->db->f('mday'),
+					'month'			=> (int)$this->db->f('month_num'),
+					'occurence'		=> (int)$this->db->f('occurence'),
+					'dow'			=> (int)$this->db->f('dow'),
 					'observance_rule'	=> $this->db->f('observance_rule')
 				);
 				if($this->debug)
@@ -136,7 +136,7 @@
 			{
 				$querymethod = " AND name like '%".$query."%'";
 			}
-			if (intval($year) > 1900)
+			if ((int)$year > 1900)
 			{
 				$querymethod .= " AND (occurence < 1900 OR occurence = $year)";
 			}
@@ -172,7 +172,7 @@
 			{
 				$querymethod = " AND name like '%".$query."%'";
 			}
-			if (intval($year) >= 1900)
+			if ((int)$year >= 1900)
 			{
 				$querymethod .= " AND (occurence < 1900 OR occurence = $year)";
 			}
@@ -185,7 +185,7 @@
 			
 			$this->db->query($sql,__LINE__,__FILE__);
 			$this->db->next_record();
-			$retval = intval($this->db->f(0));
+			$retval = (int)$this->db->f(0);
 			if($this->debug)
 			{
 				echo 'Total Holidays for : '.$locale.' : '.$retval."<br>\n";
diff --git a/calendar/inc/class.uialarm.inc.php b/calendar/inc/class.uialarm.inc.php
index aedf25028a..93aba8cab4 100755
--- a/calendar/inc/class.uialarm.inc.php
+++ b/calendar/inc/class.uialarm.inc.php
@@ -57,7 +57,7 @@
 		function prep_page()
 		{
 			if ($this->bo->cal_id <= 0 ||
-			    !$this->event = $this->bo->read_entry($this->bo->cal_id))
+				!$this->event = $this->bo->read_entry($this->bo->cal_id))
 			{
 				$GLOBALS['phpgw']->redirect_link('/index.php',Array(
 					'menuaction'	=> 'calendar.uicalendar.index'
@@ -122,9 +122,9 @@
 
 			if ($_POST['add'])
 			{
-				$time = intval($_POST['time']['days'])*24*3600 +
-					intval($_POST['time']['hours'])*3600 +
-					intval($_POST['time']['mins'])*60;
+				$time = (int)($_POST['time']['days'])*24*3600 +
+					(int)($_POST['time']['hours'])*3600 +
+					(int)($_POST['time']['mins'])*60;
 
 				if ($time > 0 && !$this->bo->add($this->event,$time,$_POST['owner']))
 				{
@@ -184,7 +184,7 @@
 				}
 				$this->template->parse('rows','buttons',True);
 			}
-			if (isset($this->event['participants'][intval($GLOBALS['phpgw_info']['user']['account_id'])]))
+			if (isset($this->event['participants'][(int)$GLOBALS['phpgw_info']['user']['account_id']]))
 			{
 				$this->template->set_var(Array(
 					'input_days'    => $this->html->select('time[days]',$_POST['time']['days'],range(0,31),True).' '.lang('days'),
diff --git a/calendar/inc/class.uicalendar.inc.php b/calendar/inc/class.uicalendar.inc.php
index 45b41c71b4..d97a10c59b 100755
--- a/calendar/inc/class.uicalendar.inc.php
+++ b/calendar/inc/class.uicalendar.inc.php
@@ -102,15 +102,15 @@
 			$this->template_dir = $GLOBALS['phpgw']->common->get_tpl_dir('calendar');
 
 			$this->holiday_color = (substr($this->theme['bg06'],0,1)=='#'?'':'#').$this->theme['bg06'];
-			
+
 			$this->cat_id   = $this->bo->cat_id;
 
 			$this->link_tpl = CreateObject('phpgwapi.Template',$this->template_dir);
 			$this->link_tpl->set_unknowns('remove');
 			$this->link_tpl->set_file(
-			   Array(
-				   'link_picture'	=> 'link_pict.tpl'
-			   )
+				Array(
+					'link_picture'	=> 'link_pict.tpl'
+				)
 			);
 			$this->link_tpl->set_block('link_picture','link_pict','link_pict');
 			$this->link_tpl->set_block('link_picture','pict','pict');
@@ -168,7 +168,7 @@
 					'syear'	=> $params['year']
 				)
 			);
-			
+
 			$params['link']			= (!isset($params['link'])?'':$params['link']);
 			$params['buttons']		= (!isset($params['buttons'])?'none':$params['buttons']);
 			$params['outside_month']	= (!isset($params['outside_month'])?True:$params['outside_month']);
@@ -176,10 +176,10 @@
 			$this->bo->read_holidays($params['year']);
 
 			$date = $GLOBALS['phpgw']->datetime->makegmttime(0,0,0,$params['month'],$params['day'],$params['year']);
-			$month_ago = intval(date('Ymd',mktime(0,0,0,$params['month'] - 1,$params['day'],$params['year'])));
-			$month_ahead = intval(date('Ymd',mktime(0,0,0,$params['month'] + 1,$params['day'],$params['year'])));
-			$monthstart = intval(date('Ymd',mktime(0,0,0,$params['month'],1,$params['year'])));
-			$monthend = intval(date('Ymd',mktime(0,0,0,$params['month'] + 1,0,$params['year'])));
+			$month_ago = (int)(date('Ymd',mktime(0,0,0,$params['month'] - 1,$params['day'],$params['year'])));
+			$month_ahead = (int)(date('Ymd',mktime(0,0,0,$params['month'] + 1,$params['day'],$params['year'])));
+			$monthstart = (int)(date('Ymd',mktime(0,0,0,$params['month'],1,$params['year'])));
+			$monthend = (int)(date('Ymd',mktime(0,0,0,$params['month'] + 1,0,$params['year'])));
 
 			$weekstarttime = $GLOBALS['phpgw']->datetime->get_weekday_start($params['year'],$params['month'],1);
 
@@ -231,7 +231,7 @@
 				case 'left':
 					$var = Array(
 						'prevmonth'			=>	'<a href="'.$this->page('month','&date='.$month_ago).'"><img src="'.$GLOBALS['phpgw']->common->image('phpgwapi','left').'" border="0"></a>'
-					);					
+					);
 					break;
 				case 'both':
 					$var = Array(
@@ -269,9 +269,9 @@
 				foreach($daily as $date => $day_params)
 				{
 					print_debug('Mini-Cal Date',$date);
-					$year = intval(substr($date,0,4));
-					$month = intval(substr($date,4,2));
-					$day = intval(substr($date,6,2));
+					$year = (int)(substr($date,0,4));
+					$month = (int)(substr($date,4,2));
+					$day = (int)(substr($date,6,2));
 					$str = '';
 					if(($date >= $monthstart && $date <= $monthend) || $params['outside_month'] == True)
 					{
@@ -302,7 +302,7 @@
 				$mini_cal_tpl->set_var('dayname','');
 				$mini_cal_tpl->set_var('monthweek_day','');
 			}
-		
+
 			$return_value = $mini_cal_tpl->fp('out','mini_cal');
 			$mini_cal_tpl->set_var('display_monthweek','');
 //			$mini_cal_tpl->set_var('daynames','');
@@ -505,7 +505,7 @@
 				$minical_prev = '';
 				$minical_next = '';
 			}
-			
+
 			if (!$this->bo->printer_friendly)
 			{
 				$printer = '';
@@ -553,7 +553,7 @@
 
 /*
 			$this->bo->read_holidays();
-			
+
 			if (!$this->bo->printer_friendly || ($this->bo->printer_friendly && @$this->bo->prefs['calendar']['display_minicals']))
 			{
 				$minical = $this->mini_calendar(
@@ -569,7 +569,7 @@
 			{
 				$minical = '';
 			}
-			
+
 			if (!$this->bo->printer_friendly)
 			{
 				unset($GLOBALS['phpgw_info']['flags']['noheader']);
@@ -691,7 +691,7 @@
 			}
 			return $p->fp('out','year_t');
 		}
-		
+
 		function view($vcal_id=0,$cal_date=0)
 		{
 			unset($GLOBALS['phpgw_info']['flags']['noheader']);
@@ -701,8 +701,8 @@
 
 			$cal_id = get_var('cal_id',array('GET','POST'),$vcal_id);
 
-			$date = $cal_date?$cal_date:0;
-			$date = $date?$date:intval($_GET['date']);
+			$date = $cal_date ? $cal_date : 0;
+			$date = $date ? $date : (int)$_GET['date'];
 
 			// First, make sure they have permission to this entry
 			if ($cal_id < 1)
@@ -909,7 +909,7 @@
 				'button_right'	=> $button_right
 			));
 			$p->pfp('phpgw_body','view_event');
-			
+
 			$GLOBALS['phpgw']->hooks->process(array(
 				'location' => 'calendar_view',
 				'cal_id'   => $cal_id
@@ -948,7 +948,7 @@
 			}
 			elseif(isset($_GET['cal_id']))
 			{
-				$cal_id = intval($_GET['cal_id']);
+				$cal_id = (int)$_GET['cal_id'];
 				$event = $this->bo->read_entry($cal_id);
 
 				if(!$this->bo->check_perms(PHPGW_ACL_EDIT,$event))
@@ -992,7 +992,7 @@
 				unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
 				$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Export');
 				$GLOBALS['phpgw']->common->phpgw_header();
-				
+
 				$p = $GLOBALS['phpgw']->template;
 				$p->set_file(
 					Array(
@@ -1018,20 +1018,20 @@
 //					$vfs->mkdir('.calendar',array(RELATIVE_USER));
 //				}
 
-				$content = ExecMethod('calendar.boicalendar.export', 
-											 Array(
-													 'l_event_id' => $_POST['cal_id'],
-													 'chunk_split' => False,
-													 )
-											 );
+				$content = ExecMethod('calendar.boicalendar.export', Array(
+					'l_event_id' => $_POST['cal_id'],
+					'chunk_split' => False,
+				));
 
-				$vfs->cd(array('string' => '/', 
-							'relatives' => array(RELATIVE_USER)
-							));
-				$vfs->write(array('string' => $output_file,
-				 			'relatives' => array (RELATIVE_USER), 
-				 			'content' => $content
-				 			));
+				$vfs->cd(array(
+					'string' => '/',
+					'relatives' => array(RELATIVE_USER)
+				));
+				$vfs->write(array(
+					'string' => $output_file,
+					'relatives' => array (RELATIVE_USER),
+					'content' => $content
+				));
 
 				if($this->debug)
 				{
@@ -1055,7 +1055,7 @@
 		{
 			if(!$this->bo->check_perms(PHPGW_ACL_EDIT))
 			{
-			   $this->no_edit();
+				$this->no_edit();
 			}
 			elseif(!$this->bo->check_perms(PHPGW_ACL_ADD))
 			{
@@ -1135,7 +1135,7 @@
 			);
 			$p->set_var($var);
 			$button_left .= '<td>'.$p->fp('out','form_button').'</td>';
-			
+
 			$p->set_var('button_left',$button_left);
 			$p->pfp('phpgw_body','view_event');
 		}
@@ -1144,17 +1144,17 @@
 		{
 			if(!$this->bo->check_perms(PHPGW_ACL_EDIT))
 			{
-			   $this->no_edit();
+				$this->no_edit();
 			}
 			elseif(!$this->bo->check_perms(PHPGW_ACL_ADD))
 			{
 				$this->index();
 			}
-			$cal_id = (isset($params['cal_id'])?intval($params['cal_id']):'');
-			$cal_id = ($cal_id==''?intval($_GET['cal_id']):$cal_id);
+			$cal_id = (isset($params['cal_id']) ? (int)$params['cal_id'] : '');
+			$cal_id = ($cal_id == '' ? (int)$_GET['cal_id'] : $cal_id);
 
-			$reinstate_index = (isset($params['reinstate_index'])?intval($params['reinstate_index']):'');
-			$reinstate_index = ($reinstate_index==''?intval($_POST['reinstate_index']):$reinstate_index);
+			$reinstate_index = (isset($params['reinstate_index']) ? (int)$params['reinstate_index'] : '');
+			$reinstate_index = ($reinstate_index == '' ? (int)$_POST['reinstate_index'] : $reinstate_index);
 			if($this->debug)
 			{
 				echo '<!-- Calling bo->reinstate -->'."\n";
@@ -1172,12 +1172,12 @@
 			if ($this->bo->return_to)
 			{
 				Header('Location: '.$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->bo->return_to));
-			}			
+			}
 			else
 			{
 				Header('Location: '.$this->page('',($cd?'&cd='.$cd:'')));
 			}
-			$GLOBALS['phpgw']->common->phpgw_exit();	
+			$GLOBALS['phpgw']->common->phpgw_exit();
 		}
 
 		function add($cd=0,$readsess=0)
@@ -1186,7 +1186,7 @@
 			{
 				$this->index();
 			}
-			
+
 			if($readsess)
 			{
 				$event = $this->bo->restore_from_appsession;
@@ -1203,9 +1203,9 @@
 
 				$can_edit = True;
 
-				$starthour = intval(get_var('hour',array('GET'),$this->bo->prefs['calendar']['workdaystarts']));
-				$startmin  = intval(get_var('minute',array('GET'),0));
-				$endmin    = $startmin + intval($this->bo->prefs['calendar']['defaultlength']);
+				$starthour = (int)(get_var('hour',array('GET'),$this->bo->prefs['calendar']['workdaystarts']));
+				$startmin  = (int)(get_var('minute',array('GET'),0));
+				$endmin    = $startmin + (int)$this->bo->prefs['calendar']['defaultlength'];
 				$endhour   = $starthour + $this->bo->normalizeminutes($endmin);
 				;
 				$this->bo->set_start($this->bo->year,$this->bo->month,$this->bo->day,$starthour,$startmin,0);
@@ -1244,7 +1244,7 @@
 			}
 
 			$date = sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day);
-			if($this->bo->check_perms(PHPGW_ACL_DELETE,$cal_id=intval($_GET['cal_id'])))
+			if($this->bo->check_perms(PHPGW_ACL_DELETE,$cal_id = (int)$_GET['cal_id']))
 			{
 				if(isset($_POST['delete_type']) && $_POST['delete_type'] == 'single')
 				{
@@ -1298,7 +1298,7 @@
 			{
 				$minical = '';
 			}
-			
+
 			if (!$this->bo->printer_friendly)
 			{
 				$printer = '';
@@ -1362,24 +1362,24 @@
 			if(is_array($todo_label))
 			{
 				list($label,$showall)=$todo_label;
-			} 
+			}
 			else
 			{
 				$label=$todo_label;
 				$showall=true;
 			}
-			$maxshow = intval($GLOBALS['phpgw_info']['user']['preferences']['infolog']['mainscreen_maxshow']);
+			$maxshow = (int)$GLOBALS['phpgw_info']['user']['preferences']['infolog']['mainscreen_maxshow'];
 			if($maxshow<=0)
 			{
 				$maxshow=10;
-			}	
+			}
 			//print_debug("get_todos(): label=$label; showall=$showall; max=$maxshow");
 
 			$content = $todo_label = '';
 			if (is_array($todos_from_hook) && count($todos_from_hook))
 			{
 				$todo_label = !empty($label)?$label:lang("open ToDo's:");
-				
+
 				foreach($todos_from_hook as $todos)
 				{
 					$i = 0;
@@ -1388,7 +1388,7 @@
 						foreach($todos as $todo)
 						{
 							if(!$showall && ($i++>$maxshow))
-							{	
+							{
 								break;
 							}
 							$icons = '';
@@ -1420,7 +1420,7 @@
 			$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
 			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Change Status');
 			$GLOBALS['phpgw']->common->phpgw_header();
-			
+
 			$event = $this->bo->read_entry($_GET['cal_id']);
 
 			reset($event['participants']);
@@ -1433,8 +1433,8 @@
 
 			if(!$this->bo->check_perms(PHPGW_ACL_EDIT))
 			{
-			   $this->no_edit();
-			   return;
+				$this->no_edit();
+				return;
 			}
 
 			$freetime = $GLOBALS['phpgw']->datetime->localdates(mktime(0,0,0,$event['start']['month'],$event['start']['mday'],$event['start']['year']) - $GLOBALS['phpgw']->datetime->tz_offset);
@@ -1462,7 +1462,7 @@
 				return;
 			}
 
-			$this->bo->set_status(intval($_GET['cal_id']),intval($_GET['action']));
+			$this->bo->set_status((int)$_GET['cal_id'],(int)$_GET['action']);
 
 			if ($this->bo->return_to)
 			{
@@ -1470,7 +1470,7 @@
 			}
 			else
 			{
-				Header('Location: '.$this->page('','')); 
+				Header('Location: '.$this->page('',''));
 			}
 			$GLOBALS['phpgw']->common->phpgw_exit();
 		}
@@ -1523,7 +1523,7 @@
 			}
 			else
 			{
-				$this->planner_group_members = array( 
+				$this->planner_group_members = array(
 					$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner) => $this->bo->owner
 				);
 			}
@@ -1660,8 +1660,8 @@
 			$this->planner_end_month = $m - 1;
 			$this->planner_end_year  = $y;
 			$this->planner_days_in_end_month = $GLOBALS['phpgw']->datetime->days_in_month($this->planner_end_month,$this->planner_end_year);
-			$this->planner_firstday = intval(date('Ymd',mktime(0,0,0,$this->bo->month,1,$this->bo->year)));
-			$this->planner_lastday  = intval(date('Ymd',mktime(0,0,0,$this->planner_end_month,$this->planner_days_in_end_month,$this->planner_end_year)));
+			$this->planner_firstday = (int)(date('Ymd',mktime(0,0,0,$this->bo->month,1,$this->bo->year)));
+			$this->planner_lastday  = (int)(date('Ymd',mktime(0,0,0,$this->planner_end_month,$this->planner_days_in_end_month,$this->planner_end_year)));
 
 			// generate line with calendar weeks in observed interval
 			//
@@ -1669,9 +1669,9 @@
 			$w      = date('W', $d);
 			if ($w == 'W')	// php < 4.1
 			{
-				$w = 1 + intval(date('z',$d) / 7);	// a bit simplistic
+				$w = 1 + (int)(date('z',$d) / 7);	// a bit simplistic
 			}
-			$offset = (7-date("w", $d)+1)%7;
+			$offset = (7-date('w', $d)+1)%7;
 			$offset = $offset == 0 ? 7 : $offset;
 			$color = $this->theme[$w % 2 ? 'th_bg' : 'row_on'];
 
@@ -1691,7 +1691,7 @@
 				$w = date('W', $d);
 				if ($w == 'W')	// php < 4.1
 				{
-					$w = 1 + intval(date('z',$d) / 7);	// a bit simplistic
+					$w = 1 + (int)(date('z',$d) / 7);	// a bit simplistic
 				}
 				$w += (isset($hdr[1][$w]))?1:0; // bug in "date('W')" ?
 
@@ -1723,7 +1723,7 @@
 			$rows              = &$this->planner_rows;
 			$intervals_per_day = $this->bo->prefs['calendar']['planner_intervals_per_day'];
 			$is_private        = !$this->bo->check_perms(PHPGW_ACL_READ,$event);
-			
+
 			$view = $this->html->link('/index.php',
 				array(
 					'menuaction' => 'calendar.uicalendar.view',
@@ -1777,7 +1777,7 @@
 
 				if (!$is_private)
 				{
-					$max_chars = intval(3*$colspan/$intervals_per_day-2);
+					$max_chars = (int)(3*$colspan/$intervals_per_day-2);
 
 					$min_chars = 3; // minimum for max_chars to display -> this should be configurable
 					if ($max_chars >= $min_chars)
@@ -1878,12 +1878,18 @@
 
 			// caluculate start and end of event
 			//
-			$event_start = intval(date('Ymd',mktime(0,0,0,$event['start']['month'],
-																			$event['start']['mday'],
-																			$event['start']['year'])));
-			$event_end   = intval(date('Ymd',mktime(0,0,0,$event['end']['month'],
-																			$event['end']['mday'],
-																			$event['end']['year'])));
+			$event_start = (int)(date('Ymd',mktime(
+				0,0,0,
+				$event['start']['month'],
+				$event['start']['mday'],
+				$event['start']['year']
+			)));
+			$event_end   = (int)(date('Ymd',mktime(
+				0,0,0,
+				$event['end']['month'],
+				$event['end']['mday'],
+				$event['end']['year']
+			)));
 
 			// calculate first cell of event within observed interval
 			//
@@ -2096,9 +2102,9 @@
 			$var[] = Array(
 				'field'	=>	lang('Date'),
 				'data'	=>	$GLOBALS['phpgw']->common->dateformatorder(
-					$sb->getYears('year',intval($GLOBALS['phpgw']->common->show_date($datetime,'Y')),intval($GLOBALS['phpgw']->common->show_date($datetime,'Y'))),
-					$sb->getMonthText('month',intval($GLOBALS['phpgw']->common->show_date($datetime,'n'))),
-					$sb->getDays('day',intval($GLOBALS['phpgw']->common->show_date($datetime,'d')))
+					$sb->getYears('year',(int)$GLOBALS['phpgw']->common->show_date($datetime,'Y'),(int)$GLOBALS['phpgw']->common->show_date($datetime,'Y')),
+					$sb->getMonthText('month',(int)$GLOBALS['phpgw']->common->show_date($datetime,'n')),
+					$sb->getDays('day',(int)$GLOBALS['phpgw']->common->show_date($datetime,'d'))
 				)
 			);
 
@@ -2193,7 +2199,7 @@
 			$participants = $_POST['participants'];
 			$parts = Array();
 			$acct = CreateObject('phpgwapi.accounts',$this->bo->owner);
-			
+
 			if (is_array($participants))
 			{
 				foreach($participants as $participant)
@@ -2201,7 +2207,7 @@
 					switch ($GLOBALS['phpgw']->accounts->get_type($participant))
 					{
 						case 'g':
-							if ($members = $acct->member(intval($participant)))
+							if ($members = $acct->member((int)$participant))
 							{
 								foreach($members as $member)
 								{
@@ -2425,7 +2431,7 @@
 				}
 			}
 			if($GLOBALS['phpgw_info']['flags']['currentapp'] == 'home' ||
-			   strstr($GLOBALS['phpgw_info']['flags']['currentapp'],'mail'))	// email, felamimail, ...
+				strstr($GLOBALS['phpgw_info']['flags']['currentapp'],'mail'))	// email, felamimail, ...
 			{
 				$page_app = 'calendar';
 			}
@@ -2469,14 +2475,14 @@
 		{
 			$menuaction = $_GET['menuaction'];
 			list(,,$method) = explode('.',$menuaction);
-		
+
 			if (@$this->bo->printer_friendly)
 			{
-			   return;
+				return;
 			}
 
 			$p = $GLOBALS['phpgw']->template;
-	
+
 			$p->set_file(
 				Array(
 					'footer'	=> 'footer.tpl',
@@ -2531,8 +2537,8 @@
 					$end = $begin + 6*24*60*60;
 //					echo "<br>$i: ".date('d.m.Y H:i',$begin).' - '.date('d.m.Y H:i',$end);
 					$str .= '<option value="' . $GLOBALS['phpgw']->common->show_date($begin,'Ymd') . '"'.($begin <= $thisdate && $end >= $thisdate?' selected':'').'>'
-					   . $GLOBALS['phpgw']->common->show_date($begin,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']) . ' - '
-					   . $GLOBALS['phpgw']->common->show_date($end,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+						. $GLOBALS['phpgw']->common->show_date($begin,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']) . ' - '
+						. $GLOBALS['phpgw']->common->show_date($end,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
 				}
 
 				$var = Array(
@@ -2616,11 +2622,11 @@
 			$GLOBALS['phpgw']->browser->browser();
 			if($GLOBALS['phpgw']->browser->get_agent() == 'MOZILLA')
 			{
-				$time_width = (intval($this->bo->prefs['common']['time_format']) == 12?12:8);
+				$time_width = ((int)($this->bo->prefs['common']['time_format']) == 12?12:8);
 			}
 			else
 			{
-			   $time_width = (intval($this->bo->prefs['common']['time_format']) == 12?10:7);
+				$time_width = ((int)($this->bo->prefs['common']['time_format']) == 12?10:7);
 			}
 
 			return 'A.minicalendar { color: #000000; font: x-small '.$this->theme['font'].' }'."\n"
@@ -2665,7 +2671,7 @@
 			$rawdate = mktime(0,0,0,$month,$day,$year);
 			$rawdate_offset = $rawdate - $GLOBALS['phpgw']->datetime->tz_offset;
 			$nextday = mktime(0,0,0,$month,$day + 1,$year) - $GLOBALS['phpgw']->datetime->tz_offset;
-			if (intval($GLOBALS['phpgw']->common->show_date($starttime,'Hi')) && $starttime == $endtime)
+			if ((int)$GLOBALS['phpgw']->common->show_date($starttime,'Hi') && $starttime == $endtime)
 			{
 				$time = $GLOBALS['phpgw']->common->show_date($starttime,$this->bo->users_timeformat);
 			}
@@ -2673,9 +2679,9 @@
 			{
 				$time = '[ '.lang('All Day').' ]';
 			}
-			elseif (intval($GLOBALS['phpgw']->common->show_date($starttime,'Hi')) || $starttime != $endtime)
+			elseif ((int)$GLOBALS['phpgw']->common->show_date($starttime,'Hi') || $starttime != $endtime)
 			{
-				if($starttime < $rawdate_offset && $event['recur_type']==MCAL_RECUR_NONE)
+				if($starttime < $rawdate_offset && $event['recur_type'] == MCAL_RECUR_NONE)
 				{
 					$start_time = $GLOBALS['phpgw']->common->show_date($rawdate_offset,$this->bo->users_timeformat);
 				}
@@ -2781,8 +2787,8 @@
 				if($this->bo->alarm_today($event,$rawdate_offset,$starttime))
 				{
 					$picture[] = Array(
-						'pict'	=> $GLOBALS['phpgw']->common->image('calendar','alarm'),
-						'width'	=> 13,
+						'pict'  => $GLOBALS['phpgw']->common->image('calendar','alarm'),
+						'width' => 13,
 						'height'=> 13,
 						'title' => lang('alarm')
 					);
@@ -2793,10 +2799,10 @@
 			for($i=0;$i<count($picture);$i++)
 			{
 				$var = Array(
-					'pic_image'  => $picture[$i]['pict'],
-					'width'	     => $picture[$i]['width'],
-					'height'     => $picture[$i]['height'],
-					'title'      => $picture[$i]['title']
+					'pic_image' => $picture[$i]['pict'],
+					'width'     => $picture[$i]['width'],
+					'height'    => $picture[$i]['height'],
+					'title'     => $picture[$i]['title']
 				);
 				$this->output_template_array($this->link_tpl,'picture','pict',$var);
 			}
@@ -2813,7 +2819,7 @@
 				$this->link_tpl->parse('picture','link_close',True);
 			}
 			$str = $this->link_tpl->fp('out','link_pict');
-			$this->link_tpl->set_var('picture','');			
+			$this->link_tpl->set_var('picture','');
 			$this->link_tpl->set_var('out','');
 //			unset($p);
 			return $str;
@@ -2898,12 +2904,12 @@
 		function planner_participants($parts)
 		{
 			static $id2lid;
-			
+
 			$names = '';
 			while (list($id,$status) = each($parts))
 			{
 				$status = substr($this->bo->get_long_status($status),0,1);
-				
+
 				if (!isset($id2lid[$id]))
 				{
 					$id2lid[$id] = $GLOBALS['phpgw']->common->grab_owner_name($id);
@@ -2920,7 +2926,7 @@
 			}
 			return $names;
 		}
-			
+
 		function planner_category($ids)
 		{
 			static $cats;
@@ -3005,7 +3011,7 @@
 			$str = '';
 			$p = CreateObject('phpgwapi.Template',$this->template_dir);
 			$p->set_unknowns('keep');
-		
+
 			$p->set_file(
 				Array(
 					'month_header'	=> 'month_header.tpl',
@@ -3030,12 +3036,12 @@
 			$daily = $this->set_week_array($startdate - $GLOBALS['phpgw']->datetime->tz_offset,$cellcolor,$weekly);
 			foreach($daily as $date => $day_params)
 			{
-				$year = intval(substr($date,0,4));
-				$month = intval(substr($date,4,2));
-				$day = intval(substr($date,6,2));
-				$var = Array(
-					'column_data'	=> '',
-					'extra'		=> ''
+				$year  = (int)substr($date,0,4);
+				$month = (int)substr($date,4,2);
+				$day   = (int)substr($date,6,2);
+				$var   = Array(
+					'column_data' => '',
+					'extra' => ''
 				);
 				$p->set_var($var);
 				if ($weekly || ($date >= $monthstart && $date <= $monthend))
@@ -3065,7 +3071,7 @@
 					}
 
 					$p->set_var($var);
-				
+
 					if(@$day_params['holidays'])
 					{
 						foreach($day_params['holidays'] as $key => $value)
@@ -3116,7 +3122,7 @@
 			$this->bo->owner = $temp_owner;
 			return $p->fp('out','monthly_header');
 		}
-		
+
 		function display_month($month,$year,$showyear,$owner=0)
 		{
 			if($this->debug)
@@ -3132,8 +3138,8 @@
 				)
 			);
 
-			$monthstart = intval(date('Ymd',mktime(0,0,0,$month    ,1,$year)));
-			$monthend   = intval(date('Ymd',mktime(0,0,0,$month + 1,0,$year)));
+			$monthstart = (int)(date('Ymd',mktime(0,0,0,$month    ,1,$year)));
+			$monthend   = (int)(date('Ymd',mktime(0,0,0,$month + 1,0,$year)));
 
 			$start = $GLOBALS['phpgw']->datetime->get_weekday_start($year, $month, 1);
 
@@ -3145,16 +3151,15 @@
 
 			$p = CreateObject('phpgwapi.Template',$this->template_dir);
 			$p->set_unknowns('keep');
-		
+
 			$p->set_file(
 				Array(
-					'week'	=>	'month_day.tpl'
-   				)
+					'week' => 'month_day.tpl'
+				)
 			);
 			$p->set_block('week','m_w_table','m_w_table');
 			$p->set_block('week','event','event');
 
-
 			$var = Array(
 				'cols'      => 7,
 				'day_events'=> $this->week_header($month,$year,False)
@@ -3163,7 +3168,7 @@
 
 			$cellcolor = $this->theme['row_on'];
 
-			for ($i=intval($start + $GLOBALS['phpgw']->datetime->tz_offset);intval(date('Ymd',$i)) <= $monthend;$i += 604800)
+			for($i = (int)($start + $GLOBALS['phpgw']->datetime->tz_offset);(int)(date('Ymd',$i)) <= $monthend;$i += 604800)
 			{
 				$cellcolor = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($cellcolor);
 				$var = Array(
@@ -3186,7 +3191,7 @@
 			$day = substr($params['date'],6,2);
 			$showyear = $params['showyear'];
 			$owners = $params['owners'];
-			
+
 			$p = CreateObject('phpgwapi.Template',$this->template_dir);
 			$p->set_unknowns('keep');
 
@@ -3197,7 +3202,7 @@
 			);
 			$p->set_block('week','m_w_table','m_w_table');
 			$p->set_block('week','event','event');
-		
+
 			$start = $GLOBALS['phpgw']->datetime->get_weekday_start($year, $month, $day) + $GLOBALS['phpgw']->datetime->tz_offset;
 
 			$cellcolor = $this->theme['row_off'];
@@ -3219,8 +3224,8 @@
 				$cols = 7;
 			}
 			$var = Array(
-			   'cols'         => $cols,
-			   'day_events'   => $this->week_header($month,$year,$display_name)
+				'cols'         => $cols,
+				'day_events'   => $this->week_header($month,$year,$display_name)
 			);
 			$this->output_template_array($p,'row','event',$var);
 
@@ -3275,11 +3280,11 @@
 			{
 				if ($this->bo->check_perms(PHPGW_ACL_EDIT,0,$user) && ereg('^(.*) \((.*)\)$',$str,$parts))
 				{
-					 $vars['participants']['data'][$user] = $parts[1].' (<a href="'.$this->page('edit_status','&cal_id='.$event['id'].'&owner='.$user).'">'.$parts[2].'</a>)';
+					$vars['participants']['data'][$user] = $parts[1].' (<a href="'.$this->page('edit_status','&cal_id='.$event['id'].'&owner='.$user).'">'.$parts[2].'</a>)';
 				}
 			}
 			$vars['participants']['data'] = implode("<br>\n",$vars['participants']['data']);
-			
+
 			foreach($vars as $var)
 			{
 				if (strlen($var['data']))
@@ -3319,20 +3324,20 @@
 		function slot_num($time,$set_day_start=0,$set_day_end=0)
 		{
 			static $day_start, $day_end, $interval=0;
-			
+
 			if ($set_day_start) $day_start = $set_day_start;
 			if ($set_day_end)   $day_end   = $set_day_end;
 			if (!$interval)     $interval  = 60*$this->bo->prefs['calendar']['interval'];
-			
+
 			if ($time > $day_end)
 			{
 				$time = $day_end;
 			}
-			$slot = intval(($time - $day_start) / $interval);
-			
+			$slot = (int)(($time - $day_start) / $interval);
+
 			return $slot < 0 ? 0 : 1+$slot;
 		}
-		
+
 		function print_day($params)
 		{
 			if(!is_array($params))
@@ -3365,7 +3370,7 @@
 			$templates = Array(
 				'day_cal'   => $tpl
 			);
-			
+
 			$p->set_file($templates);
 			$p->set_block('day_cal','day','day');
 			$p->set_block('day_cal','day_row','day_row');
@@ -3483,7 +3488,7 @@
 				}
 				else
 				{
-					$rowspan = intval($row_span[$slot]);
+					$rowspan = (int)$row_span[$slot];
 					if ($rowspan > 1)
 					{
 						$p->set_var('extras',' rowspan="'.$rowspan.'"');
@@ -3559,7 +3564,7 @@
 				for($j=0;$j<$interval;$j++)
 				{
 					$k = ($j == 0 ? sprintf('%02d',$i).'<br>':'').sprintf('%02d',$j*$increment);
-					
+
 					$str .= '<td align="left" bgcolor="'.$this->theme['bg_color'].'"><font color="'.$phpgw_info['theme']['bg_text'].'" face="'.$this->theme['font'].'" size="-2">'
 						. '<a href="'.$this->page('add','&date='.$date['full'].'&hour='.$i.'&minute='.(interval * $j))."\" onMouseOver=\"window.status='".$i.':'.(($increment * $j)<=9?'0':'').($increment * $j)."'; return true;\">"
 						. $k."</a>&nbsp;</font></td>\n";
@@ -3635,7 +3640,7 @@
 			$this->bo->so->owner = $owner;
 			$this->bo->so->open_box($owner);
 			return $str.'</table></center>'."\n";
-		}      
+		}
 
 		function get_response($cal_id)
 		{
@@ -3699,7 +3704,7 @@
 			}
 
 			$hourformat = substr($this->bo->users_timeformat,0,1);
-			
+
 			// $sb = CreateObject('phpgwapi.sbox');
 			$sb = CreateObject('phpgwapi.sbox2');
 			$jscal = CreateObject('phpgwapi.jscalendar');	// before phpgw_header() !!!
@@ -3721,19 +3726,19 @@
 			$p->set_block('edit','edit_entry','edit_entry');
 			$p->set_block('edit','list','list');
 			$p->set_block('edit','hr','hr');
-	
+
 			$vars = Array(
 				'font'			=> $this->theme['font'],
 				'bg_color'		=> $this->theme['bg_text'],
 				'action_url'		=> $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.bocalendar.update')),
 				'accounts_link'		=> $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.accounts_popup'),
 				'common_hidden'	=> '<input type="hidden" name="cal[id]" value="'.$event['id'].'">'."\n"
-										. '<input type="hidden" name="cal[owner]" value="'.$event['owner'].'">'."\n"
-										. '<input type="hidden" name="cal[uid]" value="'.$event['uid'].'">'."\n"
-										. ($_GET['cal_id'] && $event['id'] == 0?'<input type="hidden" name="cal[reference]" value="'.$_GET['cal_id'].'">'."\n":
-										  (@isset($event['reference'])?'<input type="hidden" name="cal[reference]" value="'.$event['reference'].'">'."\n":''))
-										. (@isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) && $GLOBALS['phpgw_info']['server']['deny_user_grants_access']?
-										  '<input type="hidden" name="participants[]" value="'.$this->bo->owner.'">'."\n":''),
+					. '<input type="hidden" name="cal[owner]" value="'.$event['owner'].'">'."\n"
+					. '<input type="hidden" name="cal[uid]" value="'.$event['uid'].'">'."\n"
+					. ($_GET['cal_id'] && $event['id'] == 0?'<input type="hidden" name="cal[reference]" value="'.$_GET['cal_id'].'">'."\n":
+					(@isset($event['reference'])?'<input type="hidden" name="cal[reference]" value="'.$event['reference'].'">'."\n":''))
+					. (@isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) && $GLOBALS['phpgw_info']['server']['deny_user_grants_access']?
+					'<input type="hidden" name="participants[]" value="'.$this->bo->owner.'">'."\n":''),
 				'errormsg'		=> ($param['cd']?$GLOBALS['phpgw']->common->check_code($param['cd']):'')
 			);
 			$p->set_var($vars);
@@ -3758,12 +3763,12 @@
 				@reset($temp_cats);
 				while(list($key,$value) = each($temp_cats))
 				{
-					$check_cats[] = intval($value);
+					$check_cats[] = (int)$value;
 				}
 			}
 			elseif($event['category'])
 			{
-				$check_cats[] = intval($event['category']);
+				$check_cats[] = (int)$event['category'];
 			}
 			else
 			{
@@ -3787,9 +3792,9 @@
 				'field'	=> lang('Start Date'),
 /*
 				'data'	=> $GLOBALS['phpgw']->common->dateformatorder(
-				   $sb->getYears('start[year]',intval($GLOBALS['phpgw']->common->show_date($start,'Y'))),
-				   $sb->getMonthText('start[month]',intval($GLOBALS['phpgw']->common->show_date($start,'n'))),
-				   $sb->getDays('start[mday]',intval($GLOBALS['phpgw']->common->show_date($start,'d')))
+				   $sb->getYears('start[year]',(int)$GLOBALS['phpgw']->common->show_date($start,'Y')),
+				   $sb->getMonthText('start[month]',(int)$GLOBALS['phpgw']->common->show_date($start,'n')),
+				   $sb->getDays('start[mday]',(int)$GLOBALS['phpgw']->common->show_date($start,'d'))
 				)
 */
 				'data' => $jscal->input('start[str]',$start)
@@ -3812,9 +3817,9 @@
 				'field'	=> lang('End Date'),
 /*
 				'data'	=> $GLOBALS['phpgw']->common->dateformatorder(
-				   $sb->getYears('end[year]',intval($GLOBALS['phpgw']->common->show_date($end,'Y'))),
-				   $sb->getMonthText('end[month]',intval($GLOBALS['phpgw']->common->show_date($end,'n'))),
-				   $sb->getDays('end[mday]',intval($GLOBALS['phpgw']->common->show_date($end,'d')))
+				   $sb->getYears('end[year]',(int)$GLOBALS['phpgw']->common->show_date($end,'Y')),
+				   $sb->getMonthText('end[month]',(int)$GLOBALS['phpgw']->common->show_date($end,'n')),
+				   $sb->getDays('end[mday]',(int)$GLOBALS['phpgw']->common->show_date($end,'d'))
 				)
 */
 				'data' => $jscal->input('end[str]',$end)
@@ -3859,10 +3864,10 @@
 					case 'popup':
 						while (is_array($event['participants']) && list($id) = each($event['participants']))
 						{
-							if($id != intval($event['owner']))
+							if($id != (int)$event['owner'])
 							{
 								$str .= '<option value="' . $id.$event['participants'][$id] . '"'.($event['participants'][$id]?' selected':'').'>('.$GLOBALS['phpgw']->accounts->get_type($id)
-										.') ' . $GLOBALS['phpgw']->common->grab_owner_name($id) . '</option>' . "\n"; 
+										.') ' . $GLOBALS['phpgw']->common->grab_owner_name($id) . '</option>' . "\n";
 							}
 						}
 						$var['participants'] = array
@@ -3875,7 +3880,7 @@
 					default:
 						foreach($users as $id => $user_array)
 						{
-							if($id != intval($event['owner']))
+							if($id != (int)$event['owner'])
 							{
 								$str .= '    <option value="' . $id.$event['participants'][$id] . '"'.($event['participants'][$id]?' selected':'').'>('.$user_array['type'].') '.$user_array['name'].'</option>'."\n";
 							}
@@ -3945,7 +3950,7 @@
 					'data'	=> '<input type="checkbox" name="participants[]" value="'.$event['owner'].$event['participants'][$event['owner']].'"'.$checked.'>'
 				);
 			}
-			
+
 // Reminder
 			// The user must use "Alarm Management" to change/modify an alarm
 			// so only display the email reminder fields if this is a new event
@@ -3970,11 +3975,11 @@
 					@reset($event['alarm']);
 					// just get the first one see above!!!
 					list($key,$alarm) = @each($event['alarm']);
-					$diff = $start - $alarm['time'];
-					$days = intval($diff / (24*3600));
-					$hours = intval(($diff - ($days * 24 * 3600))/3600);
-					$min = intval(($diff - ($days * 24 * 3600) - ($hours * 3600))/60);
-				} 
+					$diff  = $start - $alarm['time'];
+					$days  = (int)($diff / (24*3600));
+					$hours = (int)(($diff - ($days * 24 * 3600))/3600);
+					$min   = (int)(($diff - ($days * 24 * 3600) - ($hours * 3600))/60);
+				}
 
 				// days
 				$dout = '<select name="cal[alarmdays]">'."\n";
@@ -4026,15 +4031,15 @@
 				$checked = '';
 				$recur_end = $this->bo->maketime($event['start']) + 86400 - $GLOBALS['phpgw']->datetime->tz_offset;
 			}
-	
+
 			$var['recure_enddate'] = Array(
 				'field'	=> lang('Repeat End Date'),
 				'data'	=> '<input type="checkbox" name="cal[rpt_use_end]" value="y"'.$checked.'>'.lang('Use End Date').'  '.
 /*
 					$GLOBALS['phpgw']->common->dateformatorder(
-						$sb->getYears('recur_enddate[year]',intval($GLOBALS['phpgw']->common->show_date($recur_end,'Y'))),
-						$sb->getMonthText('recur_enddate[month]',intval($GLOBALS['phpgw']->common->show_date($recur_end,'n'))),
-						$sb->getDays('recur_enddate[mday]',intval($GLOBALS['phpgw']->common->show_date($recur_end,'d')))
+						$sb->getYears('recur_enddate[year]',(int)$GLOBALS['phpgw']->common->show_date($recur_end,'Y')),
+						$sb->getMonthText('recur_enddate[month]',(int)$GLOBALS['phpgw']->common->show_date($recur_end,'n')),
+						$sb->getDays('recur_enddate[mday]',(int)$GLOBALS['phpgw']->common->show_date($recur_end,'d'))
 					)
 */
 					$jscal->input('recur_enddate[str]',$recur_end)
@@ -4204,7 +4209,7 @@
 			$p->set_block('T_edit_partlist_blocks','B_partlist','V_partlist');
 			$p->set_block('T_edit_partlist_blocks','B_participants_none','V_participants_none');
 			$p->set_block('T_edit_partlist_blocks','B_delete_btn','V_delete_btn');
-			
+
 			global $query_addr;
 			$sb = CreateObject('phpgwapi.sbox2');
 			$addy = $sb->getAddress('addr','',$query_addr);
@@ -4228,11 +4233,11 @@
 
 			for ($i=0; $i<count($control_data['part']); $i++)
 			{
-			  $id = $control_data['part'][$i];
-			  list($contact) = $this->read_contact($id);
+				$id = $control_data['part'][$i];
+				list($contact) = $this->read_contact($id);
 
-			  $participant[$id] = array();
-			  $participant[$id]['name'] = $contact['n_given'].' '.$contact['n_family'];
+				$participant[$id] = array();
+				$participant[$id]['name'] = $contact['n_given'].' '.$contact['n_family'];
 			}
 
 			if ($control_data['action'] == lang('Delete selected contacts'))
@@ -4243,11 +4248,11 @@
 					unset($participant[$id]);
 				}
 			}
-			
+
 			if ($control_data['action'] == lang('Add Contact'))
 			{
 				$id = $_POST['id_addr'];
-				if (isset($id) && intval($id) != 0)
+				if (isset($id) && (int)$id != 0)
 				{
 					list($contact) = $this->read_contact($id);
 					$participant[$id] = array();
@@ -4295,11 +4300,11 @@
 							.'" vlink="'.$GLOBALS['phpgw_info']['theme']['vlink'].'"';
 
 			$form_action = $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 'calendar.uicalendar.modify'));
-			
+
 			$charset = lang('charset');
 			$p->set_var('charset',$charset);
-			$p->set_var('page_title',$GLOBALS['phpgw_flags']['currentapp'] 
-															 . ' - ' .lang('External Participants'));
+			$p->set_var('page_title',$GLOBALS['phpgw_flags']['currentapp']
+				. ' - ' .lang('External Participants'));
 			$p->set_var('font_family',$GLOBALS['phpgw_info']['theme']['font']);
 			$p->set_var('body_tags',$body_tags);
 			$p->set_var('form_method','POST');
@@ -4313,7 +4318,7 @@
 			$p->set_var('btn_done_js','copyback()');
 			$p->set_var('form1_name','ext_form');
 
-			$p->pfp('out','T_edit_partlist');			
+			$p->pfp('out','T_edit_partlist');
 		}
 
 		function read_contact($id)
@@ -4325,7 +4330,7 @@
 				'email_home' => 'email_home'
 			);
 
-		  /*
+			/*
 			if ($this->rights & PHPGW_ACL_READ)
 			{
 				return $this->contacts->read_single_entry($id,$fields);
@@ -4335,10 +4340,10 @@
 				$rtrn = array(0 => array('No access' => 'No access'));
 				return $rtrn;
 			}
-		  */
+			*/
 
-		  $contacts = CreateObject('phpgwapi.contacts', False);
-		  return $contacts->read_single_entry($id,$query_fields);
+			$contacts = CreateObject('phpgwapi.contacts', False);
+			return $contacts->read_single_entry($id,$query_fields);
 		}
 
 		function build_part_list(&$users,$accounts,$owner)
@@ -4349,7 +4354,7 @@
 			}
 			foreach($accounts as $id)
 			{
-				$id = intval($id);
+				$id = (int)$id;
 				if($id == $owner)
 				{
 					continue;
@@ -4422,7 +4427,7 @@
 				{
 					$cellcolor = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($cellcolor);
 				}
-				
+
 				$day_image = '';
 				if($holidays)
 				{
@@ -4486,7 +4491,7 @@
 			{
 				_debug_array($daily);
 			}
-			
+
 			return $daily;
 		}
 	}
diff --git a/calendar/inc/class.uicustom_fields.inc.php b/calendar/inc/class.uicustom_fields.inc.php
index 668e5002ab..1cfc6b2cd1 100644
--- a/calendar/inc/class.uicustom_fields.inc.php
+++ b/calendar/inc/class.uicustom_fields.inc.php
@@ -129,8 +129,8 @@
 				$ordered[$order] = array(
 					'field'     => $field,
 					'name'      => stripslashes($_POST['name'][$field]),
-					'length'    => intval($_POST['length'][$field]),
-					'shown'     => intval($_POST['shown'][$field]),
+					'length'    => (int)$_POST['length'][$field],
+					'shown'     => (int)$_POST['shown'][$field],
 					'title'     => !!$_POST['title'][$field],
 					'disabled'  => !!$_POST['disabled'][$field]
 				);
@@ -158,8 +158,8 @@
 					$ordered[$order] = array(
 						'field'     => '#'.$name,
 						'name'      => $name,
-						'length'    => intval($_POST['length']['***new***']),
-						'shown'     => intval($_POST['shown']['***new***']),
+						'length'    => (int)$_POST['length']['***new***'],
+						'shown'     => (int)$_POST['shown']['***new***'],
 						'title'     => !!$_POST['title']['***new***'],
 						'disabled'  => !!$_POST['disabled']['***new***']
 					);
diff --git a/calendar/inc/class.uiholiday.inc.php b/calendar/inc/class.uiholiday.inc.php
index 96483bdb03..8e40ba0203 100755
--- a/calendar/inc/class.uiholiday.inc.php
+++ b/calendar/inc/class.uiholiday.inc.php
@@ -264,11 +264,11 @@
 			}
 	
 			$var = Array(
-				'title_holiday'=> ($this->bo->id ? lang('Edit') : lang('Add')).' '.lang('Holiday'),
-				'message'		=> $message,
-				'actionurl'	   => $GLOBALS['phpgw']->link($this->base_url,'menuaction=calendar.boholiday.add&year='.$this->bo->year),
-				'hidden_vars'	=> '<input type="hidden" name="holiday[hol_id]" value="'.$this->bo->id.'">'."\n"
-							 . '<input type="hidden" name="holiday[locales]" value="'.$this->bo->locales[0].'">'."\n"
+				'title_holiday' => ($this->bo->id ? lang('Edit') : lang('Add')).' '.lang('Holiday'),
+				'message'       => $message,
+				'actionurl'     => $GLOBALS['phpgw']->link($this->base_url,'menuaction=calendar.boholiday.add&year='.$this->bo->year),
+				'hidden_vars'   => '<input type="hidden" name="holiday[hol_id]" value="'.$this->bo->id.'">'."\n"
+					. '<input type="hidden" name="holiday[locales]" value="'.$this->bo->locales[0].'">'."\n"
 			);
 			$t->set_var($var);
 
diff --git a/calendar/inc/hook_add_def_pref.inc.php b/calendar/inc/hook_add_def_pref.inc.php
index 247aa9e91b..658fb7d971 100755
--- a/calendar/inc/hook_add_def_pref.inc.php
+++ b/calendar/inc/hook_add_def_pref.inc.php
@@ -11,12 +11,12 @@
   \**************************************************************************/
 
   /* $Id$ */
-  
-  global $pref;
-  $pref->change("calendar","weekstarts","Monday");
-  $pref->change("calendar","workdaystarts","9");
-  $pref->change("calendar","workdayends","17");
-  $pref->change("calendar","defaultcalendar","month.php");
-  $pref->change("calendar","defaultfilter","all");
-  $pref->change("calendar","mainscreen_showevents","Y");
+
+	global $pref;
+	$pref->change('calendar','weekstarts','Monday');
+	$pref->change('calendar','workdaystarts','9');
+	$pref->change('calendar','workdayends','17');
+	$pref->change('calendar','defaultcalendar','month.php');
+	$pref->change('calendar','defaultfilter',"all');
+	$pref->change('calendar','mainscreen_showevents','Y');
 ?>
diff --git a/calendar/inc/hook_deleteaccount.inc.php b/calendar/inc/hook_deleteaccount.inc.php
index 6943770922..85972cab42 100755
--- a/calendar/inc/hook_deleteaccount.inc.php
+++ b/calendar/inc/hook_deleteaccount.inc.php
@@ -12,16 +12,16 @@
 	/* $Id$ */
 
 	// Delete all records for a user
-	if(intval($GLOBALS['HTTP_POST_VARS']['new_owner'])==0)
+	if((int)$_POST['new_owner'] == 0)
 	{
-		ExecMethod('calendar.bocalendar.delete_calendar',intval($GLOBALS['HTTP_POST_VARS']['account_id']));
+		ExecMethod('calendar.bocalendar.delete_calendar',(int)$_POST['account_id']);
 	}
 	else
 	{
 		ExecMethod('calendar.bocalendar.change_owner',
 			Array(
-				'old_owner'	=> intval($GLOBALS['HTTP_POST_VARS']['account_id']),
-				'new_owner'	=> intval($GLOBALS['HTTP_POST_VARS']['new_owner'])
+				'old_owner'	=> (int)$_POST['account_id'],
+				'new_owner'	=> (int)$_POST['new_owner']
 			)
 		);
 	}
diff --git a/calendar/inc/hook_home.inc.php b/calendar/inc/hook_home.inc.php
index 4b7906c6ff..3c5a76049d 100755
--- a/calendar/inc/hook_home.inc.php
+++ b/calendar/inc/hook_home.inc.php
@@ -22,7 +22,7 @@
 	}
 	unset($d1);
 
-	$showevents = intval($GLOBALS['phpgw_info']['user']['preferences']['calendar']['mainscreen_showevents']);
+	$showevents = (int)$GLOBALS['phpgw_info']['user']['preferences']['calendar']['mainscreen_showevents'];
 	if($showevents>0)
 	{
 		$GLOBALS['phpgw']->translation->add_app('calendar');
@@ -60,9 +60,9 @@
 			$_page = 'day';
 		}
 		include(PHPGW_INCLUDE_ROOT.'/calendar/inc/hook_home_'.$_page.'.inc.php');
-		
+
 		$title = lang('Calendar');
-		
+
 		$portalbox = CreateObject('phpgwapi.listbox',
 			Array(
 				'title'	=> $title,
@@ -94,7 +94,7 @@
 
 		echo "\n".'<!-- BEGIN Calendar info -->'."\n".$portalbox->draw($GLOBALS['extra_data'])."\n".'<!-- END Calendar info -->'."\n";
 		unset($cal);
-	} 
+	}
 	flush();
 	unset($showevents);
 ?>
diff --git a/calendar/inc/hook_settings.inc.php b/calendar/inc/hook_settings.inc.php
index 999afda25a..2d2355c29a 100644
--- a/calendar/inc/hook_settings.inc.php
+++ b/calendar/inc/hook_settings.inc.php
@@ -33,7 +33,7 @@
 	   for the main calendar page.  But the list could be added to the
 	   default list above, if requested.  - shrykedude. */
 	$mainpage = array(
-		'1' => lang('Yes'),	
+		'1' => lang('Yes'),
 		'0' => lang('No'),
 		'2' => lang('No').' - '.lang('show list of upcoming events'),
 	);
@@ -112,7 +112,7 @@
 	);
 	create_select_box('weekday starts on','weekdaystarts',$weekdaystarts,
 		'This day is shown as first day in the week or month view.');
-	
+
 	for ($i=0; $i < 24; ++$i)
 	{
 		$options[$i] = $GLOBALS['phpgw']->common->formattime($i,'00');
@@ -146,7 +146,7 @@
 	}
 	create_select_box('Preselected group for entering the planner','planner_start_with_group',$options,
 		'This group that is preselected when you enter the planner. You can change it in the planner anytime you want.');
-	
+
 	$planner_intervals = array(
 		1	=> '1',
 		2	=> '2',
@@ -154,7 +154,7 @@
 		4	=> '4',
 	);
 	create_select_box('Intervals per day in planner view','planner_intervals_per_day',
-		$planner_intervals,'Specifies the the number of intervals shown in the planner view.'); 
+		$planner_intervals,'Specifies the the number of intervals shown in the planner view.');
 
 	$defaultfilter = array(
 		'all'     => lang('all'),
diff --git a/calendar/inc/hook_sidebox_menu.inc.php b/calendar/inc/hook_sidebox_menu.inc.php
index bb1d2c720e..46bf62ae04 100644
--- a/calendar/inc/hook_sidebox_menu.inc.php
+++ b/calendar/inc/hook_sidebox_menu.inc.php
@@ -14,7 +14,7 @@
 {
 
  /*
-	This hookfile is for generating an app-specific side menu used in the idots 
+	This hookfile is for generating an app-specific side menu used in the idots
 	template set.
 
 	$menu_title speaks for itself
diff --git a/calendar/index.php b/calendar/index.php
index 18e979a358..2667ec8ee5 100755
--- a/calendar/index.php
+++ b/calendar/index.php
@@ -24,18 +24,18 @@
 	);
 
 	$GLOBALS['phpgw_info']['flags'] = $phpgw_flags;
-	
+
 	include('../header.inc.php');
 	if(!is_object($GLOBALS['phpgw']->datetime))
 	{
 		$GLOBALS['phpgw']->datetime = CreateObject('phpgwapi.datetime');
 	}
-	
+
 	$parms = Array(
 #		'menuaction'=> 'calendar.uicalendar.index',
 		'date'		=> date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime)
 	);
-	
+
 	//echo 'Local DateTime: '.date('Ymd H:i:s',$GLOBALS['phpgw']->datetime->users_localtime).'<br>'."\n";
 
 #	$GLOBALS['phpgw']->redirect_link('/index.php',$parms);
diff --git a/calendar/preferences.php b/calendar/preferences.php
index 9e1a39394c..8fc418cd59 100644
--- a/calendar/preferences.php
+++ b/calendar/preferences.php
@@ -11,7 +11,7 @@
 
 	/* $Id$ */
 
-	$phpgw_flags = Array(
+	$GLOBALS['phpgw']_flags = Array(
 		'currentapp'			=>	'calendar',
 		'enable_nextmatchs_class'	=>	True,
 		'noheader'			=>	True,
@@ -20,82 +20,82 @@
 		'noappfooter'			=>	True
 	);
 
-	$phpgw_info['flags'] = $phpgw_flags;
+	$GLOBALS['phpgw_info']['flags'] = $GLOBALS['phpgw']_flags;
 	include('../header.inc.php');
 
 	if ($submit)
 	{
-		$phpgw->preferences->read_repository();
-		$phpgw->preferences->add('calendar','weekdaystarts');
-		$phpgw->preferences->add('calendar','workdaystarts');
-		$phpgw->preferences->add('calendar','workdayends');
-		$phpgw->preferences->add('calendar','defaultcalendar');
-		$phpgw->preferences->add('calendar','defaultfilter');
-		$phpgw->preferences->add('calendar','interval');
+		$GLOBALS['phpgw']->preferences->read_repository();
+		$GLOBALS['phpgw']->preferences->add('calendar','weekdaystarts');
+		$GLOBALS['phpgw']->preferences->add('calendar','workdaystarts');
+		$GLOBALS['phpgw']->preferences->add('calendar','workdayends');
+		$GLOBALS['phpgw']->preferences->add('calendar','defaultcalendar');
+		$GLOBALS['phpgw']->preferences->add('calendar','defaultfilter');
+		$GLOBALS['phpgw']->preferences->add('calendar','interval');
 		if ($mainscreen_showevents == True)
 		{
-			$phpgw->preferences->add('calendar','mainscreen_showevents');
+			$GLOBALS['phpgw']->preferences->add('calendar','mainscreen_showevents');
 		}
 		else
 		{
-			$phpgw->preferences->delete('calendar','mainscreen_showevents');
+			$GLOBALS['phpgw']->preferences->delete('calendar','mainscreen_showevents');
 		}
 		if ($send_updates == True)
 		{
-			$phpgw->preferences->add('calendar','send_updates');
+			$GLOBALS['phpgw']->preferences->add('calendar','send_updates');
 		}
 		else
 		{
-			$phpgw->preferences->delete('calendar','send_updates');
+			$GLOBALS['phpgw']->preferences->delete('calendar','send_updates');
 		}
-		
+
 		if ($display_status == True)
 		{
-			$phpgw->preferences->add('calendar','display_status');
+			$GLOBALS['phpgw']->preferences->add('calendar','display_status');
 		}
 		else
 		{
-			$phpgw->preferences->delete('calendar','display_status');
+			$GLOBALS['phpgw']->preferences->delete('calendar','display_status');
 		}
 
 		if ($default_private == True)
 		{
-			$phpgw->preferences->add('calendar','default_private');
+			$GLOBALS['phpgw']->preferences->add('calendar','default_private');
 		}
 		else
 		{
-			$phpgw->preferences->delete('calendar','default_private');
+			$GLOBALS['phpgw']->preferences->delete('calendar','default_private');
 		}
 
 		if ($display_minicals == True)
 		{
-			$phpgw->preferences->add('calendar','display_minicals');
+			$GLOBALS['phpgw']->preferences->add('calendar','display_minicals');
 		}
 		else
 		{
-			$phpgw->preferences->delete('calendar','display_minicals');
+			$GLOBALS['phpgw']->preferences->delete('calendar','display_minicals');
 		}
 
 		if ($print_black_white == True)
 		{
-			$phpgw->preferences->add('calendar','print_black_white');
+			$GLOBALS['phpgw']->preferences->add('calendar','print_black_white');
 		}
 		else
 		{
-			$phpgw->preferences->delete('calendar','print_black_white');
+			$GLOBALS['phpgw']->preferences->delete('calendar','print_black_white');
 		}
 
-		$phpgw->preferences->save_repository(True);
-     
-		Header('Location: '.$phpgw->link('/preferences/index.php'));
-		$phpgw->common->phpgw_exit();
+		$GLOBALS['phpgw']->preferences->save_repository(True);
+
+		Header('Location: '.$GLOBALS['phpgw']->link('/preferences/index.php'));
+		$GLOBALS['phpgw']->common->phpgw_exit();
 	}
 
 	function display_item($field,$data)
 	{
-		global $phpgw, $p, $tr_color;
+		global $GLOBALS['phpgw'], $p, $tr_color;
 
-		$tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
+		$tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
 		$var = Array(
 			'bg_color'	=>	$tr_color,
 			'field'		=>	$field,
@@ -105,10 +105,10 @@
 		$p->parse('row','pref_list',True);
 	}
 
-	$phpgw->common->phpgw_header();
+	$GLOBALS['phpgw']->common->phpgw_header();
 	echo parse_navbar();
 
-	$p = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('calendar'));
+	$p = CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('calendar'));
 	$templates = Array(
 		'pref'		=>	'pref.tpl',
 		'pref_colspan'	=>	'pref_colspan.tpl',
@@ -118,24 +118,24 @@
 
 	$var = Array(
 		'title'		=>	lang('Calendar preferences'),
-		'action_url'	=>	$phpgw->link('/'.$phpgw_info['flags']['currentapp'].'/preferences.php'),
-		'bg_color'	=>	$phpgw_info['theme']['th_bg'],
+		'action_url'	=>	$GLOBALS['phpgw']->link('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/preferences.php'),
+		'bg_color'	=>	$GLOBALS['phpgw_info']['theme']['th_bg'],
 		'submit_lang'	=>	lang('submit')
 	);
-	
+
 	$p->set_var($var);
 	$p->set_var('text','&nbsp;');
 	$p->parse('row','pref_colspan',True);
 
 //	if ($totalerrors)
 //	{
-//		echo '<p><center>' . $phpgw->common->error_list($errors) . '</center>';
+//		echo '<p><center>' . $GLOBALS['phpgw']->common->error_list($errors) . '</center>';
 //	}
 
-	$str = '<input type="checkbox" name="mainscreen_showevents" value="True"'.($phpgw_info['user']['preferences']['calendar']['mainscreen_showevents'] == 'Y' || $phpgw_info['user']['preferences']['calendar']['mainscreen_showevents'] == True?' checked':'').'>';
+	$str = '<input type="checkbox" name="mainscreen_showevents" value="True"'.($GLOBALS['phpgw_info']['user']['preferences']['calendar']['mainscreen_showevents'] == 'Y' || $GLOBALS['phpgw_info']['user']['preferences']['calendar']['mainscreen_showevents'] == True?' checked':'').'>';
 	display_item(lang('show day view on main screen'),$str);
 
-	$t_weekday[$phpgw_info['user']['preferences']['calendar']['weekdaystarts']] = ' selected';
+	$t_weekday[$GLOBALS['phpgw_info']['user']['preferences']['calendar']['weekdaystarts']] = ' selected';
 	$str = '<select name="weekdaystarts">'
 		. '<option value="Monday"'.$t_weekday['Monday'].'>'.lang('Monday').'</option>'
 		. '<option value="Sunday"'.$t_weekday['Sunday'].'>'.lang('Sunday').'</option>'
@@ -144,28 +144,28 @@
 		. '</select>';
 	display_item(lang('weekday starts on'),$str);
 
-	$t_workdaystarts[$phpgw_info['user']['preferences']['calendar']['workdaystarts']] = ' selected';
+	$t_workdaystarts[$GLOBALS['phpgw_info']['user']['preferences']['calendar']['workdaystarts']] = ' selected';
 	$str = '<select name="workdaystarts">';
 	for ($i=0; $i<24; $i++)
 	{
 		$str .= '<option value="'.$i.'"'.$t_workdaystarts[$i].'>'
-			. $phpgw->common->formattime($i,'00') . '</option>';
+			. $GLOBALS['phpgw']->common->formattime($i,'00') . '</option>';
 	}
 	$str .= '</select>';
 	display_item(lang('work day starts on'),$str);
-  
-	$t_workdayends[$phpgw_info['user']['preferences']['calendar']['workdayends']] = ' selected';
+
+	$t_workdayends[$GLOBALS['phpgw_info']['user']['preferences']['calendar']['workdayends']] = ' selected';
 	$str = '<select name="workdayends">';
 	for ($i=0; $i<24; $i++)
 	{
 		$str .= '<option value="'.$i.'"'.$t_workdayends[$i].'>'
-			. $phpgw->common->formattime($i,'00') . '</option>';
+			. $GLOBALS['phpgw']->common->formattime($i,'00') . '</option>';
 	}
 	$str .= '</select>';
 	display_item(lang('work day ends on'),$str);
 
-	$selected[$phpgw_info['user']['preferences']['calendar']['defaultcalendar']] = ' selected';
-	if (!isset($phpgw_info['user']['preferences']['calendar']['defaultcalendar']))
+	$selected[$GLOBALS['phpgw_info']['user']['preferences']['calendar']['defaultcalendar']] = ' selected';
+	if (!isset($GLOBALS['phpgw_info']['user']['preferences']['calendar']['defaultcalendar']))
 	{
 		$selected['month.php'] = ' selected';
 	}
@@ -179,8 +179,8 @@
 
 
 	$selected = array();
-	$selected[$phpgw_info['user']['preferences']['calendar']['defaultfilter']] = ' selected';
-	if (! isset($phpgw_info['user']['preferences']['calendar']['defaultfilter']) || $phpgw_info['user']['preferences']['calendar']['defaultfilter'] == 'private')
+	$selected[$GLOBALS['phpgw_info']['user']['preferences']['calendar']['defaultfilter']] = ' selected';
+	if (! isset($GLOBALS['phpgw_info']['user']['preferences']['calendar']['defaultfilter']) || $GLOBALS['phpgw_info']['user']['preferences']['calendar']['defaultfilter'] == 'private')
 	{
 		$selected['private'] = ' selected';
 	}
@@ -196,8 +196,8 @@
 	display_item(lang('Default calendar filter'),$str);
 
 	$selected = array();
-	$selected[intval($phpgw_info['user']['preferences']['calendar']['interval'])] = ' selected';
-	if (! isset($phpgw_info['user']['preferences']['calendar']['interval']))
+	$selected[intval($GLOBALS['phpgw_info']['user']['preferences']['calendar']['interval'])] = ' selected';
+	if (! isset($GLOBALS['phpgw_info']['user']['preferences']['calendar']['interval']))
 	{
 		$selected[60] = ' selected';
 	}
@@ -210,7 +210,7 @@
 		45	=> '45',
 		60	=> '60'
 	);
-	
+
 	$str = '<select name="interval">';
 	while(list($key,$value) = each($var))
 	{
@@ -219,21 +219,21 @@
 	$str .= '</select>';
 	display_item(lang('Display interval in Day View'),$str);
 
-	$str = '<input type="checkbox" name="send_updates" value="True"'.($phpgw_info['user']['preferences']['calendar']['send_updates'] == 'Y' || $phpgw_info['user']['preferences']['calendar']['send_updates'] == True?' checked':'').'>';
+	$str = '<input type="checkbox" name="send_updates" value="True"'.($GLOBALS['phpgw_info']['user']['preferences']['calendar']['send_updates'] == 'Y' || $GLOBALS['phpgw_info']['user']['preferences']['calendar']['send_updates'] == True?' checked':'').'>';
 	display_item(lang('Send/receive updates via email'),$str);
 
-	$str = '<input type="checkbox" name="display_status" value="True"'.($phpgw_info['user']['preferences']['calendar']['display_status'] == 'Y' || $phpgw_info['user']['preferences']['calendar']['display_status'] == True?' checked':'').'>';
+	$str = '<input type="checkbox" name="display_status" value="True"'.($GLOBALS['phpgw_info']['user']['preferences']['calendar']['display_status'] == 'Y' || $GLOBALS['phpgw_info']['user']['preferences']['calendar']['display_status'] == True?' checked':'').'>';
 	display_item(lang('Display status of events'),$str);
 
-	$str = '<input type="checkbox" name="default_private" value="True"'.($phpgw_info['user']['preferences']['calendar']['default_private'] == 'Y' || $phpgw_info['user']['preferences']['calendar']['default_private'] == True?' checked':'').'>';
+	$str = '<input type="checkbox" name="default_private" value="True"'.($GLOBALS['phpgw_info']['user']['preferences']['calendar']['default_private'] == 'Y' || $GLOBALS['phpgw_info']['user']['preferences']['calendar']['default_private'] == True?' checked':'').'>';
 	display_item(lang('When creating new events default set to private'),$str);
 
-	$str = '<input type="checkbox" name="display_minicals" value="True"'.($phpgw_info['user']['preferences']['calendar']['display_minicals'] == 'Y' || $phpgw_info['user']['preferences']['calendar']['display_minicals'] == True?' checked':'').'>';
+	$str = '<input type="checkbox" name="display_minicals" value="True"'.($GLOBALS['phpgw_info']['user']['preferences']['calendar']['display_minicals'] == 'Y' || $GLOBALS['phpgw_info']['user']['preferences']['calendar']['display_minicals'] == True?' checked':'').'>';
 	display_item(lang('Display mini calendars when printing'),$str);
 
-	$str = '<input type="checkbox" name="print_black_white" value="True"'.($phpgw_info['user']['preferences']['calendar']['print_black_white'] == 'Y' || $phpgw_info['user']['preferences']['calendar']['print_black_white'] == True?' checked':'').'>';
+	$str = '<input type="checkbox" name="print_black_white" value="True"'.($GLOBALS['phpgw_info']['user']['preferences']['calendar']['print_black_white'] == 'Y' || $GLOBALS['phpgw_info']['user']['preferences']['calendar']['print_black_white'] == True?' checked':'').'>';
 	display_item(lang('Print calendars in black & white'),$str);
 
 	$p->pparse('out','pref');
-	$phpgw->common->phpgw_footer();
+	$GLOBALS['phpgw']->common->phpgw_footer();
 ?>