EGroupware / egroupware

calendar/setup/tables_update.inc.php

Spacing +438 added lines, -438 removed lines

@@ -20,7 +20,7 @@ 
 		{
 			$owner[count($owner)] = $GLOBALS['egw_setup']->oProc->f($field);
 		}
-		if($GLOBALS['egw_setup']->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'],'0.9.10pre4'))
+		if ($GLOBALS['egw_setup']->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'], '0.9.10pre4'))
 		{
 			$acctstbl = 'accounts';
 		}
@@ -28,7 +28,7 @@ 
 		{
 			$acctstbl = 'phpgw_accounts';
 		}
-		for($i=0;$i<count($owner);$i++)
+		for ($i = 0; $i < count($owner); $i++)
 		{
 			$GLOBALS['egw_setup']->oProc->query("SELECT account_id FROM $acctstbl WHERE account_lid='".$owner[$i]."'");
 			$GLOBALS['egw_setup']->oProc->next_record();
@@ -41,8 +41,8 @@ 
 
 function calendar_upgrade0_9_3pre1()
 {
-	calendar_v0_9_2to0_9_3update_owner('webcal_entry','cal_create_by');
-	calendar_v0_9_2to0_9_3update_owner('webcal_entry_user','cal_login');
+	calendar_v0_9_2to0_9_3update_owner('webcal_entry', 'cal_create_by');
+	calendar_v0_9_2to0_9_3update_owner('webcal_entry_user', 'cal_login');
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre2';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
 }
@@ -209,12 +209,12 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry',__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry', __LINE__, __FILE__);
 	$GLOBALS['egw_setup']->oProc->next_record();
-	if($GLOBALS['egw_setup']->oProc->f(0))
+	if ($GLOBALS['egw_setup']->oProc->f(0))
 	{
-		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_owner,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description,cal_id,cal_date,cal_time,cal_mod_date,cal_mod_time FROM webcal_entry ORDER BY cal_id',__LINE__,__FILE__);
-		while($GLOBALS['egw_setup']->oProc->next_record())
+		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_owner,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description,cal_id,cal_date,cal_time,cal_mod_date,cal_mod_time FROM webcal_entry ORDER BY cal_id', __LINE__, __FILE__);
+		while ($GLOBALS['egw_setup']->oProc->next_record())
 		{
 			$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 			$cal_owner = $GLOBALS['egw_setup']->oProc->f('cal_owner');
@@ -224,13 +224,13 @@ 
 			$cal_access = $GLOBALS['egw_setup']->oProc->f('cal_access');
 			$cal_name = $GLOBALS['egw_setup']->oProc->f('cal_name');
 			$cal_description = $GLOBALS['egw_setup']->oProc->f('cal_description');
-			$datetime = mktime(intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')),4))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')),2,2))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')),0,2))),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'),4,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'),6,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'),0,4)));
-			$moddatetime = mktime(intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')),4))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')),2,2))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')),0,2))),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'),4,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'),6,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'),0,4)));
-			$db2->query('SELECT groups FROM webcal_entry_groups WHERE cal_id='.$cal_id,__LINE__,__FILE__);
+			$datetime = mktime(intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')), 4))), intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')), 2, 2))), intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')), 0, 2))), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'), 4, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'), 6, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'), 0, 4)));
+			$moddatetime = mktime(intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')), 4))), intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')), 2, 2))), intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')), 0, 2))), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'), 4, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'), 6, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'), 0, 4)));
+			$db2->query('SELECT groups FROM webcal_entry_groups WHERE cal_id='.$cal_id, __LINE__, __FILE__);
 			$db2->next_record();
 			$cal_group = $db2->f('groups');
 			$db2->query('INSERT INTO calendar_entry(cal_id,cal_owner,cal_group,cal_datetime,cal_mdatetime,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description) '
-				.'VALUES('.$cal_id.",'".$cal_owner."','".$cal_group."',".$datetime.",".$moddatetime.",".$cal_duration.",".$cal_priority.",'".$cal_type."','".$cal_access."','".$cal_name."','".$cal_description."')",__LINE__,__FILE__);
+				.'VALUES('.$cal_id.",'".$cal_owner."','".$cal_group."',".$datetime.",".$moddatetime.",".$cal_duration.",".$cal_priority.",'".$cal_type."','".$cal_access."','".$cal_name."','".$cal_description."')", __LINE__, __FILE__);
 		}
 	}
 
@@ -251,17 +251,17 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_user',__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_user', __LINE__, __FILE__);
 	$GLOBALS['egw_setup']->oProc->next_record();
-	if($GLOBALS['egw_setup']->oProc->f(0))
+	if ($GLOBALS['egw_setup']->oProc->f(0))
 	{
-		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_login,cal_status FROM webcal_entry_user ORDER BY cal_id',__LINE__,__FILE__);
-		while($GLOBALS['egw_setup']->oProc->next_record())
+		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_login,cal_status FROM webcal_entry_user ORDER BY cal_id', __LINE__, __FILE__);
+		while ($GLOBALS['egw_setup']->oProc->next_record())
 		{
 			$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 			$cal_login = $GLOBALS['egw_setup']->oProc->f('cal_login');
 			$cal_status = $GLOBALS['egw_setup']->oProc->f('cal_status');
-			$db2->query('INSERT INTO calendar_entry_user(cal_id,cal_login,cal_status) VALUES('.$cal_id.','.$cal_login.",'".$cal_status."')",__LINE__,__FILE__);
+			$db2->query('INSERT INTO calendar_entry_user(cal_id,cal_login,cal_status) VALUES('.$cal_id.','.$cal_login.",'".$cal_status."')", __LINE__, __FILE__);
 		}
 	}
 
@@ -284,18 +284,18 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_repeats',__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_repeats', __LINE__, __FILE__);
 	$GLOBALS['egw_setup']->oProc->next_record();
-	if($GLOBALS['egw_setup']->oProc->f(0))
+	if ($GLOBALS['egw_setup']->oProc->f(0))
 	{
-		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_type,cal_end,cal_frequency,cal_days FROM webcal_entry_repeats ORDER BY cal_id',__LINE__,__FILE__);
-		while($GLOBALS['egw_setup']->oProc->next_record())
+		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_type,cal_end,cal_frequency,cal_days FROM webcal_entry_repeats ORDER BY cal_id', __LINE__, __FILE__);
+		while ($GLOBALS['egw_setup']->oProc->next_record())
 		{
 			$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 			$cal_type = $GLOBALS['egw_setup']->oProc->f('cal_type');
-			if(isset($GLOBALS['egw_setup']->oProc->Record['cal_end']))
+			if (isset($GLOBALS['egw_setup']->oProc->Record['cal_end']))
 			{
-				$enddate = mktime(0,0,0,intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'),4,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'),6,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'),0,4)));
+				$enddate = mktime(0, 0, 0, intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'), 4, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'), 6, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'), 0, 4)));
 				$useend = 1;
 			}
 			else
@@ -305,12 +305,12 @@ 
 			}
 			$cal_frequency = $GLOBALS['egw_setup']->oProc->f('cal_frequency');
 			$cal_days = $GLOBALS['egw_setup']->oProc->f('cal_days');
-			$db2->query('INSERT INTO calendar_entry_repeats(cal_id,cal_type,cal_use_end,cal_end,cal_frequency,cal_days) VALUES('.$cal_id.",'".$cal_type."',".$useend.",".$enddate.",".$cal_frequency.",'".$cal_days."')",__LINE__,__FILE__);
+			$db2->query('INSERT INTO calendar_entry_repeats(cal_id,cal_type,cal_use_end,cal_end,cal_frequency,cal_days) VALUES('.$cal_id.",'".$cal_type."',".$useend.",".$enddate.",".$cal_frequency.",'".$cal_days."')", __LINE__, __FILE__);
 		}
 	}
 
 	$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry_repeats');
-	$GLOBALS['egw_setup']->oProc->query("UPDATE {$GLOBALS['egw_setup']->applications_table} SET app_tables='calendar_entry,calendar_entry_user,calendar_entry_repeats' WHERE app_name='calendar'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("UPDATE {$GLOBALS['egw_setup']->applications_table} SET app_tables='calendar_entry,calendar_entry_user,calendar_entry_repeats' WHERE app_name='calendar'", __LINE__, __FILE__);
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.7pre2';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -322,19 +322,19 @@ 
 	$db2 = $GLOBALS['egw_setup']->db;
 
 	$GLOBALS['egw_setup']->oProc->RenameColumn('calendar_entry', 'cal_duration', 'cal_edatetime');
-	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_datetime,cal_owner,cal_edatetime,cal_mdatetime FROM calendar_entry ORDER BY cal_id',__LINE__,__FILE__);
-	if($GLOBALS['egw_setup']->oProc->num_rows())
+	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_datetime,cal_owner,cal_edatetime,cal_mdatetime FROM calendar_entry ORDER BY cal_id', __LINE__, __FILE__);
+	if ($GLOBALS['egw_setup']->oProc->num_rows())
 	{
-		while($GLOBALS['egw_setup']->oProc->next_record())
+		while ($GLOBALS['egw_setup']->oProc->next_record())
 		{
-			$db2->query("SELECT preference_value FROM preferences WHERE preference_name='tz_offset' AND preference_appname='common' AND preference_owner=".$GLOBALS['egw_setup']->db->f('cal_owner'),__LINE__,__FILE__);
+			$db2->query("SELECT preference_value FROM preferences WHERE preference_name='tz_offset' AND preference_appname='common' AND preference_owner=".$GLOBALS['egw_setup']->db->f('cal_owner'), __LINE__, __FILE__);
 			$db2->next_record();
 			$tz = $db2->f('preference_value');
 			$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 			$datetime = $GLOBALS['egw_setup']->oProc->f('cal_datetime') - ((60 * 60) * $tz);
 			$mdatetime = $GLOBALS['egw_setup']->oProc->f('cal_mdatetime') - ((60 * 60) * $tz);
 			$edatetime = $datetime + (60 * $GLOBALS['egw_setup']->oProc->f('cal_edatetime'));
-			$db2->query('UPDATE calendar_entry SET cal_datetime='.$datetime.', cal_edatetime='.$edatetime.', cal_mdatetime='.$mdatetime.' WHERE cal_id='.$cal_id,__LINE__,__FILE__);
+			$db2->query('UPDATE calendar_entry SET cal_datetime='.$datetime.', cal_edatetime='.$edatetime.', cal_mdatetime='.$mdatetime.' WHERE cal_id='.$cal_id, __LINE__, __FILE__);
 		}
 	}
 
@@ -582,22 +582,22 @@ 
 {
 	$db2 = $GLOBALS['egw_setup']->db;
 
-	if(extension_loaded('mcal') == False)
+	if (extension_loaded('mcal') == False)
 	{
-		define(RECUR_NONE,0);
-		define(RECUR_DAILY,1);
-		define(RECUR_WEEKLY,2);
-		define(RECUR_MONTHLY_MDAY,3);
-		define(RECUR_MONTHLY_WDAY,4);
-		define(RECUR_YEARLY,5);
-
-		define(M_SUNDAY,1);
-		define(M_MONDAY,2);
-		define(M_TUESDAY,4);
-		define(M_WEDNESDAY,8);
-		define(M_THURSDAY,16);
-		define(M_FRIDAY,32);
-		define(M_SATURDAY,64);
+		define(RECUR_NONE, 0);
+		define(RECUR_DAILY, 1);
+		define(RECUR_WEEKLY, 2);
+		define(RECUR_MONTHLY_MDAY, 3);
+		define(RECUR_MONTHLY_WDAY, 4);
+		define(RECUR_YEARLY, 5);
+
+		define(M_SUNDAY, 1);
+		define(M_MONDAY, 2);
+		define(M_TUESDAY, 4);
+		define(M_WEDNESDAY, 8);
+		define(M_THURSDAY, 16);
+		define(M_FRIDAY, 32);
+		define(M_SATURDAY, 64);
 	}
 
 // calendar_entry => phpgw_cal
@@ -624,13 +624,13 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry',__LINE__,__FILE__);
-	while($GLOBALS['egw_setup']->oProc->next_record())
+	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry', __LINE__, __FILE__);
+	while ($GLOBALS['egw_setup']->oProc->next_record())
 	{
 		$id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 		$owner = $GLOBALS['egw_setup']->oProc->f('cal_owner');
 		$access = $GLOBALS['egw_setup']->oProc->f('cal_access');
-		switch($access)
+		switch ($access)
 		{
 			case 'private':
 				$is_public = 0;
@@ -652,7 +652,7 @@ 
 		$description = $GLOBALS['egw_setup']->oProc->f('cal_description');
 
 		$db2->query("INSERT INTO phpgw_cal(cal_id,owner,groups,datetime,mdatetime,edatetime,priority,cal_type,is_public,title,description) "
-			. "VALUES($id,$owner,'$groups',$datetime,$mdatetime,$edatetime,$priority,'$type',$is_public,'$title','$description')",__LINE__,__FILE__);
+			. "VALUES($id,$owner,'$groups',$datetime,$mdatetime,$edatetime,$priority,'$type',$is_public,'$title','$description')", __LINE__, __FILE__);
 	}
 	$GLOBALS['egw_setup']->oProc->DropTable('calendar_entry');
 
@@ -660,12 +660,12 @@ 
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_repeats',
 		Array(
 			'fd' => array(
-				'cal_id' => array('type' => 'int', 'precision' => 8,'nullable' => False),
-				'recur_type' => array('type' => 'int', 'precision' => 8,'nullable' => False),
-				'recur_use_end' => array('type' => 'int', 'precision' => 8,'nullable' => True),
-				'recur_enddate' => array('type' => 'int', 'precision' => 8,'nullable' => True),
-				'recur_interval' => array('type' => 'int', 'precision' => 8,'nullable' => True,'default' => '1'),
-				'recur_data' => array('type' => 'int', 'precision' => 8,'nullable' => True,'default' => '1')
+				'cal_id' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
+				'recur_type' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
+				'recur_use_end' => array('type' => 'int', 'precision' => 8, 'nullable' => True),
+				'recur_enddate' => array('type' => 'int', 'precision' => 8, 'nullable' => True),
+				'recur_interval' => array('type' => 'int', 'precision' => 8, 'nullable' => True, 'default' => '1'),
+				'recur_data' => array('type' => 'int', 'precision' => 8, 'nullable' => True, 'default' => '1')
 			),
 			'pk' => array(),
 			'fk' => array(),
@@ -673,12 +673,12 @@ 
 			'uc' => array()
 		)
 	);
-	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry_repeats',__LINE__,__FILE__);
-	while($GLOBALS['egw_setup']->oProc->next_record())
+	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry_repeats', __LINE__, __FILE__);
+	while ($GLOBALS['egw_setup']->oProc->next_record())
 	{
 		$id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 		$recur_type = $GLOBALS['egw_setup']->oProc->f('cal_type');
-		switch($recur_type)
+		switch ($recur_type)
 		{
 			case 'daily':
 				$recur_type_num = RECUR_DAILY;
@@ -701,20 +701,20 @@ 
 		$recur_interval = $GLOBALS['egw_setup']->oProc->f('cal_frequency');
 		$days = strtoupper($GLOBALS['egw_setup']->oProc->f('cal_days'));
 		$recur_data = 0;
-		$recur_data += (substr($days,0,1)=='Y'?M_SUNDAY:0);
-		$recur_data += (substr($days,1,1)=='Y'?M_MONDAY:0);
-		$recur_data += (substr($days,2,1)=='Y'?M_TUESDAY:0);
-		$recur_data += (substr($days,3,1)=='Y'?M_WEDNESDAY:0);
-		$recur_data += (substr($days,4,1)=='Y'?M_THURSDAY:0);
-		$recur_data += (substr($days,5,1)=='Y'?M_FRIDAY:0);
-		$recur_data += (substr($days,6,1)=='Y'?M_SATURDAY:0);
+		$recur_data += (substr($days, 0, 1) == 'Y' ?M_SUNDAY:0);
+		$recur_data += (substr($days, 1, 1) == 'Y' ?M_MONDAY:0);
+		$recur_data += (substr($days, 2, 1) == 'Y' ?M_TUESDAY:0);
+		$recur_data += (substr($days, 3, 1) == 'Y' ?M_WEDNESDAY:0);
+		$recur_data += (substr($days, 4, 1) == 'Y' ?M_THURSDAY:0);
+		$recur_data += (substr($days, 5, 1) == 'Y' ?M_FRIDAY:0);
+		$recur_data += (substr($days, 6, 1) == 'Y' ?M_SATURDAY:0);
 		$db2->query("INSERT INTO phpgw_cal_repeats(cal_id,recur_type,recur_use_end,recur_enddate,recur_interval,recur_data) "
-			. "VALUES($id,$recur_type_num,$recur_use_end,$recur_end,$recur_interval,$recur_data)",__LINE__,__FILE__);
+			. "VALUES($id,$recur_type_num,$recur_use_end,$recur_end,$recur_interval,$recur_data)", __LINE__, __FILE__);
 	}
 	$GLOBALS['egw_setup']->oProc->DropTable('calendar_entry_repeats');
 
 // calendar_entry_user => phpgw_cal_user
-	$GLOBALS['egw_setup']->oProc->RenameTable('calendar_entry_user','phpgw_cal_user');
+	$GLOBALS['egw_setup']->oProc->RenameTable('calendar_entry_user', 'phpgw_cal_user');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.002';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -733,11 +733,11 @@ 
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_holidays',
 		Array(
 			'fd' => array(
-				'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
-				'name' => array('type' => 'varchar', 'precision' => 50,'nullable' => False),
-				'date_time' => array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0')
+				'locale' => array('type' => 'char', 'precision' => 2, 'nullable' => False),
+				'name' => array('type' => 'varchar', 'precision' => 50, 'nullable' => False),
+				'date_time' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0')
 			),
-			'pk' => array('locale','name'),
+			'pk' => array('locale', 'name'),
 			'fk' => array(),
 			'ix' => array(),
 			'uc' => array()
@@ -769,10 +769,10 @@ 
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_holidays',
 		Array(
 			'fd' => array(
-				'hol_id' => array('type' => 'auto','nullable' => False),
-				'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
-				'name' => array('type' => 'varchar', 'precision' => 50,'nullable' => False),
-				'date_time' => array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0')
+				'hol_id' => array('type' => 'auto', 'nullable' => False),
+				'locale' => array('type' => 'char', 'precision' => 2, 'nullable' => False),
+				'name' => array('type' => 'varchar', 'precision' => 50, 'nullable' => False),
+				'date_time' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0')
 			),
 			'pk' => array('hol_id'),
 			'fk' => array(),
@@ -789,10 +789,10 @@ 
 function calendar_upgrade0_9_11_007()
 {
 	$GLOBALS['egw_setup']->oProc->query('DELETE FROM phpgw_cal_holidays');
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','mday',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','month_num',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','occurence',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','dow',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'mday', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'month_num', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'occurence', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'dow', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.008';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -809,7 +809,7 @@ 
 function calendar_upgrade0_9_11_009()
 {
 	$GLOBALS['egw_setup']->oProc->query('DELETE FROM phpgw_cal_holidays');
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','observance_rule',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'observance_rule', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.010';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -844,7 +844,7 @@ 
 
 function calendar_upgrade0_9_13_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal','reference',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal', 'reference', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.003';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -856,7 +856,7 @@ 
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_alarm',
 		Array(
 			'fd' => array(
-				'alarm_id' => array('type' => 'auto','nullable' => False),
+				'alarm_id' => array('type' => 'auto', 'nullable' => False),
 				'cal_id'   => array('type' => 'int', 'precision' => 8, 'nullable' => False),
 				'cal_owner'	=> array('type' => 'int', 'precision' => 8, 'nullable' => False),
 				'cal_time' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
@@ -869,8 +869,8 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal','uid',array('type' => 'varchar', 'precision' => 255,'nullable' => False));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal','location',array('type' => 'varchar', 'precision' => 255,'nullable' => True));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal', 'uid', array('type' => 'varchar', 'precision' => 255, 'nullable' => False));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal', 'location', array('type' => 'varchar', 'precision' => 255, 'nullable' => True));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.004';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -879,7 +879,7 @@ 
 
 function calendar_upgrade0_9_13_004()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_alarm','alarm_enabled',array('type' => 'int', 'precision' => 4,'nullable' => False, 'default' => '1'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_alarm', 'alarm_enabled', array('type' => 'int', 'precision' => 4, 'nullable' => False, 'default' => '1'));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.005';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -889,18 +889,18 @@ 
 function calendar_upgrade0_9_13_005()
 {
 	$calendar_data = Array();
-	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id, category FROM phpgw_cal',__LINE__,__FILE__);
-	while($GLOBALS['egw_setup']->oProc->next_record())
+	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id, category FROM phpgw_cal', __LINE__, __FILE__);
+	while ($GLOBALS['egw_setup']->oProc->next_record())
 	{
 		$calendar_data[$GLOBALS['egw_setup']->oProc->f('cal_id')] = $GLOBALS['egw_setup']->oProc->f('category');
 	}
 
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal','category',array('type' => 'varchar', 'precision' => 30,'nullable' => True));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal', 'category', array('type' => 'varchar', 'precision' => 30, 'nullable' => True));
 
 	@reset($calendar_data);
-	while($calendar_data && list($cal_id,$category) = each($calendar_data))
+	while ($calendar_data && list($cal_id, $category) = each($calendar_data))
 	{
-		$GLOBALS['egw_setup']->oProc->query("UPDATE phpgw_cal SET category='".$category."' WHERE cal_id=".$cal_id,__LINE__,__FILE__);
+		$GLOBALS['egw_setup']->oProc->query("UPDATE phpgw_cal SET category='".$category."' WHERE cal_id=".$cal_id, __LINE__, __FILE__);
 	}
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.006';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -909,7 +909,7 @@ 
 
 function calendar_upgrade0_9_13_006()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_repeats','recur_exception',array('type' => 'varchar', 'precision' => 255, 'nullable' => True, 'default' => ''));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_repeats', 'recur_exception', array('type' => 'varchar', 'precision' => 255, 'nullable' => True, 'default' => ''));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.007';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -919,20 +919,20 @@ 
 
 function calendar_upgrade0_9_13_007()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_user','cal_type',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_user', 'cal_type', array(
 		'type' => 'varchar',
 		'precision' => '1',
 		'nullable' => False,
 		'default' => 'u'
 	));
 
-	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_extra',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_extra', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_extra_name' => array('type' => 'varchar','precision' => '40','nullable' => False),
-			'cal_extra_value' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '')
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_extra_name' => array('type' => 'varchar', 'precision' => '40', 'nullable' => False),
+			'cal_extra_value' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '')
 		),
-		'pk' => array('cal_id','cal_extra_name'),
+		'pk' => array('cal_id', 'cal_extra_name'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -949,7 +949,7 @@ 
 function calendar_upgrade0_9_16_001()
 {
 	// this is to set the default as schema_proc was not setting an empty default
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal_user','cal_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal_user', 'cal_type', array(
 		'type' => 'varchar',
 		'precision' => '1',
 		'nullable' => False,
@@ -966,15 +966,15 @@ 
 
 function calendar_upgrade0_9_16_002()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_use_end' => array('type' => 'int','precision' => '8','default' => '0'),
-			'recur_enddate' => array('type' => 'int','precision' => '8'),
-			'recur_interval' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_exception' => array('type' => 'varchar','precision' => '255','default' => '')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_use_end' => array('type' => 'int', 'precision' => '8', 'default' => '0'),
+			'recur_enddate' => array('type' => 'int', 'precision' => '8'),
+			'recur_interval' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_exception' => array('type' => 'varchar', 'precision' => '255', 'default' => '')
 		),
 		'pk' => array(),
 		'fk' => array(),
@@ -990,14 +990,14 @@ 
 
 function calendar_upgrade0_9_16_003()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_user',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_user', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_login' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_status' => array('type' => 'char','precision' => '1','default' => 'A'),
-			'cal_type' => array('type' => 'varchar','precision' => '1','nullable' => False,'default' => 'u')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_login' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_status' => array('type' => 'char', 'precision' => '1', 'default' => 'A'),
+			'cal_type' => array('type' => 'varchar', 'precision' => '1', 'nullable' => False, 'default' => 'u')
 		),
-		'pk' => array('cal_id','cal_login','cal_type'),
+		'pk' => array('cal_id', 'cal_login', 'cal_type'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -1011,16 +1011,16 @@ 
 
 function calendar_upgrade0_9_16_004()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_holidays',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_holidays', array(
 		'fd' => array(
-			'hol_id' => array('type' => 'auto','nullable' => False),
-			'locale' => array('type' => 'char','precision' => '2','nullable' => False),
-			'name' => array('type' => 'varchar','precision' => '50','nullable' => False),
-			'mday' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'month_num' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'occurence' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'dow' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'observance_rule' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+			'hol_id' => array('type' => 'auto', 'nullable' => False),
+			'locale' => array('type' => 'char', 'precision' => '2', 'nullable' => False),
+			'name' => array('type' => 'varchar', 'precision' => '50', 'nullable' => False),
+			'mday' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'month_num' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'occurence' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'dow' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'observance_rule' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0')
 		),
 		'pk' => array('hol_id'),
 		'fk' => array(),
@@ -1038,13 +1038,13 @@ 
 {
 	// creates uid's for all entries which do not have unique ones, they are '-@domain.com'
 	// very old entries even have an empty uid, see 0.9.16.006 update
-	$GLOBALS['egw_setup']->oProc->query("SELECT config_name,config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_name IN ('install_id','mail_suffix') AND config_app='phpgwapi'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("SELECT config_name,config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_name IN ('install_id','mail_suffix') AND config_app='phpgwapi'", __LINE__, __FILE__);
 	while ($GLOBALS['egw_setup']->oProc->next_record())
 	{
 		$config[$GLOBALS['egw_setup']->oProc->f(0)] = $GLOBALS['egw_setup']->oProc->f(1);
 	}
 	$GLOBALS['egw_setup']->oProc->query('UPDATE phpgw_cal SET uid='.
-		$GLOBALS['egw_setup']->db->concat($GLOBALS['egw_setup']->db->quote('cal-'),'cal_id',
+		$GLOBALS['egw_setup']->db->concat($GLOBALS['egw_setup']->db->quote('cal-'), 'cal_id',
 			$GLOBALS['egw_setup']->db->quote('-'.$config['install_id'].'@'.
 			($config['mail_suffix'] ? $config['mail_suffix'] : 'local'))).
 		" WHERE uid LIKE '-@%' OR uid=''");
@@ -1067,7 +1067,7 @@ 
 function calendar_upgrade0_9_16_007()
 {
 	// update the sequenzes for refreshed tables (postgres only)
-	$GLOBALS['egw_setup']->oProc->UpdateSequence('phpgw_cal_holidays','hol_id');
+	$GLOBALS['egw_setup']->oProc->UpdateSequence('phpgw_cal_holidays', 'hol_id');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1077,19 +1077,19 @@ 
 
 function calendar_upgrade1_0_0()
 {
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','uid','cal_uid');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','owner','cal_owner');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','category','cal_category');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','groups','cal_groups');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','datetime','cal_starttime');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','mdatetime','cal_modified');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','edatetime','cal_endtime');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','priority','cal_priority');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','is_public','cal_public');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','title','cal_title');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','description','cal_description');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','location','cal_location');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','reference','cal_reference');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'uid', 'cal_uid');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'owner', 'cal_owner');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'category', 'cal_category');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'groups', 'cal_groups');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'datetime', 'cal_starttime');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'mdatetime', 'cal_modified');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'edatetime', 'cal_endtime');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'priority', 'cal_priority');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'is_public', 'cal_public');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'title', 'cal_title');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'description', 'cal_description');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'location', 'cal_location');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'reference', 'cal_reference');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0.001';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1099,13 +1099,13 @@ 
 
 function calendar_upgrade1_0_0_001()
 {
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','locale','hol_locale');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','name','hol_name');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','mday','hol_mday');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','month_num','hol_month_num');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','occurence','hol_occurence');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','dow','hol_dow');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','observance_rule','hol_observance_rule');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'locale', 'hol_locale');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'name', 'hol_name');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'mday', 'hol_mday');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'month_num', 'hol_month_num');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'occurence', 'hol_occurence');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'dow', 'hol_dow');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'observance_rule', 'hol_observance_rule');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0.002';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1115,8 +1115,8 @@ 
 
 function calendar_upgrade1_0_0_002()
 {
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_user','cal_login','cal_user_id');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_user','cal_type','cal_user_type');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_user', 'cal_login', 'cal_user_id');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_user', 'cal_type', 'cal_user_type');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0.003';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1126,7 +1126,7 @@ 
 
 function calendar_upgrade1_0_0_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal','cal_title',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal', 'cal_title', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'nullable' => False,
@@ -1141,15 +1141,15 @@ 
 
 function calendar_upgrade1_0_0_004()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_use_end' => array('type' => 'int','precision' => '8','default' => '0'),
-			'recur_enddate' => array('type' => 'int','precision' => '8'),
-			'recur_interval' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_exception' => array('type' => 'varchar','precision' => '255','default' => '')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_use_end' => array('type' => 'int', 'precision' => '8', 'default' => '0'),
+			'recur_enddate' => array('type' => 'int', 'precision' => '8'),
+			'recur_interval' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_exception' => array('type' => 'varchar', 'precision' => '255', 'default' => '')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
@@ -1166,19 +1166,19 @@ 
 function calendar_upgrade1_0_0_005()
 {
 	// change prefix of all calendar tables to egw_
-	foreach(array('cal_user','cal_repeats','cal_extra','cal_holidays','cal') as $name)
+	foreach (array('cal_user', 'cal_repeats', 'cal_extra', 'cal_holidays', 'cal') as $name)
 	{
-		$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_'.$name,'egw_'.$name);
+		$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_'.$name, 'egw_'.$name);
 	}
 
 	// create new dates table, with content from the egw_cal table
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_cal_dates',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_cal_dates', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_start' => array('type' => 'int','precision' => '8','nullable' => False),
-			'cal_end' => array('type' => 'int','precision' => '8','nullable' => False)
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_start' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'cal_end' => array('type' => 'int', 'precision' => '8', 'nullable' => False)
 		),
-		'pk' => array('cal_id','cal_start'),
+		'pk' => array('cal_id', 'cal_start'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -1186,49 +1186,49 @@ 
 	$GLOBALS['egw_setup']->oProc->query("INSERT INTO egw_cal_dates SELECT cal_id,cal_starttime,cal_endtime FROM egw_cal");
 
 	// drop the fields transfered to the dates table
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '8','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_groups' => array('type' => 'varchar','precision' => '255'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_endtime' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '2'),
-			'cal_type' => array('type' => 'varchar','precision' => '10'),
-			'cal_public' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_groups' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_endtime' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '2'),
+			'cal_type' => array('type' => 'varchar', 'precision' => '10'),
+			'cal_public' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_starttime');
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	), 'cal_starttime');
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '8','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_groups' => array('type' => 'varchar','precision' => '255'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '2'),
-			'cal_type' => array('type' => 'varchar','precision' => '10'),
-			'cal_public' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_groups' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '2'),
+			'cal_type' => array('type' => 'varchar', 'precision' => '10'),
+			'cal_public' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_endtime');
+	), 'cal_endtime');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.1.001';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1244,15 +1244,15 @@ 
 		'precision' => '8',
 		'default' => '0'
 	));*/
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal_user',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal_user', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_recur_date' => array('type' => 'int','precision' => '8','default' => '0'),
-			'cal_user_type' => array('type' => 'varchar','precision' => '1','nullable' => False,'default' => 'u'),
-			'cal_user_id' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_status' => array('type' => 'char','precision' => '1','default' => 'A')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_recur_date' => array('type' => 'int', 'precision' => '8', 'default' => '0'),
+			'cal_user_type' => array('type' => 'varchar', 'precision' => '1', 'nullable' => False, 'default' => 'u'),
+			'cal_user_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_status' => array('type' => 'char', 'precision' => '1', 'default' => 'A')
 		),
-		'pk' => array('cal_id','cal_recur_date','cal_user_type','cal_user_id'),
+		'pk' => array('cal_id', 'cal_recur_date', 'cal_user_type', 'cal_user_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -1266,50 +1266,50 @@ 
 
 function calendar_upgrade1_0_1_002()
 {
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '8','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_groups' => array('type' => 'varchar','precision' => '255'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_groups' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_type');
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_owner',array(
+	), 'cal_type');
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_owner', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_priority',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_priority', array(
 		'type' => 'int',
 		'precision' => '2',
 		'nullable' => False,
 		'default' => '2'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_public',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_public', array(
 		'type' => 'int',
 		'precision' => '2',
 		'nullable' => False,
 		'default' => '1'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_reference',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_reference', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
 		'default' => '0'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_modifier',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_modifier', array(
 		'type' => 'int',
 		'precision' => '4'
 	));
@@ -1322,36 +1322,36 @@ 
 
 function calendar_upgrade1_0_1_003()
 {
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_enddate' => array('type' => 'int','precision' => '8'),
-			'recur_interval' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_exception' => array('type' => 'varchar','precision' => '255','default' => '')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_enddate' => array('type' => 'int', 'precision' => '8'),
+			'recur_interval' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_exception' => array('type' => 'varchar', 'precision' => '255', 'default' => '')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'recur_use_end');
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','cal_id',array(
+	), 'recur_use_end');
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'cal_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'recur_type', array(
 		'type' => 'int',
 		'precision' => '2',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_interval',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'recur_interval', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '1'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_data',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'recur_data', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '1'
@@ -1365,13 +1365,13 @@ 
 
 function calendar_upgrade1_0_1_004()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
 		'default' => '0'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
@@ -1386,7 +1386,7 @@ 
 
 function calendar_upgrade1_0_1_005()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_quantity',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_quantity', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '1'
@@ -1400,7 +1400,7 @@ 
 
 function calendar_upgrade1_0_1_006()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_non_blocking',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_non_blocking', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '0'
@@ -1414,9 +1414,9 @@ 
 
 function calendar_upgrade1_0_1_007()
 {
-	$GLOBALS['egw_setup']->db->update('egw_cal_repeats',array('recur_exception' => null),array('recur_exception' => ''),__LINE__,__FILE__,'calendar');
+	$GLOBALS['egw_setup']->db->update('egw_cal_repeats', array('recur_exception' => null), array('recur_exception' => ''), __LINE__, __FILE__, 'calendar');
 
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_exception',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'recur_exception', array(
 		'type' => 'text'
 	));
 
@@ -1433,11 +1433,11 @@ 
 	{
 		$customfields = array();
 		$order = 0;
-		foreach($config_data['fields'] as $name => $data)
+		foreach ($config_data['fields'] as $name => $data)
 		{
 			if ($name{0} == '#' && !$data['disabled'])	// real not-disabled custom field
 			{
-				$customfields[substr($name,1)] = array(
+				$customfields[substr($name, 1)] = array(
 					'type'  => 'text',
 					'len'   => $data['length'].($data['shown'] ? ','.$data['shown'] : ''),
 					'label' => $data['name'],
@@ -1460,38 +1460,38 @@ 
 function calendar_upgrade1_0_1_009()
 {
 	$db2 = clone($GLOBALS['egw_setup']->db);
-	$GLOBALS['egw_setup']->db->select('egw_cal','DISTINCT egw_cal.cal_id,cal_groups,cal_recur_date',"cal_groups != ''",__LINE__,__FILE__,
-		False,'','calendar',0,',egw_cal_user WHERE egw_cal.cal_id=egw_cal_user.cal_id');
-	while(($row = $GLOBALS['egw_setup']->db->row(true)))
+	$GLOBALS['egw_setup']->db->select('egw_cal', 'DISTINCT egw_cal.cal_id,cal_groups,cal_recur_date', "cal_groups != ''", __LINE__, __FILE__,
+		False, '', 'calendar', 0, ',egw_cal_user WHERE egw_cal.cal_id=egw_cal_user.cal_id');
+	while (($row = $GLOBALS['egw_setup']->db->row(true)))
 	{
 		$row['cal_user_type'] = 'u';
-		foreach(explode(',',$row['cal_groups']) as $group)
+		foreach (explode(',', $row['cal_groups']) as $group)
 		{
 			$row['cal_user_id'] = $group;
-			$db2->insert('egw_cal_user',array('cal_status' => 'U'),$row,__LINE__,__FILE__,'calendar');
+			$db2->insert('egw_cal_user', array('cal_status' => 'U'), $row, __LINE__, __FILE__, 'calendar');
 		}
 	}
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'cal_modifier' => array('type' => 'int','precision' => '4'),
-			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'cal_modifier' => array('type' => 'int', 'precision' => '4'),
+			'cal_non_blocking' => array('type' => 'int', 'precision' => '2', 'default' => '0')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_groups');
+	), 'cal_groups');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.2';
 }
@@ -1501,7 +1501,7 @@ 
 function calendar_upgrade1_2()
 {
 	// get old alarms (saved before 1.2) working again
-	$GLOBALS['egw_setup']->db->query("UPDATE egw_async SET async_method ='calendar.bocalupdate.send_alarm' WHERE async_method ='calendar.bocalendar.send_alarm'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->db->query("UPDATE egw_async SET async_method ='calendar.bocalupdate.send_alarm' WHERE async_method ='calendar.bocalendar.send_alarm'", __LINE__, __FILE__);
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.2.001';
 }
@@ -1509,7 +1509,7 @@ 
 
 function calendar_upgrade1_2_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_special',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_special', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '0'
@@ -1527,7 +1527,7 @@ 
 
 function calendar_upgrade1_4()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_etag',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_etag', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '0'
@@ -1539,59 +1539,59 @@ 
 
 function calendar_upgrade1_5()
 {
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'cal_modifier' => array('type' => 'int','precision' => '4'),
-			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_etag' => array('type' => 'int','precision' => '4'),
-			'cal_edit_time' => array('type' => 'int','precision' => '8')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'cal_modifier' => array('type' => 'int', 'precision' => '4'),
+			'cal_non_blocking' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_special' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_etag' => array('type' => 'int', 'precision' => '4'),
+			'cal_edit_time' => array('type' => 'int', 'precision' => '8')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_edit_user');
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	), 'cal_edit_user');
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'cal_modifier' => array('type' => 'int','precision' => '4'),
-			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_etag' => array('type' => 'int','precision' => '4')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'cal_modifier' => array('type' => 'int', 'precision' => '4'),
+			'cal_non_blocking' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_special' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_etag' => array('type' => 'int', 'precision' => '4')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_edit_time');
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_etag',array(
+	), 'cal_edit_time');
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_etag', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '0'
 	));
-	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_etag=0 WHERE cal_etag IS NULL',__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_etag=0 WHERE cal_etag IS NULL', __LINE__, __FILE__);
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.5.001';
 }
@@ -1599,12 +1599,12 @@ 
 
 function calendar_upgrade1_5_001()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'varchar',
 		'precision' => '128',
 		'nullable' => False
@@ -1618,12 +1618,12 @@ 
 {
 	// update the alarm methods
 	$async = new Api\Asyncservice();
-	foreach((array)$async->read('cal:%') as $job)
+	foreach ((array)$async->read('cal:%') as $job)
 	{
 		if ($job['method'] == 'calendar.bocalupdate.send_alarm')
 		{
 			$job['method'] = 'calendar.calendar_boupdate.send_alarm';
-			$async->write($job,true);
+			$async->write($job, true);
 		}
 	}
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.6';
@@ -1640,48 +1640,48 @@ 
 {
 	// Set UID of series exception to UID of series master
 	// update cal_etag, cal_modified and cal_modifier to distribute changes on GroupDAV devices
-	foreach($GLOBALS['egw_setup']->db->query('
+	foreach ($GLOBALS['egw_setup']->db->query('
 		SELECT cal_ex.cal_id,cal_ex.cal_uid AS cal_uid_ex,cal_master.cal_uid AS cal_uid_master
 		FROM egw_cal cal_ex
 		JOIN egw_cal cal_master ON cal_ex.cal_reference=cal_master.cal_id
-		WHERE cal_ex.cal_reference != 0',__LINE__,__FILE__) as $row)
+		WHERE cal_ex.cal_reference != 0',__LINE__, __FILE__) as $row)
 	{
 		if (strlen($row['cal_uid_master']) > 0 && $row['cal_uid_ex'] != $row['cal_uid_master'])
 		{
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_uid=\''.$row['cal_uid_master'].
 				'\',cal_etag=cal_etag+1,cal_modified='.time().
-				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 	}
 
 	// Search series exception for nearest exception in series master and add that RECURRENCE-ID
 	// as cal_reference (for 1.6.003 and move it to new field cal_recurrence in 1.7.001)
 	$diff = null;
-	foreach($GLOBALS['egw_setup']->db->query('SELECT egw_cal.cal_id,cal_start,recur_exception FROM egw_cal
+	foreach ($GLOBALS['egw_setup']->db->query('SELECT egw_cal.cal_id,cal_start,recur_exception FROM egw_cal
 		JOIN egw_cal_dates ON egw_cal.cal_id=egw_cal_dates.cal_id
 		JOIN egw_cal_repeats ON cal_reference=egw_cal_repeats.cal_id
-		WHERE cal_reference != 0',__LINE__,__FILE__) as $row)
+		WHERE cal_reference != 0',__LINE__, __FILE__) as $row)
 	{
 		$recurrence = null;
-		foreach(explode(',',$row['recur_exception']) as $ts)
+		foreach (explode(',', $row['recur_exception']) as $ts)
 		{
-			if (is_null($recurrence) || abs($ts-$row['cal_start']) < $diff)
+			if (is_null($recurrence) || abs($ts - $row['cal_start']) < $diff)
 			{
 				$recurrence = $ts;
-				$diff = abs($ts-$row['cal_start']);
+				$diff = abs($ts - $row['cal_start']);
 			}
 		}
 		if ($recurrence)
 		{
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_reference='.(int)$recurrence.
-				' WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				' WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 		else
 		{
 			// if we cannot determine the RECURRENCE-ID use cal_start
 			// because RECURRENCE-ID must be present
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_reference='.(int)$row['cal_start'].
-				' WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				' WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 	}
 
@@ -1696,33 +1696,33 @@ 
  */
 function calendar_upgrade1_6_003()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_creator',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_creator', array(
 		'type' => 'int',
 		'precision' => '4',
 		'comment' => 'creating user'
 	));
-	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_creator=cal_owner',__LINE__,__FILE__);
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_creator',array(
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_creator=cal_owner', __LINE__, __FILE__);
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_creator', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
 		'comment' => 'creating user'
 	));
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_created',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_created', array(
 		'type' => 'int',
 		'precision' => '8',
 		'comment' => 'creation time of event'
 	));
-	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_created=cal_modified',__LINE__,__FILE__);
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_created',array(
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_created=cal_modified', __LINE__, __FILE__);
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_created', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
 		'comment' => 'creation time of event'
 	));
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_recurrence',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_recurrence', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
@@ -1733,14 +1733,14 @@ 
 	// move RECURRENCE-ID from temporarily (1.6.003)
 	// used field cal_reference to new field cal_recurrence
 	// and restore cal_reference field of series exceptions with id of the series master
-	foreach($GLOBALS['egw_setup']->db->query('
+	foreach ($GLOBALS['egw_setup']->db->query('
 		SELECT cal_ex.cal_id AS cal_id_ex,cal_master.cal_id AS cal_id_master,
 		cal_ex.cal_reference AS cal_reference_ex,cal_ex.cal_uid AS cal_uid_ex,
 		cal_master.cal_uid AS cal_uid_master
 		FROM egw_cal cal_ex
 		JOIN egw_cal cal_master
 		ON cal_ex.cal_uid=cal_master.cal_uid AND cal_master.cal_reference = 0 AND cal_ex.cal_owner = cal_master.cal_owner
-		WHERE cal_ex.cal_reference !=0 AND cal_master.cal_id IS NOT NULL',__LINE__,__FILE__) as $row)
+		WHERE cal_ex.cal_reference !=0 AND cal_master.cal_id IS NOT NULL',__LINE__, __FILE__) as $row)
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_recurrence='.(int)$row['cal_reference_ex'].
 			', cal_reference='.(int)$row['cal_id_master'].
@@ -1757,7 +1757,7 @@ 
  */
 function calendar_upgrade1_7_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_role',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_role', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'default' => 'REQ-PARTICIPANT'
@@ -1773,14 +1773,14 @@ 
  */
 function calendar_upgrade1_7_002()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_cal_timezones',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_cal_timezones', array(
 		'fd' => array(
-			'tz_id' => array('type' => 'auto','nullable' => False),
-			'tz_tzid' => array('type' => 'varchar','precision' => '128','nullable' => False),
-			'tz_alias' => array('type' => 'int','precision' => '4','comment' => 'tz_id for data'),
-			'tz_latitude' => array('type' => 'int','precision' => '4'),
-			'tz_longitude' => array('type' => 'int','precision' => '4'),
-			'tz_component' => array('type' => 'text','comment' => 'iCal VTIMEZONE component')
+			'tz_id' => array('type' => 'auto', 'nullable' => False),
+			'tz_tzid' => array('type' => 'varchar', 'precision' => '128', 'nullable' => False),
+			'tz_alias' => array('type' => 'int', 'precision' => '4', 'comment' => 'tz_id for data'),
+			'tz_latitude' => array('type' => 'int', 'precision' => '4'),
+			'tz_longitude' => array('type' => 'int', 'precision' => '4'),
+			'tz_component' => array('type' => 'text', 'comment' => 'iCal VTIMEZONE component')
 		),
 		'pk' => array('tz_id'),
 		'fk' => array(),
@@ -1800,38 +1800,38 @@ 
  */
 function calendar_upgrade1_7_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_type', array(
 		'type' => 'varchar',
 		'precision' => '1',
 		'nullable' => False,
 		'default' => 'u',
 		'comment' => 'u=user, g=group, c=contact, r=resource, e=email'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'varchar',
 		'precision' => '128',
 		'nullable' => False,
 		'comment' => 'id or email-address for type=e'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_status',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_status', array(
 		'type' => 'char',
 		'precision' => '1',
 		'default' => 'A',
 		'comment' => 'U=unknown, A=accepted, R=rejected, T=tentative'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_quantity',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_quantity', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '1',
 		'comment' => 'only for certain types (eg. resources)'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_role',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_role', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'default' => 'REQ-PARTICIPANT',
 		'comment' => 'CHAIR, REQ-PARTICIPANT, OPT-PARTICIPANT, NON-PARTICIPANT, X-CAT-$cat_id'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_user_modified',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_user_modified', array(
 		'type' => 'timestamp',
 		'default' => 'current_timestamp',
 		'comment' => 'automatic timestamp of last update'
@@ -1847,19 +1847,19 @@ 
  */
 function calendar_upgrade1_7_004()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates','cal_start',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates', 'cal_start', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
 		'comment' => 'starttime in server time'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates','cal_end',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates', 'cal_end', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
 		'comment' => 'endtime in server time'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','tz_id',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'tz_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'comment' => 'key into egw_cal_timezones'
@@ -1868,7 +1868,7 @@ 
 	// set id of server timezone for existing events, as that's the timezone their recurrences are using
 	if (($tzid = date_default_timezone_get()) && ($tz_id = calendar_timezones::tz2id($tzid)))
 	{
-		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET tz_id='.(int)$tz_id,__LINE__,__FILE__);
+		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET tz_id='.(int)$tz_id, __LINE__, __FILE__);
 	}
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.005';
 }
@@ -1895,22 +1895,22 @@ 
  */
 function calendar_upgrade1_7_006()
 {
-	foreach($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
-		WHERE (cal_end-cal_start)%86400=86340',__LINE__,__FILE__) as $row)
+	foreach ($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
+		WHERE (cal_end-cal_start)%86400=86340',__LINE__, __FILE__) as $row)
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal_dates SET cal_end=cal_end+59
-			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'],__LINE__,__FILE__);
+			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'], __LINE__, __FILE__);
 	}
 
-	foreach($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
-		WHERE cal_end-cal_start>0 AND (cal_end-cal_start)%86400=0',__LINE__,__FILE__) as $row)
+	foreach ($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
+		WHERE cal_end-cal_start>0 AND (cal_end-cal_start)%86400=0',__LINE__, __FILE__) as $row)
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal_dates SET cal_end=cal_end-1
-			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'],__LINE__,__FILE__);
+			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'], __LINE__, __FILE__);
 	}
 
     $GLOBALS['egw_setup']->db->query('UPDATE egw_cal_repeats SET recur_interval=1
-			WHERE recur_interval=0',__LINE__,__FILE__);
+			WHERE recur_interval=0',__LINE__, __FILE__);
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.007';
 }
@@ -1926,17 +1926,17 @@ 
 {
 	// Set UID of series exception to UID of series master
 	// update cal_etag,cal_modified and cal_modifier to distribute changes on GroupDAV devices
-	foreach($GLOBALS['egw_setup']->db->query('
+	foreach ($GLOBALS['egw_setup']->db->query('
 		SELECT cal_ex.cal_id,cal_ex.cal_uid AS cal_uid_ex,cal_master.cal_uid AS cal_uid_master
 		FROM egw_cal cal_ex
 		JOIN egw_cal cal_master ON cal_ex.cal_reference=cal_master.cal_id
-		WHERE cal_ex.cal_reference != 0',__LINE__,__FILE__) as $row)
+		WHERE cal_ex.cal_reference != 0',__LINE__, __FILE__) as $row)
 	{
 		if (strlen($row['cal_uid_master']) > 0 && $row['cal_uid_ex'] != $row['cal_uid_master'])
 		{
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_uid=\''.$row['cal_uid_master'].
 				'\',cal_etag=cal_etag+1,cal_modified='.time().
-				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 	}
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.008';
@@ -1949,7 +1949,7 @@ 
  */
 function calendar_upgrade1_7_008()
 {
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user',array('cal_user_type','cal_user_id'));
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user', array('cal_user_type', 'cal_user_id'));
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.009';
 }
@@ -1961,22 +1961,22 @@ 
  */
 function calendar_upgrade1_7_009()
 {
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','cal_uid');
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','cal_owner');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'cal_uid');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'cal_owner');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.010';
 }
 
 function calendar_upgrade1_7_010()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_deleted',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_deleted', array(
 		'type' => 'bool',
 		'nullable' => False,
 		'default' => '0',
 		'comment' => '1 if the event has been deleted, but you want to keep it around'
 	));
 
-	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.001';	// was 1.7.011
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.001'; // was 1.7.011
 }
 
 function calendar_upgrade1_7_011()
@@ -2006,36 +2006,36 @@ 
 		'precision' => '8',
 		'comment' => 'ts when event was deleted'
 	));*/
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False,'comment' => 'unique id of event(-series)'),
-			'cal_owner' => array('type' => 'int','precision' => '4','nullable' => False,'comment' => 'event owner / calendar'),
-			'cal_category' => array('type' => 'varchar','precision' => '30','comment' => 'category id'),
-			'cal_modified' => array('type' => 'int','precision' => '8','comment' => 'ts of last modification'),
-			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1','comment' => '1=public, 0=private event'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'comment' => 'unique id of event(-series)'),
+			'cal_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'comment' => 'event owner / calendar'),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30', 'comment' => 'category id'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8', 'comment' => 'ts of last modification'),
+			'cal_priority' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '1', 'comment' => '1=public, 0=private event'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0','comment' => 'cal_id of series for exception'),
-			'cal_modifier' => array('type' => 'int','precision' => '4','comment' => 'user who last modified event'),
-			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0','comment' => '1 for non-blocking events'),
-			'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_etag' => array('type' => 'int','precision' => '4','default' => '0','comment' => 'etag for optimistic locking'),
-			'cal_creator' => array('type' => 'int','precision' => '4','nullable' => False,'comment' => 'creating user'),
-			'cal_created' => array('type' => 'int','precision' => '8','nullable' => False,'comment' => 'creation time of event'),
-			'cal_recurrence' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0','comment' => 'cal_start of original recurrence for exception'),
-			'tz_id' => array('type' => 'int','precision' => '4','comment' => 'key into egw_cal_timezones'),
-			'cal_deleted' => array('type' => 'int','precision' => '8','comment' => 'ts when event was deleted')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'cal_id of series for exception'),
+			'cal_modifier' => array('type' => 'int', 'precision' => '4', 'comment' => 'user who last modified event'),
+			'cal_non_blocking' => array('type' => 'int', 'precision' => '2', 'default' => '0', 'comment' => '1 for non-blocking events'),
+			'cal_special' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_etag' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'comment' => 'etag for optimistic locking'),
+			'cal_creator' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'comment' => 'creating user'),
+			'cal_created' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'comment' => 'creation time of event'),
+			'cal_recurrence' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0', 'comment' => 'cal_start of original recurrence for exception'),
+			'tz_id' => array('type' => 'int', 'precision' => '4', 'comment' => 'key into egw_cal_timezones'),
+			'cal_deleted' => array('type' => 'int', 'precision' => '8', 'comment' => 'ts when event was deleted')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
-		'ix' => array('cal_uid','cal_owner','cal_deleted'),
+		'ix' => array('cal_uid', 'cal_owner', 'cal_deleted'),
 		'uc' => array()
-	),array(
+	), array(
 		// for deleted rows use cal_modified as deleted date, NULL for not deleted ones
-		'cal_deleted' => 'CASE cal_deleted WHEN '.$GLOBALS['egw_setup']->db->quote(true,'bool').' THEN cal_modified ELSE NULL END',
+		'cal_deleted' => 'CASE cal_deleted WHEN '.$GLOBALS['egw_setup']->db->quote(true, 'bool').' THEN cal_modified ELSE NULL END',
 	));
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.002';
@@ -2047,16 +2047,16 @@ 
  */
 function calendar_upgrade1_9_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'caldav_name', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'comment' => 'name part of CalDAV URL, if specified by client'
 	));
-	$GLOBALS['egw_setup']->db->query($sql='UPDATE egw_cal SET caldav_name='.
+	$GLOBALS['egw_setup']->db->query($sql = 'UPDATE egw_cal SET caldav_name='.
 		$GLOBALS['egw_setup']->db->concat(
-			$GLOBALS['egw_setup']->db->to_varchar('cal_id'),"'.ics'"),__LINE__,__FILE__);
+			$GLOBALS['egw_setup']->db->to_varchar('cal_id'), "'.ics'"), __LINE__, __FILE__);
 
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','caldav_name');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'caldav_name');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.003';
 }
@@ -2067,8 +2067,8 @@ 
  */
 function calendar_upgrade1_9_003()
 {
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','cal_modified');
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user','cal_user_modified');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'cal_modified');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user', 'cal_user_modified');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.004';
 }
@@ -2080,7 +2080,7 @@ 
  */
 function calendar_upgrade1_9_004()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_dates','recur_exception',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_dates', 'recur_exception', array(
 		'type' => 'bool',
 		'default' => '',
 		'null' => false,
@@ -2088,16 +2088,16 @@ 
 	));
 
 	// migrate existing exceptions to egw_cal_dates
-	foreach($GLOBALS['egw_setup']->db->select('egw_cal_repeats',
+	foreach ($GLOBALS['egw_setup']->db->select('egw_cal_repeats',
 		'egw_cal_repeats.cal_id AS cal_id,egw_cal_repeats.recur_exception AS recur_exception,MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
 		'egw_cal_repeats.recur_exception IS NOT NULL', __LINE__, __FILE__, false,
 		'GROUP BY egw_cal_repeats.cal_id,egw_cal_repeats.recur_exception', 'calendar', '',
 		'JOIN egw_cal_dates ON egw_cal_repeats.cal_id=egw_cal_dates.cal_id') as $row)
 	{
-		foreach($row['recur_exception'] ? array_unique(explode(',', $row['recur_exception'])) : array() as $recur_exception)
+		foreach ($row['recur_exception'] ? array_unique(explode(',', $row['recur_exception'])) : array() as $recur_exception)
 		{
 			$GLOBALS['egw_setup']->db->insert('egw_cal_dates', array(
-				'cal_end' => $recur_exception+$row['cal_end']-$row['cal_start'],
+				'cal_end' => $recur_exception + $row['cal_end'] - $row['cal_start'],
 				'recur_exception' => true,
 			), array(
 				'cal_id' => $row['cal_id'],
@@ -2109,11 +2109,11 @@ 
 
 	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '2','nullable' => False),
-			'recur_enddate' => array('type' => 'int','precision' => '8'),
-			'recur_interval' => array('type' => 'int','precision' => '2','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '2','default' => '1'),
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '2', 'nullable' => False),
+			'recur_enddate' => array('type' => 'int', 'precision' => '8'),
+			'recur_interval' => array('type' => 'int', 'precision' => '2', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '2', 'default' => '1'),
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
@@ -2134,19 +2134,19 @@ 
 	// returns NULL, if there are no rows!
 	if ((int)$max_description_length <= 16384 && $GLOBALS['egw_setup']->oProc->max_varchar_length >= 16384)
 	{
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_description',array(
+		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_description', array(
 			'type' => 'varchar',
 			'precision' => '16384'
 		));
 	}
 	// allow more categories
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_category',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_category', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'comment' => 'category id(s)'
 	));
 	// remove silly default of 1
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_title',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_title', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'nullable' => False
@@ -2161,14 +2161,14 @@ 
 {
 	// PostgreSQL needs temporary a nullable column, to not stall on broken events without dates!
 	// We add that constrain in 1.9.007, after deleting all rows with range_start=0 OR range_start IS NULL
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','range_start',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'range_start', array(
 		'type' => 'int',
 		'precision' => '8',
 		'comment' => 'startdate (of range)'
 	));
 	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET range_start = (SELECT MIN(cal_start) FROM egw_cal_dates WHERE egw_cal_dates.cal_id=egw_cal.cal_id)', __LINE__, __FILE__);
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','range_end',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'range_end', array(
 		'type' => 'int',
 		'precision' => '8',
 		'comment' => 'enddate (of range, UNTIL of RRULE)'
@@ -2184,18 +2184,18 @@ 
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET range_end=recur_enddate FROM egw_cal_repeats WHERE egw_cal.cal_id=egw_cal_repeats.cal_id', __LINE__, __FILE__);
 	}
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '2','nullable' => False),
-			'recur_interval' => array('type' => 'int','precision' => '2','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '2','default' => '1')
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '2', 'nullable' => False),
+			'recur_interval' => array('type' => 'int', 'precision' => '2', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '2', 'default' => '1')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'recur_enddate');
+	), 'recur_enddate');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.007';
 }
@@ -2207,14 +2207,14 @@ 
  */
 function calendar_upgrade1_9_007()
 {
-	foreach(array('egw_cal_repeats','egw_cal_dates','egw_cal_user','egw_cal_extra') as $table)
+	foreach (array('egw_cal_repeats', 'egw_cal_dates', 'egw_cal_user', 'egw_cal_extra') as $table)
 	{
 		$GLOBALS['egw_setup']->db->query("DELETE FROM $table WHERE cal_id IN (SELECT cal_id FROM egw_cal WHERE range_start=0 OR range_start IS NULL)", __LINE__, __FILE__);
 	}
 	$GLOBALS['egw_setup']->db->query("DELETE FROM egw_cal WHERE range_start=0 OR range_start IS NULL", __LINE__, __FILE__);
 
 	// now we can remove temporary default of 0 from range_start and set it NOT NULL
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','range_start',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'range_start', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
@@ -2279,7 +2279,7 @@ 
 
 function calendar_upgrade1_9_010()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'caldav_name', array(
 		'type' => 'varchar',
 		'precision' => '200',
 		'comment' => 'name part of CalDAV URL, if specified by client'
@@ -2309,7 +2309,7 @@ 
 SET cal_reference=0,cal_recurrence=0,cal_etag=cal_etag+1,cal_modifier=0,cal_modified=".time()."
 WHERE cal_reference != 0 AND cal_id IN (SELECT cal_id FROM egw_cal_repeats)", __LINE__, __FILE__);
 
-	foreach($GLOBALS['egw_setup']->db->query(
+	foreach ($GLOBALS['egw_setup']->db->query(
 "SELECT DISTINCT master.cal_id,egw_cal_user.cal_user_type,egw_cal_user.cal_user_id,'E' AS cal_status
 FROM egw_cal_user
 JOIN egw_cal ON egw_cal_user.cal_id=egw_cal.cal_id
@@ -2336,7 +2336,7 @@ 
  */
 function calendar_upgrade14_1_001()
 {
-	foreach($GLOBALS['egw_setup']->db->query(
+	foreach ($GLOBALS['egw_setup']->db->query(
 "SELECT egw_cal.cal_id AS cal_id,cal_start,cal_end,range_start,range_end,egw_cal_repeats.*,tz_tzid AS tzid
 FROM egw_cal
 JOIN egw_cal_repeats ON egw_cal_repeats.cal_id=egw_cal.cal_id
@@ -2364,7 +2364,7 @@ 
 		$enddate->modify(($event['end'] - $event['start']).' second');
 		if (($range_end = $enddate->format('server')) != $event['range_end'])
 		{
-			$GLOBALS['egw_setup']->db->update('egw_cal',array(
+			$GLOBALS['egw_setup']->db->update('egw_cal', array(
 				'range_end' => $range_end,
 				'cal_etag=cal_etag+1',
 				'cal_modified' => time(),
@@ -2374,7 +2374,7 @@ 
 			//error_log(__FUNCTION__."() #$event[id], start=".date('Y-m-d H:i:s', $event['start']).', end='.date('Y-m-d H:i:s', $event['end']).', range_end='.date('Y-m-d H:i:s', $event['recur_enddate']).' --> '.date('Y-m-d H:i:s', $range_end));
 		}
 	}
-	return $GLOBALS['setup_info']['calendar']['currentver'] = '14.2.002';	// skip 14.2.001 update, as query is fixed now
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '14.2.002'; // skip 14.2.001 update, as query is fixed now
 }
 
 /**
@@ -2398,7 +2398,7 @@ 
 	// if maximum is bigger then 3
 	if ($values[1] > 3)
 	{
-		switch($GLOBALS['egw_setup']->db->Type)
+		switch ($GLOBALS['egw_setup']->db->Type)
 		{
 			case 'mysql':
 				$sql = "UPDATE egw_cal
@@ -2443,7 +2443,7 @@ 
 
 function calendar_upgrade14_2_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_uid',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_uid', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'nullable' => False,
@@ -2455,13 +2455,13 @@ 
 	{
 		$GLOBALS['egw_setup']->db->query("UPDATE egw_cal SET cal_category='' WHERE cal_category NOT REGEXP '^[0-9,]*$'", __LINE__, __FILE__);
 	}
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_category',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_category', array(
 		'type' => 'ascii',
 		'meta' => 'category',
 		'precision' => '64',
 		'comment' => 'category id(s)'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'caldav_name', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'comment' => 'name part of CalDAV URL, if specified by client'
@@ -2518,22 +2518,22 @@ 
 		'type' => 'auto',
 		'nullable' => False
 	));*/
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal_user',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal_user', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_recur_date' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_user_type' => array('type' => 'ascii','precision' => '1','nullable' => False,'default' => 'u','comment' => 'u=user, g=group, c=contact, r=resource, e=email'),
-			'cal_user_id' => array('type' => 'varchar','meta' => array("cal_user_type='u'" => 'account'),'precision' => '128','nullable' => False,'comment' => 'id or email-address for type=e'),
-			'cal_status' => array('type' => 'ascii','precision' => '1','default' => 'A','comment' => 'U=unknown, A=accepted, R=rejected, T=tentative'),
-			'cal_quantity' => array('type' => 'int','precision' => '4','default' => '1','comment' => 'only for certain types (eg. resources)'),
-			'cal_role' => array('type' => 'ascii','precision' => '64','default' => 'REQ-PARTICIPANT','comment' => 'CHAIR, REQ-PARTICIPANT, OPT-PARTICIPANT, NON-PARTICIPANT, X-CAT-$cat_id'),
-			'cal_user_modified' => array('type' => 'timestamp','default' => 'current_timestamp','comment' => 'automatic timestamp of last update'),
-			'cal_user_auto' => array('type' => 'auto','nullable' => False)
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_recur_date' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_user_type' => array('type' => 'ascii', 'precision' => '1', 'nullable' => False, 'default' => 'u', 'comment' => 'u=user, g=group, c=contact, r=resource, e=email'),
+			'cal_user_id' => array('type' => 'varchar', 'meta' => array("cal_user_type='u'" => 'account'), 'precision' => '128', 'nullable' => False, 'comment' => 'id or email-address for type=e'),
+			'cal_status' => array('type' => 'ascii', 'precision' => '1', 'default' => 'A', 'comment' => 'U=unknown, A=accepted, R=rejected, T=tentative'),
+			'cal_quantity' => array('type' => 'int', 'precision' => '4', 'default' => '1', 'comment' => 'only for certain types (eg. resources)'),
+			'cal_role' => array('type' => 'ascii', 'precision' => '64', 'default' => 'REQ-PARTICIPANT', 'comment' => 'CHAIR, REQ-PARTICIPANT, OPT-PARTICIPANT, NON-PARTICIPANT, X-CAT-$cat_id'),
+			'cal_user_modified' => array('type' => 'timestamp', 'default' => 'current_timestamp', 'comment' => 'automatic timestamp of last update'),
+			'cal_user_auto' => array('type' => 'auto', 'nullable' => False)
 		),
 		'pk' => array('cal_user_auto'),
 		'fk' => array(),
-		'ix' => array('cal_user_modified',array('cal_user_type','cal_user_id')),
-		'uc' => array(array('cal_id','cal_recur_date','cal_user_type','cal_user_id'))
+		'ix' => array('cal_user_modified', array('cal_user_type', 'cal_user_id')),
+		'uc' => array(array('cal_id', 'cal_recur_date', 'cal_user_type', 'cal_user_id'))
 	));
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '14.2.005';
@@ -2542,12 +2542,12 @@ 
 
 function calendar_upgrade14_2_005()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones','tz_tzid',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones', 'tz_tzid', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones','tz_component',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones', 'tz_component', array(
 		'type' => 'ascii',
 		'precision' => '8192',
 		'comment' => 'iCal VTIMEZONE component'
@@ -2563,7 +2563,7 @@ 
  */
 function calendar_upgrade14_3()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_user_attendee',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_user_attendee', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'comment' => 'email or json object with attr. cn, url, ...'
@@ -2574,12 +2574,12 @@ 
 
 	// delete all but one row, which would give a doublicate key, after above normalising of email addresses
 	// by ordering by status we prever accepted over tentative over unknow over deleted
-	foreach($GLOBALS['egw_setup']->db->select('egw_cal_user', "cal_id,cal_recur_date,$email AS email", array(
+	foreach ($GLOBALS['egw_setup']->db->select('egw_cal_user', "cal_id,cal_recur_date,$email AS email", array(
 		'cal_user_type' => 'e',
 	), __LINE__, __FILE__, false, "GROUP BY cal_id,cal_recur_date,$email HAVING COUNT(*)>1", 'calendar') as $row)
 	{
 		$n = 0;
-		foreach($GLOBALS['egw_setup']->db->select('egw_cal_user', "*,$email AS email", array(
+		foreach ($GLOBALS['egw_setup']->db->select('egw_cal_user', "*,$email AS email", array(
 			'cal_id' => $row['cal_id'],
 			'cal_recur_date' => $row['cal_recur_date'],
 			'cal_user_type' => 'e',
@@ -2588,7 +2588,7 @@ 
 		{
 			if (strpos($user['email'], '@') !== false && !$n++) continue;
 			$GLOBALS['egw_setup']->db->delete('egw_cal_user',
-				array_intersect_key($user, array_flip(array('cal_id','cal_recur_date','cal_user_type','cal_user_id','cal_status'))),
+				array_intersect_key($user, array_flip(array('cal_id', 'cal_recur_date', 'cal_user_type', 'cal_user_id', 'cal_status'))),
 				__LINE__, __FILE__, 'calendar');
 		}
 	}
@@ -2598,7 +2598,7 @@ 
 		"UPDATE egw_cal_user SET cal_user_attendee=cal_user_id,cal_user_id=MD5($email) WHERE cal_user_type='e'",
 		__LINE__, __FILE__);
 
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'ascii',
 		'meta' => array(
 			"cal_user_type='u'" => 'account'
@@ -2620,7 +2620,7 @@ 
 {
 	$GLOBALS['calendar_upgrade14_3_001-run'] = true;
 
-	foreach($GLOBALS['egw_setup']->db->query("SELECT egw_cal_user.cal_id AS cal_id,egw_cal_user.cal_user_id AS cal_user_id,egw_cal_user.cal_user_attendee AS cal_user_attendee
+	foreach ($GLOBALS['egw_setup']->db->query("SELECT egw_cal_user.cal_id AS cal_id,egw_cal_user.cal_user_id AS cal_user_id,egw_cal_user.cal_user_attendee AS cal_user_attendee
 FROM egw_cal_user
 JOIN egw_cal_user euser ON euser.cal_id=egw_cal_user.cal_id AND euser.cal_user_type='e' AND euser.cal_user_id=egw_cal_user.cal_user_id AND euser.cal_user_attendee IS NULL
 WHERE egw_cal_user.cal_user_type='e' AND egw_cal_user.cal_user_attendee IS NOT NULL
@@ -2671,8 +2671,8 @@ 
 {
 	Api\Preferences::change_preference('calendar', '/^favorite_/', function($attr, $old_value, $owner)
 	{
-		unset($attr, $owner);	// not used, but required by function signature
-		if($old_value['state'] && is_array($old_value['state']))
+		unset($attr, $owner); // not used, but required by function signature
+		if ($old_value['state'] && is_array($old_value['state']))
 		{
 			unset($old_value['state']['date']);
 			unset($old_value['state']['startdate']);
@@ -2692,15 +2692,15 @@ 
 {
 	Api\Preferences::change_preference('calendar', 'use_time_grid', function($attr, $old_value, $owner)
 	{
-		unset($attr, $owner);	// not used, but required by function signature
-		switch($old_value)
+		unset($attr, $owner); // not used, but required by function signature
+		switch ($old_value)
 		{
 			case 'all':
 				return 0;
 			case 'day_week':
-				return ['day','day4','week'];
+				return ['day', 'day4', 'week'];
 			case 'day4':
-				return ['day','day4'];
+				return ['day', 'day4'];
 		}
 		return null;
 	});
@@ -2725,7 +2725,7 @@ 
 function calendar_upgrade16_1_001()
 {
 	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_extra', 'cal_extra_value',
-		array('type' => 'varchar','meta' => 'cfvalue','precision' => '16384','nullable' => False,'default' => ''));
+		array('type' => 'varchar', 'meta' => 'cfvalue', 'precision' => '16384', 'nullable' => False, 'default' => ''));
 
 	Api\Preferences::change_preference('calendar', 'defaultresource_sel', 'resources', 'addressbook', 'forced');
 	Api\Preferences::change_preference('calendar', 'defaultresource_sel', 'resources', 'addressbook', 'default');
@@ -2737,8 +2737,8 @@ 
 {
 	// Explicitly add months as showing list of events, no times
 	$change = function($attr, $old_value, $owner) {
-		if($owner == Api\Preferences::FORCED_ID) return;
-		if(is_array($old_value) && !in_array('month', $old_value))
+		if ($owner == Api\Preferences::FORCED_ID) return;
+		if (is_array($old_value) && !in_array('month', $old_value))
 		{
 			$old_value[] = 'month';
 		}

Braces +18 added lines, -5 removed lines

@@ -1429,13 +1429,18 @@ 
 function calendar_upgrade1_0_1_008()
 {
 	$config_data = Api\Config::read('calendar');
-	if (isset($config_data['fields']))	// old custom fields
+	if (isset($config_data['fields']))
+	{
+		// old custom fields
 	{
 		$customfields = array();
+	}
 		$order = 0;
 		foreach($config_data['fields'] as $name => $data)
 		{
-			if ($name{0} == '#' && !$data['disabled'])	// real not-disabled custom field
+			if ($name{0} == '#' && !$data['disabled'])
+			{
+				// real not-disabled custom field
 			{
 				$customfields[substr($name,1)] = array(
 					'type'  => 'text',
@@ -1444,6 +1449,7 @@ 
 					'order' => ($order += 10),
 				);
 			}
+			}
 		}
 		if (count($customfields))
 		{
@@ -2584,9 +2590,12 @@ 
 			'cal_recur_date' => $row['cal_recur_date'],
 			'cal_user_type' => 'e',
 			$email.'='.$GLOBALS['egw_setup']->db->quote($row['email']),
-		), __LINE__, __FILE__, false, 'ORDER BY cal_status', 'calendar') as $user)	// order A, T, U, X
+		), __LINE__, __FILE__, false, 'ORDER BY cal_status', 'calendar') as $user)
+		{
+			// order A, T, U, X
 		{
 			if (strpos($user['email'], '@') !== false && !$n++) continue;
+		}
 			$GLOBALS['egw_setup']->db->delete('egw_cal_user',
 				array_intersect_key($user, array_flip(array('cal_id','cal_recur_date','cal_user_type','cal_user_id','cal_status'))),
 				__LINE__, __FILE__, 'calendar');
@@ -2736,8 +2745,12 @@ 
 function calendar_upgrade16_1_002()
 {
 	// Explicitly add months as showing list of events, no times
-	$change = function($attr, $old_value, $owner) {
-		if($owner == Api\Preferences::FORCED_ID) return;
+	$change = function($attr, $old_value, $owner)
+	{
+		if($owner == Api\Preferences::FORCED_ID)
+		{
+			return;
+		}
 		if(is_array($old_value) && !in_array('month', $old_value))
 		{
 			$old_value[] = 'month';

calendar/inc/class.calendar_bo.inc.php

Spacing +302 added lines, -304 removed lines

@@ -17,12 +17,12 @@ 
 
 if (!defined('ACL_TYPE_IDENTIFER'))	// used to mark ACL-values for the debug_message methode
 {
-	define('ACL_TYPE_IDENTIFER','***ACL***');
+	define('ACL_TYPE_IDENTIFER', '***ACL***');
 }
 
-define('HOUR_s',60*60);
-define('DAY_s',24*HOUR_s);
-define('WEEK_s',7*DAY_s);
+define('HOUR_s', 60 * 60);
+define('DAY_s', 24 * HOUR_s);
+define('WEEK_s', 7 * DAY_s);
 
 /**
  * Required (!) include, as we use the MCAL_* constants, BEFORE instanciating (and therefore autoloading) the class
@@ -71,7 +71,7 @@ 
 	 *	4 = function-calls to exported conversation-functions like date2ts, date2array, ...
 	 *	5 = function-calls to private functions
 	 */
-	var $debug=false;
+	var $debug = false;
 
 	/**
 	 * @var int $now timestamp in server-time
@@ -101,12 +101,12 @@ 
 	/**
 	 * @var int $user nummerical id of the current user-id
 	 */
-	var $user=0;
+	var $user = 0;
 
 	/**
 	 * @var array $grants grants of the current user, array with user-id / ored-ACL-rights pairs
 	 */
-	var $grants=array();
+	var $grants = array();
 
 	/**
 	 * @var array $verbose_status translated 1-char status values to a verbose name, run through lang() by the constructor
@@ -219,7 +219,7 @@ 
 	 */
 	function __construct()
 	{
-		if ($this->debug > 0) $this->debug_message('calendar_bo::bocal() started',True);
+		if ($this->debug > 0) $this->debug_message('calendar_bo::bocal() started', True);
 
 		$this->so = new calendar_so();
 
@@ -240,11 +240,11 @@ 
 			}
 			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository();
 		}
-		$this->common_prefs =& $GLOBALS['egw_info']['user']['preferences']['common'];
-		$this->cal_prefs =& $GLOBALS['egw_info']['user']['preferences']['calendar'];
+		$this->common_prefs = & $GLOBALS['egw_info']['user']['preferences']['common'];
+		$this->cal_prefs = & $GLOBALS['egw_info']['user']['preferences']['calendar'];
 
 		$this->now = time();
-		$this->now_su = Api\DateTime::server2user($this->now,'ts');
+		$this->now_su = Api\DateTime::server2user($this->now, 'ts');
 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
@@ -253,7 +253,7 @@ 
 		if (!is_array($this->resources = Api\Cache::getSession('calendar', 'resources')))
 		{
 			$this->resources = array();
-			foreach(Api\Hooks::process('calendar_resources') as $app => $data)
+			foreach (Api\Hooks::process('calendar_resources') as $app => $data)
 			{
 				if ($data && $data['type'])
 				{
@@ -266,8 +266,8 @@ 
 				'app'  => 'email',
 			);
 			$this->resources['l'] = array(
-				'type' => 'l',// one char type-identifier for this resources
-				'info' => __CLASS__ .'::mailing_lists',// info method, returns array with id, type & name for a given id
+				'type' => 'l', // one char type-identifier for this resources
+				'info' => __CLASS__.'::mailing_lists', // info method, returns array with id, type & name for a given id
 				'app' => 'Distribution list'
 			);
 			$this->resources[''] = array(
@@ -275,22 +275,22 @@ 
 				'app' => 'api-accounts',
 			);
 			$this->resources['l'] = array(
-				'type' => 'l',// one char type-identifier for this resources
-				'info' => __CLASS__ .'::mailing_lists',// info method, returns array with id, type & name for a given id
+				'type' => 'l', // one char type-identifier for this resources
+				'info' => __CLASS__.'::mailing_lists', // info method, returns array with id, type & name for a given id
 				'app' => 'Distribution list'
 			);
 			Api\Cache::setSession('calendar', 'resources', $this->resources);
 		}
 		//error_log(__METHOD__ . " registered resources=". array2string($this->resources));
 
-		$this->config = Api\Config::read('calendar');	// only used for horizont, regular calendar config is under phpgwapi
+		$this->config = Api\Config::read('calendar'); // only used for horizont, regular calendar config is under phpgwapi
 		$this->require_acl_invite = $GLOBALS['egw_info']['server']['require_acl_invite'];
 
-		$this->categories = new Api\Categories($this->user,'calendar');
+		$this->categories = new Api\Categories($this->user, 'calendar');
 
 		$this->customfields = Api\Storage\Customfields::get('calendar');
 
-		foreach($this->alarms as $secs => &$label)
+		foreach ($this->alarms as $secs => &$label)
 		{
 			$label = self::secs2label($secs);
 		}
@@ -306,15 +306,15 @@ 
 	{
 		if ($secs <= 3600)
 		{
-			$label = lang('%1 minutes', $secs/60);
+			$label = lang('%1 minutes', $secs / 60);
 		}
-		elseif($secs <= 86400)
+		elseif ($secs <= 86400)
 		{
-			$label = lang('%1 hours', $secs/3600);
+			$label = lang('%1 hours', $secs / 3600);
 		}
 		else
 		{
-			$label = lang('%1 days', $secs/86400);
+			$label = lang('%1 days', $secs / 86400);
 		}
 		return $label;
 	}
@@ -330,12 +330,12 @@ 
 		if (!$ids) return null;
 
 		$data = array();
-		foreach((array)$ids as $id)
+		foreach ((array)$ids as $id)
 		{
 			$email = $id;
 			$name = '';
 			$matches = null;
-			if (preg_match('/^(.*) *<([a-z0-9_.@-]{8,})>$/iU',$email,$matches))
+			if (preg_match('/^(.*) *<([a-z0-9_.@-]{8,})>$/iU', $email, $matches))
 			{
 				$name = $matches[1];
 				$email = $matches[2];
@@ -359,7 +359,7 @@ 
 	 */
 	static function mailing_lists($ids)
 	{
-		if(!is_array($ids))
+		if (!is_array($ids))
 		{
 			$ids = array($ids);
 		}
@@ -368,7 +368,7 @@ 
 		// Email list
 		$contacts_obj = new Api\Contacts();
 		$bo = new calendar_bo();
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			$list = $contacts_obj->read_list((int)$id);
 
@@ -395,22 +395,22 @@ 
 	 *
 	 * @return array
 	 */
-	public function enum_mailing_list($id, $ignore_acl= false, $use_freebusy = true)
+	public function enum_mailing_list($id, $ignore_acl = false, $use_freebusy = true)
 	{
 		$contact_list = array();
 		$contacts = new Api\Contacts();
-		if($contacts->check_list((int)substr($id,1), ACL::READ) || (int)substr($id,1) < 0)
+		if ($contacts->check_list((int)substr($id, 1), ACL::READ) || (int)substr($id, 1) < 0)
 		{
-			$options = array('list' => substr($id,1));
-			$lists = $contacts->search('',true,'','','',false,'AND',false,$options);
-			if(!$lists)
+			$options = array('list' => substr($id, 1));
+			$lists = $contacts->search('', true, '', '', '', false, 'AND', false, $options);
+			if (!$lists)
 			{
 				return $contact_list;
 			}
-			foreach($lists as &$contact)
+			foreach ($lists as &$contact)
 			{
 				// Check for user account
-				if (($account_id = $GLOBALS['egw']->accounts->name2id($contact['id'],'person_id')))
+				if (($account_id = $GLOBALS['egw']->accounts->name2id($contact['id'], 'person_id')))
 				{
 					$contact = ''.$account_id;
 				}
@@ -418,9 +418,9 @@ 
 				{
 					$contact = 'c'.$contact['id'];
 				}
-				if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy?self::ACL_FREEBUSY:0),0,$contact))
+				if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy ?self::ACL_FREEBUSY : 0), 0, $contact))
 				{
-					if ($contact && !in_array($contact,$contact_list))	// already added?
+					if ($contact && !in_array($contact, $contact_list))	// already added?
 					{
 						$contact_list[] = $contact;
 					}
@@ -439,12 +439,12 @@ 
 	function enum_groups(&$event)
 	{
 		$added = 0;
-		foreach(array_keys($event['participants']) as $uid)
+		foreach (array_keys($event['participants']) as $uid)
 		{
 			if (is_numeric($uid) && $GLOBALS['egw']->accounts->get_type($uid) == 'g' &&
 				($members = $GLOBALS['egw']->accounts->members($uid, true)))
 			{
-				foreach($members as $member)
+				foreach ($members as $member)
 				{
 					if (!isset($event['participants'][$member]))
 					{
@@ -466,7 +466,7 @@ 
 	 * @param boolean $use_freebusy =true should freebusy rights are taken into account, default true, can be set to false eg. for a search
 	 * @return array of user-ids
 	 */
-	private function resolve_users($_users, $no_enum_groups=true, $ignore_acl=false, $use_freebusy=true)
+	private function resolve_users($_users, $no_enum_groups = true, $ignore_acl = false, $use_freebusy = true)
 	{
 		if (!is_array($_users))
 		{
@@ -474,35 +474,35 @@ 
 		}
 		// only query calendars of users, we have READ-grants from
 		$users = array();
-		foreach($_users as $user)
+		foreach ($_users as $user)
 		{
 			$user = trim($user);
 			
 			// Handle email lists
-			if(!is_numeric($user) && $user[0] == 'l')
+			if (!is_numeric($user) && $user[0] == 'l')
 			{
-				foreach($this->enum_mailing_list($user, $ignore_acl, $use_freebusy) as $contact)
+				foreach ($this->enum_mailing_list($user, $ignore_acl, $use_freebusy) as $contact)
 				{
-					if ($contact && !in_array($contact,$users))	// already added?
+					if ($contact && !in_array($contact, $users))	// already added?
 					{
 						$users[] = $contact;
 					}
 				}
 				continue;
 			}
-			if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy?self::ACL_FREEBUSY:0),0,$user))
+			if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy ?self::ACL_FREEBUSY : 0), 0, $user))
 			{
-				if ($user && !in_array($user,$users))	// already added?
+				if ($user && !in_array($user, $users))	// already added?
 				{
 					// General expansion check
 					if (!is_numeric($user) && $this->resources[$user[0]]['info'])
 					{
 						$info = $this->resource_info($user);
-						if($info && $info['resources'])
+						if ($info && $info['resources'])
 						{
-							foreach($info['resources'] as $_user)
+							foreach ($info['resources'] as $_user)
 							{
-								if($_user && !in_array($_user, $users))
+								if ($_user && !in_array($_user, $users))
 								{
 									$users[] = $_user;
 								}
@@ -515,7 +515,7 @@ 
 			}
 			elseif ($GLOBALS['egw']->accounts->get_type($user) != 'g')
 			{
-				continue;	// for non-groups (eg. users), we stop here if we have no read-rights
+				continue; // for non-groups (eg. users), we stop here if we have no read-rights
 			}
 			// the further code is only for real users
 			if (!is_numeric($user)) continue;
@@ -528,11 +528,11 @@ 
 				$members = $GLOBALS['egw']->accounts->members($user, true);
 				if (is_array($members))
 				{
-					foreach($members as $member)
+					foreach ($members as $member)
 					{
 						// use only members which gave the user a read-grant
 						if (!in_array($member, $users) &&
-							($ignore_acl || $this->check_perms(Acl::READ|($use_freebusy?self::ACL_FREEBUSY:0),0,$member)))
+							($ignore_acl || $this->check_perms(Acl::READ|($use_freebusy ?self::ACL_FREEBUSY : 0), 0, $member)))
 						{
 							$users[] = $member;
 						}
@@ -544,9 +544,9 @@ 
 				$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 				if (is_array($memberships))
 				{
-					foreach($memberships as $group)
+					foreach ($memberships as $group)
 					{
-						if (!in_array($group,$users))
+						if (!in_array($group, $users))
 						{
 							$users[] = $group;
 						}
@@ -587,18 +587,18 @@ 
 	 * @return iterator|array|boolean array of events or array with YYYYMMDD strings / array of events pairs (depending on $daywise param)
 	 *	or false if there are no read-grants from _any_ of the requested users or iterator/recordset if cols are given
 	 */
-	function &search($params,$sql_filter=null)
+	function &search($params, $sql_filter = null)
 	{
 		$params_in = $params;
 
-		$params['sql_filter'] = $sql_filter;	// dont allow to set it via UI or xmlrpc
+		$params['sql_filter'] = $sql_filter; // dont allow to set it via UI or xmlrpc
 
 		// check if any resource wants to hook into
-		foreach($this->resources as $data)
+		foreach ($this->resources as $data)
 		{
 			if (isset($data['search_filter']))
 			{
-				$params = ExecMethod($data['search_filter'],$params);
+				$params = ExecMethod($data['search_filter'], $params);
 			}
 		}
 
@@ -616,9 +616,9 @@ 
 		if (!empty($params['query']))
 		{
 			$params['private_grants'] = array();
-			foreach($this->grants as $user => $rights)
+			foreach ($this->grants as $user => $rights)
 			{
-				if ($rights & Acl::PRIVAT) $params['private_grants'][] = $user;
+				if ($rights&Acl::PRIVAT) $params['private_grants'][] = $user;
 			}
 		}
 
@@ -644,49 +644,49 @@ 
 		$params['enum_recuring'] = $enum_recuring = $daywise || !isset($params['enum_recuring']) || !!$params['enum_recuring'];
 		$cat_id = isset($params['cat_id']) ? $params['cat_id'] : 0;
 		$filter = isset($params['filter']) ? $params['filter'] : 'all';
-		$offset = isset($params['offset']) && $params['offset'] !== false ? (int) $params['offset'] : false;
+		$offset = isset($params['offset']) && $params['offset'] !== false ? (int)$params['offset'] : false;
 		// socal::search() returns rejected group-invitations, as only the user not also the group is rejected
 		// as we cant remove them efficiantly in SQL, we kick them out here, but only if just one user is displayed
 		$users_in = (array)$params_in['users'];
-		$remove_rejected_by_user = !in_array($filter,array('all','rejected','everything')) &&
+		$remove_rejected_by_user = !in_array($filter, array('all', 'rejected', 'everything')) &&
 			count($users_in) == 1 && $users_in[0] > 0 ? $users_in[0] : null;
 		//error_log(__METHOD__.'('.array2string($params_in).", $sql_filter) params[users]=".array2string($params['users']).' --> remove_rejected_by_user='.array2string($remove_rejected_by_user));
 
 		if ($this->debug && ($this->debug > 1 || $this->debug == 'search'))
 		{
 			$this->debug_message('calendar_bo::search(%1) start=%2, end=%3, daywise=%4, cat_id=%5, filter=%6, query=%7, offset=%8, num_rows=%9, order=%10, sql_filter=%11)',
-				True,$params,$start,$end,$daywise,$cat_id,$filter,$params['query'],$offset,(int)$params['num_rows'],$params['order'],$params['sql_filter']);
+				True, $params, $start, $end, $daywise, $cat_id, $filter, $params['query'], $offset, (int)$params['num_rows'], $params['order'], $params['sql_filter']);
 		}
 		// date2ts(,true) converts to server time, db2data converts again to user-time
-		$events =& $this->so->search(isset($start) ? $this->date2ts($start,true) : null,isset($end) ? $this->date2ts($end,true) : null,
-			$users,$cat_id,$filter,$offset,(int)$params['num_rows'],$params,$remove_rejected_by_user);
+		$events = & $this->so->search(isset($start) ? $this->date2ts($start, true) : null, isset($end) ? $this->date2ts($end, true) : null,
+			$users, $cat_id, $filter, $offset, (int)$params['num_rows'], $params, $remove_rejected_by_user);
 
 		if (isset($params['cols']))
 		{
 			return $events;
 		}
 		$this->total = $this->so->total;
-		$this->db2data($events,isset($params['date_format']) ? $params['date_format'] : 'ts');
+		$this->db2data($events, isset($params['date_format']) ? $params['date_format'] : 'ts');
 
 		//echo "<p align=right>remove_rejected_by_user=$remove_rejected_by_user, filter=$filter, params[users]=".print_r($param['users'])."</p>\n";
-		foreach($events as $id => $event)
+		foreach ($events as $id => $event)
 		{
 			if ($params['enum_groups'] && $this->enum_groups($event))
 			{
 				$events[$id] = $event;
 			}
 			$matches = null;
-			if (!(int)$event['id'] && preg_match('/^([a-z_]+)([0-9]+)$/',$event['id'],$matches))
+			if (!(int)$event['id'] && preg_match('/^([a-z_]+)([0-9]+)$/', $event['id'], $matches))
 			{
-				$is_private = self::integration_get_private($matches[1],$matches[2],$event);
+				$is_private = self::integration_get_private($matches[1], $matches[2], $event);
 			}
 			else
 			{
-				$is_private = !$this->check_perms(Acl::READ,$event);
+				$is_private = !$this->check_perms(Acl::READ, $event);
 			}
 			if (!$params['ignore_acl'] && ($is_private || (!$event['public'] && $filter == 'hideprivate')))
 			{
-				$this->clear_private_infos($events[$id],$users);
+				$this->clear_private_infos($events[$id], $users);
 			}
 		}
 
@@ -694,18 +694,18 @@ 
 		{
 			if ($this->debug && ($this->debug > 2 || $this->debug == 'search'))
 			{
-				$this->debug_message('socalendar::search daywise sorting from %1 to %2 of %3',False,$start,$end,$events);
+				$this->debug_message('socalendar::search daywise sorting from %1 to %2 of %3', False, $start, $end, $events);
 			}
 			// create empty entries for each day in the reported time
-			for($ts = $start; $ts <= $end; $ts += DAY_s) // good enough for array creation, but see while loop below.
+			for ($ts = $start; $ts <= $end; $ts += DAY_s) // good enough for array creation, but see while loop below.
 			{
 				$daysEvents[$this->date2string($ts)] = array();
 			}
-			foreach($events as $k => $event)
+			foreach ($events as $k => $event)
 			{
-				$e_start = max($this->date2ts($event['start']),$start);
+				$e_start = max($this->date2ts($event['start']), $start);
 				// $event['end']['raw']-1 to allow events to end on a full hour/day without the need to enter it as minute=59
-				$e_end   = min($this->date2ts($event['end'])-1,$end);
+				$e_end   = min($this->date2ts($event['end']) - 1, $end);
 
 				// add event to each day in the reported time
 				$ts = $e_start;
@@ -714,23 +714,23 @@ 
 				$ymd = null;
 				while ($ts <= $e_end)
 				{
-					$daysEvents[$ymd = $this->date2string($ts)][] =& $events[$k];
-					$ts = strtotime("+1 day",$ts);
+					$daysEvents[$ymd = $this->date2string($ts)][] = & $events[$k];
+					$ts = strtotime("+1 day", $ts);
 				}
 				if ($ymd != ($last = $this->date2string($e_end)))
 				{
-					$daysEvents[$last][] =& $events[$k];
+					$daysEvents[$last][] = & $events[$k];
 				}
 			}
-			$events =& $daysEvents;
+			$events = & $daysEvents;
 			if ($this->debug && ($this->debug > 2 || $this->debug == 'search'))
 			{
-				$this->debug_message('socalendar::search daywise events=%1',False,$events);
+				$this->debug_message('socalendar::search daywise events=%1', False, $events);
 			}
 		}
 		if ($this->debug && ($this->debug > 0 || $this->debug == 'search'))
 		{
-			$this->debug_message('calendar_bo::search(%1)=%2',True,$params,$events);
+			$this->debug_message('calendar_bo::search(%1)=%2', True, $params, $events);
 		}
 		//error_log(__METHOD__."() returning ".count($events)." entries, total=$this->total ".function_backtrace());
 		return $events;
@@ -743,9 +743,9 @@ 
 	 * @param string $part
 	 * @return array
 	 */
-	static function integration_get_data($app,$part=null)
+	static function integration_get_data($app, $part = null)
 	{
-		static $integration_data=null;
+		static $integration_data = null;
 
 		if (!isset($integration_data))
 		{
@@ -767,14 +767,14 @@ 
 	 * @param int|string $id
 	 * @return string
 	 */
-	static function integration_get_private($app,$id,$event)
+	static function integration_get_private($app, $id, $event)
 	{
-		$app_data = self::integration_get_data($app,'is_private');
+		$app_data = self::integration_get_data($app, 'is_private');
 
 		// no method, fall back to link title
 		if (is_null($app_data))
 		{
-			$is_private = !Link::title($app,$id);
+			$is_private = !Link::title($app, $id);
 		}
 		// boolean value to make all events of $app public (false) or private (true)
 		elseif (is_bool($app_data))
@@ -783,7 +783,7 @@ 
 		}
 		else
 		{
-			$is_private = (bool)ExecMethod2($app_data,$id,$event);
+			$is_private = (bool)ExecMethod2($app_data, $id, $event);
 		}
 		//echo '<p>'.__METHOD__."($app,$id,) app_data=".array2string($app_data).' returning '.array2string($is_private)."</p>\n";
 		return $is_private;
@@ -797,7 +797,7 @@ 
 	 * @param array &$event
 	 * @param array $allowed_participants ids of the allowed participants, eg. the ones the search is over or eg. the owner of the calendar
 	 */
-	function clear_private_infos(&$event,$allowed_participants = array())
+	function clear_private_infos(&$event, $allowed_participants = array())
 	{
 		if ($event == false) return;
 		if (!is_array($event['participants'])) error_log(__METHOD__.'('.array2string($event).', '.array2string($allowed_participants).') NO PARTICIPANTS '.function_backtrace());
@@ -813,19 +813,19 @@ 
 			'owner'		=> $event['owner'],
 			'uid'	=> $event['uid'],
 			'etag'	=> $event['etag'],
-			'participants' => array_intersect_key($event['participants'],array_flip($allowed_participants)),
+			'participants' => array_intersect_key($event['participants'], array_flip($allowed_participants)),
 			'public'=> 0,
-			'category' => $event['category'],	// category is visible anyway, eg. by using planner by cat
+			'category' => $event['category'], // category is visible anyway, eg. by using planner by cat
 			'non_blocking' => $event['non_blocking'],
 			'caldav_name' => $event['caldav_name'],
 		// we need full recurrence information, as they are relevant free/busy information
-		)+($event['recur_type'] ? array(
+		) + ($event['recur_type'] ? array(
 			'recur_type'     => $event['recur_type'],
 			'recur_interval' => $event['recur_interval'],
 			'recur_data'     => $event['recur_data'],
 			'recur_enddate'  => $event['recur_enddate'],
 			'recur_exception'=> $event['recur_exception'],
-		):array(
+		) : array(
 			'reference'      => $event['reference'],
 			'recurrence'     => $event['recurrence'],
 		));
@@ -839,15 +839,15 @@ 
 	 */
 	function check_move_horizont($_new_horizont)
 	{
-		if ((int) $this->debug >= 2 || $this->debug == 'check_move_horizont')
+		if ((int)$this->debug >= 2 || $this->debug == 'check_move_horizont')
 		{
-			$this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2',true,$_new_horizont,(int)$this->config['horizont']);
+			$this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2', true, $_new_horizont, (int)$this->config['horizont']);
 		}
-		$new_horizont = $this->date2ts($_new_horizont,true);	// now we are in server-time, where this function operates
+		$new_horizont = $this->date2ts($_new_horizont, true); // now we are in server-time, where this function operates
 
 		if ($new_horizont <= $this->config['horizont'])	// no move necessary
 		{
-			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 is bigger ==> nothing to do',true,$new_horizont,(int)$this->config['horizont']);
+			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 is bigger ==> nothing to do', true, $new_horizont, (int)$this->config['horizont']);
 			return;
 		}
 		if (!empty($GLOBALS['egw_info']['server']['calendar_horizont']))
@@ -855,15 +855,15 @@ 
 			$maxdays = abs($GLOBALS['egw_info']['server']['calendar_horizont']);
 		}
 		if (empty($maxdays)) $maxdays = 1000; // old default
-		if ($new_horizont > time()+$maxdays*DAY_s)		// some user tries to "look" more then the maximum number of days in the future
+		if ($new_horizont > time() + $maxdays * DAY_s)		// some user tries to "look" more then the maximum number of days in the future
 		{
-			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 new horizont more then %3 days from now --> ignoring it',true,$new_horizont,(int)$this->config['horizont'],$maxdays);
-			$this->warnings['horizont'] = lang('Requested date %1 outside allowed range of %2 days: recurring events obmitted!', Api\DateTime::to($new_horizont,true), $maxdays);
+			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 new horizont more then %3 days from now --> ignoring it', true, $new_horizont, (int)$this->config['horizont'], $maxdays);
+			$this->warnings['horizont'] = lang('Requested date %1 outside allowed range of %2 days: recurring events obmitted!', Api\DateTime::to($new_horizont, true), $maxdays);
 			return;
 		}
-		if ($new_horizont < time()+31*DAY_s)
+		if ($new_horizont < time() + 31 * DAY_s)
 		{
-			$new_horizont = time()+31*DAY_s;
+			$new_horizont = time() + 31 * DAY_s;
 		}
 		$old_horizont = $this->config['horizont'];
 		$this->config['horizont'] = $new_horizont;
@@ -871,21 +871,21 @@ 
 		// create further recurrences for all recurring and not yet (at the old horizont) ended events
 		if (($recuring = $this->so->unfinished_recuring($old_horizont)))
 		{
-			@set_time_limit(0);	// disable time-limit, in case it takes longer to calculate the recurrences
-			foreach($this->read(array_keys($recuring)) as $cal_id => $event)
+			@set_time_limit(0); // disable time-limit, in case it takes longer to calculate the recurrences
+			foreach ($this->read(array_keys($recuring)) as $cal_id => $event)
 			{
 				if ($this->debug == 'check_move_horizont')
 				{
-					$this->debug_message('calendar_bo::check_move_horizont(%1): calling set_recurrences(%2,%3)',true,$new_horizont,$event,$old_horizont);
+					$this->debug_message('calendar_bo::check_move_horizont(%1): calling set_recurrences(%2,%3)', true, $new_horizont, $event, $old_horizont);
 				}
 				// insert everything behind max(cal_start), which can be less then $old_horizont because of bugs in the past
-				$this->set_recurrences($event,Api\DateTime::server2user($recuring[$cal_id]+1));	// set_recurences operates in user-time!
+				$this->set_recurrences($event, Api\DateTime::server2user($recuring[$cal_id] + 1)); // set_recurences operates in user-time!
 			}
 		}
 		// update the horizont
-		Api\Config::save_value('horizont',$this->config['horizont'],'calendar');
+		Api\Config::save_value('horizont', $this->config['horizont'], 'calendar');
 
-		if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) new horizont=%2, exiting',true,$new_horizont,(int)$this->config['horizont']);
+		if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) new horizont=%2, exiting', true, $new_horizont, (int)$this->config['horizont']);
 	}
 
 	/**
@@ -896,11 +896,11 @@ 
 	 * @param array $event
 	 * @param mixed $start =0 minimum start-time for new recurrences or !$start = since the start of the event
 	 */
-	function set_recurrences($event,$start=0)
+	function set_recurrences($event, $start = 0)
 	{
-		if ($this->debug && ((int) $this->debug >= 2 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont'))
+		if ($this->debug && ((int)$this->debug >= 2 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont'))
 		{
-			$this->debug_message('calendar_bo::set_recurrences(%1,%2)',true,$event,$start);
+			$this->debug_message('calendar_bo::set_recurrences(%1,%2)', true, $event, $start);
 		}
 		// check if the caller gave us enough information and if not read it from the DB
 		if (!isset($event['participants']) || !isset($event['start']) || !isset($event['end']))
@@ -921,29 +921,29 @@ 
 		$read_start = new Api\DateTime($event_read['start']);
 
 		$events = array();
-		$this->insert_all_recurrences($event,$start,$this->date2usertime($this->config['horizont']),$events);
+		$this->insert_all_recurrences($event, $start, $this->date2usertime($this->config['horizont']), $events);
 
 		$exceptions = array();
-		foreach((array)$event['recur_exception'] as $exception)
+		foreach ((array)$event['recur_exception'] as $exception)
 		{
-			$exceptions[] = Api\DateTime::to($exception, true);	// true = date
+			$exceptions[] = Api\DateTime::to($exception, true); // true = date
 		}
-		foreach($events as $event)
+		foreach ($events as $event)
 		{
 			$is_exception = in_array(Api\DateTime::to($event['start'], true), $exceptions);
-			$start = $this->date2ts($event['start'],true);
+			$start = $this->date2ts($event['start'], true);
 			if ($event['whole_day'])
 			{
 				$start = new Api\DateTime($event['start'], Api\DateTime::$server_timezone);
-				$start->setTime(0,0,0);
+				$start->setTime(0, 0, 0);
 				$start = $start->format('ts');
 				$time = $this->so->startOfDay(new Api\DateTime($event['end'], Api\DateTime::$user_timezone));
 				$time->setTime(23, 59, 59);
-				$end = $this->date2ts($time,true);
+				$end = $this->date2ts($time, true);
 			}
 			else
 			{
-				$end = $this->date2ts($event['end'],true);
+				$end = $this->date2ts($event['end'], true);
 			}
 			//error_log(__METHOD__."() start=".Api\DateTime::to($start).", is_exception=".array2string($is_exception));
 			$this->so->recurrence($event['id'], $start, $end, $event['participants'], $is_exception);
@@ -959,7 +959,7 @@ 
 	 * @param array &$events array of event-arrays (reference)
 	 * @param $date_format ='ts' date-formats: 'ts'=timestamp, 'server'=timestamp in server-time, 'array'=array or string with date-format
 	 */
-	function db2data(&$events,$date_format='ts')
+	function db2data(&$events, $date_format = 'ts')
 	{
 		if (!is_array($events)) echo "<p>calendar_bo::db2data(\$events,$date_format) \$events is no array<br />\n".function_backtrace()."</p>\n";
 		foreach ($events as &$event)
@@ -972,65 +972,65 @@ 
 			// database returns timestamps as string, convert them to integer
 			// to avoid misinterpretation by Api\DateTime as Ymd string
 			// (this will fail on 32bit systems for times > 2038!)
-			$event['start'] = (int)$event['start'];	// this is for isWholeDay(), which also calls Api\DateTime
+			$event['start'] = (int)$event['start']; // this is for isWholeDay(), which also calls Api\DateTime
 			$event['end'] = (int)$event['end'];
 			$event['whole_day'] = self::isWholeDay($event);
 			if ($event['whole_day'] && $date_format != 'server')
 			{
 				// Adjust dates to user TZ
-				$stime =& $this->so->startOfDay(new Api\DateTime((int)$event['start'], Api\DateTime::$server_timezone), $event['tzid']);
+				$stime = & $this->so->startOfDay(new Api\DateTime((int)$event['start'], Api\DateTime::$server_timezone), $event['tzid']);
 				$event['start'] = Api\DateTime::to($stime, $date_format);
-				$time =& $this->so->startOfDay(new Api\DateTime((int)$event['end'], Api\DateTime::$server_timezone), $event['tzid']);
+				$time = & $this->so->startOfDay(new Api\DateTime((int)$event['end'], Api\DateTime::$server_timezone), $event['tzid']);
 				$time->setTime(23, 59, 59);
 				$event['end'] = Api\DateTime::to($time, $date_format);
 				if (!empty($event['recurrence']))
 				{
-					$time =& $this->so->startOfDay(new Api\DateTime((int)$event['recurrence'], Api\DateTime::$server_timezone), $event['tzid']);
+					$time = & $this->so->startOfDay(new Api\DateTime((int)$event['recurrence'], Api\DateTime::$server_timezone), $event['tzid']);
 					$event['recurrence'] = Api\DateTime::to($time, $date_format);
 				}
 				if (!empty($event['recur_enddate']))
 				{
-					$time =& $this->so->startOfDay(new Api\DateTime((int)$event['recur_enddate'], Api\DateTime::$server_timezone), $event['tzid']);
+					$time = & $this->so->startOfDay(new Api\DateTime((int)$event['recur_enddate'], Api\DateTime::$server_timezone), $event['tzid']);
 					$time->setTime(23, 59, 59);
 					$event['recur_enddate'] = Api\DateTime::to($time, $date_format);
 				}
-				$timestamps = array('modified','created','deleted');
+				$timestamps = array('modified', 'created', 'deleted');
 			}
 			else
 			{
-				$timestamps = array('start','end','modified','created','recur_enddate','recurrence','recur_date','deleted');
+				$timestamps = array('start', 'end', 'modified', 'created', 'recur_enddate', 'recurrence', 'recur_date', 'deleted');
 			}
 			// we convert here from the server-time timestamps to user-time and (optional) to a different date-format!
 			foreach ($timestamps as $ts)
 			{
 				if (!empty($event[$ts]))
 				{
-					$event[$ts] = $this->date2usertime((int)$event[$ts],$date_format);
+					$event[$ts] = $this->date2usertime((int)$event[$ts], $date_format);
 				}
 			}
 			// same with the recur exceptions
 			if (isset($event['recur_exception']) && is_array($event['recur_exception']))
 			{
-				foreach($event['recur_exception'] as &$date)
+				foreach ($event['recur_exception'] as &$date)
 				{
 					if ($event['whole_day'] && $date_format != 'server')
 					{
 						// Adjust dates to user TZ
-						$time =& $this->so->startOfDay(new Api\DateTime((int)$date, Api\DateTime::$server_timezone), $event['tzid']);
+						$time = & $this->so->startOfDay(new Api\DateTime((int)$date, Api\DateTime::$server_timezone), $event['tzid']);
 						$date = Api\DateTime::to($time, $date_format);
 					}
 					else
 					{
-						$date = $this->date2usertime((int)$date,$date_format);
+						$date = $this->date2usertime((int)$date, $date_format);
 					}
 				}
 			}
 			// same with the alarms
 			if (isset($event['alarm']) && is_array($event['alarm']))
 			{
-				foreach($event['alarm'] as &$alarm)
+				foreach ($event['alarm'] as &$alarm)
 				{
-					$alarm['time'] = $this->date2usertime((int)$alarm['time'],$date_format);
+					$alarm['time'] = $this->date2usertime((int)$alarm['time'], $date_format);
 				}
 			}
 		}
@@ -1043,11 +1043,11 @@ 
 	 * @param string $date_format ='ts' date-formats: 'ts'=timestamp, 'server'=timestamp in server-time, 'array'=array or string with date-format
 	 * @return mixed depending of $date_format
 	 */
-	function date2usertime($ts,$date_format='ts')
+	function date2usertime($ts, $date_format = 'ts')
 	{
 		if (empty($ts) || $date_format == 'server') return $ts;
 
-		return Api\DateTime::server2user($ts,$date_format);
+		return Api\DateTime::server2user($ts, $date_format);
 	}
 
 	/**
@@ -1061,7 +1061,7 @@ 
 	 * 	but call clear_private_infos() with the given users
 	 * @return boolean|array event or array of id => event pairs, false if the acl-check went wrong, null if $ids not found
 	 */
-	function read($ids,$date=null,$ignore_acl=False,$date_format='ts',$clear_private_infos_users=null)
+	function read($ids, $date = null, $ignore_acl = False, $date_format = 'ts', $clear_private_infos_users = null)
 	{
 		if (!$ids) return false;
 
@@ -1070,21 +1070,21 @@ 
 		$return = null;
 
 		$check = $clear_private_infos_users ? self::ACL_FREEBUSY : Acl::READ;
-		if ($ignore_acl || is_array($ids) || ($return = $this->check_perms($check,$ids,0,$date_format,$date)))
+		if ($ignore_acl || is_array($ids) || ($return = $this->check_perms($check, $ids, 0, $date_format, $date)))
 		{
 			if (is_array($ids) || !isset(self::$cached_event['id']) || self::$cached_event['id'] != $ids ||
 				self::$cached_event_date_format != $date_format ||
 				self::$cached_event['recur_type'] != MCAL_RECUR_NONE && self::$cached_event_date != $date)
 			{
-				$events = $this->so->read($ids,$date ? $this->date2ts($date,true) : 0);
+				$events = $this->so->read($ids, $date ? $this->date2ts($date, true) : 0);
 
 				if ($events)
 				{
-					$this->db2data($events,$date_format);
+					$this->db2data($events, $date_format);
 
 					if (is_array($ids))
 					{
-						$return =& $events;
+						$return = & $events;
 					}
 					else
 					{
@@ -1100,13 +1100,13 @@ 
 				$return = self::$cached_event;
 			}
 		}
-		if ($clear_private_infos_users && !is_array($ids) && !$this->check_perms(Acl::READ,$return))
+		if ($clear_private_infos_users && !is_array($ids) && !$this->check_perms(Acl::READ, $return))
 		{
 			$this->clear_private_infos($return, (array)$clear_private_infos_users);
 		}
 		if ($this->debug && ($this->debug > 1 || $this->debug == 'read'))
 		{
-			$this->debug_message('calendar_bo::read(%1,%2,%3,%4,%5)=%6',True,$ids,$date,$ignore_acl,$date_format,$clear_private_infos_users,$return);
+			$this->debug_message('calendar_bo::read(%1,%2,%3,%4,%5)=%6', True, $ids, $date, $ignore_acl, $date_format, $clear_private_infos_users, $return);
 		}
 		return $return;
 	}
@@ -1124,17 +1124,17 @@ 
 	 * @param array $events where the repetions get inserted
 	 * @param array $recur_exceptions with date (in Ymd) as key (and True as values), seems not to be used anymore
 	 */
-	function insert_all_recurrences($event,$_start,$end,&$events)
+	function insert_all_recurrences($event, $_start, $end, &$events)
 	{
-		if ((int) $this->debug >= 3 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_recurrences')
+		if ((int)$this->debug >= 3 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_recurrences')
 		{
-			$this->debug_message(__METHOD__.'(%1,%2,%3,&$events)',true,$event,$_start,$end);
+			$this->debug_message(__METHOD__.'(%1,%2,%3,&$events)', true, $event, $_start, $end);
 		}
 		$end_in = $end;
 
 		$start = $this->date2ts($_start);
 		$event_start_ts = $this->date2ts($event['start']);
-		$event_length = $this->date2ts($event['end']) - $event_start_ts;	// we use a constant event-length, NOT a constant end-time!
+		$event_length = $this->date2ts($event['end']) - $event_start_ts; // we use a constant event-length, NOT a constant end-time!
 
 		// if $end is before recur_enddate, use it instead
 		if (!$event['recur_enddate'] || $this->date2ts($event['recur_enddate']) > $this->date2ts($end))
@@ -1143,39 +1143,38 @@ 
 			// insert at least the event itself, if it's behind the horizont
 			$event['recur_enddate'] = $this->date2ts($end) < $this->date2ts($event['end']) ? $event['end'] : $end;
 		}
-		$event['recur_enddate'] = is_a($event['recur_enddate'],'DateTime') ?
-				$event['recur_enddate'] :
-				new Api\DateTime($event['recur_enddate'], calendar_timezones::DateTimeZone($event['tzid']));
+		$event['recur_enddate'] = is_a($event['recur_enddate'], 'DateTime') ?
+				$event['recur_enddate'] : new Api\DateTime($event['recur_enddate'], calendar_timezones::DateTimeZone($event['tzid']));
 		// unset exceptions, as we need to add them as recurrence too, but marked as exception
 		unset($event['recur_exception']);
 		// loop over all recurrences and insert them, if they are after $start
- 		$rrule = calendar_rrule::event2rrule($event, !$event['whole_day'], Api\DateTime::$user_timezone->getName());	// true = we operate in usertime, like the rest of calendar_bo
-		foreach($rrule as $time)
+ 		$rrule = calendar_rrule::event2rrule($event, !$event['whole_day'], Api\DateTime::$user_timezone->getName()); // true = we operate in usertime, like the rest of calendar_bo
+		foreach ($rrule as $time)
 		{
-			$time->setUser();	// $time is in timezone of event, convert it to usertime used here
-			if($event['whole_day'])
+			$time->setUser(); // $time is in timezone of event, convert it to usertime used here
+			if ($event['whole_day'])
 			{
 				// All day events are processed in server timezone
 				$time->setServer();
-				$time->setTime(0,0,0);
+				$time->setTime(0, 0, 0);
 			}
-			if (($ts = $this->date2ts($time)) < $start-$event_length)
+			if (($ts = $this->date2ts($time)) < $start - $event_length)
 			{
 				//echo "<p>".$time." --> ignored as $ts < $start-$event_length</p>\n";
-				continue;	// to early or original event (returned by interator too)
+				continue; // to early or original event (returned by interator too)
 			}
 
 			$ts_end = $ts + $event_length;
 			// adjust ts_end for whole day events in case it does not fit due to
 			// spans over summer/wintertime adjusted days
-			if($event['whole_day'] && ($arr_end = $this->date2array($ts_end)) &&
+			if ($event['whole_day'] && ($arr_end = $this->date2array($ts_end)) &&
 				!($arr_end['hour'] == 23 && $arr_end['minute'] == 59 && $arr_end['second'] == 59))
 			{
 				$arr_end['hour'] = 23;
 				$arr_end['minute'] = 59;
 				$arr_end['second'] = 59;
 				$ts_end_guess = $this->date2ts($arr_end);
-				if($ts_end_guess - $ts_end > DAY_s/2)
+				if ($ts_end_guess - $ts_end > DAY_s / 2)
 				{
 					$ts_end = $ts_end_guess - DAY_s; // $ts_end_guess was one day too far in the future
 				}
@@ -1189,11 +1188,11 @@ 
 			$event['end'] = $ts_end;
 			$events[] = $event;
 		}
-		if ($this->debug && ((int) $this->debug > 2 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_recurrences'))
+		if ($this->debug && ((int)$this->debug > 2 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_recurrences'))
 		{
 			$event['start'] = $event_start_ts;
 			$event['end'] = $event_start_ts + $event_length;
-			$this->debug_message(__METHOD__.'(%1,start=%2,end=%3,events) events=%5',True,$event,$_start,$end_in,$events);
+			$this->debug_message(__METHOD__.'(%1,start=%2,end=%3,events) events=%5', True, $event, $_start, $end_in, $events);
 		}
 	}
 
@@ -1204,18 +1203,18 @@ 
 	 * @param array $event event to insert, it has start- and end-date of the first recurrence, not of $date_ymd
 	 * @param int|string $date_ymd of the date of the event
 	 */
-	function add_adjusted_event(&$events,$event,$date_ymd)
+	function add_adjusted_event(&$events, $event, $date_ymd)
 	{
 		$event_in = $event;
 		// calculate the new start- and end-time
 		$length_s = $this->date2ts($event['end']) - $this->date2ts($event['start']);
 		$event_start_arr = $this->date2array($event['start']);
 
-		$date_arr = $this->date2array((string) $date_ymd);
+		$date_arr = $this->date2array((string)$date_ymd);
 		$date_arr['hour'] = $event_start_arr['hour'];
 		$date_arr['minute'] = $event_start_arr['minute'];
 		$date_arr['second'] = $event_start_arr['second'];
-		unset($date_arr['raw']);	// else date2ts would use it
+		unset($date_arr['raw']); // else date2ts would use it
 		$event['start'] = $this->date2ts($date_arr);
 		$event['end'] = $event['start'] + $length_s;
 
@@ -1223,7 +1222,7 @@ 
 
 		if ($this->debug && ($this->debug > 2 || $this->debug == 'add_adjust_event'))
 		{
-			$this->debug_message('calendar_bo::add_adjust_event(,%1,%2) as %3',True,$event_in,$date_ymd,$event);
+			$this->debug_message('calendar_bo::add_adjust_event(,%1,%2) as %3', True, $event_in, $date_ymd, $event);
 		}
 	}
 
@@ -1247,22 +1246,22 @@ 
 			{
 				$info = array(
 					'res_id'    => $uid,
-					'email' => $GLOBALS['egw']->accounts->id2name($uid,'account_email'),
-					'name'  => trim($GLOBALS['egw']->accounts->id2name($uid,'account_firstname'). ' ' .
-					$GLOBALS['egw']->accounts->id2name($uid,'account_lastname')),
+					'email' => $GLOBALS['egw']->accounts->id2name($uid, 'account_email'),
+					'name'  => trim($GLOBALS['egw']->accounts->id2name($uid, 'account_firstname').' '.
+					$GLOBALS['egw']->accounts->id2name($uid, 'account_lastname')),
 					'type'  => $GLOBALS['egw']->accounts->get_type($uid),
 					'app'   => 'accounts',
 				);
 			}
 			else
 			{
-				list($info) = $this->resources[$uid[0]]['info'] ? ExecMethod($this->resources[$uid[0]]['info'],substr($uid,1)) : false;
+				list($info) = $this->resources[$uid[0]]['info'] ? ExecMethod($this->resources[$uid[0]]['info'], substr($uid, 1)) : false;
 				if ($info)
 				{
 					$info['type'] = $uid[0];
 					if (!$info['email'] && $info['responsible'])
 					{
-						$info['email'] = $GLOBALS['egw']->accounts->id2name($info['responsible'],'account_email');
+						$info['email'] = $GLOBALS['egw']->accounts->id2name($info['responsible'], 'account_email');
 					}
 					$info['app'] = $this->resources[$uid[0]]['app'];
 				}
@@ -1271,7 +1270,7 @@ 
 		}
 		if ($this->debug && ($this->debug > 2 || $this->debug == 'resource_info'))
 		{
-			$this->debug_message('calendar_bo::resource_info(%1) = %2',True,$uid,$res_info_cache[$uid]);
+			$this->debug_message('calendar_bo::resource_info(%1) = %2', True, $uid, $res_info_cache[$uid]);
 		}
 		return $res_info_cache[$uid];
 	}
@@ -1292,7 +1291,7 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true permission granted, false for permission denied or null if event not found
 	 */
-	function check_perms($needed,$event=0,$other=0,$date_format='ts',$date_to_read=null,$user=null)
+	function check_perms($needed, $event = 0, $other = 0, $date_format = 'ts', $date_to_read = null, $user = null)
 	{
 		if (!$user) $user = $this->user;
 		if ($user == $this->user)
@@ -1301,13 +1300,13 @@ 
 		}
 		else
 		{
-			$grants = $GLOBALS['egw']->acl->get_grants('calendar',true,$user);
+			$grants = $GLOBALS['egw']->acl->get_grants('calendar', true, $user);
 		}
 
 		if ($other && !is_numeric($other))
 		{
 			$resource = $this->resource_info($other);
-			return $needed & $resource['rights'];
+			return $needed&$resource['rights'];
 		}
 		if (is_int($event) && $event == 0)
 		{
@@ -1317,15 +1316,15 @@ 
 		{
 			if (!is_array($event))
 			{
-				$event = $this->read($event,$date_to_read,true,$date_format);	// = no ACL check !!!
+				$event = $this->read($event, $date_to_read, true, $date_format); // = no ACL check !!!
 			}
 			if (!is_array($event))
 			{
 				if ($this->xmlrpc)
 				{
-					$GLOBALS['server']->xmlrpc_error($GLOBALS['xmlrpcerr']['not_exist'],$GLOBALS['xmlrpcstr']['not_exist']);
+					$GLOBALS['server']->xmlrpc_error($GLOBALS['xmlrpcerr']['not_exist'], $GLOBALS['xmlrpcstr']['not_exist']);
 				}
-				return null;	// event not found
+				return null; // event not found
 			}
 			$owner = $event['owner'];
 			$private = !$event['public'];
@@ -1333,7 +1332,7 @@ 
 		$grant = $grants[$owner];
 
 		// now any ACL rights (but invite rights!) implicate FREEBUSY rights (at least READ has to include FREEBUSY)
-		if ($grant & ~self::ACL_INVITE) $grant |= self::ACL_FREEBUSY;
+		if ($grant&~self::ACL_INVITE) $grant |= self::ACL_FREEBUSY;
 
 		if (is_array($event) && ($needed == Acl::READ || $needed == self::ACL_FREEBUSY))
 		{
@@ -1342,15 +1341,15 @@ 
 			//
 			if ($event['participants'] && is_array($event['participants']))
 			{
-				foreach(array_keys($event['participants']) as $uid)
+				foreach (array_keys($event['participants']) as $uid)
 				{
-					if ($uid == $user || $uid < 0 && in_array($user, (array)$GLOBALS['egw']->accounts->members($uid,true)))
+					if ($uid == $user || $uid < 0 && in_array($user, (array)$GLOBALS['egw']->accounts->members($uid, true)))
 					{
 						// if we are a participant, we have an implicite FREEBUSY, READ and PRIVAT grant
-						$grant |= self::ACL_FREEBUSY | Acl::READ | Acl::PRIVAT;
+						$grant |= self::ACL_FREEBUSY|Acl::READ|Acl::PRIVAT;
 						break;
 					}
-					elseif ($grants[$uid] & Acl::READ)
+					elseif ($grants[$uid]&Acl::READ)
 					{
 						// if we have a READ grant from a participant, we dont give an implicit privat grant too
 						$grant |= Acl::READ;
@@ -1369,12 +1368,12 @@ 
 		}
 		if ($GLOBALS['egw']->accounts->get_type($owner) == 'g' && $needed == Acl::ADD)
 		{
-			$access = False;	// a group can't be the owner of an event
+			$access = False; // a group can't be the owner of an event
 		}
 		else
 		{
-			$access = $user == $owner || $grant & $needed
-				&& ($needed == self::ACL_FREEBUSY || !$private || $grant & Acl::PRIVAT);
+			$access = $user == $owner || $grant&$needed
+				&& ($needed == self::ACL_FREEBUSY || !$private || $grant&Acl::PRIVAT);
 		}
 		// do NOT allow users to purge deleted events, if we dont have 'userpurge' enabled
 		if ($access && $needed == Acl::DELETE && $event['deleted'] &&
@@ -1385,7 +1384,7 @@ 
 		}
 		if ($this->debug && ($this->debug > 2 || $this->debug == 'check_perms'))
 		{
-			$this->debug_message('calendar_bo::check_perms(%1,%2,other=%3,%4,%5,user=%6)=%7',True,ACL_TYPE_IDENTIFER.$needed,$event,$other,$date_format,$date_to_read,$user,$access);
+			$this->debug_message('calendar_bo::check_perms(%1,%2,other=%3,%4,%5,user=%6)=%7', True, ACL_TYPE_IDENTIFER.$needed, $event, $other, $date_format, $date_to_read, $user, $access);
 		}
 		//error_log(__METHOD__."($needed,".array2string($event).",$other,...,$user) returning ".array2string($access));
 		return $access;
@@ -1400,9 +1399,9 @@ 
 	 *	array with keys 'second', 'minute', 'hour', 'day' or 'mday' (depricated !), 'month' and 'year'
 	 * @param boolean $user2server =False conversion between user- and server-time; default False == Off
 	 */
-	static function date2ts($date,$user2server=False)
+	static function date2ts($date, $user2server = False)
 	{
-		return $user2server ? Api\DateTime::user2server($date,'ts') : Api\DateTime::to($date,'ts');
+		return $user2server ? Api\DateTime::user2server($date, 'ts') : Api\DateTime::to($date, 'ts');
 	}
 
 	/**
@@ -1412,9 +1411,9 @@ 
 	 * @param boolean $server2user conversation between user- and server-time default False == Off
 	 * @return array with keys 'second', 'minute', 'hour', 'day', 'month', 'year', 'raw' (timestamp) and 'full' (Ymd-string)
 	 */
-	static function date2array($date,$server2user=False)
+	static function date2array($date, $server2user = False)
 	{
-		return $server2user ? Api\DateTime::server2user($date,'array') : Api\DateTime::to($date,'array');
+		return $server2user ? Api\DateTime::server2user($date, 'array') : Api\DateTime::to($date, 'array');
 	}
 
 	/**
@@ -1425,9 +1424,9 @@ 
 	 * @param string $format ='Ymd' format of the date to return, eg. 'Y-m-d\TH:i:sO' (2005-11-01T15:30:00+0100)
 	 * @return string date formatted according to $format
 	 */
-	static function date2string($date,$server2user=False,$format='Ymd')
+	static function date2string($date, $server2user = False, $format = 'Ymd')
 	{
-		return $server2user ? Api\DateTime::server2user($date,$format) : Api\DateTime::to($date,$format);
+		return $server2user ? Api\DateTime::server2user($date, $format) : Api\DateTime::to($date, $format);
 	}
 
 	/**
@@ -1437,9 +1436,9 @@ 
 	 * @param string|boolean $format ='' default common_prefs[dateformat], common_prefs[timeformat], false=time only, true=date only
 	 * @return string the formated date (incl. time)
 	 */
-	static function format_date($date,$format='')
+	static function format_date($date, $format = '')
 	{
-		return Api\DateTime::to($date,$format);
+		return Api\DateTime::to($date, $format);
 	}
 
 	/**
@@ -1461,7 +1460,7 @@ 
 	 * @param mixed $param a variable number of parameters, to be inserted in $msg
 	 *	arrays get serialized with print_r() !
 	 */
-	static function debug_message($msg,$backtrace=True)
+	static function debug_message($msg, $backtrace = True)
 	{
 		static $acl2string = array(
 			0               => 'ACL-UNKNOWN',
@@ -1472,22 +1471,22 @@ 
 			Acl::PRIVAT => 'ACL_PRIVATE',
 			self::ACL_FREEBUSY => 'ACL_FREEBUSY',
 		);
-		for($i = 2; $i < func_num_args(); ++$i)
+		for ($i = 2; $i < func_num_args(); ++$i)
 		{
 			$param = func_get_arg($i);
 
 			if (is_null($param))
 			{
-				$param='NULL';
+				$param = 'NULL';
 			}
 			else
 			{
-				switch(gettype($param))
+				switch (gettype($param))
 				{
 					case 'string':
-						if (substr($param,0,strlen(ACL_TYPE_IDENTIFER))== ACL_TYPE_IDENTIFER)
+						if (substr($param, 0, strlen(ACL_TYPE_IDENTIFER)) == ACL_TYPE_IDENTIFER)
 						{
-							$param = (int) substr($param,strlen(ACL_TYPE_IDENTIFER));
+							$param = (int)substr($param, strlen(ACL_TYPE_IDENTIFER));
 							$param = (isset($acl2string[$param]) ? $acl2string[$param] : $acl2string[0])." ($param)";
 						}
 						else
@@ -1510,11 +1509,11 @@ 
 						$param = $param ? 'True' : 'False';
 						break;
 					case 'integer':
-						if ($param >= mktime(0,0,0,1,1,2000)) $param = adodb_date('Y-m-d H:i:s',$param)." ($param)";
+						if ($param >= mktime(0, 0, 0, 1, 1, 2000)) $param = adodb_date('Y-m-d H:i:s', $param)." ($param)";
 						break;
 				}
 			}
-			$msg = str_replace('%'.($i-1),$param,$msg);
+			$msg = str_replace('%'.($i - 1), $param, $msg);
 		}
 		error_log($msg);
 		if ($backtrace) error_log(function_backtrace(1));
@@ -1529,7 +1528,7 @@ 
 	 * @param boolean $display_day =false should a day-name prefix the date, eg. monday June 20, 2006
 	 * @return string with formated date
 	 */
-	function long_date($_first,$last=0,$display_time=false,$display_day=false)
+	function long_date($_first, $last = 0, $display_time = false, $display_day = false)
 	{
 		$first = $this->date2array($_first);
 		if ($last)
@@ -1544,27 +1543,27 @@ 
 
 		if ($display_day)
 		{
-			$range = lang(adodb_date('l',$first['raw'])).($this->common_prefs['dateformat'][0] != 'd' ? ' ' : ', ');
+			$range = lang(adodb_date('l', $first['raw'])).($this->common_prefs['dateformat'][0] != 'd' ? ' ' : ', ');
 		}
 		for ($i = 0; $i < 5; $i += 2)
 		{
-			switch($datefmt[$i])
+			switch ($datefmt[$i])
 			{
 				case 'd':
-					$range .= $first['day'] . ($datefmt[1] == '.' ? '.' : '');
+					$range .= $first['day'].($datefmt[1] == '.' ? '.' : '');
 					if ($first['month'] != $last['month'] || $first['year'] != $last['year'])
 					{
 						if (!$month_before_day)
 						{
-							$range .= ' '.lang(strftime('%B',$first['raw']));
+							$range .= ' '.lang(strftime('%B', $first['raw']));
 						}
 						if ($first['year'] != $last['year'] && $datefmt[0] != 'Y')
 						{
-							$range .= ($datefmt[0] != 'd' ? ', ' : ' ') . $first['year'];
+							$range .= ($datefmt[0] != 'd' ? ', ' : ' ').$first['year'];
 						}
 						if ($display_time)
 						{
-							$range .= ' '.adodb_date($timefmt,$first['raw']);
+							$range .= ' '.adodb_date($timefmt, $first['raw']);
 						}
 						if (!$last)
 						{
@@ -1574,43 +1573,43 @@ 
 
 						if ($first['year'] != $last['year'] && $datefmt[0] == 'Y')
 						{
-							$range .= $last['year'] . ', ';
+							$range .= $last['year'].', ';
 						}
 
 						if ($month_before_day)
 						{
-							$range .= lang(strftime('%B',$last['raw']));
+							$range .= lang(strftime('%B', $last['raw']));
 						}
 					}
 					else
 					{
 						if ($display_time)
 						{
-							$range .= ' '.adodb_date($timefmt,$first['raw']);
+							$range .= ' '.adodb_date($timefmt, $first['raw']);
 						}
 						$range .= ' - ';
 					}
-					$range .= ' ' . $last['day'] . ($datefmt[1] == '.' ? '.' : '');
+					$range .= ' '.$last['day'].($datefmt[1] == '.' ? '.' : '');
 					break;
 				case 'm':
 				case 'M':
-					$range .= ' '.lang(strftime('%B',$month_before_day ? $first['raw'] : $last['raw'])) . ' ';
+					$range .= ' '.lang(strftime('%B', $month_before_day ? $first['raw'] : $last['raw'])).' ';
 					break;
 				case 'Y':
 					if ($datefmt[0] != 'm')
 					{
-						$range .= ' ' . ($datefmt[0] == 'Y' ? $first['year'].($datefmt[2] == 'd' ? ', ' : ' ') : $last['year'].' ');
+						$range .= ' '.($datefmt[0] == 'Y' ? $first['year'].($datefmt[2] == 'd' ? ', ' : ' ') : $last['year'].' ');
 					}
 					break;
 			}
 		}
 		if ($display_time && $last)
 		{
-			$range .= ' '.adodb_date($timefmt,$last['raw']);
+			$range .= ' '.adodb_date($timefmt, $last['raw']);
 		}
 		if ($datefmt[4] == 'Y' && $datefmt[0] == 'm')
 		{
-			$range .= ', ' . $last['year'];
+			$range .= ', '.$last['year'];
 		}
 		return $range;
 	}
@@ -1622,25 +1621,25 @@ 
 	 * @param int $end_m end time in minutes since 0h
 	 * @param boolean $both =false display the end-time too, duration is always displayed
 	 */
-	function timespan($start_m,$end_m,$both=false)
+	function timespan($start_m, $end_m, $both = false)
 	{
 		$duration = $end_m - $start_m;
-		if ($end_m == 24*60-1) ++$duration;
-		$duration = floor($duration/60).lang('h').($duration%60 ? $duration%60 : '');
+		if ($end_m == 24 * 60 - 1) ++$duration;
+		$duration = floor($duration / 60).lang('h').($duration % 60 ? $duration % 60 : '');
 
-		$timespan = $t = Api\DateTime::to('20000101T'.sprintf('%02d',$start_m/60).sprintf('%02d',$start_m%60).'00', false);
+		$timespan = $t = Api\DateTime::to('20000101T'.sprintf('%02d', $start_m / 60).sprintf('%02d', $start_m % 60).'00', false);
 
 		if ($both)	// end-time too
 		{
-			$timespan .= ' - '.Api\DateTime::to('20000101T'.sprintf('%02d',$end_m/60).sprintf('%02d',$end_m%60).'00', false);
+			$timespan .= ' - '.Api\DateTime::to('20000101T'.sprintf('%02d', $end_m / 60).sprintf('%02d', $end_m % 60).'00', false);
 			// dont double am/pm if they are the same in both times
-			if ($this->common_prefs['timeformat'] == 12 && substr($timespan,-2) == substr($t,-2))
+			if ($this->common_prefs['timeformat'] == 12 && substr($timespan, -2) == substr($t, -2))
 			{
-				$timespan = str_replace($t,substr($t,0,-3),$timespan);
+				$timespan = str_replace($t, substr($t, 0, -3), $timespan);
 			}
 			$timespan .= ':';
 		}
-		return $timespan . ' ' . $duration;
+		return $timespan.' '.$duration;
 	}
 
 	/**
@@ -1651,7 +1650,7 @@ 
 	* @param boolean $append_email =false append email (Name <email>)
 	* @return string with name
 	*/
-	function participant_name($id,$use_type=false, $append_email=false)
+	function participant_name($id, $use_type = false, $append_email = false)
 	{
 		static $id2lid = array();
 		static $id2email = array();
@@ -1672,7 +1671,7 @@ 
 			else
 			{
 				$id2lid[$id] = Api\Accounts::username($id);
-				$id2email[$id] = $GLOBALS['egw']->accounts->id2name($id,'account_email');
+				$id2email[$id] = $GLOBALS['egw']->accounts->id2name($id, 'account_email');
 			}
 		}
 		return $id2lid[$id].(($append_email || $id[0] == 'e') && $id2email[$id] ? ' <'.$id2email[$id].'>' : '');
@@ -1686,37 +1685,37 @@ 
 	* @param boolean $show_group_invitation =false show group-invitations (status == 'G') or not (default)
 	* @return array with id / names with status pairs
 	*/
-	function participants($event,$long_status=false,$show_group_invitation=false)
+	function participants($event, $long_status = false, $show_group_invitation = false)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($event['participants']));
 		$names = array();
-		foreach((array)$event['participants'] as $id => $status)
+		foreach ((array)$event['participants'] as $id => $status)
 		{
 			if (!is_string($status)) continue;
 			$quantity = $role = null;
-			calendar_so::split_status($status,$quantity,$role);
+			calendar_so::split_status($status, $quantity, $role);
 
-			if ($status == 'G' && !$show_group_invitation) continue;	// dont show group-invitation
+			if ($status == 'G' && !$show_group_invitation) continue; // dont show group-invitation
 
 			$lang_status = lang($this->verbose_status[$status]);
 			if (!$long_status)
 			{
-				switch($status[0])
+				switch ($status[0])
 				{
 					case 'A':	// accepted
-						$status = Api\Html::image('calendar','accepted',$lang_status);
+						$status = Api\Html::image('calendar', 'accepted', $lang_status);
 						break;
 					case 'R':	// rejected
-						$status = Api\Html::image('calendar','rejected',$lang_status);
+						$status = Api\Html::image('calendar', 'rejected', $lang_status);
 						break;
 					case 'T':	// tentative
-						$status = Api\Html::image('calendar','tentative',$lang_status);
+						$status = Api\Html::image('calendar', 'tentative', $lang_status);
 						break;
 					case 'U':	// no response = unknown
-						$status = Api\Html::image('calendar','needs-action',$lang_status);
+						$status = Api\Html::image('calendar', 'needs-action', $lang_status);
 						break;
 					case 'D':	// delegated
-						$status = Api\Html::image('calendar','forward',$lang_status);
+						$status = Api\Html::image('calendar', 'forward', $lang_status);
 						break;
 					case 'G':	// group invitation
 						// Todo: Image, seems not to be used
@@ -1738,13 +1737,13 @@ 
 					$role = lang($this->roles[$role]);
 				}
 				// allow to use cats as roles (beside regular iCal ones)
-				elseif (substr($role,0,6) == 'X-CAT-' && ($cat_id = (int)substr($role,6)) > 0)
+				elseif (substr($role, 0, 6) == 'X-CAT-' && ($cat_id = (int)substr($role, 6)) > 0)
 				{
 					$role = $GLOBALS['egw']->categories->id2name($cat_id);
 				}
 				else
 				{
-					$role = lang(str_replace('X-','',$role));
+					$role = lang(str_replace('X-', '', $role));
 				}
 				$names[$id] .= ' '.$role;
 			}
@@ -1761,13 +1760,13 @@ 
 	* @param int $color color of the category, if multiple cats, the color of the last one with color is returned
 	* @return array with id / names
 	*/
-	function categories($category,&$color)
+	function categories($category, &$color)
 	{
 		static $id2cat = array();
 		$cats = array();
 		$color = 0;
 
-		foreach(explode(',',$category) as $cat_id)
+		foreach (explode(',', $category) as $cat_id)
 		{
 			if (!$cat_id) continue;
 
@@ -1782,7 +1781,7 @@ 
 			{
 				$color = $cat['data']['color'];
 			}
-			elseif(preg_match('/(#[0-9A-Fa-f]{6})/', $cat['description'], $parts))
+			elseif (preg_match('/(#[0-9A-Fa-f]{6})/', $cat['description'], $parts))
 			{
 				$color = $parts[1];
 			}
@@ -1794,12 +1793,12 @@ 
 	/**
 	 *  This is called only by list_cals().  It was moved here to remove fatal error in php5 beta4
 	 */
-	private static function _list_cals_add($id,&$users,&$groups)
+	private static function _list_cals_add($id, &$users, &$groups)
 	{
 		$name = Api\Accounts::username($id);
 		if (!($egw_name = $GLOBALS['egw']->accounts->id2name($id)))
 		{
-			return;	// do not return no longer existing accounts which eg. still mentioned in acl
+			return; // do not return no longer existing accounts which eg. still mentioned in acl
 		}
 		if (($type = $GLOBALS['egw']->accounts->get_type($id)) == 'g')
 		{
@@ -1811,7 +1810,7 @@ 
 		}
 		$arr[$id] = array(
 			'grantor' => $id,
-			'value'   => ($type == 'g' ? 'g_' : '') . $id,
+			'value'   => ($type == 'g' ? 'g_' : '').$id,
 			'name'    => $name,
 			'sname'	  => $egw_name
 		);
@@ -1833,26 +1832,26 @@ 
 	 * @param int $user account_id of user to generate list for
 	 * @param array $grants =null calendar grants from user, or null to query them from acl class
 	 */
-	public static function list_calendars($user, array $grants=null)
+	public static function list_calendars($user, array $grants = null)
 	{
 		if (is_null($grants)) $grants = $GLOBALS['egw']->acl->get_grants('calendar', true, $user);
 
 		$users = $groups = array();
-		foreach(array_keys($grants) as $id)
+		foreach (array_keys($grants) as $id)
 		{
-			self::_list_cals_add($id,$users,$groups);
+			self::_list_cals_add($id, $users, $groups);
 		}
 		if (($memberships = $GLOBALS['egw']->accounts->memberships($user, true)))
 		{
-			foreach($memberships as $group)
+			foreach ($memberships as $group)
 			{
-				self::_list_cals_add($group,$users,$groups);
+				self::_list_cals_add($group, $users, $groups);
 
-				if (($account_perms = $GLOBALS['egw']->acl->get_ids_for_location($group,Acl::READ,'calendar')))
+				if (($account_perms = $GLOBALS['egw']->acl->get_ids_for_location($group, Acl::READ, 'calendar')))
 				{
-					foreach($account_perms as $id)
+					foreach ($account_perms as $id)
 					{
-						self::_list_cals_add($id,$users,$groups);
+						self::_list_cals_add($id, $users, $groups);
 					}
 				}
 			}
@@ -1860,7 +1859,7 @@ 
 		usort($users, array(__CLASS__, 'name_cmp'));
 		usort($groups, array(__CLASS__, 'name_cmp'));
 
-		return array_merge($users, $groups);	// users first and then groups, both alphabeticaly
+		return array_merge($users, $groups); // users first and then groups, both alphabeticaly
 	}
 
 	/**
@@ -1900,28 +1899,27 @@ 
 	 *	month: numerical month
 	 *	occurence: numerical year or 0 for every year
 	 */
-	function read_holidays($year=0)
+	function read_holidays($year = 0)
 	{
-		if (!$year) $year = (int) date('Y',$this->now_su);
+		if (!$year) $year = (int)date('Y', $this->now_su);
 
 		$holidays = calendar_holidays::read(
 				!empty($GLOBALS['egw_info']['server']['ical_holiday_url']) ?
-				$GLOBALS['egw_info']['server']['ical_holiday_url'] :
-				$GLOBALS['egw_info']['user']['preferences']['common']['country'], $year);
+				$GLOBALS['egw_info']['server']['ical_holiday_url'] : $GLOBALS['egw_info']['user']['preferences']['common']['country'], $year);
 
 		// search for birthdays
 		if ($GLOBALS['egw_info']['server']['hide_birthdays'] != 'yes')
 		{
 			$contacts = new Api\Contacts();
-			foreach($contacts->get_addressbooks() as $owner => $name)
+			foreach ($contacts->get_addressbooks() as $owner => $name)
 			{
 				$holidays += $contacts->read_birthdays($owner, $year);
 			}
 		}
 
-		if ((int) $this->debug >= 2 || $this->debug == 'read_holidays')
+		if ((int)$this->debug >= 2 || $this->debug == 'read_holidays')
 		{
-			$this->debug_message('calendar_bo::read_holidays(%1)=%2',true,$year,$holidays);
+			$this->debug_message('calendar_bo::read_holidays(%1)=%2', true, $year, $holidays);
 		}
 		return $holidays;
 	}
@@ -1932,10 +1930,10 @@ 
 	 * @param type $event
 	 * @return array array of selected calendar fields
 	 */
-	public static function get_link_options ($event = array())
+	public static function get_link_options($event = array())
 	{
-		unset($event);	// not used, but required by function signature
-		$options = array (
+		unset($event); // not used, but required by function signature
+		$options = array(
 			'end' => lang('End date'),
 			'id' => lang('ID'),
 			'owner' => lang('Event owner'),
@@ -1962,7 +1960,7 @@ 
 			list($id, $recur) = explode('-', $event, 2);
 			$event = $this->read($id, $recur);
 		}
-		else if (!is_array($event) && (int) $event > 0)
+		else if (!is_array($event) && (int)$event > 0)
 		{
 			$event = $this->read($event);
 		}
@@ -1970,7 +1968,7 @@ 
 		{
 			return $event;
 		}
-		$type = explode(',',$this->cal_prefs['link_title']);
+		$type = explode(',', $this->cal_prefs['link_title']);
 		if (is_array($type))
 		{
 			foreach ($type as &$val)
@@ -1996,10 +1994,10 @@ 
 						$extra_fields [] = $event[$val];
 				}
 			}
-			$str_fields = implode(', ',$extra_fields);
-			if (is_array($extra_fields)) return $this->format_date($event['start']) . ': ' . $event['title'] . ($str_fields? ', ' . $str_fields:'');
+			$str_fields = implode(', ', $extra_fields);
+			if (is_array($extra_fields)) return $this->format_date($event['start']).': '.$event['title'].($str_fields ? ', '.$str_fields : '');
 		}
-		return $this->format_date($event['start']) . ': ' . $event['title'];
+		return $this->format_date($event['start']).': '.$event['title'];
 	}
 
 	/**
@@ -2018,10 +2016,10 @@ 
 			'offset' =>	$options['start'],
 			'order' => 'cal_start DESC',
 		);
-		if($options['num_rows']) {
+		if ($options['num_rows']) {
 			$query['num_rows'] = $options['num_rows'];
 		}
-		foreach((array) $this->search($query) as $event)
+		foreach ((array)$this->search($query) as $event)
 		{
 			$result[$event['id']] = $this->link_title($event);
 		}
@@ -2038,11 +2036,11 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true if access is granted or false otherwise
 	 */
-	function file_access($id,$check,$rel_path,$user=null)
+	function file_access($id, $check, $rel_path, $user = null)
 	{
-		unset($rel_path);	// not used, but required by function signature
+		unset($rel_path); // not used, but required by function signature
 
-		return $this->check_perms($check,$id,0,'ts',null,$user);
+		return $this->check_perms($check, $id, 0, 'ts', null, $user);
 	}
 
 	/**
@@ -2058,36 +2056,36 @@ 
 		}
 		Api\Cache::setSession('calendar', 'default_prefs_set', 'set');
 
-		$default_prefs =& $GLOBALS['egw']->preferences->default['calendar'];
-		$forced_prefs  =& $GLOBALS['egw']->preferences->forced['calendar'];
+		$default_prefs = & $GLOBALS['egw']->preferences->default['calendar'];
+		$forced_prefs  = & $GLOBALS['egw']->preferences->forced['calendar'];
 
-		$subject = lang('Calendar Event') . ' - $$action$$: $$startdate$$ $$title$$'."\n";
+		$subject = lang('Calendar Event').' - $$action$$: $$startdate$$ $$title$$'."\n";
 		$values = array(
-			'notifyAdded'     => $subject . lang ('You have a meeting scheduled for %1','$$startdate$$'),
-			'notifyCanceled'  => $subject . lang ('Your meeting scheduled for %1 has been canceled','$$startdate$$'),
-			'notifyModified'  => $subject . lang ('Your meeting that had been scheduled for %1 has been rescheduled to %2','$$olddate$$','$$startdate$$'),
-			'notifyDisinvited'=> $subject . lang ('You have been disinvited from the meeting at %1','$$startdate$$'),
-			'notifyResponse'  => $subject . lang ('On %1 %2 %3 your meeting request for %4','$$date$$','$$fullname$$','$$action$$','$$startdate$$'),
-			'notifyAlarm'     => lang('Alarm for %1 at %2 in %3','$$title$$','$$startdate$$','$$location$$')."\n".lang ('Here is your requested alarm.'),
+			'notifyAdded'     => $subject.lang('You have a meeting scheduled for %1', '$$startdate$$'),
+			'notifyCanceled'  => $subject.lang('Your meeting scheduled for %1 has been canceled', '$$startdate$$'),
+			'notifyModified'  => $subject.lang('Your meeting that had been scheduled for %1 has been rescheduled to %2', '$$olddate$$', '$$startdate$$'),
+			'notifyDisinvited'=> $subject.lang('You have been disinvited from the meeting at %1', '$$startdate$$'),
+			'notifyResponse'  => $subject.lang('On %1 %2 %3 your meeting request for %4', '$$date$$', '$$fullname$$', '$$action$$', '$$startdate$$'),
+			'notifyAlarm'     => lang('Alarm for %1 at %2 in %3', '$$title$$', '$$startdate$$', '$$location$$')."\n".lang('Here is your requested alarm.'),
 			'interval'        => 30,
 		);
-		foreach($values as $var => $default)
+		foreach ($values as $var => $default)
 		{
-			$type = substr($var,0,6) == 'notify' ? 'forced' : 'default';
+			$type = substr($var, 0, 6) == 'notify' ? 'forced' : 'default';
 
 			// only set, if neither default nor forced pref exists
 			if ((!isset($default_prefs[$var]) || (string)$default_prefs[$var] === '') && (!isset($forced_prefs[$var]) || (string)$forced_prefs[$var] === ''))
 			{
-				$GLOBALS['egw']->preferences->add('calendar',$var,$default,'default');	// always store default, even if we have a forced too
-				if ($type == 'forced') $GLOBALS['egw']->preferences->add('calendar',$var,$default,'forced');
+				$GLOBALS['egw']->preferences->add('calendar', $var, $default, 'default'); // always store default, even if we have a forced too
+				if ($type == 'forced') $GLOBALS['egw']->preferences->add('calendar', $var, $default, 'forced');
 				$this->cal_prefs[$var] = $default;
 				$need_save = True;
 			}
 		}
 		if ($need_save)
 		{
-			$GLOBALS['egw']->preferences->save_repository(False,'default');
-			$GLOBALS['egw']->preferences->save_repository(False,'forced');
+			$GLOBALS['egw']->preferences->save_repository(False, 'default');
+			$GLOBALS['egw']->preferences->save_repository(False, 'forced');
 		}
 	}
 
@@ -2097,7 +2095,7 @@ 
 	 * @param int|string $user account_id or account_lid
 	 * @param string $pw =null password
 	 */
-	static function freebusy_url($user='',$pw=null)
+	static function freebusy_url($user = '', $pw = null)
 	{
 		if (is_numeric($user)) $user = $GLOBALS['egw']->accounts->id2name($user);
 
@@ -2110,8 +2108,8 @@ 
 		elseif ($GLOBALS['egw_info']['user']['preferences']['calendar']['freebusy'] == 2)
 		{
 			$credentials = $GLOBALS['egw_info']['user']['account_lid']
-				. ':' . $GLOBALS['egw_info']['user']['passwd'];
-			$credentials = '&cred=' . base64_encode($credentials);
+				. ':'.$GLOBALS['egw_info']['user']['passwd'];
+			$credentials = '&cred='.base64_encode($credentials);
 		}
 		return (!$GLOBALS['egw_info']['server']['webserver_url'] || $GLOBALS['egw_info']['server']['webserver_url'][0] == '/' ?
 			($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'] : '').
@@ -2143,11 +2141,11 @@ 
 	 * @param string &$schedule_tag=null on return schedule-tag (egw_cal.cal_id:egw_cal.cal_etag, no participant modifications!)
 	 * @return string|boolean string with etag or false
 	 */
-	function get_etag($entry, &$schedule_tag=null)
+	function get_etag($entry, &$schedule_tag = null)
 	{
 		if (!is_array($entry))
 		{
-			list($id,$recur_date) = explode(':',$entry);
+			list($id, $recur_date) = explode(':', $entry);
 			$entry = $this->read($id, $recur_date, true, 'server');
 		}
 		$etag = $schedule_tag = $entry['id'].':'.$entry['etag'];
@@ -2165,15 +2163,15 @@ 
 	 * @param boolean $master_only =false only check recurance master (egw_cal_user.recur_date=0)
 	 * @return integer
 	 */
-	public function get_ctag($user, $filter='owner', $master_only=false)
+	public function get_ctag($user, $filter = 'owner', $master_only = false)
 	{
 		if ($this->debug > 1) $startime = microtime(true);
 
 		// resolve users to add memberships for users and members for groups
 		$users = $this->resolve_users($user);
-		$ctag = $users ? $this->so->get_ctag($users, $filter == 'owner', $master_only) : 0;	// no rights, return 0 as ctag (otherwise we get SQL error!)
+		$ctag = $users ? $this->so->get_ctag($users, $filter == 'owner', $master_only) : 0; // no rights, return 0 as ctag (otherwise we get SQL error!)
 
-		if ($this->debug > 1) error_log(__METHOD__. "($user, '$filter', $master_only) = $ctag = ".date('Y-m-d H:i:s',$ctag)." took ".(microtime(true)-$startime)." secs");
+		if ($this->debug > 1) error_log(__METHOD__."($user, '$filter', $master_only) = $ctag = ".date('Y-m-d H:i:s', $ctag)." took ".(microtime(true) - $startime)." secs");
 		return $ctag;
 	}
 
@@ -2193,7 +2191,7 @@ 
 
 		$content = array(
 			'info_cat'       => $GLOBALS['egw']->categories->check_list(Acl::READ, $calendar['category']),
-			'info_priority'  => $calendar['priority'] ,
+			'info_priority'  => $calendar['priority'],
 			'info_public'    => $calendar['public'] != 'private',
 			'info_subject'   => $calendar['title'],
 			'info_des'       => $calendar['description'],
@@ -2208,7 +2206,7 @@ 
 		$content['link_app'][] = $calendar['info_link']['app'];
 		$content['link_id'][]  = $calendar['info_link']['id'];
 		// Copy claendar's links
-		foreach(Link::get_links('calendar',$calendar['id'],'','link_lastmod DESC',true) as $link)
+		foreach (Link::get_links('calendar', $calendar['id'], '', 'link_lastmod DESC', true) as $link)
 		{
 			if ($link['app'] != Link::VFS_APPNAME)
 			{
@@ -2221,7 +2219,7 @@ 
 			}
 		}
 		// Copy same custom fields
-		foreach(array_keys(Api\Storage\Customfields::get('infolog')) as $name)
+		foreach (array_keys(Api\Storage\Customfields::get('infolog')) as $name)
 		{
 			if ($this->customfields[$name]) $content['#'.$name] = $calendar['#'.$name];
 		}
@@ -2239,20 +2237,20 @@ 
 	function timesheet_set($data)
 	{
 		$set = array();
-		list($id,$recurrence) = explode(':',$data['id']);
-		if ((int)$id && ($event = $this->read($id,$recurrence)))
+		list($id, $recurrence) = explode(':', $data['id']);
+		if ((int)$id && ($event = $this->read($id, $recurrence)))
 		{
 			$set['ts_start'] = $event['start'];
 			$set['ts_title'] = $this->link_title($event);
-			$set['start_time'] = Api\DateTime::to($event['start'],'H:i');
+			$set['start_time'] = Api\DateTime::to($event['start'], 'H:i');
 			$set['ts_description'] = $event['description'];
-			if ($this->isWholeDay($event)) $event['end']++;	// whole day events are 1sec short
+			if ($this->isWholeDay($event)) $event['end']++; // whole day events are 1sec short
 			$set['ts_duration']	= ($event['end'] - $event['start']) / 60;
 			$set['ts_quantity'] = ($event['end'] - $event['start']) / 3600;
-			$set['end_time'] = null;	// unset end-time
+			$set['end_time'] = null; // unset end-time
 			$set['cat_id'] = (int)$event['category'];
 
-			foreach(Link::get_links('calendar',$id,'','link_lastmod DESC',true) as $link)
+			foreach (Link::get_links('calendar', $id, '', 'link_lastmod DESC', true) as $link)
 			{
 				if ($link['app'] != 'timesheet' && $link['app'] != Link::VFS_APPNAME)
 				{