EGroupware / egroupware

calendar/inc/class.calendar_bo.inc.php

Spacing +298 added lines, -298 removed lines

@@ -13,23 +13,23 @@ 
 
 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);
 
 /**
  * Gives read access to the calendar, but all events the user is not participating are private!
  * Used by addressbook.
  */
-define('EGW_ACL_READ_FOR_PARTICIPANTS',EGW_ACL_CUSTOM_1);
-define('EGW_ACL_FREEBUSY',EGW_ACL_CUSTOM_2);
+define('EGW_ACL_READ_FOR_PARTICIPANTS', EGW_ACL_CUSTOM_1);
+define('EGW_ACL_FREEBUSY', EGW_ACL_CUSTOM_2);
 /**
  * Allows to invite an other user (if configured to be used!)
  */
-define('EGW_ACL_INVITE',EGW_ACL_CUSTOM_3);
+define('EGW_ACL_INVITE', EGW_ACL_CUSTOM_3);
 
 /**
  * Required (!) include, as we use the MCAL_* constants, BEFORE instanciating (and therefore autoloading) the class
@@ -64,7 +64,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
@@ -94,12 +94,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
@@ -225,25 +225,25 @@ 
 	 */
 	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();
 		$this->datetime = $GLOBALS['egw']->datetime;
 
-		$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 = egw_time::server2user($this->now,'ts');
+		$this->now_su = egw_time::server2user($this->now, 'ts');
 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		$this->grants = $GLOBALS['egw']->acl->get_grants('calendar');
 
-		if (!is_array($this->resources = $GLOBALS['egw']->session->appsession('resources','calendar')))
+		if (!is_array($this->resources = $GLOBALS['egw']->session->appsession('resources', 'calendar')))
 		{
 			$this->resources = array();
-			foreach($GLOBALS['egw']->hooks->process('calendar_resources') as $app => $data)
+			foreach ($GLOBALS['egw']->hooks->process('calendar_resources') as $app => $data)
 			{
 				if ($data && $data['type'])
 				{
@@ -259,19 +259,19 @@ 
 				'type' => '',
 				'app' => 'home-accounts',
 			);
-			$GLOBALS['egw']->session->appsession('resources','calendar',$this->resources);
+			$GLOBALS['egw']->session->appsession('resources', 'calendar', $this->resources);
 		}
 		//echo "registered resources="; _debug_array($this->resources);
 
-		$this->config = config::read('calendar');	// only used for horizont, regular calendar config is under phpgwapi
-		$this->calview_no_consolidate = ($GLOBALS['egw_info']['server']['calview_no_consolidate']?$GLOBALS['egw_info']['server']['calview_no_consolidate']:5);
+		$this->config = config::read('calendar'); // only used for horizont, regular calendar config is under phpgwapi
+		$this->calview_no_consolidate = ($GLOBALS['egw_info']['server']['calview_no_consolidate'] ? $GLOBALS['egw_info']['server']['calview_no_consolidate'] : 5);
 		$this->require_acl_invite = $GLOBALS['egw_info']['server']['require_acl_invite'];
 
-		$this->categories = new categories($this->user,'calendar');
+		$this->categories = new categories($this->user, 'calendar');
 
 		$this->customfields = config::get_customfields('calendar');
 
-		foreach($this->alarms as $secs => &$label)
+		foreach ($this->alarms as $secs => &$label)
 		{
 			$label = self::secs2label($secs);
 		}
@@ -287,15 +287,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;
 	}
@@ -311,12 +311,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];
@@ -341,12 +341,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->member($uid)))
 			{
-				foreach($members as $member)
+				foreach ($members as $member)
 				{
 					$member = $member['account_id'];
 					if (!isset($event['participants'][$member]))
@@ -369,7 +369,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))
 		{
@@ -377,19 +377,19 @@ 
 		}
 		// only query calendars of users, we have READ-grants from
 		$users = array();
-		foreach($_users as $user)
+		foreach ($_users as $user)
 		{
 			$user = trim($user);
-			if ($ignore_acl || $this->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS|($use_freebusy?EGW_ACL_FREEBUSY:0),0,$user))
+			if ($ignore_acl || $this->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS|($use_freebusy ? EGW_ACL_FREEBUSY : 0), 0, $user))
 			{
-				if ($user && !in_array($user,$users))	// already added?
+				if ($user && !in_array($user, $users))	// already added?
 				{
 					$users[] = $user;
 				}
 			}
 			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;
@@ -402,11 +402,11 @@ 
 				$members = $GLOBALS['egw']->accounts->member($user);
 				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['account_id'],$users) &&
-							($ignore_acl || $this->check_perms(EGW_ACL_READ|($use_freebusy?EGW_ACL_FREEBUSY:0),0,$member['account_id'])))
+						if (!in_array($member['account_id'], $users) &&
+							($ignore_acl || $this->check_perms(EGW_ACL_READ|($use_freebusy ? EGW_ACL_FREEBUSY : 0), 0, $member['account_id'])))
 						{
 							$users[] = $member['account_id'];
 						}
@@ -418,9 +418,9 @@ 
 				$memberships = $GLOBALS['egw']->accounts->membership($user);
 				if (is_array($memberships))
 				{
-					foreach($memberships as $group)
+					foreach ($memberships as $group)
 					{
-						if (!in_array($group['account_id'],$users))
+						if (!in_array($group['account_id'], $users))
 						{
 							$users[] = $group['account_id'];
 						}
@@ -461,18 +461,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);
 			}
 		}
 
@@ -490,9 +490,9 @@ 
 		if (!empty($params['query']))
 		{
 			$params['private_grants'] = array();
-			foreach($this->grants as $user => $rights)
+			foreach ($this->grants as $user => $rights)
 			{
-				if ($rights & EGW_ACL_PRIVATE) $params['private_grants'][] = $user;
+				if ($rights&EGW_ACL_PRIVATE) $params['private_grants'][] = $user;
 			}
 		}
 
@@ -518,49 +518,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(EGW_ACL_READ,$event);
+				$is_private = !$this->check_perms(EGW_ACL_READ, $event);
 			}
 			if ($is_private || (!$event['public'] && $filter == 'hideprivate'))
 			{
-				$this->clear_private_infos($events[$id],$users);
+				$this->clear_private_infos($events[$id], $users);
 			}
 		}
 
@@ -568,18 +568,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;
@@ -588,23 +588,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;
@@ -617,9 +617,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))
 		{
@@ -641,14 +641,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 = !egw_link::title($app,$id);
+			$is_private = !egw_link::title($app, $id);
 		}
 		// boolean value to make all events of $app public (false) or private (true)
 		elseif (is_bool($app_data))
@@ -657,7 +657,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;
@@ -671,7 +671,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());
@@ -687,19 +687,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'],
 		));
@@ -713,15 +713,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']))
@@ -729,15 +729,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!', egw_time::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!', egw_time::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;
@@ -745,21 +745,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,egw_time::server2user($recuring[$cal_id]+1));	// set_recurences operates in user-time!
+				$this->set_recurrences($event, egw_time::server2user($recuring[$cal_id] + 1)); // set_recurences operates in user-time!
 			}
 		}
 		// update the horizont
-		config::save_value('horizont',$this->config['horizont'],'calendar');
+		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']);
 	}
 
 	/**
@@ -770,11 +770,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']))
@@ -793,27 +793,27 @@ 
 		if (!$start) $start = $event['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[] = egw_time::to($exception, true);	// true = date
+			$exceptions[] = egw_time::to($exception, true); // true = date
 		}
 		//error_log(__METHOD__."(".array2string($event).", $start) exceptions=".array2string($exceptions));
-		foreach($events as $event)
+		foreach ($events as $event)
 		{
 			$is_exception = in_array(egw_time::to($event['start'], true), $exceptions);
-			$start = $this->date2ts($event['start'],true);
+			$start = $this->date2ts($event['start'], true);
 			if ($event['whole_day'])
 			{
 				$time = $this->so->startOfDay(new egw_time($event['end'], egw_time::$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=".egw_time::to($start).", is_exception=".array2string($is_exception));
 			$this->so->recurrence($event['id'], $start, $end, $event['participants'], $is_exception);
@@ -829,7 +829,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)
@@ -842,65 +842,65 @@ 
 			// database returns timestamps as string, convert them to integer
 			// to avoid misinterpretation by egw_time as Ymd string
 			// (this will fail on 32bit systems for times > 2038!)
-			$event['start'] = (int)$event['start'];	// this is for isWholeDay(), which also calls egw_time
+			$event['start'] = (int)$event['start']; // this is for isWholeDay(), which also calls egw_time
 			$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 egw_time((int)$event['start'], egw_time::$server_timezone), $event['tzid']);
+				$stime = & $this->so->startOfDay(new egw_time((int)$event['start'], egw_time::$server_timezone), $event['tzid']);
 				$event['start'] = egw_time::to($stime, $date_format);
-				$time =& $this->so->startOfDay(new egw_time((int)$event['end'], egw_time::$server_timezone), $event['tzid']);
+				$time = & $this->so->startOfDay(new egw_time((int)$event['end'], egw_time::$server_timezone), $event['tzid']);
 				$time->setTime(23, 59, 59);
 				$event['end'] = egw_time::to($time, $date_format);
 				if (!empty($event['recurrence']))
 				{
-					$time =& $this->so->startOfDay(new egw_time((int)$event['recurrence'], egw_time::$server_timezone), $event['tzid']);
+					$time = & $this->so->startOfDay(new egw_time((int)$event['recurrence'], egw_time::$server_timezone), $event['tzid']);
 					$event['recurrence'] = egw_time::to($time, $date_format);
 				}
 				if (!empty($event['recur_enddate']))
 				{
-					$time =& $this->so->startOfDay(new egw_time((int)$event['recur_enddate'], egw_time::$server_timezone), $event['tzid']);
+					$time = & $this->so->startOfDay(new egw_time((int)$event['recur_enddate'], egw_time::$server_timezone), $event['tzid']);
 					$time->setTime(23, 59, 59);
 					$event['recur_enddate'] = egw_time::to($time, $date_format);
 				}
-				$timestamps = array('modified','created');
+				$timestamps = array('modified', 'created');
 			}
 			else
 			{
-				$timestamps = array('start','end','modified','created','recur_enddate','recurrence');
+				$timestamps = array('start', 'end', 'modified', 'created', 'recur_enddate', 'recurrence');
 			}
 			// 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 egw_time((int)$date, egw_time::$server_timezone), $event['tzid']);
+						$time = & $this->so->startOfDay(new egw_time((int)$date, egw_time::$server_timezone), $event['tzid']);
 						$date = egw_time::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);
 				}
 			}
 		}
@@ -913,11 +913,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 egw_time::server2user($ts,$date_format);
+		return egw_time::server2user($ts, $date_format);
 	}
 
 	/**
@@ -931,7 +931,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;
 
@@ -940,21 +940,21 @@ 
 		$return = null;
 
 		$check = $clear_private_infos_users ? EGW_ACL_FREEBUSY : EGW_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
 					{
@@ -970,13 +970,13 @@ 
 				$return = self::$cached_event;
 			}
 		}
-		if ($clear_private_infos_users && !is_array($ids) && !$this->check_perms(EGW_ACL_READ,$return))
+		if ($clear_private_infos_users && !is_array($ids) && !$this->check_perms(EGW_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;
 	}
@@ -994,17 +994,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))
@@ -1016,27 +1016,27 @@ 
 		// 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, true);	// true = we operate in usertime, like the rest of calendar_bo
-		foreach($rrule as $time)
+		$rrule = calendar_rrule::event2rrule($event, true); // 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 (($ts = $this->date2ts($time)) < $start-$event_length)
+			$time->setUser(); // $time is in timezone of event, convert it to usertime used here
+			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
 				}
@@ -1050,11 +1050,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);
 		}
 	}
 
@@ -1065,18 +1065,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;
 
@@ -1084,7 +1084,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);
 		}
 	}
 
@@ -1108,22 +1108,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'];
 				}
@@ -1132,7 +1132,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];
 	}
@@ -1153,7 +1153,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)
@@ -1162,13 +1162,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)
 		{
@@ -1178,15 +1178,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'];
@@ -1194,7 +1194,7 @@ 
 		$grant = $grants[$owner];
 
 		// now any ACL rights (but invite rights!) implicate FREEBUSY rights (at least READ has to include FREEBUSY)
-		if ($grant & ~EGW_ACL_INVITE) $grant |= EGW_ACL_FREEBUSY;
+		if ($grant&~EGW_ACL_INVITE) $grant |= EGW_ACL_FREEBUSY;
 
 		if (is_array($event) && ($needed == EGW_ACL_READ || $needed == EGW_ACL_FREEBUSY))
 		{
@@ -1203,15 +1203,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 |= EGW_ACL_FREEBUSY | EGW_ACL_READ | EGW_ACL_PRIVATE;
+						$grant |= EGW_ACL_FREEBUSY|EGW_ACL_READ|EGW_ACL_PRIVATE;
 						break;
 					}
-					elseif ($grants[$uid] & EGW_ACL_READ)
+					elseif ($grants[$uid]&EGW_ACL_READ)
 					{
 						// if we have a READ grant from a participant, we dont give an implicit privat grant too
 						$grant |= EGW_ACL_READ;
@@ -1230,12 +1230,12 @@ 
 		}
 		if ($GLOBALS['egw']->accounts->get_type($owner) == 'g' && $needed == EGW_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 == EGW_ACL_FREEBUSY || !$private || $grant & EGW_ACL_PRIVATE);
+			$access = $user == $owner || $grant&$needed
+				&& ($needed == EGW_ACL_FREEBUSY || !$private || $grant&EGW_ACL_PRIVATE);
 		}
 		// do NOT allow users to purge deleted events, if we dont have 'userpurge' enabled
 		if ($access && $needed == EGW_ACL_DELETE && $event['deleted'] &&
@@ -1246,7 +1246,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;
@@ -1261,9 +1261,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 ? egw_time::user2server($date,'ts') : egw_time::to($date,'ts');
+		return $user2server ? egw_time::user2server($date, 'ts') : egw_time::to($date, 'ts');
 	}
 
 	/**
@@ -1273,9 +1273,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 ? egw_time::server2user($date,'array') : egw_time::to($date,'array');
+		return $server2user ? egw_time::server2user($date, 'array') : egw_time::to($date, 'array');
 	}
 
 	/**
@@ -1286,9 +1286,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 ? egw_time::server2user($date,$format) : egw_time::to($date,$format);
+		return $server2user ? egw_time::server2user($date, $format) : egw_time::to($date, $format);
 	}
 
 	/**
@@ -1298,9 +1298,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 egw_time::to($date,$format);
+		return egw_time::to($date, $format);
 	}
 
 	/**
@@ -1322,7 +1322,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',
@@ -1333,22 +1333,22 @@ 
 			EGW_ACL_PRIVATE => 'ACL_PRIVATE',
 			EGW_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
@@ -1370,11 +1370,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));
@@ -1389,7 +1389,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)
@@ -1404,27 +1404,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)
 						{
@@ -1434,43 +1434,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;
 	}
@@ -1482,25 +1482,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 = common::formattime(sprintf('%02d',$start_m/60),sprintf('%02d',$start_m%60));
+		$timespan = $t = common::formattime(sprintf('%02d', $start_m / 60), sprintf('%02d', $start_m % 60));
 
 		if ($both)	// end-time too
 		{
-			$timespan .= ' - '.common::formattime(sprintf('%02d',$end_m/60),sprintf('%02d',$end_m%60));
+			$timespan .= ' - '.common::formattime(sprintf('%02d', $end_m / 60), sprintf('%02d', $end_m % 60));
 			// 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;
 	}
 
 	/**
@@ -1511,13 +1511,13 @@ 
 	* @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();
 
 		if ($use_type && $use_type != 'u') $id = $use_type.$id;
-		if($id === 0 || $id === '0') $id = $this->user;
+		if ($id === 0 || $id === '0') $id = $this->user;
 
 		if (!isset($id2lid[$id]))
 		{
@@ -1533,7 +1533,7 @@ 
 			else
 			{
 				$id2lid[$id] = common::grab_owner_name($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].'>' : '');
@@ -1547,37 +1547,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 = html::image('calendar','accepted',$lang_status);
+						$status = html::image('calendar', 'accepted', $lang_status);
 						break;
 					case 'R':	// rejected
-						$status = html::image('calendar','rejected',$lang_status);
+						$status = html::image('calendar', 'rejected', $lang_status);
 						break;
 					case 'T':	// tentative
-						$status = html::image('calendar','tentative',$lang_status);
+						$status = html::image('calendar', 'tentative', $lang_status);
 						break;
 					case 'U':	// no response = unknown
-						$status = html::image('calendar','needs-action',$lang_status);
+						$status = html::image('calendar', 'needs-action', $lang_status);
 						break;
 					case 'D':	// delegated
-						$status = html::image('calendar','forward',$lang_status);
+						$status = html::image('calendar', 'forward', $lang_status);
 						break;
 					case 'G':	// group invitation
 						// Todo: Image, seems not to be used
@@ -1599,13 +1599,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;
 			}
@@ -1622,13 +1622,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;
 
@@ -1643,7 +1643,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];
 			}
@@ -1655,12 +1655,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 = common::grab_owner_name($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')
 		{
@@ -1672,7 +1672,7 @@ 
 		}
 		$arr[$id] = array(
 			'grantor' => $id,
-			'value'   => ($type == 'g' ? 'g_' : '') . $id,
+			'value'   => ($type == 'g' ? 'g_' : '').$id,
 			'name'    => $name,
 			'sname'	  => $egw_name
 		);
@@ -1694,26 +1694,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->membership($user)))
 		{
-			foreach($memberships as $group_info)
+			foreach ($memberships as $group_info)
 			{
-				self::_list_cals_add($group_info['account_id'],$users,$groups);
+				self::_list_cals_add($group_info['account_id'], $users, $groups);
 
-				if (($account_perms = $GLOBALS['egw']->acl->get_ids_for_location($group_info['account_id'],EGW_ACL_READ,'calendar')))
+				if (($account_perms = $GLOBALS['egw']->acl->get_ids_for_location($group_info['account_id'], EGW_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);
 					}
 				}
 			}
@@ -1721,7 +1721,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
 	}
 
 	/**
@@ -1764,13 +1764,13 @@ 
 	 *	dow: day of week, 0=sunday, .., 6= saturday
 	 *	observande_rule: boolean
 	 */
-	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);
 
 		if (!$this->cached_holidays)	// try reading the holidays from the session
 		{
-			$this->cached_holidays = $GLOBALS['egw']->session->appsession('holidays','calendar');
+			$this->cached_holidays = $GLOBALS['egw']->session->appsession('holidays', 'calendar');
 		}
 		if (!isset($this->cached_holidays[$year]))
 		{
@@ -1789,46 +1789,46 @@ 
 					'n_family' => "!''",
 					'bday' => "!''",
 				);
-				$bdays =& $contacts->search('',array('id','n_family','n_given','n_prefix','n_middle','bday'),
-					'contact_bday ASC',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter);
+				$bdays = & $contacts->search('', array('id', 'n_family', 'n_given', 'n_prefix', 'n_middle', 'bday'),
+					'contact_bday ASC', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter);
 				// search accounts too, if not stored in contacts repository
 				$extra_accounts_search = $contacts->account_repository == 'ldap' && !is_null($contacts->so_accounts) &&
 					!$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'];
-				if ($extra_accounts_search && ($bdays2 =& $contacts->search('',array('id','n_family','n_given','n_prefix','n_middle','bday'),
-					'contact_bday ASC',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter+array('owner' => 0))))
+				if ($extra_accounts_search && ($bdays2 = & $contacts->search('', array('id', 'n_family', 'n_given', 'n_prefix', 'n_middle', 'bday'),
+					'contact_bday ASC', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter + array('owner' => 0))))
 				{
-					$bdays = !$bdays ? $bdays2 : array_merge($bdays,$bdays2);
+					$bdays = !$bdays ? $bdays2 : array_merge($bdays, $bdays2);
 				}
 				if ($bdays)
 				{
 					// sort by month and day only
-					usort($bdays,create_function('$a,$b','return (int) $a[\'bday\'] == (int) $b[\'bday\'] ? strcmp($a[\'bday\'],$b[\'bday\']) : (int) $a[\'bday\'] - (int) $b[\'bday\'];'));
-					foreach($bdays as $pers)
+					usort($bdays, create_function('$a,$b', 'return (int) $a[\'bday\'] == (int) $b[\'bday\'] ? strcmp($a[\'bday\'],$b[\'bday\']) : (int) $a[\'bday\'] - (int) $b[\'bday\'];'));
+					foreach ($bdays as $pers)
 					{
-						if (empty($pers['bday']) || $pers['bday']=='0000-00-00 0' || $pers['bday']=='0000-00-00' || $pers['bday']=='0.0.00')
+						if (empty($pers['bday']) || $pers['bday'] == '0000-00-00 0' || $pers['bday'] == '0000-00-00' || $pers['bday'] == '0.0.00')
 						{
 							//error_log(__METHOD__.__LINE__.' Skipping entry for invalid birthday:'.array2string($pers));
 							continue;
 						}
-						list($y,$m,$d) = explode('-',$pers['bday']);
-						if ($y > $year) continue; 	// not yet born
-						$this->cached_holidays[$year][sprintf('%04d%02d%02d',$year,$m,$d)][] = array(
+						list($y, $m, $d) = explode('-', $pers['bday']);
+						if ($y > $year) continue; // not yet born
+						$this->cached_holidays[$year][sprintf('%04d%02d%02d', $year, $m, $d)][] = array(
 							'day'       => $d,
 							'month'     => $m,
 							'occurence' => 0,
 							'name'      => lang('Birthday').' '.($pers['n_given'] ? $pers['n_given'] : $pers['n_prefix']).' '.$pers['n_middle'].' '.
 								$pers['n_family'].($y && !$GLOBALS['egw_info']['server']['hide_birthdays'] ? ' ('.$y.')' : ''),
-							'birthyear' => $y,	// this can be used to identify birthdays from holidays
+							'birthyear' => $y, // this can be used to identify birthdays from holidays
 						);
 					}
 				}
 			}
 			// store holidays and birthdays in the session
-			$this->cached_holidays = $GLOBALS['egw']->session->appsession('holidays','calendar',$this->cached_holidays);
+			$this->cached_holidays = $GLOBALS['egw']->session->appsession('holidays', 'calendar', $this->cached_holidays);
 		}
-		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,$this->cached_holidays[$year]);
+			$this->debug_message('calendar_bo::read_holidays(%1)=%2', true, $year, $this->cached_holidays[$year]);
 		}
 		return $this->cached_holidays[$year];
 	}
@@ -1839,10 +1839,10 @@ 
 	 * @param type $event
 	 * @return array array of selected calendar fields
 	 */
-	function get_link_options ($event = array())
+	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'),
@@ -1869,7 +1869,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);
 		}
@@ -1877,7 +1877,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)
@@ -1903,10 +1903,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'];
 	}
 
 	/**
@@ -1925,10 +1925,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);
 		}
@@ -1945,11 +1945,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);
 	}
 
 	/**
@@ -1959,47 +1959,47 @@ 
 	 */
 	function check_set_default_prefs()
 	{
-		if ($this->cal_prefs['interval'] && ($set = $GLOBALS['egw']->session->appsession('default_prefs_set','calendar')))
+		if ($this->cal_prefs['interval'] && ($set = $GLOBALS['egw']->session->appsession('default_prefs_set', 'calendar')))
 		{
 			return;
 		}
-		$GLOBALS['egw']->session->appsession('default_prefs_set','calendar','set');
+		$GLOBALS['egw']->session->appsession('default_prefs_set', 'calendar', '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'];
 
 		if (!($planner_start_with_group = $GLOBALS['egw']->accounts->name2id('Default')))
 		{
 			$planner_start_with_group = '0';
 		}
-		$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.'),
 			'planner_start_with_group' => $planner_start_with_group,
 			'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');
 		}
 	}
 
@@ -2009,7 +2009,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);
 
@@ -2022,8 +2022,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'] : '').
@@ -2055,11 +2055,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'];
@@ -2077,15 +2077,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') = $ctag = ".date('Y-m-d H:i:s',$ctag)." took ".(microtime(true)-$startime)." secs");
+		if ($this->debug > 1) error_log(__METHOD__."($user, '$filter') = $ctag = ".date('Y-m-d H:i:s', $ctag)." took ".(microtime(true) - $startime)." secs");
 		return $ctag;
 	}
 
@@ -2105,7 +2105,7 @@ 
 
 		$content = array(
 			'info_cat'       => $GLOBALS['egw']->categories->check_list(EGW_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'],
@@ -2120,7 +2120,7 @@ 
 		$content['link_app'][] = $calendar['info_link']['app'];
 		$content['link_id'][]  = $calendar['info_link']['id'];
 		// Copy claendar's links
-		foreach(egw_link::get_links('calendar',$calendar['id'],'','link_lastmod DESC',true) as $link)
+		foreach (egw_link::get_links('calendar', $calendar['id'], '', 'link_lastmod DESC', true) as $link)
 		{
 			if ($link['app'] != egw_link::VFS_APPNAME)
 			{
@@ -2133,7 +2133,7 @@ 
 			}
 		}
 		// Copy same custom fields
-		foreach(array_keys(config::get_customfields('infolog')) as $name)
+		foreach (array_keys(config::get_customfields('infolog')) as $name)
 		{
 			if ($this->customfields[$name]) $content['#'.$name] = $calendar['#'.$name];
 		}
@@ -2151,20 +2151,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'] = egw_time::to($event['start'],'H:i');
+			$set['start_time'] = egw_time::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(egw_link::get_links('calendar',$id,'','link_lastmod DESC',true) as $link)
+			foreach (egw_link::get_links('calendar', $id, '', 'link_lastmod DESC', true) as $link)
 			{
 				if ($link['app'] != 'timesheet' && $link['app'] != egw_link::VFS_APPNAME)
 				{

calendar/inc/class.calendar_merge.inc.php

Spacing +132 added lines, -132 removed lines

@@ -82,17 +82,17 @@ 
 
 		// Register table plugins
 		$this->table_plugins['participant'] = 'participant';
-		for($i = 0; $i < 7; $i++)
+		for ($i = 0; $i < 7; $i++)
 		{
 			$this->table_plugins[date('l', strtotime("+$i days"))] = 'day_plugin';
 		}
-		for($i = 1; $i <= 31; $i++) {
+		for ($i = 1; $i <= 31; $i++) {
 			$this->table_plugins['day_'.$i] = 'day'; // Numerically by day number (1-31)
 		}
-		foreach(self::$relative as $day) {
+		foreach (self::$relative as $day) {
 			$this->table_plugins[$day] = 'day'; // Current day
 		}
-		$this->query = $GLOBALS['egw']->session->appsession('session_data','calendar');
+		$this->query = $GLOBALS['egw']->session->appsession('session_data', 'calendar');
 		$this->query['users'] = explode(',', $this->query['owner']);
 		$this->query['num_rows'] = -1;
 	}
@@ -113,10 +113,10 @@ 
 	 * @param string $charset=null charset to override default set by mimetype or export charset
 	 * @return string|boolean merged document or false on error
 	 */
-	function merge_string($content,$ids,$err,$mimetype,$fix)
+	function merge_string($content, $ids, $err, $mimetype, $fix)
 	{
 		// Handle merging a list of events into a document with range instead of pagerepeat
-		if(strpos($content, '$$pagerepeat') === false && strpos($content, '{{pagerepeat') === false && count($ids) > 1)
+		if (strpos($content, '$$pagerepeat') === false && strpos($content, '{{pagerepeat') === false && count($ids) > 1)
 		{
 			// Merging more than one something will fail without pagerepeat
 			if (is_array($ids) && $ids[0]['id'])
@@ -125,16 +125,16 @@ 
 				$events = $ids;
 				$ids = array('start' => PHP_INT_MAX, 'end' => 0);
 				$this->ids = array();
-				foreach($events as $event) {
-					if($event['start'] && egw_time::to($event['start'],'ts') < $ids['start']) $ids['start'] = egw_time::to($event['start'],'ts');
-					if($event['end'] && egw_time::to($event['end'],'ts') > $ids['end']) $ids['end'] = egw_time::to($event['end'],'ts');
+				foreach ($events as $event) {
+					if ($event['start'] && egw_time::to($event['start'], 'ts') < $ids['start']) $ids['start'] = egw_time::to($event['start'], 'ts');
+					if ($event['end'] && egw_time::to($event['end'], 'ts') > $ids['end']) $ids['end'] = egw_time::to($event['end'], 'ts');
 					// Keep ids for future use
 					$this->ids[] = $event['id'];
 				}
 				$ids = array($ids);
 			}
 		}
-		return parent::merge_string($content, $ids, $err, $mimetype,$fix);
+		return parent::merge_string($content, $ids, $err, $mimetype, $fix);
 	}
 
 	/**
@@ -144,20 +144,20 @@ 
 	 * @param string &$content=null content to create some replacements only if they are used
 	 * @return array|boolean
 	 */
-	protected function get_replacements($id,&$content=null)
+	protected function get_replacements($id, &$content = null)
 	{
 		$prefix = '';
 		// List events ?
-		if(is_array($id) && !$id['id'] && !$id[0]['id'])
+		if (is_array($id) && !$id['id'] && !$id[0]['id'])
 		{
 			$events = $this->bo->search($this->query + $id + array(
 				'offset' => 0,
 				'order' => 'cal_start',
 				'cfs' => strpos($content, '#') !== false ? array_keys(config::get_customfields('calendar')) : null
 			));
-			if(strpos($content,'$$calendar/') !== false || strpos($content, '$$table/day') !== false)
+			if (strpos($content, '$$calendar/') !== false || strpos($content, '$$table/day') !== false)
 			{
-				array_unshift($events,false); unset($events[0]);	// renumber the array to start with key 1, instead of 0
+				array_unshift($events, false); unset($events[0]); // renumber the array to start with key 1, instead of 0
 				$prefix = 'calendar/%d';
 			}
 		}
@@ -167,11 +167,11 @@ 
 			$events = $id;
 			$id = array('start' => PHP_INT_MAX, 'end' => 0);
 			$this->ids = array();
-			foreach($events as $event) {
-				if($event['start'] && $event['start'] < $id['start']) $id['start'] = $event['start'];
-				if($event['end'] && $event['end'] > $id['end']) $id['end'] = $event['end'];
+			foreach ($events as $event) {
+				if ($event['start'] && $event['start'] < $id['start']) $id['start'] = $event['start'];
+				if ($event['end'] && $event['end'] > $id['end']) $id['end'] = $event['end'];
 				// Keep ids for future use
-				$this->ids[]  = $event['id'];
+				$this->ids[] = $event['id'];
 			}
 			$id = array($id);
 		}
@@ -183,20 +183,20 @@ 
 		// as this function allows to pass query- parameters, we need to check the result of the query against export_limit restrictions
 		if (bo_merge::hasExportLimit($this->export_limit) && !bo_merge::is_export_limit_excepted() && count($events) > (int)$this->export_limit)
 		{
-			$err = lang('No rights to export more than %1 entries!',(int)$this->export_limit);
+			$err = lang('No rights to export more than %1 entries!', (int)$this->export_limit);
 			throw new egw_exception_wrong_userinput($err);
 		}
 		$replacements = array();
 		$n = 0;
-		foreach($events as $event)
+		foreach ($events as $event)
 		{
-			$values = $this->calendar_replacements($event,sprintf($prefix,++$n), $content);
-			if(is_array($id) && $id['start'])
+			$values = $this->calendar_replacements($event, sprintf($prefix, ++$n), $content);
+			if (is_array($id) && $id['start'])
 			{
-				foreach(self::$range_tags as $key => $format)
+				foreach (self::$range_tags as $key => $format)
 				{
 					$value = date($format, $key == 'end' ? $id['end'] : $id['start']);
-					if($key == 'month') $value = lang($value);
+					if ($key == 'month') $value = lang($value);
 					$values["$\$range/$key$$"] = $value;
 				}
 			}
@@ -212,10 +212,10 @@ 
 	 * @param boolean $last_event_too=false also include information about the last event
 	 * @return array
 	 */
-	public function calendar_replacements($id,$prefix = '', &$content = '')
+	public function calendar_replacements($id, $prefix = '', &$content = '')
 	{
 		$replacements = array();
-		if(!is_array($id) || !$id['start']) {
+		if (!is_array($id) || !$id['start']) {
 			$event = $this->bo->read(is_array($id) ? $id['id'] : $id, is_array($id) ? $id['recur_date'] : null);
 		} else {
 			$event = $id;
@@ -228,68 +228,68 @@ 
 		importexport_export_csv::convert($record, $types, 'calendar');
 
 		$array = $record->get_record_array();
-		foreach($array as $key => $value)
+		foreach ($array as $key => $value)
 		{
-			$replacements['$$'.($prefix?$prefix.'/':'').$key.'$$'] = $value;
+			$replacements['$$'.($prefix ? $prefix.'/' : '').$key.'$$'] = $value;
 		}
 
-		$replacements['$$' . ($prefix ? $prefix . '/' : '') . 'calendar_id'. '$$'] = $event['id'];
-		foreach($this->bo->event2array($event) as $name => $data)
+		$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_id'.'$$'] = $event['id'];
+		foreach ($this->bo->event2array($event) as $name => $data)
 		{
-			if (substr($name,-4) == 'date') $name = substr($name,0,-4);
-			$replacements['$$' . ($prefix ? $prefix . '/' : '') . 'calendar_'.$name . '$$'] = is_array($data['data']) ? implode(', ',$data['data']) : $data['data'];
+			if (substr($name, -4) == 'date') $name = substr($name, 0, -4);
+			$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_'.$name.'$$'] = is_array($data['data']) ? implode(', ', $data['data']) : $data['data'];
 		}
 		// Add seperate lists of participants by type
-		if(strpos($content, 'calendar_participants/')!== false)
+		if (strpos($content, 'calendar_participants/') !== false)
 		{
 			$types = array();
-			foreach($this->bo->resources as $resource)
+			foreach ($this->bo->resources as $resource)
 			{
 				$types[$resource['app']] = array();
 			}
-			foreach($event['participants'] as $uid => $status)
+			foreach ($event['participants'] as $uid => $status)
 			{
 				$type = $this->bo->resources[$uid[0]]['app'];
-				if($type == 'home-accounts')
+				if ($type == 'home-accounts')
 				{
 					$type = ($GLOBALS['egw']->accounts->get_type($uid) == 'g' ? 'group' : 'account');
 				}
 				$types[$type][] = $this->bo->participant_name($uid);
 			}
-			foreach($types as $t_id => $type)
+			foreach ($types as $t_id => $type)
 			{
-				$replacements['$$'.($prefix ? $prefix . '/' : '') . "calendar_participants/{$t_id}$$"] = implode(', ',$type);
+				$replacements['$$'.($prefix ? $prefix.'/' : '')."calendar_participants/{$t_id}$$"] = implode(', ', $type);
 			}
 		}
-		if(!$replacements['$$'.($prefix ? $prefix . '/' : '') . 'calendar_recur_type$$'])
+		if (!$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_recur_type$$'])
 		{
 			// Need to set it to '' if not set or previous record may be used
-			$replacements['$$'.($prefix ? $prefix . '/' : '') . 'calendar_recur_type$$'] = '';
+			$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_recur_type$$'] = '';
 		}
-		foreach(array('start','end') as $what)
+		foreach (array('start', 'end') as $what)
 		{
-			foreach(array(
+			foreach (array(
 				'date' => $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],
 				'day'  => 'l',
-				'time' => (date('Ymd',$event['start']) != date('Ymd',$event['end']) ? $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].' ' : '') . ($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i'),
+				'time' => (date('Ymd', $event['start']) != date('Ymd', $event['end']) ? $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].' ' : '').($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i'),
 			) as $name => $format)
 			{
-				$value = egw_time::to($event[$what],$format);
+				$value = egw_time::to($event[$what], $format);
 				if ($format == 'l') $value = lang($value);
-				$replacements['$$' .($prefix ? $prefix.'/':'').'calendar_'.$what.$name.'$$'] = $value;
+				$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_'.$what.$name.'$$'] = $value;
 			}
 		}
-		$duration = ($event['end'] - $event['start'])/60;
-		$replacements['$$'.($prefix?$prefix.'/':'').'calendar_duration$$'] = floor($duration/60).lang('h').($duration%60 ? $duration%60 : '');
+		$duration = ($event['end'] - $event['start']) / 60;
+		$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_duration$$'] = floor($duration / 60).lang('h').($duration % 60 ? $duration % 60 : '');
 
 		// Add in contact stuff for owner
-		if (strpos($content,'$$calendar_owner/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($event['owner'],'person_id')))
+		if (strpos($content, '$$calendar_owner/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($event['owner'], 'person_id')))
 		{
-			$replacements += $this->contact_replacements($user,($prefix ? $prefix.'/':'').'calendar_owner');
-			$replacements['$$'.($prefix?$prefix.'/':'').'calendar_owner/primary_group$$'] = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw']->accounts->id2name($event['owner'],'account_primary_group'));
+			$replacements += $this->contact_replacements($user, ($prefix ? $prefix.'/' : '').'calendar_owner');
+			$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_owner/primary_group$$'] = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw']->accounts->id2name($event['owner'], 'account_primary_group'));
 		}
 
-		if($content && strpos($content, '$$#') !== FALSE)
+		if ($content && strpos($content, '$$#') !== FALSE)
 		{
 			$this->cf_link_to_expand($event, $content, $replacements);
 		}
@@ -315,77 +315,77 @@ 
 	* @param string $repeat Text being repeated for each entry
 	* @return array
 	*/
-	public function day_plugin($plugin,$date,$n,$repeat)
+	public function day_plugin($plugin, $date, $n, $repeat)
 	{
 		static $days = null;
-		if(is_array($date) && !$date['start']) {
+		if (is_array($date) && !$date['start']) {
 			// List of IDs
-			if($date[0]['start']) {
+			if ($date[0]['start']) {
 				$id = array('start' => PHP_INT_MAX, 'end' => 0);
-				foreach($date as $event) {
-					if($event['start'] && $event['start'] < $id['start']) $id['start'] = $event['start'];
-					if($event['end'] && $event['end'] > $id['end']) $id['end'] = $event['end'];
+				foreach ($date as $event) {
+					if ($event['start'] && $event['start'] < $id['start']) $id['start'] = $event['start'];
+					if ($event['end'] && $event['end'] > $id['end']) $id['end'] = $event['end'];
 				}
 				$date = $id;
 			} else {
 				$event = $this->bo->read(is_array($date) ? $date['id'] : $date, is_array($date) ? $date['recur_date'] : null);
-				if(date('l',$event['start']) != $plugin) return array();
+				if (date('l', $event['start']) != $plugin) return array();
 				$date = $event['start'];
 			}
 		}
 
 		$_date = $date['start'] ? $date['start'] : $date;
-		if($days[date('Ymd',$_date)][$plugin]) return $days[date('Ymd',$_date)][$plugin][$n];
+		if ($days[date('Ymd', $_date)][$plugin]) return $days[date('Ymd', $_date)][$plugin][$n];
 
 		$events = $this->bo->search($this->query + array(
-			'start' => $date['end'] ? $date['start'] : mktime(0,0,0,date('m',$_date),date('d',$_date),date('Y',$_date)),
-			'end' => $date['end'] ? $date['end'] : mktime(23,59,59,date('m',$_date),date('d',$_date),date('Y',$_date)),
+			'start' => $date['end'] ? $date['start'] : mktime(0, 0, 0, date('m', $_date), date('d', $_date), date('Y', $_date)),
+			'end' => $date['end'] ? $date['end'] : mktime(23, 59, 59, date('m', $_date), date('d', $_date), date('Y', $_date)),
 			'offset' => 0,
 			'num_rows' => 20,
 			'order' => 'cal_start',
 			'daywise' => true,
-			'cfs' => array(),	// read all custom-fields
+			'cfs' => array(), // read all custom-fields
 		));
 
 		if (true) $days = array();
 		$replacements = array();
 		$time_format = $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i';
-		foreach($events as $day => $list)
+		foreach ($events as $day => $list)
 		{
-			foreach($list as $event)
+			foreach ($list as $event)
 			{
-				if($this->ids && !in_array($event['id'], $this->ids)) continue;
+				if ($this->ids && !in_array($event['id'], $this->ids)) continue;
 				$start = egw_time::to($event['start'], 'array');
 				$end = egw_time::to($event['end'], 'array');
 				$replacements = $this->calendar_replacements($event);
-				if($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) {
-					$dow = date('l',$event['start']);
+				if ($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) {
+					$dow = date('l', $event['start']);
 				} else {
 					$dow = date('l', strtotime($day));
 					// Fancy date+time formatting for multi-day events
-					$replacements['$$calendar_starttime$$'] = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0,0,0,0,0,1));
-					$replacements['$$calendar_endtime$$'] = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23,59,59,0,0,0));
+					$replacements['$$calendar_starttime$$'] = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0, 0, 0, 0, 0, 1));
+					$replacements['$$calendar_endtime$$'] = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23, 59, 59, 0, 0, 0));
 				}
 
-				$days[date('Ymd',$_date)][$dow][] = $replacements;
+				$days[date('Ymd', $_date)][$dow][] = $replacements;
 			}
-			if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) {
+			if (strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) {
 				$date_marker = array(
 					'$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)),
 					'$$day/name$$' => lang(date('l', strtotime($day)))
 				);
-				if(!is_array($days[date('Ymd',$_date)][date('l',strtotime($day))])) {
+				if (!is_array($days[date('Ymd', $_date)][date('l', strtotime($day))])) {
 					$blank = $this->calendar_replacements(array());
-					foreach($blank as &$value)
+					foreach ($blank as &$value)
 					{
 						$value = '';
 					}
-					$days[date('Ymd',$_date)][date('l',strtotime($day))][] = $blank;
+					$days[date('Ymd', $_date)][date('l', strtotime($day))][] = $blank;
 				}
-				$days[date('Ymd',$_date)][date('l',strtotime($day))][0] += $date_marker;
+				$days[date('Ymd', $_date)][date('l', strtotime($day))][0] += $date_marker;
 			}
 		}
-		return $days[date('Ymd',$_date)][$plugin][0];
+		return $days[date('Ymd', $_date)][$plugin][0];
 	}
 
 	/**
@@ -399,27 +399,27 @@ 
 	* @param string $repeat Text being repeated for each entry
 	* @return array
 	*/
-	public function day($plugin,$id,$n,$repeat)
+	public function day($plugin, $id, $n, $repeat)
 	{
 		static $days = null;
 
 		// Figure out which day
-		list($type, $which) = explode('_',$plugin);
-		if($type == 'day' && $which)
+		list($type, $which) = explode('_', $plugin);
+		if ($type == 'day' && $which)
 		{
-			if($id[0]['start'])
+			if ($id[0]['start'])
 			{
 				$dates = array('start' => PHP_INT_MAX, 'end' => 0);
-				foreach($id as $event) {
-					if($event['start'] && $event['start'] < $dates['start']) $dates['start'] = $event['start'];
-					if($event['end'] && $event['end'] > $dates['end']) $dates['end'] = $event['end'];
+				foreach ($id as $event) {
+					if ($event['start'] && $event['start'] < $dates['start']) $dates['start'] = $event['start'];
+					if ($event['end'] && $event['end'] > $dates['end']) $dates['end'] = $event['end'];
 				}
 				$id = $dates;
 			}
 			$arr = $this->bo->date2array($id['start']);
 			$arr['day'] = $which;
 			$date = $this->bo->date2ts($arr);
-			if(is_array($id) && $id['start'] && ($date < $id['start'] || $date > $id['end'])) return array();
+			if (is_array($id) && $id['start'] && ($date < $id['start'] || $date > $id['end'])) return array();
 		}
 		elseif ($plugin == 'selected')
 		{
@@ -429,64 +429,64 @@ 
 		{
 			$date = strtotime($plugin);
 		}
-		if($type == 'day' && is_array($id) && !$id['start']) {
+		if ($type == 'day' && is_array($id) && !$id['start']) {
 			$event = $this->bo->read(is_array($id) ? $id['id'] : $id, is_array($id) ? $id['recur_date'] : null);
-			if($which && date('d',$event['start']) != $which) return array();
-			if(date('Ymd',$date) != date('Ymd', $event['start'])) return array();
+			if ($which && date('d', $event['start']) != $which) return array();
+			if (date('Ymd', $date) != date('Ymd', $event['start'])) return array();
 			return $n == 0 ? $this->calendar_replacements($event) : array();
 		}
 
 		// Use start for cache, in case of multiple months
 		$_date = $id['start'] ? $id['start'] : $date;
-		if($days[date('Ymd',$_date)][$plugin]) return $days[date('Ymd',$_date)][$plugin][$n];
+		if ($days[date('Ymd', $_date)][$plugin]) return $days[date('Ymd', $_date)][$plugin][$n];
 
 		$events = $this->bo->search($this->query + array(
 			'start' => $date,
-			'end' => mktime(23,59,59,date('m',$date),date('d',$date),date('Y',$date)),
+			'end' => mktime(23, 59, 59, date('m', $date), date('d', $date), date('Y', $date)),
 			'offset' => 0,
 			'num_rows' => 20,
 			'order' => 'cal_start',
 			'daywise' => true,
-			'cfs' => array(),	// read all custom-fields
+			'cfs' => array(), // read all custom-fields
 		));
 
 		$replacements = array();
 		if (true) $days = array();
 		$time_format = $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i';
-		foreach($events as $day => $list)
+		foreach ($events as $day => $list)
 		{
-			foreach($list as $event)
+			foreach ($list as $event)
 			{
-				if($this->ids && !in_array($event['id'], $this->ids)) continue;
+				if ($this->ids && !in_array($event['id'], $this->ids)) continue;
 				$start = egw_time::to($event['start'], 'array');
 				$end = egw_time::to($event['end'], 'array');
 				$replacements = $this->calendar_replacements($event);
-				if($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) {
+				if ($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) {
 					//$dow = date('l',$event['start']);
 				} else {
 					// Fancy date+time formatting for multi-day events
-					$replacements['$$calendar_starttime$$'] = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0,0,0,0,0,1));
-					$replacements['$$calendar_endtime$$'] = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23,59,59,0,0,0));
+					$replacements['$$calendar_starttime$$'] = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0, 0, 0, 0, 0, 1));
+					$replacements['$$calendar_endtime$$'] = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23, 59, 59, 0, 0, 0));
 				}
-				$days[date('Ymd',$_date)][$plugin][] = $replacements;
+				$days[date('Ymd', $_date)][$plugin][] = $replacements;
 			}
-			if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) {
+			if (strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) {
 				$date_marker = array(
 					'$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)),
 					'$$day/name$$' => lang(date('l', strtotime($day)))
 				);
-				if(!is_array($days[date('Ymd',$_date)][$plugin])) {
+				if (!is_array($days[date('Ymd', $_date)][$plugin])) {
 					$blank = $this->calendar_replacements(array());
-					foreach($blank as &$value)
+					foreach ($blank as &$value)
 					{
 						$value = '';
 					}
-					$days[date('Ymd',$_date)][$plugin][] = $blank;
+					$days[date('Ymd', $_date)][$plugin][] = $blank;
 				}
-				$days[date('Ymd',$_date)][$plugin][0] += $date_marker;
+				$days[date('Ymd', $_date)][$plugin][0] += $date_marker;
 			}
 		}
-		return $days[date('Ymd',$_date)][$plugin][0];
+		return $days[date('Ymd', $_date)][$plugin][0];
 	}
 
 	/**
@@ -499,30 +499,30 @@ 
 	* @param int $n
 	* @return array
 	*/
-	public function participant($plugin,$id,$n)
+	public function participant($plugin, $id, $n)
 	{
-		unset($plugin);	// not used, but required by function signature
+		unset($plugin); // not used, but required by function signature
 
-		if(!is_array($id) || !$id['start']) {
+		if (!is_array($id) || !$id['start']) {
 			$event = $this->bo->read(is_array($id) ? $id['id'] : $id, is_array($id) ? $id['recur_date'] : null);
 		} else {
 			$event = $id;
 		}
 
-		if(!is_array($event['participants']) || $n >= count($event['participants'])) return array();
+		if (!is_array($event['participants']) || $n >= count($event['participants'])) return array();
 
 		$participant = null;
 		$status = null;
 		$i = -1;
-		foreach($event['participants'] as $participant => $status) {
-			if(++$i == $n) break;
+		foreach ($event['participants'] as $participant => $status) {
+			if (++$i == $n) break;
 		}
 
-		if(!$participant) return array();
+		if (!$participant) return array();
 
 		// Add some common information
 		$quantity = $role = null;
-		calendar_so::split_status($status,$quantity,$role);
+		calendar_so::split_status($status, $quantity, $role);
 		if ($role != 'REQ-PARTICIPANT')
 		{
 			if (isset($this->bo->roles[$role]))
@@ -530,13 +530,13 @@ 
 				$role = lang($this->bo->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));
 			}
 		}
 		$info = array(
@@ -549,26 +549,26 @@ 
 		switch ($participant[0])
 		{
 			case 'c':
-				$replacements = $this->contact_replacements(substr($participant,1),'');
+				$replacements = $this->contact_replacements(substr($participant, 1), '');
 				break;
 			case 'r':
 				if (is_null(self::$resources)) self::$resources = CreateObject('resources.resources_bo');
-				if (($resource = self::$resources->read(substr($participant,1))))
+				if (($resource = self::$resources->read(substr($participant, 1))))
 				{
-					foreach($resource as $name => $value)
+					foreach ($resource as $name => $value)
 					{
 					    $replacements['$$'.$name.'$$'] = $value;
 					}
 				}
 				break;
 			default:
-				if (is_numeric($participant) && ($contact = $GLOBALS['egw']->accounts->id2name($participant,'person_id')))
+				if (is_numeric($participant) && ($contact = $GLOBALS['egw']->accounts->id2name($participant, 'person_id')))
 				{
-					$replacements = $this->contact_replacements($contact,'');
+					$replacements = $this->contact_replacements($contact, '');
 				}
 				break;
 		}
-		foreach($info as $name => $value)
+		foreach ($info as $name => $value)
 		{
 			$replacements['$$'.$name.'$$'] = $value;
 		}
@@ -590,7 +590,7 @@ 
 		echo '<tr><td colspan="4"><h3>'.lang('Calendar fields:')."</h3></td></tr>";
 
 		$n = 0;
-		foreach(array(
+		foreach (array(
 			'calendar_id' => lang('Calendar ID'),
 			'calendar_title' => lang('Title'),
 			'calendar_description' => lang('Description'),
@@ -613,7 +613,7 @@ 
 			'calendar_owner'    => lang('Owner'),
 		) as $name => $label)
 		{
-			if (in_array($name,array('start','end')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name, array('start', 'end')) && $n&1)		// main values, which should be in the first column
 			{
 				echo "</tr>\n";
 				$n++;
@@ -626,13 +626,13 @@ 
 
 		echo '<tr><td colspan="4"><h3>'.lang('Range fields').":</h3></td></tr>";
 		echo '<tr><td colspan="4">'.lang('If you select a range (month, week, etc) instead of a list of entries, these extra fields are available').'</td></tr>';
-		foreach(array_keys(self::$range_tags) as $name)
+		foreach (array_keys(self::$range_tags) as $name)
 		{
 			echo '<tr><td>{{range/'.$name.'}}</td><td>'.lang($name)."</td></tr>\n";
 		}
 		echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
 		$custom = config::get_customfields('calendar');
-		foreach($custom as $name => $field)
+		foreach ($custom as $name => $field)
 		{
 			echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label']."</td></tr>\n";
 		}
@@ -641,9 +641,9 @@ 
 		echo '<tr><td colspan="4"><h3>'.lang('Participants').":</h3></td></tr>";
 		echo '<tr><td>{{calendar_participants/account}}</td><td colspan="3">'.lang('Accounts')."</td></tr>\n";
 		echo '<tr><td>{{calendar_participants/group}}</td><td colspan="3">'.lang('Groups')."</td></tr>\n";
-		foreach($this->bo->resources as $resource)
+		foreach ($this->bo->resources as $resource)
 		{
-			if($resource['type'])
+			if ($resource['type'])
 			{
 				echo '<tr><td>{{calendar_participants/'.$resource['app'].'}}</td><td colspan="3">'.lang($resource['app'])."</td></tr>\n";
 			}
@@ -660,19 +660,19 @@ 
 		echo '<tr style="vertical-align:top"><td colspan="2"><table >';
 		echo '<tr><td><h3>'.lang('Day of week tables').":</h3></td></tr>";
 		$days = array();
-		for($i = 0; $i < 7; $i++)
+		for ($i = 0; $i < 7; $i++)
 		{
-			$days[date('N',strtotime("+$i days"))] = date('l',strtotime("+$i days"));
+			$days[date('N', strtotime("+$i days"))] = date('l', strtotime("+$i days"));
 		}
 		ksort($days);
-		foreach($days as $day)
+		foreach ($days as $day)
 		{
-			echo '<tr><td>{{table/'.$day. '}} ... {{endtable}}</td></tr>';
+			echo '<tr><td>{{table/'.$day.'}} ... {{endtable}}</td></tr>';
 		}
 		echo '</table></td><td colspan="2"><table >';
 		echo '<tr><td><h3>'.lang('Daily tables').":</h3></td></tr>";
-		foreach(self::$relative as $value) {
-			echo '<tr><td>{{table/'.$value. '}} ... {{endtable}}</td></tr>';
+		foreach (self::$relative as $value) {
+			echo '<tr><td>{{table/'.$value.'}} ... {{endtable}}</td></tr>';
 		}
 		echo '<tr><td>{{table/day_n}} ... {{endtable}}</td><td>1 <= n <= 31</td></tr>';
 		echo '</table></td></tr>';
@@ -680,7 +680,7 @@ 
 		echo '<tr><td>{{day/name}}</td><td colspan="3">'.lang('Name of the week (ex: Monday), available for the first entry inside each day of week or daily table inside the selected range.').'</td></tr>';
 
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
-		foreach(array(
+		foreach (array(
 			'link' => lang('HTML link to the current record'),
 			'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
 			'attachments' => lang('List of files linked to the current record'),

calendar/inc/class.sbox.inc.php

Spacing +64 added lines, -64 removed lines

@@ -59,7 +59,7 @@ 
 				unset($country);
 				unset($this->country_array['  ']);
 				// try to translate them and sort alphabetic
-				foreach($this->country_array as $k => $name)
+				foreach ($this->country_array as $k => $name)
 				{
 					if (($translated = lang($name)) != $name.'*')
 					{
@@ -72,13 +72,13 @@ 
 
 		function hour_formated_text($name, $selected = 0)
 		{
-			$s = '<select name="' . $name . '">';
+			$s = '<select name="'.$name.'">';
 			$t_s[$selected] = ' selected';
 
-			for ($i=0; $i<24; $i++)
+			for ($i = 0; $i < 24; $i++)
 			{
-				$s .= '<option value="' . $i . '"' . $t_s[$i] . '>'
-					. $GLOBALS['phpgw']->common->formattime($i+1,"00") . '</option>' . "\n";
+				$s .= '<option value="'.$i.'"'.$t_s[$i].'>'
+					. $GLOBALS['phpgw']->common->formattime($i + 1, "00").'</option>'."\n";
 			}
 			$s .= "</select>";
 
@@ -87,12 +87,12 @@ 
 
 		function hour_text($name, $selected = 0)
 		{
-			$s = '<select name="' . $name . '">';
+			$s = '<select name="'.$name.'">';
 			$t_s[$selected] = " selected";
-			for ($i=1; $i<13; $i++)
+			for ($i = 1; $i < 13; $i++)
 			{
-				$s .= '<option value="' . $i . '"' . $t_s[$i] . '>'
-					. $i . '</option>';
+				$s .= '<option value="'.$i.'"'.$t_s[$i].'>'
+					. $i.'</option>';
 				$s .= "\n";
 			}
 			$s .= "</select>";
@@ -103,52 +103,52 @@ 
 		// I would like to add a increment feature
 		function sec_minute_text($name, $selected = 0)
 		{
-			$s = '<select name="' . $name . '">';
+			$s = '<select name="'.$name.'">';
 			$t_s[$selected] = " selected";
 
-			for ($i=0; $i<60; $i++)
+			for ($i = 0; $i < 60; $i++)
 			{
-				$s .= '<option value="' . $i . '"' . $t_s[sprintf("%02d",$i)] . '>' . sprintf("%02d",$i) . '</option>';
+				$s .= '<option value="'.$i.'"'.$t_s[sprintf("%02d", $i)].'>'.sprintf("%02d", $i).'</option>';
 				$s .= "\n";
 			}
 			$s .= "</select>";
 			return $s;
 		}
 
-		function ap_text($name,$selected)
+		function ap_text($name, $selected)
 		{
 			$selected = strtolower($selected);
 			$t[$selected] = " selected";
-			$s = '<select name="' . $name . '">'
-				. ' <option value="am"' . $t['am'] . '>am</option>'
-				. ' <option value="pm"' . $t['pm'] . '>pm</option>';
+			$s = '<select name="'.$name.'">'
+				. ' <option value="am"'.$t['am'].'>am</option>'
+				. ' <option value="pm"'.$t['pm'].'>pm</option>';
 			$s .= '</select>';
 			return $s;
 		}
 
-		function full_time($hour_name,$hour_selected,$min_name,$min_selected,$sec_name,$sec_selected,$ap_name,$ap_selected)
+		function full_time($hour_name, $hour_selected, $min_name, $min_selected, $sec_name, $sec_selected, $ap_name, $ap_selected)
 		{
 			// This needs to be changed to support there time format preferences
-			$s = $this->hour_text($hour_name,$hour_selected)
-				. $this->sec_minute_text($min_name,$min_selected)
-				. $this->sec_minute_text($sec_name,$sec_selected)
-				. $this->ap_text($ap_name,$ap_selected);
+			$s = $this->hour_text($hour_name, $hour_selected)
+				. $this->sec_minute_text($min_name, $min_selected)
+				. $this->sec_minute_text($sec_name, $sec_selected)
+				. $this->ap_text($ap_name, $ap_selected);
 			return $s;
 		}
 
-		function getWeekdays($name, $selected=0)
+		function getWeekdays($name, $selected = 0)
 		{
 			$out = '';
-			for($i=0;$i<count($this->weekdays);$i++)
+			for ($i = 0; $i < count($this->weekdays); $i++)
 			{
-				$out .= '<option value="'.$i.'"'.($selected!=$i?'':' selected').'>'.($this->weekdays[$i]!=''?lang($this->weekdays[$i]):'').'</option>'."\n";
+				$out .= '<option value="'.$i.'"'.($selected != $i ? '' : ' selected').'>'.($this->weekdays[$i] != '' ? lang($this->weekdays[$i]) : '').'</option>'."\n";
 			}
 			return '<select name="'.$name.'">'."\n".$out.'</select>'."\n";
 		}
 
 		function nr2weekday($selected = 0)
 		{
-			for($i=0;$i<count($this->weekdays);$i++)
+			for ($i = 0; $i < count($this->weekdays); $i++)
 			{
 				if ($selected > 0 && $selected == $i)
 				{
@@ -157,24 +157,24 @@ 
 			}
 		}
 
-		function getMonthText($name, $selected=0)
+		function getMonthText($name, $selected = 0)
 		{
 			$out = '';
 			$c_monthnames = count($this->monthnames);
-			for($i=0;$i<$c_monthnames;$i++)
+			for ($i = 0; $i < $c_monthnames; $i++)
 			{
-				$out .= '<option value="'.$i.'"'.($selected!=$i?'':' selected').'>'.($this->monthnames[$i]!=''?lang($this->monthnames[$i]):'').'</option>'."\n";
+				$out .= '<option value="'.$i.'"'.($selected != $i ? '' : ' selected').'>'.($this->monthnames[$i] != '' ? lang($this->monthnames[$i]) : '').'</option>'."\n";
 			}
 			return '<select name="'.$name.'">'."\n".$out.'</select>'."\n";
 		}
 
-		function getDays($name, $selected=0)
+		function getDays($name, $selected = 0)
 		{
 			$out = '';
 
-			for($i=0;$i<32;$i++)
+			for ($i = 0; $i < 32; $i++)
 			{
-				$out .= '<option value="'.($i?$i:'').'"'.($selected!=$i?'':' selected').'>'.($i?$i:'').'</option>'."\n";
+				$out .= '<option value="'.($i ? $i : '').'"'.($selected != $i ? '' : ' selected').'>'.($i ? $i : '').'</option>'."\n";
 			}
 			return '<select name="'.$name.'">'."\n".$out.'</select>'."\n";
 		}
@@ -203,10 +203,10 @@ 
 			$out .= '></option>'."\n";
 
 			// We need to add some good error checking here.
-			for ($i=$startYear;$i<$endyear; $i++)
+			for ($i = $startYear; $i < $endyear; $i++)
 			{
 				$out .= '<option value="'.$i.'"';
-				if ($selected==$i)
+				if ($selected == $i)
 				{
 					$out .= ' SELECTED';
 				}
@@ -217,14 +217,14 @@ 
 			return $out;
 		}
 
-		function getPercentage($name, $selected=0)
+		function getPercentage($name, $selected = 0)
 		{
 			$out = "<select name=\"$name\">\n";
 
-			for($i=0;$i<101;$i=$i+10)
+			for ($i = 0; $i < 101; $i = $i + 10)
 			{
 				$out .= "<option value=\"$i\"";
-				if($selected==$i)
+				if ($selected == $i)
 				{
 					$out .= " SELECTED";
 				}
@@ -235,17 +235,17 @@ 
 			return $out;
 		}
 
-		function getPriority($name, $selected=2)
+		function getPriority($name, $selected = 2)
 		{
-			$arr = array('','low','normal','high');
-			$out = '<select name="' . $name . '">';
+			$arr = array('', 'low', 'normal', 'high');
+			$out = '<select name="'.$name.'">';
 
-			for($i=1;$i<count($arr);$i++)
+			for ($i = 1; $i < count($arr); $i++)
 			{
 				$out .= "<option value=\"";
 				$out .= $i;
 				$out .= "\"";
-				if ($selected==$i)
+				if ($selected == $i)
 				{
 					$out .= ' SELECTED';
 				}
@@ -257,7 +257,7 @@ 
 			return $out;
 		}
 
-		function getAccessList($name, $selected="private")
+		function getAccessList($name, $selected = "private")
 		{
 			$arr = array(
 				"private" => "Private",
@@ -265,35 +265,35 @@ 
 				"group" => "Group public"
 			);
 
-			if (strpos($selected,",") !== false)
+			if (strpos($selected, ",") !== false)
 			{
 				$selected = "group";
 			}
 
 			$out = "<select name=\"$name\">\n";
 
-			for(reset($arr);current($arr);next($arr))
+			for (reset($arr); current($arr); next($arr))
 			{
-				$out .= '<option value="' . key($arr) . '"';
-				if($selected==key($arr))
+				$out .= '<option value="'.key($arr).'"';
+				if ($selected == key($arr))
 				{
 					$out .= " SELECTED";
 				}
-				$out .= ">" . pos($arr) . "</option>\n";
+				$out .= ">".pos($arr)."</option>\n";
 			}
 			$out .= "</select>\n";
 			return $out;
 		}
 
-		function getGroups($groups, $selected="", $name="n_groups[]")
+		function getGroups($groups, $selected = "", $name = "n_groups[]")
 		{
-			$out = '<select name="' . $name . '" multiple>';
-			while (list($null,$group) = each($groups))
+			$out = '<select name="'.$name.'" multiple>';
+			while (list($null, $group) = each($groups))
 			{
-				$out .= '<option value="' . $group['account_id'] . '"';
-				if(@is_array($selected))
+				$out .= '<option value="'.$group['account_id'].'"';
+				if (@is_array($selected))
 				{
-					for($i=0;$i<count($selected);$i++)
+					for ($i = 0; $i < count($selected); $i++)
 					{
 						if ($group['account_id'] == $selected[$i])
 						{
@@ -302,11 +302,11 @@ 
 						}
 					}
 				}
-				elseif (ereg("," . $group['account_id'] . ",", $selected))
+				elseif (ereg(",".$group['account_id'].",", $selected))
 				{
 					$out .= " SELECTED";
 				}
-				$out .= ">" . $group['account_name'] . "</option>\n";
+				$out .= ">".$group['account_name']."</option>\n";
 			}
 			$out .= "</select>\n";
 
@@ -371,29 +371,29 @@ 
 				'WY'	=>	'Wyoming'
 			);
 
-			while (list($sn,$ln) = each($states))
+			while (list($sn, $ln) = each($states))
 			{
-				$s .= '<option value="' . $sn . '"';
+				$s .= '<option value="'.$sn.'"';
 				if ($selected == $sn)
 				{
 					$s .= ' selected';
 				}
-				$s .= '>' . $ln . '</option>';
+				$s .= '>'.$ln.'</option>';
 			}
-			return '<select name="' . $name . '">' . $s . '</select>';
+			return '<select name="'.$name.'">'.$s.'</select>';
 		}
 
-		function form_select($selected,$name='')
+		function form_select($selected, $name = '')
 		{
-			if($name=='')
+			if ($name == '')
 			{
 				$name = 'country';
 			}
 			$str = '<select name="'.$name.'">'."\n"
-				. ' <option value="  "'.($selected == '  '?' selected':'').'>'.lang('Select One').'</option>'."\n";
-			foreach($this->country_array as $key => $value)
+				. ' <option value="  "'.($selected == '  ' ? ' selected' : '').'>'.lang('Select One').'</option>'."\n";
+			foreach ($this->country_array as $key => $value)
 			{
-				$str .= ' <option value="'.$key.'"'.($selected == $key?' selected':'') . '>'.$value.'</option>'."\n";
+				$str .= ' <option value="'.$key.'"'.($selected == $key ? ' selected' : '').'>'.$value.'</option>'."\n";
 			}
 			$str .= '</select>'."\n";
 			return $str;

calendar/inc/class.calendar_groupdav.inc.php

Spacing +148 added lines, -149 removed lines

@@ -138,7 +138,7 @@ 
 	 * @param string $id =''
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function propfind($path,&$options,&$files,$user,$id='')
+	function propfind($path, &$options, &$files, $user, $id = '')
 	{
 		if ($this->debug)
 		{
@@ -164,10 +164,10 @@ 
 			'enum_recuring' => false,
 			'daywise' => false,
 			'date_format' => 'server',
-			'no_total' => true,	// we need no total number of rows (saves extra query)
-			'cfs' => array(),	// return custom-fields, as we use them to store X- attributes
+			'no_total' => true, // we need no total number of rows (saves extra query)
+			'cfs' => array(), // return custom-fields, as we use them to store X- attributes
 		);
-		foreach(array(
+		foreach (array(
 			'start' => $GLOBALS['egw_info']['user']['preferences']['groupdav']['calendar-past-limit'],
 			'end' => $GLOBALS['egw_info']['user']['preferences']['groupdav']['calendar-future-limit'],
 		) as $name => $value)
@@ -176,7 +176,7 @@ 
 			{
 				$value = $name == 'start' ? self::PAST_LIMIT : self::FUTURE_LIMIT;
 			}
-			$filter[$name] = $this->bo->now + 24*3600*($name == 'start' ? -1 : 1)*abs($value);
+			$filter[$name] = $this->bo->now + 24 * 3600 * ($name == 'start' ? -1 : 1) * abs($value);
 		}
 		if ($this->client_shared_uid_exceptions)	// do NOT return (non-virtual) exceptions
 		{
@@ -188,13 +188,13 @@ 
 			$filter['filter'] = 'owner';
 		}
 		// scheduling inbox, shows only not yet accepted or rejected events
-		elseif (substr($path,-7) == '/inbox/')
+		elseif (substr($path, -7) == '/inbox/')
 		{
 			$filter['filter'] = 'unknown';
-			$filter['start'] = $this->bo->now;	// only return future invitations
+			$filter['start'] = $this->bo->now; // only return future invitations
 		}
 		// ToDo: not sure what scheduling outbox is supposed to show, leave it empty for now
-		elseif (substr($path,-8) == '/outbox/')
+		elseif (substr($path, -8) == '/outbox/')
 		{
 			return true;
 		}
@@ -211,7 +211,7 @@ 
 			// when trying to request not supported components, eg. VTODO on a calendar collection
 			return true;
 		}
-		if ($id) $path = dirname($path).'/';	// caldav_name get's added anyway in the callback
+		if ($id) $path = dirname($path).'/'; // caldav_name get's added anyway in the callback
 
 		if ($this->debug > 1)
 		{
@@ -228,7 +228,7 @@ 
 
 			$this->sync_collection_token = null;
 
-			$filter['order'] = 'cal_modified ASC';	// return oldest modifications first
+			$filter['order'] = 'cal_modified ASC'; // return oldest modifications first
 			$filter['sync-collection'] = true;
 			// no end-date / limit into the future, as unchanged entries would never be transferted later on
 			unset($filter['end']);
@@ -236,7 +236,7 @@ 
 
 		if (isset($nresults))
 		{
-			unset($filter['no_total']);	// we need the total!
+			unset($filter['no_total']); // we need the total!
 			$files['files'] = $this->propfind_callback($path, $filter, array(0, (int)$nresults));
 
 			// hack to support limit with sync-collection report: events are returned in modified ASC order (oldest first)
@@ -245,13 +245,13 @@ 
 			if ($options['root']['name'] == 'sync-collection' && $this->bo->total > $nresults)
 			{
 				--$this->sync_collection_token;
-				$files['sync-token-params'][] = true;	// tel get_sync_collection_token that we have more entries
+				$files['sync-token-params'][] = true; // tel get_sync_collection_token that we have more entries
 			}
 		}
 		else
 		{
 			// return iterator, calling ourself to return result in chunks
-			$files['files'] = new groupdav_propfind_iterator($this,$path,$filter,$files['files']);
+			$files['files'] = new groupdav_propfind_iterator($this, $path, $filter, $files['files']);
 		}
 		if (isset($_GET['download']))
 		{
@@ -271,9 +271,9 @@ 
 		html::content_header('calendar.ics', 'text/calendar');
 
 		$n = 0;
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			if (!$n++) continue;	// first entry is collection itself
+			if (!$n++) continue; // first entry is collection itself
 
 			$icalendar = $file['props']['calendar-data']['val'];
 			if (($start = strpos($icalendar, 'BEGIN:VEVENT')) !== false &&
@@ -297,7 +297,7 @@ 
 						echo substr($icalendar, 0, $start);
 					}
 				}
-				echo substr($icalendar, $start, $end-$start);
+				echo substr($icalendar, $start, $end - $start);
 			}
 		}
 		if ($icalendar && $end)
@@ -315,12 +315,12 @@ 
 	 * @param array|boolean $start =false false=return all or array(start,num)
 	 * @return array with "files" array with values for keys path and props
 	 */
-	function propfind_callback($path,array $filter,$start=false)
+	function propfind_callback($path, array $filter, $start = false)
 	{
 		if ($this->debug) $starttime = microtime(true);
 
 		$calendar_data = $this->groupdav->prop_requested('calendar-data', groupdav::CALDAV, true);
-		if (!is_array($calendar_data)) $calendar_data = false;	// not in allprop or autoindex
+		if (!is_array($calendar_data)) $calendar_data = false; // not in allprop or autoindex
 
 		$files = array();
 
@@ -332,11 +332,11 @@ 
 		$requested_multiget_ids = (array)$filter['query'][self::$path_attr];
 		$sync_collection = $filter['sync-collection'];
 
-		$events =& $this->bo->search($filter);
+		$events = & $this->bo->search($filter);
 
 		if ($events)
 		{
-			foreach($events as $event)
+			foreach ($events as $event)
 			{
 				// remove event from requested multiget ids, to be able to report not found urls
 				if ($requested_multiget_ids && ($k = array_search($event[self::$path_attr], $requested_multiget_ids)) !== false)
@@ -344,7 +344,7 @@ 
 					unset($requested_multiget_ids[$k]);
 				}
 				// sync-collection report: deleted entries need to be reported without properties, same for rejected or deleted invitations
-				if ($sync_collection && ($event['deleted'] || in_array($event['participants'][$filter['users']][0], array('R','X'))))
+				if ($sync_collection && ($event['deleted'] || in_array($event['participants'][$filter['users']][0], array('R', 'X'))))
 				{
 					$files[] = array('path' => $path.urldecode($this->get_path($event)));
 					continue;
@@ -372,10 +372,9 @@ 
 				{
 					$content = $this->iCal($event, $filter['users'],
 						strpos($path, '/inbox/') !== false ? 'REQUEST' : null,
-						!isset($calendar_data['children']['expand']) ? false :
-							($calendar_data['children']['expand']['attrs'] ? $calendar_data['children']['expand']['attrs'] : true));
+						!isset($calendar_data['children']['expand']) ? false : ($calendar_data['children']['expand']['attrs'] ? $calendar_data['children']['expand']['attrs'] : true));
 					$props['getcontentlength'] = bytes($content);
-					$props['calendar-data'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-data',$content);
+					$props['calendar-data'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-data', $content);
 				}
 				/* Calendarserver reports new events with schedule-changes: action: create, which iCal request
 				 * adding it, unfortunately does not lead to showing the new event in the users inbox
@@ -394,7 +393,7 @@ 
 		// report not found multiget urls
 		if ($requested_multiget_ids)
 		{
-			foreach($requested_multiget_ids as $id)
+			foreach ($requested_multiget_ids as $id)
 			{
 				$files[] = array('path' => $path.$id.self::$path_extension);
 			}
@@ -430,7 +429,7 @@ 
 	private function _created_updated_by_prop($user, $time)
 	{
 		$props = array();
-		foreach(array(
+		foreach (array(
 			'first-name' => 'account_firstname',
 			'last-name' => 'account_lastname',
 			'href' => 'account_email',
@@ -473,23 +472,23 @@ 
 			$cal_end = $cal_filters['end']; unset($cal_filters['end']);
 			$num_filters = count($cal_filters);
 
-			foreach($options['filters'] as $filter)
+			foreach ($options['filters'] as $filter)
 			{
-				switch($filter['name'])
+				switch ($filter['name'])
 				{
 					case 'comp-filter':
 						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
 
-						switch($filter['attrs']['name'])
+						switch ($filter['attrs']['name'])
 						{
 							case 'VTODO':
-								return false;	// return nothing for now, todo: check if we can pass it on to the infolog handler
+								return false; // return nothing for now, todo: check if we can pass it on to the infolog handler
 								// todos are handled by the infolog handler
 								//$infolog_handler = new groupdav_infolog();
 								//return $infolog_handler->propfind($options['path'],$options,$options['files'],$user,$method);
 							case 'VCALENDAR':
 							case 'VEVENT':
-								break;			// that's our default anyway
+								break; // that's our default anyway
 						}
 						break;
 					case 'prop-filter':
@@ -512,14 +511,14 @@ 
 						if ($this->debug) error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
 						break;
 					case 'time-range':
-				 		if ($this->debug > 1) error_log(__FILE__ . __METHOD__."($options[path],...) time-range={$filter['attrs']['start']}-{$filter['attrs']['end']}");
+				 		if ($this->debug > 1) error_log(__FILE__.__METHOD__."($options[path],...) time-range={$filter['attrs']['start']}-{$filter['attrs']['end']}");
 				 		if (!empty($filter['attrs']['start']))
 				 		{
 					 		$cal_filters['start'] = $this->vCalendar->_parseDateTime($filter['attrs']['start']);
 				 		}
 				 		if (!empty($filter['attrs']['end']))
 				 		{
-					 		$cal_filters['end']   = $this->vCalendar->_parseDateTime($filter['attrs']['end']);
+					 		$cal_filters['end'] = $this->vCalendar->_parseDateTime($filter['attrs']['end']);
 				 		}
 						break;
 					default:
@@ -540,9 +539,9 @@ 
 		    <B:nresults>10</B:nresults>
 		  </B:limit>
 		*/
-		foreach((array)$options['other'] as $option)
+		foreach ((array)$options['other'] as $option)
 		{
-			switch($option['name'])
+			switch ($option['name'])
 			{
 				case 'nresults':
 					$nresults = (int)$option['data'];
@@ -551,7 +550,7 @@ 
 				case 'limit':
 					break;
 				case 'href':
-					break;	// from addressbook-multiget, handled below
+					break; // from addressbook-multiget, handled below
 				// rfc 6578 sync-report
 				case 'sync-token':
 					if (!empty($option['data']))
@@ -559,7 +558,7 @@ 
 						$parts = explode('/', $option['data']);
 						$sync_token = array_pop($parts);
 						$cal_filters['query'][] = 'cal_modified>'.(int)$sync_token;
-						$cal_filters['filter'] = 'everything';	// to return deleted entries too
+						$cal_filters['filter'] = 'everything'; // to return deleted entries too
 						// no standard time-range!
 						unset($cal_filters['start']);
 					}
@@ -588,25 +587,25 @@ 
 			if ($id)
 			{
 				$cal_filters['query'][self::$path_attr] = groupdav_handler::$path_extension ?
-					basename($id,groupdav_handler::$path_extension) : $id;
+					basename($id, groupdav_handler::$path_extension) : $id;
 			}
 			else	// fetch all given url's
 			{
-				foreach($options['other'] as $option)
+				foreach ($options['other'] as $option)
 				{
 					if ($option['name'] == 'href')
 					{
-						$parts = explode('/',$option['data']);
+						$parts = explode('/', $option['data']);
 						if (($id = urldecode(array_pop($parts))))
 						{
 							$cal_filters['query'][self::$path_attr][] = groupdav_handler::$path_extension ?
-								basename($id,groupdav_handler::$path_extension) : $id;
+								basename($id, groupdav_handler::$path_extension) : $id;
 						}
 					}
 				}
 			}
 
-			if ($this->debug > 1) error_log(__FILE__ . __METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids).', cal_filters='.array2string($cal_filters));
+			if ($this->debug > 1) error_log(__FILE__.__METHOD__."($options[path],...,$id) calendar-multiget: ids=".implode(',', $ids).', cal_filters='.array2string($cal_filters));
 		}
 		return true;
 	}
@@ -619,9 +618,9 @@ 
 	 * @param int $user =null account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function get(&$options,$id,$user=null)
+	function get(&$options, $id, $user = null)
 	{
-		if (!is_array($event = $this->_common_get_put_delete('GET',$options,$id)))
+		if (!is_array($event = $this->_common_get_put_delete('GET', $options, $id)))
 		{
 			return $event;
 		}
@@ -649,7 +648,7 @@ 
 	 * @param boolean|array $expand =false true or array with values for 'start', 'end' to expand recurrences
 	 * @return string
 	 */
-	private function iCal(array $event,$user=null, $method=null, $expand=false)
+	private function iCal(array $event, $user = null, $method = null, $expand = false)
 	{
 		static $handler = null;
 		if (is_null($handler)) $handler = $this->_get_handler();
@@ -673,11 +672,11 @@ 
 				if (isset($expand['start'])) $expand['start'] = $this->vCalendar->_parseDateTime($expand['start']);
 				if (isset($expand['end'])) $expand['end'] = $this->vCalendar->_parseDateTime($expand['end']);
 			}
-			$events =& self::get_series($event['uid'], $this->bo, $expand, $user);
+			$events = & self::get_series($event['uid'], $this->bo, $expand, $user);
 		}
-		elseif(!$this->client_shared_uid_exceptions && $event['reference'])
+		elseif (!$this->client_shared_uid_exceptions && $event['reference'])
 		{
-			$events[0]['uid'] .= '-'.$event['id'];	// force a different uid
+			$events[0]['uid'] .= '-'.$event['id']; // force a different uid
 		}
 		return $handler->exportVCal($events, '2.0', $method);
 	}
@@ -693,20 +692,20 @@ 
 	 * @param int $user =null account_id of calendar to display, to remove master, if current user does not participate in
 	 * @return array
 	 */
-	private static function &get_series($uid,calendar_bo $bo=null, $expand=false, $user=null)
+	private static function &get_series($uid, calendar_bo $bo = null, $expand = false, $user = null)
 	{
 		if (is_null($bo)) $bo = new calendar_bopdate();
 
 		$params = array(
 			'query' => array('cal_uid' => $uid),
-			'filter' => 'owner',  // return all possible entries
+			'filter' => 'owner', // return all possible entries
 			'daywise' => false,
 			'date_format' => 'server',
-			'cfs' => array(),	// read cfs as we use them to store X- attributes
+			'cfs' => array(), // read cfs as we use them to store X- attributes
 		);
 		if (is_array($expand)) $params += $expand;
 
-		if (!($events =& $bo->search($params)))
+		if (!($events = & $bo->search($params)))
 		{
 			return array();
 		}
@@ -714,12 +713,12 @@ 
 		// find master, which is not always first event, eg. when first event is an exception
 		$master = null;
 		$exceptions = array();
-		foreach($events as $k => &$recurrence)
+		foreach ($events as $k => &$recurrence)
 		{
 			if ($recurrence['recur_type'])
 			{
 				$master = $recurrence;
-				$exceptions =& $master['recur_exception'];
+				$exceptions = & $master['recur_exception'];
 				unset($events[$k]);
 				break;
 			}
@@ -727,7 +726,7 @@ 
 		// if recurring event starts in future behind horizont, nothing will be returned by bo::search()
 		if (!isset($master)) $master = $bo->read($uid);
 
-		foreach($events as $k => &$recurrence)
+		foreach ($events as $k => &$recurrence)
 		{
 			//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($uid)[$k]:" . array2string($recurrence));
 			if (!$master || $recurrence['id'] != $master['id'])	// real exception
@@ -749,16 +748,16 @@ 
 				// at least Lightning "understands" EXDATE as exception from what's included
 				// in the whole resource / VCALENDAR component
 				// not removing it causes Lightning to remove the exception itself
-				if (($e = array_search($recurrence['recurrence'],$exceptions)) !== false)
+				if (($e = array_search($recurrence['recurrence'], $exceptions)) !== false)
 				{
 					unset($exceptions[$e]);
 				}
-				continue;	// nothing to change
+				continue; // nothing to change
 			}
 			// alarms are reported on recurrences --> move them to master
 			if ($master)
 			{
-				foreach($recurrence['alarm'] as $alarm)
+				foreach ($recurrence['alarm'] as $alarm)
 				{
 					$master['alarm'][] = $alarm;
 				}
@@ -768,14 +767,14 @@ 
 			if (!$expand && $master && $master['participants'] == $recurrence['participants'])
 			{
 				//error_log('NO exception: '.array2string($recurrence));
-				unset($events[$k]);	// no exception --> remove it
+				unset($events[$k]); // no exception --> remove it
 				continue;
 			}
 			// this is a virtual exception now (no extra event/cal_id in DB)
 			//error_log('virtual exception: '.array2string($recurrence));
 			$recurrence['recurrence'] = $recurrence['start'];
 			if ($master) $recurrence['reference'] = $master['id'];
-			$recurrence['recur_type'] = MCAL_RECUR_NONE;	// is set, as this is a copy of the master
+			$recurrence['recur_type'] = MCAL_RECUR_NONE; // is set, as this is a copy of the master
 			// not for included exceptions (Lightning): $master['recur_exception'][] = $recurrence['start'];
 		}
 		// only add master if we are not expanding and current user participates in master (and not just some exceptions)
@@ -809,23 +808,23 @@ 
 	 * @param string $prefix =null user prefix from path (eg. /ralf from /ralf/addressbook)
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function put(&$options,$id,$user=null,$prefix=null)
+	function put(&$options, $id, $user = null, $prefix = null)
 	{
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options, true));
 
-		if (!$prefix) $user = null;	// /infolog/ does not imply setting the current user (for new entries it's done anyway)
+		if (!$prefix) $user = null; // /infolog/ does not imply setting the current user (for new entries it's done anyway)
 
 		// fix for iCal4OL using WinHTTP only supporting a certain header length
 		if (isset($_SERVER['HTTP_IF_SCHEDULE']) && !isset($_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH']))
 		{
 			$_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH'] = $_SERVER['HTTP_IF_SCHEDULE'];
 		}
-		$return_no_access = true;	// as handled by importVCal anyway and allows it to set the status for participants
-		$oldEvent = $this->_common_get_put_delete('PUT',$options,$id,$return_no_access,
-			isset($_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH']));	// dont fail with 412 Precondition Failed in that case
+		$return_no_access = true; // as handled by importVCal anyway and allows it to set the status for participants
+		$oldEvent = $this->_common_get_put_delete('PUT', $options, $id, $return_no_access,
+			isset($_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH'])); // dont fail with 412 Precondition Failed in that case
 		if (!is_null($oldEvent) && !is_array($oldEvent))
 		{
-			if ($this->debug) error_log(__METHOD__.': '.print_r($oldEvent,true).function_backtrace());
+			if ($this->debug) error_log(__METHOD__.': '.print_r($oldEvent, true).function_backtrace());
 			return $oldEvent;
 		}
 
@@ -856,7 +855,7 @@ 
 					switch (strtolower($key))
 					{
 						case 'charset':
-							$charset = strtoupper(substr($value,1,-1));
+							$charset = strtoupper(substr($value, 1, -1));
 					}
 				}
 			}
@@ -912,7 +911,7 @@ 
 				if (($events = $handler->icaltoegw($vCalendar)))
 				{
 					$modified = 0;
-					foreach($events as $n => $event)
+					foreach ($events as $n => $event)
 					{
 						// for recurrances of event series, we need to read correct recurrence (or if series master is no first event)
 						if ($event['recurrence'] || $n && !$event['recurrence'] || isset($series))
@@ -923,7 +922,7 @@ 
 								$series = self::get_series($event['uid'], $this->bo);
 								//foreach($series as $s => $sEvent) error_log("series[$s]: ".array2string($sEvent));
 							}
-							foreach($series as $oldEvent)
+							foreach ($series as $oldEvent)
 							{
 								if ($oldEvent['recurrence'] == $event['recurrence']) break;
 							}
@@ -988,9 +987,9 @@ 
 					isset($oldEvent['participants'][$GLOBALS['egw_info']['user']['account_id']]))
 				{
 					// just update etag in database
-					$GLOBALS['egw']->db->update($this->bo->so->cal_table,'cal_etag=cal_etag+1',array(
+					$GLOBALS['egw']->db->update($this->bo->so->cal_table, 'cal_etag=cal_etag+1', array(
 						'cal_id' => $eventId,
-					),__LINE__,__FILE__,'calendar');
+					), __LINE__, __FILE__, 'calendar');
 				}
 			}
 		}
@@ -1037,9 +1036,9 @@ 
 	 * @param int $user =null account_id of owner, default null
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function post(&$options,$id,$user=null)
+	function post(&$options, $id, $user = null)
 	{
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options, true));
 
 		$vCalendar = htmlspecialchars_decode($options['content']);
 		$charset = null;
@@ -1056,13 +1055,13 @@ 
 					switch (strtolower($key))
 					{
 						case 'charset':
-							$charset = strtoupper(substr($value,1,-1));
+							$charset = strtoupper(substr($value, 1, -1));
 					}
 				}
 			}
 		}
 
-		if (substr($options['path'],-8) == '/outbox/')
+		if (substr($options['path'], -8) == '/outbox/')
 		{
 			if (preg_match('/^METHOD:REQUEST(\r\n|\r|\n)(.*)^BEGIN:VFREEBUSY/ism', $vCalendar))
 			{
@@ -1113,7 +1112,7 @@ 
 	 */
 	protected function outbox_freebusy_request($ical, $charset, $user, array &$options)
 	{
-		unset($options);	// not used, but required by function signature
+		unset($options); // not used, but required by function signature
 
 		$vcal = new Horde_Icalendar();
 		if (!$vcal->parsevCalendar($ical, 'VCALENDAR', $charset))
@@ -1126,7 +1125,7 @@ 
 
 		$handler = $this->_get_handler();
 		$handler->setSupportedFields('groupdav');
-		$handler->calendarOwner = $handler->user = 0;	// to NOT default owner/organizer to something
+		$handler->calendarOwner = $handler->user = 0; // to NOT default owner/organizer to something
 		if (!($component = $vcal->getComponent(0)) ||
 			!($event = $handler->vevent2egw($component, $version, $handler->supportedFields, $this->groupdav->current_user_principal, 'Horde_Icalendar_Vfreebusy')))
 		{
@@ -1151,13 +1150,13 @@ 
 		$xml->startDocument('1.0', 'UTF-8');
 		$xml->startElementNs('C', 'schedule-response', groupdav::CALDAV);
 
-		foreach(array_keys($event['participants']) as $uid)
+		foreach (array_keys($event['participants']) as $uid)
 		{
 			$xml->startElementNs('C', 'response', null);
 
 			$xml->startElementNs('C', 'recipient', null);
-			$xml->writeElementNs('D', 'href', 'DAV:', $attendee=array_shift($attendees));
-			$xml->endElement();	// recipient
+			$xml->writeElementNs('D', 'href', 'DAV:', $attendee = array_shift($attendees));
+			$xml->endElement(); // recipient
 
 			$xml->writeElementNs('C', 'request-status', null, '2.0;Success');
 			$xml->writeElementNs('C', 'calendar-data', null,
@@ -1165,13 +1164,13 @@ 
 					'UID' => $event['uid'],
 					'ORGANIZER' => $organizer,
 					'ATTENDEE' => $attendee,
-				)+(empty($mask_uid) || !is_string($mask_uid) ? array() : array(
+				) + (empty($mask_uid) || !is_string($mask_uid) ? array() : array(
 					'X-CALENDARSERVER-MASK-UID' => $mask_uid,
 				))));
 
-			$xml->endElement();	// response
+			$xml->endElement(); // response
 		}
-		$xml->endElement();	// schedule-response
+		$xml->endElement(); // schedule-response
 		$xml->endDocument();
 		echo $xml->outputMemory();
 
@@ -1186,14 +1185,14 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function free_busy_report($path,$options,$user)
+	function free_busy_report($path, $options, $user)
 	{
-		unset($path);	// unused, but required by function signature
+		unset($path); // unused, but required by function signature
 		if (!$this->bo->check_perms(EGW_ACL_FREEBUSY, 0, $user))
 		{
 			return '403 Forbidden';
 		}
-		foreach($options['other'] as $filter)
+		foreach ($options['other'] as $filter)
 		{
 			if ($filter['name'] == 'time-range')
 			{
@@ -1205,7 +1204,7 @@ 
 		header('Content-Type: text/calendar');
 		echo $handler->freebusy($user, $end, true, 'utf-8', $start, 'REPLY', array());
 
-		common::egw_exit();	// otherwise we get a 207 multistatus, not 200 Ok
+		common::egw_exit(); // otherwise we get a 207 multistatus, not 200 Ok
 	}
 
 	/**
@@ -1217,7 +1216,7 @@ 
 	 * @param int $user =null owner of the collection, default current user
 	 * @return array with privileges
 	 */
-	public function current_user_privileges($path, $user=null)
+	public function current_user_privileges($path, $user = null)
 	{
 		$privileges = parent::current_user_privileges($path, $user);
 		//error_log(__METHOD__."('$path', $user) parent gave ".array2string($privileges));
@@ -1260,7 +1259,7 @@ 
 
 		// get array with orginal recurrences indexed by recurrence-id
 		$org_recurrences = $exceptions = array();
-		foreach(self::get_series($events[0]['uid'],$bo) as $k => $event)
+		foreach (self::get_series($events[0]['uid'], $bo) as $k => $event)
 		{
 			if (!$k) $master = $event;
 			if ($event['recurrence'])
@@ -1270,13 +1269,13 @@ 
 		}
 
 		// assign cal_id's to already existing recurrences and evtl. re-add recur_exception to master
-		foreach($events as $k => &$recurrence)
+		foreach ($events as $k => &$recurrence)
 		{
 			if (!$recurrence['recurrence'])
 			{
 				// master
 				$recurrence['id'] = $master['id'];
-				$master =& $events[$k];
+				$master = & $events[$k];
 				continue;
 			}
 
@@ -1300,12 +1299,12 @@ 
 		$master['recur_exception'] = array_merge($exceptions, $master['recur_exception']);
 
 		// delete not longer existing recurrences
-		foreach($org_recurrences as $org_recurrence)
+		foreach ($org_recurrences as $org_recurrence)
 		{
 			if ($org_recurrence['id'] != $master['id'])	// non-virtual recurrence
 			{
 				//error_log(__METHOD__.'() deleting #'.$org_recurrence['id']);
-				$bo->delete($org_recurrence['id']);	// might fail because of permissions
+				$bo->delete($org_recurrence['id']); // might fail because of permissions
 			}
 			else	// virtual recurrence
 			{
@@ -1326,25 +1325,25 @@ 
 	 * @param int $id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function delete(&$options,$id)
+	function delete(&$options, $id)
 	{
 		if (strpos($options['path'], '/inbox/') !== false)
 		{
-			return true;	// simply ignore DELETE in inbox for now
+			return true; // simply ignore DELETE in inbox for now
 		}
-		$return_no_access = true;	// to allow to check if current use is a participant and reject the event for him
-		if (!is_array($event = $this->_common_get_put_delete('DELETE',$options,$id,$return_no_access)) || !$return_no_access)
+		$return_no_access = true; // to allow to check if current use is a participant and reject the event for him
+		if (!is_array($event = $this->_common_get_put_delete('DELETE', $options, $id, $return_no_access)) || !$return_no_access)
 		{
  			if (!$return_no_access)
 			{
 				// check if user is a participant or one of the groups he is a member of --> reject the meeting request
 				$ret = '403 Forbidden';
 				$memberships = $GLOBALS['egw']->accounts->memberships($this->bo->user, true);
-				foreach(array_keys($event['participants']) as $uid)
+				foreach (array_keys($event['participants']) as $uid)
 				{
 					if ($this->bo->user == $uid || in_array($uid, $memberships))
 					{
-						$this->bo->set_status($event,$this->bo->user, 'R');
+						$this->bo->set_status($event, $this->bo->user, 'R');
 						$ret = true;
 						break;
 					}
@@ -1359,7 +1358,7 @@ 
 		{
 			$ret = $this->bo->delete($event['id']);
 		}
-		if ($this->debug) error_log(__METHOD__."(,$id) return_no_access=$return_no_access, event[participants]=".array2string(is_array($event)?$event['participants']:null).", user={$this->bo->user} --> return ".array2string($ret));
+		if ($this->debug) error_log(__METHOD__."(,$id) return_no_access=$return_no_access, event[participants]=".array2string(is_array($event) ? $event['participants'] : null).", user={$this->bo->user} --> return ".array2string($ret));
 		return $ret;
 	}
 
@@ -1374,12 +1373,12 @@ 
 	 */
 	function read($id)
 	{
-		if (strpos($column=self::$path_attr,'_') === false) $column = 'cal_'.$column;
+		if (strpos($column = self::$path_attr, '_') === false) $column = 'cal_'.$column;
 
 		$event = $this->bo->read(array($column => $id, 'cal_deleted IS NULL', 'cal_reference=0'), null, true, 'server');
-		if ($event) $event = array_shift($event);	// read with array as 1. param, returns an array of events!
+		if ($event) $event = array_shift($event); // read with array as 1. param, returns an array of events!
 
-		if (!($retval = $this->bo->check_perms(EGW_ACL_FREEBUSY,$event, 0, 'server')) &&
+		if (!($retval = $this->bo->check_perms(EGW_ACL_FREEBUSY, $event, 0, 'server')) &&
 			// above can be true, if current user is not in master but just a recurrence
 			(!$event['recur_type'] || !($events = self::get_series($event['uid'], $this->bo))))
 		{
@@ -1415,11 +1414,11 @@ 
 	 *
 	 * @return string
 	 */
-	public function getctag($path,$user)
+	public function getctag($path, $user)
 	{
-		$ctag = $this->bo->get_ctag($user,$path == '/calendar/' ? 'owner' : 'default'); // default = not rejected
+		$ctag = $this->bo->get_ctag($user, $path == '/calendar/' ? 'owner' : 'default'); // default = not rejected
 
-		if ($this->debug > 1) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user] = $ctag");
+		if ($this->debug > 1) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($path)[$user] = $ctag");
 
 		return $ctag;
 	}
@@ -1431,7 +1430,7 @@ 
 	 * @param string $schedule_tag =null on return schedule-tag
 	 * @return string|boolean string with etag or false
 	 */
-	function get_etag($entry, &$schedule_tag=null)
+	function get_etag($entry, &$schedule_tag = null)
 	{
 		$etag = $this->bo->get_etag($entry, $schedule_tag, $this->client_shared_uid_exceptions);
 
@@ -1449,7 +1448,7 @@ 
 	 * @param int|string $retval
 	 * @param boolean $path_attr_is_name =true true: path_attr is ca(l|rd)dav_name, false: id (GroupDAV needs Location header)
 	 */
-	function put_response_headers($entry, $path, $retval, $path_attr_is_name=true)
+	function put_response_headers($entry, $path, $retval, $path_attr_is_name = true)
 	{
 		$schedule_tag = null;
 		$etag = $this->get_etag($entry, $schedule_tag);
@@ -1468,14 +1467,14 @@ 
 	 * @param array|int $event event-array or id
 	 * @return boolean null if entry does not exist, false if no access, true if access permitted
 	 */
-	function check_access($acl,$event)
+	function check_access($acl, $event)
 	{
 		if ($acl == EGW_ACL_READ)
 		{
 			// we need at least EGW_ACL_FREEBUSY to get some information
 			$acl = EGW_ACL_FREEBUSY;
 		}
-		return $this->bo->check_perms($acl,$event,0,'server');
+		return $this->bo->check_perms($acl, $event, 0, 'server');
 	}
 
 	/**
@@ -1488,53 +1487,53 @@ 
 	 * @param string $path =null path of the collection
 	 * @return array
 	 */
-	public function extra_properties(array $props, $displayname, $base_uri=null, $user=null, $path=null)
+	public function extra_properties(array $props, $displayname, $base_uri = null, $user = null, $path = null)
 	{
-		unset($base_uri);	// unused, but required by function signature
+		unset($base_uri); // unused, but required by function signature
 		if (!isset($props['calendar-description']))
 		{
 			// default calendar description: can be overwritten via PROPPATCH, in which case it's already set
-			$props['calendar-description'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-description',$displayname);
+			$props['calendar-description'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-description', $displayname);
 		}
 		$supported_components = array(
-			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'comp',array('name' => 'VCALENDAR')),
-			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'comp',array('name' => 'VEVENT')),
+			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'comp', array('name' => 'VCALENDAR')),
+			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'comp', array('name' => 'VEVENT')),
 		);
 		// outbox supports VFREEBUSY too, it is required from OS X iCal to autocomplete locations
-		if (substr($path,-8) == '/outbox/')
+		if (substr($path, -8) == '/outbox/')
 		{
-			$supported_components[] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'comp',array('name' => 'VFREEBUSY'));
+			$supported_components[] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'comp', array('name' => 'VFREEBUSY'));
 		}
 		$props['supported-calendar-component-set'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,
-			'supported-calendar-component-set',$supported_components);
+			'supported-calendar-component-set', $supported_components);
 		// supported reports
 		$props['supported-report-set'] = array(
-			'calendar-query' => HTTP_WebDAV_Server::mkprop('supported-report',array(
-				HTTP_WebDAV_Server::mkprop('report',array(
-					HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-query',''))))),
-			'calendar-multiget' => HTTP_WebDAV_Server::mkprop('supported-report',array(
-				HTTP_WebDAV_Server::mkprop('report',array(
-					HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-multiget',''))))),
-			'free-busy-query' => HTTP_WebDAV_Server::mkprop('supported-report',array(
-				HTTP_WebDAV_Server::mkprop('report',array(
-					HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'free-busy-query',''))))),
+			'calendar-query' => HTTP_WebDAV_Server::mkprop('supported-report', array(
+				HTTP_WebDAV_Server::mkprop('report', array(
+					HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-query', ''))))),
+			'calendar-multiget' => HTTP_WebDAV_Server::mkprop('supported-report', array(
+				HTTP_WebDAV_Server::mkprop('report', array(
+					HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-multiget', ''))))),
+			'free-busy-query' => HTTP_WebDAV_Server::mkprop('supported-report', array(
+				HTTP_WebDAV_Server::mkprop('report', array(
+					HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'free-busy-query', ''))))),
 		);
 		// rfc 6578 sync-collection report for everything but outbox
 		// only if "delete-prevention" is switched on (deleted entries get marked deleted but not actualy deleted
 		if (strpos($path, '/outbox/') === false && $GLOBALS['egw_info']['server']['calendar_delete_history'])
 		{
-			$props['supported-report-set']['sync-collection'] = HTTP_WebDAV_Server::mkprop('supported-report',array(
-				HTTP_WebDAV_Server::mkprop('report',array(
-					HTTP_WebDAV_Server::mkprop('sync-collection','')))));
+			$props['supported-report-set']['sync-collection'] = HTTP_WebDAV_Server::mkprop('supported-report', array(
+				HTTP_WebDAV_Server::mkprop('report', array(
+					HTTP_WebDAV_Server::mkprop('sync-collection', '')))));
 		}
-		$props['supported-calendar-data'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'supported-calendar-data',array(
-			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-data', array('content-type' => 'text/calendar', 'version'=> '2.0')),
-			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-data', array('content-type' => 'text/x-calendar', 'version'=> '1.0'))));
+		$props['supported-calendar-data'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'supported-calendar-data', array(
+			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-data', array('content-type' => 'text/calendar', 'version'=> '2.0')),
+			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-data', array('content-type' => 'text/x-calendar', 'version'=> '1.0'))));
 
 		// get timezone of calendar
 		if ($this->groupdav->prop_requested('calendar-timezone'))
 		{
-			$props['calendar-timezone'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-timezone',
+			$props['calendar-timezone'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-timezone',
 				calendar_timezones::user_timezone($user));
 		}
 		return $props;
@@ -1548,9 +1547,9 @@ 
 	private function _get_handler()
 	{
 		$handler = new calendar_ical();
-		$handler->setSupportedFields('GroupDAV',$this->agent);
-		$handler->supportedFields['attachments'] = true;	// enabling attachments
-		if ($this->debug > 1) error_log("ical Handler called: " . $this->agent);
+		$handler->setSupportedFields('GroupDAV', $this->agent);
+		$handler->supportedFields['attachments'] = true; // enabling attachments
+		if ($this->debug > 1) error_log("ical Handler called: ".$this->agent);
 		return $handler;
 	}
 
@@ -1565,7 +1564,7 @@ 
 		$pref = $GLOBALS['egw_info']['user']['preferences']['groupdav']['calendar-home-set'];
 		$calendar_home_set = $pref ? explode(',', $pref) : array();
 		// replace symbolic id's with real nummeric id's
-		foreach(array(
+		foreach (array(
 			'G' => $GLOBALS['egw_info']['user']['account_primary_group'],
 		) as $sym => $id)
 		{
@@ -1574,11 +1573,11 @@ 
 				$calendar_home_set[$key] = $id;
 			}
 		}
-		foreach(ExecMethod('calendar.calendar_bo.list_cals') as $entry)
+		foreach (ExecMethod('calendar.calendar_bo.list_cals') as $entry)
 		{
 			$id = $entry['grantor'];
-			if ($id && $GLOBALS['egw_info']['user']['account_id'] != $id &&	// no current user
-				(in_array('A',$calendar_home_set) || in_array((string)$id,$calendar_home_set)) &&
+			if ($id && $GLOBALS['egw_info']['user']['account_id'] != $id && // no current user
+				(in_array('A', $calendar_home_set) || in_array((string)$id, $calendar_home_set)) &&
 				is_numeric($id) && ($owner = $this->accounts->id2name($id)))
 			{
 				$shared[$id] = 'calendar-'.$owner;
@@ -1587,11 +1586,11 @@ 
 		// shared locations and resources
 		if ($GLOBALS['egw_info']['user']['apps']['resources'])
 		{
-			foreach(array('locations','resources') as $res)
+			foreach (array('locations', 'resources') as $res)
 			{
 				if (($pref = $GLOBALS['egw_info']['user']['preferences']['groupdav']['calendar-home-set-'.$res]))
 				{
-					foreach(explode(',', $pref) as $res_id)
+					foreach (explode(',', $pref) as $res_id)
 					{
 						$is_location = $res == 'locations';
 						$shared['r'.$res_id] = str_replace('s/', '-', groupdav_principals::resource2name($res_id, $is_location));
@@ -1621,7 +1620,7 @@ 
 			{
 				$calendars[$entry['grantor']] = $entry['name'];
 			}
-			if ($user > 0) unset($calendars[$user]);	// skip current user
+			if ($user > 0) unset($calendars[$user]); // skip current user
 		}
 
 		$settings = array();
@@ -1629,7 +1628,7 @@ 
 			'type'   => 'multiselect',
 			'label'  => 'Calendars to sync in addition to personal calendar',
 			'name'   => 'calendar-home-set',
-			'help'   => lang('Only supported by a few fully conformant clients (eg. from Apple). If you have to enter a URL, it will most likly not be suppored!').'<br/>'.lang('They will be sub-folders in users home (%1 attribute).','CalDAV "calendar-home-set"'),
+			'help'   => lang('Only supported by a few fully conformant clients (eg. from Apple). If you have to enter a URL, it will most likly not be suppored!').'<br/>'.lang('They will be sub-folders in users home (%1 attribute).', 'CalDAV "calendar-home-set"'),
 			'values' => $calendars,
 			'xmlrpc' => True,
 			'admin'  => False,
@@ -1655,7 +1654,7 @@ 
 		if ($GLOBALS['egw_info']['user']['apps']['resources'] && ($all_resources = groupdav_principals::get_resources()))
 		{
 			$resources = $locations = array();
-			foreach($all_resources as $resource)
+			foreach ($all_resources as $resource)
 			{
 				if (groupdav_principals::resource_is_location($resource))
 				{
@@ -1666,7 +1665,7 @@ 
 					$resources[$resource['res_id']] = $resource['name'];
 				}
 			}
-			foreach(array(
+			foreach (array(
 				'locations' => $locations,
 				'resources' => $resources,
 			) as $name => $options)
@@ -1679,7 +1678,7 @@ 
 						'label'  => lang('%1 to sync', lang($name == 'locations' ? 'Location calendars' : 'Resource calendars')),
 						'no_lang'=> true,
 						'name'   => 'calendar-home-set-'.$name,
-						'help'   => lang('Only supported by a few fully conformant clients (eg. from Apple). If you have to enter a URL, it will most likly not be suppored!').'<br/>'.lang('They will be sub-folders in users home (%1 attribute).','CalDAV "calendar-home-set"'),
+						'help'   => lang('Only supported by a few fully conformant clients (eg. from Apple). If you have to enter a URL, it will most likly not be suppored!').'<br/>'.lang('They will be sub-folders in users home (%1 attribute).', 'CalDAV "calendar-home-set"'),
 						'values' => $options,
 						'xmlrpc' => True,
 						'admin'  => False,

calendar/inc/class.boholiday.inc.php

Spacing +100 added lines, -100 removed lines

@@ -53,39 +53,39 @@ 
 
 		function boholiday()
 		{
-			$this->so =& CreateObject('calendar.soholiday');
-
-			$this->start  = (int)get_var('start',array('POST','GET'));
-			$this->query  = get_var('query',array('POST','GET'));
-			$this->sort   = get_var('sort',array('POST','GET'));
-			$this->order  = get_var('order',array('POST','GET'));
-			$this->id     = get_var('id',array('POST','GET'));
-			$this->year   = get_var('year',array('POST','GET'),date('Y'));
-			$this->locale = get_var('locale',array('POST','GET'));
+			$this->so = & CreateObject('calendar.soholiday');
+
+			$this->start  = (int)get_var('start', array('POST', 'GET'));
+			$this->query  = get_var('query', array('POST', 'GET'));
+			$this->sort   = get_var('sort', array('POST', 'GET'));
+			$this->order  = get_var('order', array('POST', 'GET'));
+			$this->id     = get_var('id', array('POST', 'GET'));
+			$this->year   = get_var('year', array('POST', 'GET'), date('Y'));
+			$this->locale = get_var('locale', array('POST', 'GET'));
 			if ($this->locale)
 			{
 				$this->locales[] = $this->locale;
 			}
 
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo '<-- Locale = '.$this->locales[0].' -->'."\n";
 			}
 
-			$this->total = $this->so->holiday_total($this->locales[0],$this->query,$this->year);
+			$this->total = $this->so->holiday_total($this->locales[0], $this->query, $this->year);
 		}
 
 		/* Begin Calendar functions */
-		function read_entry($id=0)
+		function read_entry($id = 0)
 		{
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "BO : Reading Holiday ID : ".$id."<br>\n";
 			}
 
-			if(!$id)
+			if (!$id)
 			{
-				if(!$this->id)
+				if (!$this->id)
 				{
 					return Array();
 				}
@@ -98,18 +98,18 @@ 
 			return $this->so->read_holiday($id);
 		}
 
-		function delete_holiday($id=0)
+		function delete_holiday($id = 0)
 		{
-			if(!$id)
+			if (!$id)
 			{
-				if($this->id)
+				if ($this->id)
 				{
 					$id = $this->id;
 				}
 			}
 
-			$this->ui =& CreateObject('calendar.uiholiday');
-			if($id)
+			$this->ui = & CreateObject('calendar.uiholiday');
+			if ($id)
 			{
 				$this->so->delete_holiday($id);
 				$this->ui->edit_locale();
@@ -120,45 +120,45 @@ 
 			}
 		}
 
-		function delete_locale($locale='')
+		function delete_locale($locale = '')
 		{
-			if(!$locale)
+			if (!$locale)
 			{
-				if($this->locales[0])
+				if ($this->locales[0])
 				{
 					$locale = $this->locales[0];
 				}
 			}
 
-			if($locale)
+			if ($locale)
 			{
 				$this->so->delete_locale($locale);
 			}
-			$this->ui =& CreateObject('calendar.uiholiday');
+			$this->ui = & CreateObject('calendar.uiholiday');
 			$this->ui->admin();
 		}
 
 		function accept_holiday()
 		{
-			$send_back_to = str_replace('submitlocale','holiday_admin',$_SERVER['HTTP_REFERER']);
-			if(!@$this->locales[0])
+			$send_back_to = str_replace('submitlocale', 'holiday_admin', $_SERVER['HTTP_REFERER']);
+			if (!@$this->locales[0])
 			{
 				Header('Location: '.$send_back_to);
 			}
 
-			$send_back_to = str_replace('&locale='.$this->locales[0],'',$send_back_to);
+			$send_back_to = str_replace('&locale='.$this->locales[0], '', $send_back_to);
 			$file = './holidays.'.$this->locales[0];
-			if(!file_exists($file) && count($_POST['name']))
+			if (!file_exists($file) && count($_POST['name']))
 			{
-				$fp = fopen($file,'w');
-				fwrite($fp,"charset\t".$GLOBALS['egw']->translation->charset()."\n");
+				$fp = fopen($file, 'w');
+				fwrite($fp, "charset\t".$GLOBALS['egw']->translation->charset()."\n");
 
 				$holidays = array();
-				foreach($_POST['name'] as $i => $name)
+				foreach ($_POST['name'] as $i => $name)
 				{
 					$holiday = array(
 						'locale' => $_POST['locale'],
-						'name'   => str_replace('\\','',$name),
+						'name'   => str_replace('\\', '', $name),
 						'day'    => $_POST['day'][$i],
 						'month'  => $_POST['month'][$i],
 						'occurence' => $_POST['occurence'][$i],
@@ -167,10 +167,10 @@ 
 					);
 				}
 				// sort holidays by year / occurence:
-				usort($holidays,'_holiday_cmp');
+				usort($holidays, '_holiday_cmp');
 
 				$last_year = -1;
-				foreach($holidays as $holiday)
+				foreach ($holidays as $holiday)
 				{
 					$year = $holiday['occurence'] <= 0 ? 0 : $holiday['occurence'];
 					if ($year != $last_year)
@@ -178,46 +178,46 @@ 
 						echo "\n".($year ? $year : 'regular (year=0)').":\n";
 						$last_year = $year;
 					}
-					fwrite($fp,"$holiday[locale]\t$holiday[name]\t$holiday[day]\t$holiday[month]\t$holiday[occurence]\t$holiday[dow]\t$holiday[observance_rule]\n");
+					fwrite($fp, "$holiday[locale]\t$holiday[name]\t$holiday[day]\t$holiday[month]\t$holiday[occurence]\t$holiday[dow]\t$holiday[observance_rule]\n");
 				}
 				fclose($fp);
 			}
 			Header('Location: '.$send_back_to);
 		}
 
-		function get_holiday_list($locale='', $sort='', $order='', $query='', $total='', $year=0)
+		function get_holiday_list($locale = '', $sort = '', $order = '', $query = '', $total = '', $year = 0)
 		{
-			$locale = ($locale?$locale:$this->locales[0]);
-			$sort = ($sort?$sort:$this->sort);
-			$order = ($order?$order:$this->order);
-			$query = ($query?$query:$this->query);
-			$year = ($$year?$$year:$this->year);
-			return $this->so->read_holidays($locale,$query,$order,$year);
+			$locale = ($locale ? $locale : $this->locales[0]);
+			$sort = ($sort ? $sort : $this->sort);
+			$order = ($order ? $order : $this->order);
+			$query = ($query ? $query : $this->query);
+			$year = ($$year ? $$year : $this->year);
+			return $this->so->read_holidays($locale, $query, $order, $year);
 		}
 
-		function get_locale_list($sort='', $order='', $query='')
+		function get_locale_list($sort = '', $order = '', $query = '')
 		{
-			$sort = ($sort?$sort:$this->sort);
-			$order = ($order?$order:$this->order);
-			$query = ($query?$query:$this->query);
-			return $this->so->get_locale_list($sort,$order,$query);
+			$sort = ($sort ? $sort : $this->sort);
+			$order = ($order ? $order : $this->order);
+			$query = ($query ? $query : $this->query);
+			return $this->so->get_locale_list($sort, $order, $query);
 		}
 
-		function prepare_read_holidays($year=0,$owner=0)
+		function prepare_read_holidays($year = 0, $owner = 0)
 		{
-			$this->year = (isset($year) && $year > 0?$year:$GLOBALS['egw']->common->show_date(time() - $GLOBALS['egw']->datetime->tz_offset,'Y'));
-			$this->owner = ($owner?$owner:$GLOBALS['egw_info']['user']['account_id']);
+			$this->year = (isset($year) && $year > 0 ? $year : $GLOBALS['egw']->common->show_date(time() - $GLOBALS['egw']->datetime->tz_offset, 'Y'));
+			$this->owner = ($owner ? $owner : $GLOBALS['egw_info']['user']['account_id']);
 
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo 'Setting Year to : '.$this->year.'<br>'."\n";
 			}
 
-			if(@$GLOBALS['egw_info']['user']['preferences']['common']['country'])
+			if (@$GLOBALS['egw_info']['user']['preferences']['common']['country'])
 			{
 				$this->locales[] = $GLOBALS['egw_info']['user']['preferences']['common']['country'];
 			}
-			elseif(@$GLOBALS['egw_info']['user']['preferences']['calendar']['locale'])
+			elseif (@$GLOBALS['egw_info']['user']['preferences']['calendar']['locale'])
 			{
 				$this->locales[] = $GLOBALS['egw_info']['user']['preferences']['calendar']['locale'];
 			}
@@ -226,45 +226,45 @@ 
 				$this->locales[] = 'US';
 			}
 
-			if($this->owner != $GLOBALS['egw_info']['user']['account_id'])
+			if ($this->owner != $GLOBALS['egw_info']['user']['account_id'])
 			{
-				$owner_pref =& CreateObject('phpgwapi.preferences',$owner);
+				$owner_pref = & CreateObject('phpgwapi.preferences', $owner);
 				$owner_prefs = $owner_pref->read_repository();
-				if(@$owner_prefs['common']['country'])
+				if (@$owner_prefs['common']['country'])
 				{
 					$this->locales[] = $owner_prefs['common']['country'];
 				}
-				elseif(@$owner_prefs['calendar']['locale'])
+				elseif (@$owner_prefs['calendar']['locale'])
 				{
 					$this->locales[] = $owner_prefs['calendar']['locale'];
 				}
 				unset($owner_pref);
 			}
 
-			if($GLOBALS['egw_info']['server']['auto_load_holidays'] == True && $this->locales)
+			if ($GLOBALS['egw_info']['server']['auto_load_holidays'] == True && $this->locales)
 			{
-				foreach($this->locales as $local)
+				foreach ($this->locales as $local)
 				{
 					$this->auto_load_holidays($local, $year);
 				}
 			}
 		}
 
-		function auto_load_holidays($locale, $year=0)
+		function auto_load_holidays($locale, $year = 0)
 		{
 			//error_log(__METHOD__."('$locale', $year)");
-			if (!egw_cache::getInstance(__CLASS__, $locale.'-'.$year) &&	// check if autoload has been tried for this locale and year
+			if (!egw_cache::getInstance(__CLASS__, $locale.'-'.$year) && // check if autoload has been tried for this locale and year
 				(!($total_year = $this->so->holiday_total($locale, '', $year)) ||
 				// automatic try load new holidays, if there are no irregular ones for queried year
 				$total_year == $this->so->holiday_total($locale, '', 1901)))
 			{
 				//error_log(__METHOD__."('$locale', $year) attemption autoload ...");
-				egw_cache::setInstance(__CLASS__, $locale.'-'.$year, true, 864000);	// do NOT try again for 10 days
+				egw_cache::setInstance(__CLASS__, $locale.'-'.$year, true, 864000); // do NOT try again for 10 days
 				@set_time_limit(0);
 
 				/* get the file that contains the calendar events for your locale */
 				/* "http://www.egroupware.org/cal/holidays.US.csv";                 */
-				if(isset($GLOBALS['egw_info']['server']['holidays_url_path']) && $GLOBALS['egw_info']['server']['holidays_url_path'] != 'localhost')
+				if (isset($GLOBALS['egw_info']['server']['holidays_url_path']) && $GLOBALS['egw_info']['server']['holidays_url_path'] != 'localhost')
 				{
 					$load_from = $GLOBALS['egw_info']['server']['holidays_url_path'];
 				}
@@ -272,7 +272,7 @@ 
 				{
 					if ($GLOBALS['egw_info']['server']['webserver_url'][0] == '/')
 					{
-						$server_host = ($_SERVER['HTTPS']?'https://':'http://').$_SERVER['HTTP_HOST'].$GLOBALS['egw_info']['server']['webserver_url'];
+						$server_host = ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$GLOBALS['egw_info']['server']['webserver_url'];
 					}
 					else
 					{
@@ -281,13 +281,13 @@ 
 					$load_from = $server_host.'/calendar/egroupware.org';
 				}
 //				echo 'Loading from: '.$load_from.'/holidays.'.strtoupper($locale).'.csv'."<br>\n";
-				if($GLOBALS['egw_info']['server']['holidays_url_path'] == 'localhost')
+				if ($GLOBALS['egw_info']['server']['holidays_url_path'] == 'localhost')
 				{
 					$lines = file(EGW_SERVER_ROOT.'/calendar/egroupware.org/holidays.'.strtoupper($locale).'.csv');
 				}
 				else
 				{
-					$lines = file($url=$load_from.'/holidays.'.strtoupper($locale).'.csv', 0, egw_framework::proxy_context());
+					$lines = file($url = $load_from.'/holidays.'.strtoupper($locale).'.csv', 0, egw_framework::proxy_context());
 					//error_log(__METHOD__."('$locale', $year) file('$url')=".array2string($lines));
 				}
 				if (!$lines)
@@ -295,21 +295,21 @@ 
 					return false;
 				}
 				// reading the holidayfile from egroupware.org via network::gethttpsocketfile contains all the headers!
-				foreach($lines as $line)
+				foreach ($lines as $line)
 				{
-					$fields = preg_split("/[\t\n ]+/",$line);
+					$fields = preg_split("/[\t\n ]+/", $line);
 
 					if ($fields[0] == 'charset' && $fields[1])
 					{
-						$lines = translation::convert($lines,$fields[1]);
+						$lines = translation::convert($lines, $fields[1]);
 						break;
 					}
 				}
 				foreach ($lines as $line)
 				{
 //					echo 'Line #'.$i.' : '.$lines[$i]."<br>\n";
-					$holiday = explode("\t",$line);
-					if(count($holiday) == 7)
+					$holiday = explode("\t", $line);
+					if (count($holiday) == 7)
 					{
 						$holiday['locale'] = $holiday[0];
 						$holiday['name'] = $GLOBALS['egw']->db->db_addslashes($holiday[1]);
@@ -332,23 +332,23 @@ 
 
 		function add()
 		{
-			if(@$_POST['submit'])
+			if (@$_POST['submit'])
 			{
 				$holiday = $_POST['holiday'];
 
-				if(empty($holiday['mday']))
+				if (empty($holiday['mday']))
 				{
 					$holiday['mday'] = 0;
 				}
-				if(!isset($this->bo->locales[0]) || $this->bo->locales[0]=='')
+				if (!isset($this->bo->locales[0]) || $this->bo->locales[0] == '')
 				{
 					$this->bo->locales[0] = $holiday['locale'];
 				}
-				elseif(!isset($holiday['locale']) || $holiday['locale']=='')
+				elseif (!isset($holiday['locale']) || $holiday['locale'] == '')
 				{
 					$holiday['locale'] = $this->bo->locales[0];
 				}
-				if(!isset($holiday['hol_id']))
+				if (!isset($holiday['hol_id']))
 				{
 					$holiday['hol_id'] = $this->bo->id;
 				}
@@ -359,7 +359,7 @@ 
 				{
 					$errors[] = lang('You need to set either a day or a occurence !!!');
 				}
-				if($holiday['year'] && $holiday['occurence'])
+				if ($holiday['year'] && $holiday['occurence'])
 				{
 					$errors[] = lang('You can only set a year or a occurence !!!');
 				}
@@ -371,13 +371,13 @@ 
 
 	// Still need to put some validation in here.....
 
-				$this->ui =& CreateObject('calendar.uiholiday');
+				$this->ui = & CreateObject('calendar.uiholiday');
 
 				if (is_array($errors))
 				{
 					$holiday['month'] = $holiday['month_num'];
 					$holiday['day']   = $holiday['mday'];
-					$this->ui->edit_holiday($errors,$holiday);
+					$this->ui->edit_holiday($errors, $holiday);
 				}
 				else
 				{
@@ -390,11 +390,11 @@ 
 		function sort_holidays_by_date($holidays)
 		{
 			$c_holidays = count($holidays);
-			for($outer_loop=0;$outer_loop<($c_holidays - 1);$outer_loop++)
+			for ($outer_loop = 0; $outer_loop < ($c_holidays - 1); $outer_loop++)
 			{
-				for($inner_loop=$outer_loop;$inner_loop<$c_holidays;$inner_loop++)
+				for ($inner_loop = $outer_loop; $inner_loop < $c_holidays; $inner_loop++)
 				{
-					if($holidays[$outer_loop]['date'] > $holidays[$inner_loop]['date'])
+					if ($holidays[$outer_loop]['date'] > $holidays[$inner_loop]['date'])
 					{
 						$temp = $holidays[$inner_loop];
 						$holidays[$inner_loop] = $holidays[$outer_loop];
@@ -408,38 +408,38 @@ 
 		function set_holidays_to_date($holidays)
 		{
 			$new_holidays = Array();
-			for($i=0;$i<count($holidays);$i++)
+			for ($i = 0; $i < count($holidays); $i++)
 			{
 //	echo "Setting Holidays Date : ".date('Ymd',$holidays[$i]['date'])."<br>\n";
-				$new_holidays[date('Ymd',$holidays[$i]['date'])][] = $holidays[$i];
+				$new_holidays[date('Ymd', $holidays[$i]['date'])][] = $holidays[$i];
 			}
 			return $new_holidays;
 		}
 
 		function read_holiday()
 		{
-			if(isset($this->cached_holidays))
+			if (isset($this->cached_holidays))
 			{
 				return $this->cached_holidays;
 			}
-			$holidays = $this->so->read_holidays($this->locales,'','',$this->year);
+			$holidays = $this->so->read_holidays($this->locales, '', '', $this->year);
 
-			if(count($holidays) == 0)
+			if (count($holidays) == 0)
 			{
 				return $holidays;
 			}
 
 			$temp_locale = $GLOBALS['egw_info']['user']['preferences']['common']['country'];
-			foreach($holidays as $i => $holiday)
+			foreach ($holidays as $i => $holiday)
 			{
-				if($i == 0 || $holidays[$i]['locale'] != $holidays[$i - 1]['locale'])
+				if ($i == 0 || $holidays[$i]['locale'] != $holidays[$i - 1]['locale'])
 				{
-					if(is_object($holidaycalc))
+					if (is_object($holidaycalc))
 					{
 						unset($holidaycalc);
 					}
 					$GLOBALS['egw_info']['user']['preferences']['common']['country'] = $holidays[$i]['locale'];
-					$holidaycalc =& CreateObject('calendar.holidaycalc');
+					$holidaycalc = & CreateObject('calendar.holidaycalc');
 				}
 				$holidays[$i]['date'] = $holidaycalc->calculate_date($holiday, $holidays, $this->year);
 			}
@@ -453,9 +453,9 @@ 
 
 		function check_admin()
 		{
-			if(!@$GLOBALS['egw_info']['user']['apps']['admin'])
+			if (!@$GLOBALS['egw_info']['user']['apps']['admin'])
 			{
-				Header('Location: ' . $GLOBALS['egw']->link('/index.php'));
+				Header('Location: '.$GLOBALS['egw']->link('/index.php'));
 			}
 		}
 
@@ -466,8 +466,8 @@ 
 				return false;
 			}
 			$monthnames = array(
-				'','January','February','March','April','May','June',
-				'July','August','September','October','November','December'
+				'', 'January', 'February', 'March', 'April', 'May', 'June',
+				'July', 'August', 'September', 'October', 'November', 'December'
 			);
 			$month = $holiday['month'] ? lang($monthnames[$holiday['month']]) : '';
 
@@ -475,14 +475,14 @@ 
 			{
 				$occ = $holiday['occurence'] == 99 ? lang('last') : $holiday['occurence'].'.';
 
-				$dow_str = Array(lang('Sun'),lang('Mon'),lang('Tue'),lang('Wed'),lang('Thu'),lang('Fri'),lang('Sat'));
+				$dow_str = Array(lang('Sun'), lang('Mon'), lang('Tue'), lang('Wed'), lang('Thu'), lang('Fri'), lang('Sat'));
 				$dow = $dow_str[$holiday['dow']];
 
-				$str = lang('%1 %2 in %3',$occ,$dow,$month);
+				$str = lang('%1 %2 in %3', $occ, $dow, $month);
 			}
 			else
 			{
-				$str = $GLOBALS['egw']->common->dateformatorder($holiday['occurence']>1900?$holiday['occurence']:'',$month,$holiday[day]);
+				$str = $GLOBALS['egw']->common->dateformatorder($holiday['occurence'] > 1900 ? $holiday['occurence'] : '', $month, $holiday[day]);
 			}
 			if ($holiday['observance_rule'])
 			{
@@ -492,7 +492,7 @@ 
 		}
 	}
 
-	function _holiday_cmp($a,$b)
+	function _holiday_cmp($a, $b)
 	{
 		if (($year_diff = ($a['occurence'] <= 0 ? 0 : $a['occurence']) - ($b['occurence'] <= 0 ? 0 : $b['occurence'])))
 		{

calendar/inc/class.holidaycalc_US.inc.php

Spacing +23 added lines, -23 removed lines

@@ -21,20 +21,20 @@ 
 	 */
 	class holidaycalc
 	{
-		function add($holiday,&$holidays,$year,$day_offset=0)
+		function add($holiday, &$holidays, $year, $day_offset = 0)
 		{
 			if ($day_offset)
 			{
 				$holiday['name'] .= ' (Observed)';
 			}
-			$holiday['date'] = mktime(0,0,0,$holiday['month'],$holiday['day']+$day_offset,$year);
-			foreach(array('day'=>'d','month'=>'m','occurence'=>'Y') as $key => $frmt)
+			$holiday['date'] = mktime(0, 0, 0, $holiday['month'], $holiday['day'] + $day_offset, $year);
+			foreach (array('day'=>'d', 'month'=>'m', 'occurence'=>'Y') as $key => $frmt)
 			{
-				$holiday[$key] = date($frmt,$holiday['date']);
+				$holiday[$key] = date($frmt, $holiday['date']);
 			}
 			$holiday['obervance_rule'] = 0;
 
-			$holidays[]= $holiday;
+			$holidays[] = $holiday;
 
 			//echo "<p>holidaycalc::add(,,$year,,$day_offset)=".print_r($holiday,True)."</p>";
 		}
@@ -43,17 +43,17 @@ 
 		{
 			//echo "<p>holidaycalc::calculate_date(".print_r($holiday,True).",,$year,)</p>";
 
-			if($holiday['day'] == 0 && $holiday['occurence'] != 0)
+			if ($holiday['day'] == 0 && $holiday['occurence'] != 0)
 			{
-				if($holiday['occurence'] != 99)
+				if ($holiday['occurence'] != 99)
 				{
-					$dow = $GLOBALS['egw']->datetime->day_of_week($year,$holiday['month'],1);
+					$dow = $GLOBALS['egw']->datetime->day_of_week($year, $holiday['month'], 1);
 					$day = (((7 * $holiday['occurence']) - 6) + ((($holiday['dow'] + 7) - $dow) % 7));
 					$day += ($day < 1 ? 7 : 0);
 
 					// Sometimes the 5th occurance of a weekday (ie the 5th monday)
 					// can spill over to the next month.  This prevents that.
-					$ld = $GLOBALS['egw']->datetime->days_in_month($holiday['month'],$year);
+					$ld = $GLOBALS['egw']->datetime->days_in_month($holiday['month'], $year);
 					if ($day > $ld)
 					{
 						return;
@@ -61,49 +61,49 @@ 
 				}
 				else
 				{
-					$ld = $GLOBALS['egw']->datetime->days_in_month($holiday['month'],$year);
-					$dow = $GLOBALS['egw']->datetime->day_of_week($year,$holiday['month'],$ld);
-					$day = $ld - (($dow + 7) - $holiday['dow']) % 7 ;
+					$ld = $GLOBALS['egw']->datetime->days_in_month($holiday['month'], $year);
+					$dow = $GLOBALS['egw']->datetime->day_of_week($year, $holiday['month'], $ld);
+					$day = $ld - (($dow + 7) - $holiday['dow']) % 7;
 				}
 			}
 			else
 			{
 				$day = $holiday['day'];
-				if($holiday['observance_rule'] == True)
+				if ($holiday['observance_rule'] == True)
 				{
-					$dow = $GLOBALS['egw']->datetime->day_of_week($year,$holiday['month'],$day);
+					$dow = $GLOBALS['egw']->datetime->day_of_week($year, $holiday['month'], $day);
 					// This now calulates Observed holidays and creates a new entry for them.
 
 					// 0 = sundays are observed on monday (+1), 6 = saturdays are observed on fridays (-1)
-					if($dow == 0 || $dow == 6)
+					if ($dow == 0 || $dow == 6)
 					{
-						$this->add($holiday,$holidays,$year,$dow == 0 ? 1 : -1);
+						$this->add($holiday, $holidays, $year, $dow == 0 ? 1 : -1);
 					}
 					if ($holiday['month'] == 1 && $day == 1)
 					{
-						$dow = $GLOBALS['egw']->datetime->day_of_week($year+1,$holiday['month'],$day);
+						$dow = $GLOBALS['egw']->datetime->day_of_week($year + 1, $holiday['month'], $day);
 						// checking if next year's newyear might be observed in this year
 						if ($dow == 6)
 						{
-							$this->add($holiday,$holidays,$year+1,-1);
+							$this->add($holiday, $holidays, $year + 1, -1);
 						}
 						// add the next years newyear, to show it in a week- or month-view
-						$this->add($holiday,$holidays,$year+1);
+						$this->add($holiday, $holidays, $year + 1);
 					}
 					// checking if last year's new year's eve might be observed in this year
 					if ($holiday['month'] == 12 && $day == 31)
 					{
-						$dow = $GLOBALS['egw']->datetime->day_of_week($year-1,$holiday['month'],$day);
+						$dow = $GLOBALS['egw']->datetime->day_of_week($year - 1, $holiday['month'], $day);
 						if ($dow == 0)
 						{
-							$this->add($holiday,$holidays,$year-1,1);
+							$this->add($holiday, $holidays, $year - 1, 1);
 						}
 						// add the last years new year's eve, to show it in a week- or month-view
-						$this->add($holiday,$holidays,$year-1);
+						$this->add($holiday, $holidays, $year - 1);
 					}
 				}
 			}
-			$date = mktime(0,0,0,$holiday['month'],$day,$year);
+			$date = mktime(0, 0, 0, $holiday['month'], $day, $year);
 
 			return $date;
 		}

calendar/inc/gradient.php

Spacing +12 added lines, -12 removed lines

@@ -11,24 +11,24 @@ 
  */
 
 include_once('../../phpgwapi/inc/common_functions.inc.php');
-check_load_extension('gd',true);	// true = throw exception if not loadable
+check_load_extension('gd', true); // true = throw exception if not loadable
 
-foreach(array('width'=>1,'height'=>1,'color1'=>'000080','color2'=>'ffffff') as $name => $default)
+foreach (array('width'=>1, 'height'=>1, 'color1'=>'000080', 'color2'=>'ffffff') as $name => $default)
 {
 	$$name = isset($_GET[$name]) ? $_GET[$name] : $default;
 }
 
-foreach(array('color1','color2') as $name)
+foreach (array('color1', 'color2') as $name)
 {
-	preg_match('/^#?([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})$/',$$name,$rgb) or
+	preg_match('/^#?([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})$/', $$name, $rgb) or
 		die("Wrong value '".htmlspecialchars($$name)."' for $name, should be something like #80FFFF' !!!");
 
-	$$name = array('r'=>hexdec($rgb[1]),'g'=>hexdec($rgb[2]),'b'=>hexdec($rgb[3]));
+	$$name = array('r'=>hexdec($rgb[1]), 'g'=>hexdec($rgb[2]), 'b'=>hexdec($rgb[3]));
 }
-$image = @imagecreate(abs($width),abs($height))
+$image = @imagecreate(abs($width), abs($height))
 	or die("Cannot Initialize new GD image stream");
 
-$length = max($width,$height);
+$length = max($width, $height);
 $dist = $length / 256;
 if ($dist < 1) $dist = 1;
 $anz = round($length / $dist);
@@ -40,24 +40,24 @@ 
 $rgb = $color1;
 for ($l = 0; $l < $length; $l += $dist)
 {
-	$color = imagecolorallocate($image,(int)$rgb['r'],(int)$rgb['g'],(int)$rgb['b']);
-	foreach($rgb as $c => $val)
+	$color = imagecolorallocate($image, (int)$rgb['r'], (int)$rgb['g'], (int)$rgb['b']);
+	foreach ($rgb as $c => $val)
 	{
 		$rgb[$c] += $c_step[$c];
 	}
 	if ($width > $height)
 	{
-		imagefilledrectangle($image,(int)$l,0,(int) ($l+$dist),$height-1,$color);
+		imagefilledrectangle($image, (int)$l, 0, (int)($l + $dist), $height - 1, $color);
 	}
 	else
 	{
-		imagefilledrectangle($image,0,(int)$l,$width-1,(int) ($l+$dist),$color);
+		imagefilledrectangle($image, 0, (int)$l, $width - 1, (int)($l + $dist), $color);
 	}
 }
 
 // allow caching for 7 days
 header('Cache-Control: public');
-header('Expires: ' . gmdate('D, d M Y H:i:s', time()+7*24*60*60) . ' GMT');
+header('Expires: '.gmdate('D, d M Y H:i:s', time() + 7 * 24 * 60 * 60).' GMT');
 
 if (function_exists('imagegif'))
 {

calendar/inc/class.calendar_import_csv.inc.php

Spacing +55 added lines, -55 removed lines

@@ -17,12 +17,12 @@ 
 /**
  * class import_csv for calendar
  */
-class calendar_import_csv extends importexport_basic_import_csv  {
+class calendar_import_csv extends importexport_basic_import_csv {
 
 	/**
 	 * actions wich could be done to data entries
 	 */
-	protected static $actions = array( 'none', 'update', 'insert' );
+	protected static $actions = array('none', 'update', 'insert');
 
 	/**
 	 * conditions for actions
@@ -44,16 +44,16 @@ 
 	/**
 	 * Set up tracker
 	 */
-	protected function init(importexport_definition &$definition)
+	protected function init(importexport_definition&$definition)
 	{
 		// fetch the addressbook bo
-		$this->bo= new calendar_boupdate();
+		$this->bo = new calendar_boupdate();
 
 		// Get the tracker for changes
 		$this->tracking = new calendar_tracking();
 
 		// Used for participants
-		$this->status_map = array_flip(array_map('lang',$this->bo->verbose_status));
+		$this->status_map = array_flip(array_map('lang', $this->bo->verbose_status));
 		$this->role_map = array_flip($this->bo->roles);
 
 		$this->lookups = array(
@@ -76,15 +76,15 @@ 
 	 *
 	 * @return boolean success
 	 */
-	public function import_record(\importexport_iface_egw_record &$record, &$import_csv)
+	public function import_record(\importexport_iface_egw_record&$record, &$import_csv)
 	{
 		// set eventOwner
-		$options =& $this->definition->plugin_options;
+		$options = & $this->definition->plugin_options;
 		$options['owner'] = $options['owner'] ? $options['owner'] : $this->user;
 
 		// Set owner, unless it's supposed to come from CSV file
-		if($options['owner_from_csv']) {
-			if(!is_numeric($record['owner'])) {
+		if ($options['owner_from_csv']) {
+			if (!is_numeric($record['owner'])) {
 				$this->errors[$import_csv->get_current_position()] = lang(
 					'Invalid owner ID: %1.  Might be a bad field translation.  Used %2 instead.',
 					$record->owner,
@@ -99,7 +99,7 @@ 
 		}
 
 		// Handle errors in length or start/end date
-		if($record->start > $record->end)
+		if ($record->start > $record->end)
 		{
 			$record->end = $record->start + $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultlength'] * 60;
 			$this->warnings[$import_csv->get_current_position()] = lang('error: starttime has to be before the endtime !!!');
@@ -109,11 +109,11 @@ 
 		if ($record->participants && !is_array($record->participants)) {
 			// Importing participants in human friendly format:
 			// Name (quantity)? (status) Role[, Name (quantity)? (status) Role]+
-			preg_match_all('/(([^(]+?)(?: \(([\d]+)\))? \(([^,)]+)\)(?: ([^ ,]+))?)(?:, )?/',$record->participants,$participants);
+			preg_match_all('/(([^(]+?)(?: \(([\d]+)\))? \(([^,)]+)\)(?: ([^ ,]+))?)(?:, )?/', $record->participants, $participants);
 			$p_participants = array();
 			$missing = array();
 			list($lines, $p, $names, $quantity, $status, $role) = $participants;
-			foreach($names as $key => $name) {
+			foreach ($names as $key => $name) {
 				//error_log("Name: $name Quantity: {$quantity[$key]} Status: {$status[$key]} Role: {$role[$key]}");
 
 				// Search for direct account name, then user in accounts first
@@ -121,26 +121,26 @@ 
 				$id = importexport_helper_functions::account_name2id($name);
 
 				// If not found, or not an exact match to a user (account_name2id is pretty generous)
-				if(!$id || $names[$key] !== $this->bo->participant_name($id)) {
-					$contacts = ExecMethod2('addressbook.addressbook_bo.search', $search,array('contact_id','account_id'),'org_name,n_family,n_given,cat_id,contact_email','','%',false,'OR',array(0,1));
-					if($contacts) $id = $contacts[0]['account_id'] ? $contacts[0]['account_id'] : 'c'.$contacts[0]['contact_id'];
+				if (!$id || $names[$key] !== $this->bo->participant_name($id)) {
+					$contacts = ExecMethod2('addressbook.addressbook_bo.search', $search, array('contact_id', 'account_id'), 'org_name,n_family,n_given,cat_id,contact_email', '', '%', false, 'OR', array(0, 1));
+					if ($contacts) $id = $contacts[0]['account_id'] ? $contacts[0]['account_id'] : 'c'.$contacts[0]['contact_id'];
 				}
-				if(!$id)
+				if (!$id)
 				{
 					// Use calendar's registered resources to find participant
-					foreach($this->bo->resources as $resource)
+					foreach ($this->bo->resources as $resource)
 					{
 						// Can't search for email
-						if($resource['app'] == 'email') continue;
+						if ($resource['app'] == 'email') continue;
 						// Special resource search, since it does special stuff in link_query
-						if($resource['app'] == 'resources')
+						if ($resource['app'] == 'resources')
 						{
-							if(!$this->resource_so)
+							if (!$this->resource_so)
 							{
 								$this->resource_so = new resources_so();
 							}
-							$result = $this->resource_so->search($search,'res_id');
-							if(count($result) >= 1) {
+							$result = $this->resource_so->search($search, 'res_id');
+							if (count($result) >= 1) {
 								$id = $resource['type'].$result[0]['res_id'];
 								break;
 							}
@@ -150,15 +150,15 @@ 
 							// Search app via link query
 							$result = egw_link::query($resource['app'], $search, $options);
 						
-							if($result)
+							if ($result)
 							{
-								$id = $resource['type'] . key($result);
+								$id = $resource['type'].key($result);
 								break;
 							}
 						}
 					}
 				}
-				if($id) {
+				if ($id) {
 					$p_participants[$id] = calendar_so::combine_status(
 						$this->status_map[lang($status[$key])] ? $this->status_map[lang($status[$key])] : $status[$key][0],
 						$quantity[$key] ? $quantity[$key] : 1,
@@ -169,47 +169,47 @@ 
 				{
 					$missing[] = $name;
 				}
-				if(count($missing) > 0)
+				if (count($missing) > 0)
 				{
-					$this->warnings[$import_csv->get_current_position()] = $record->title . ' ' . lang('participants') . ': ' .
-						lang('Contact not found!') . '<br />'.implode(", ",$missing);
+					$this->warnings[$import_csv->get_current_position()] = $record->title.' '.lang('participants').': '.
+						lang('Contact not found!').'<br />'.implode(", ", $missing);
 				}
 			}
 			$record->participants = $p_participants;
 		}
 
-		if($record->recurrence)
+		if ($record->recurrence)
 		{
-			list($record->recur_type, $record->recur_interval) = explode('/',$record->recurrence,2);
+			list($record->recur_type, $record->recur_interval) = explode('/', $record->recurrence, 2);
 			$record->recur_interval = trim($record->recur_interval);
-			$record->recur_type = array_search(strtolower(trim($record->recur_type)), array_map('strtolower',$lookups['recurrence']));
+			$record->recur_type = array_search(strtolower(trim($record->recur_type)), array_map('strtolower', $lookups['recurrence']));
 			unset($record->recurrence);
 		}
 		$record->tzid = calendar_timezones::id2tz($record->tz_id);
 
-		if ( $options['conditions'] ) {
-			foreach ( $options['conditions'] as $condition ) {
+		if ($options['conditions']) {
+			foreach ($options['conditions'] as $condition) {
 				$records = array();
-				switch ( $condition['type'] ) {
+				switch ($condition['type']) {
 					// exists
 					case 'exists' :
 						// Check for that record
 						$result = $this->exists($record, $condition, $records);
 
-						if ( is_array( $records ) && count( $records ) >= 1) {
+						if (is_array($records) && count($records) >= 1) {
 							// apply action to all records matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$records as $event ) {
+							foreach ((array)$records as $event) {
 								$record->id = $event['id'];
-								if ( $this->definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $record->category ) ) $record->category = explode( ',', $record->category );
-									$record->category = implode( ',', array_unique( array_merge( $record->category, $event['category'] ) ) );
+								if ($this->definition->plugin_options['update_cats'] == 'add') {
+									if (!is_array($record->category)) $record->category = explode(',', $record->category);
+									$record->category = implode(',', array_unique(array_merge($record->category, $event['category'])));
 								}
-								$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
+								$success = $this->action($action['action'], $record, $import_csv->get_current_position());
 							}
 						} else {
 							$action = $condition['false'];
-							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+							$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 						}
 						break;
 
@@ -222,7 +222,7 @@ 
 			}
 		} else {
 			// unconditional insert
-			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+			$success = $this->action('insert', $record, $import_csv->get_current_position());
 		}
 		
 		return $success;
@@ -237,14 +237,14 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function exists(importexport_iface_egw_record &$record, Array &$condition, &$records = array())
+	protected function exists(importexport_iface_egw_record&$record, Array &$condition, &$records = array())
 	{
-		if($record->__get($condition['string']) && $condition['string'] == 'id') {
+		if ($record->__get($condition['string']) && $condition['string'] == 'id') {
 			$event = $this->bo->read($record->__get($condition['string']));
 			$records = array($event);
 		}
 
-		if ( is_array( $records ) && count( $records ) >= 1) {
+		if (is_array($records) && count($records) >= 1) {
 			return true;
 		}
 		return false;
@@ -257,7 +257,7 @@ 
 	 * @param array $_data record data for the action
 	 * @return bool success or not
 	 */
-	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 )
+	protected function action($_action, importexport_iface_egw_record&$record, $record_num = 0)
 	{
 		$_data = $record->get_record_array();
 		switch ($_action) {
@@ -268,7 +268,7 @@ 
 				$old = $this->bo->read($_data['id']);
 
 				// Don't change a user account into a record
-				if(!$this->definition->plugin_options['change_owner']) {
+				if (!$this->definition->plugin_options['change_owner']) {
 					// Don't change owner of an existing record
 					unset($_data['owner']);
 				}
@@ -276,29 +276,29 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0) {
+				if (count($changed) == 0) {
 					return true;
 				}
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if ($_action == 'insert') {
 					// Backend doesn't like inserting with ID specified, can overwrite existing
 					unset($_data['id']);
 				}
 				// Make sure participants are set
-				if(!$_data['participants']) {
+				if (!$_data['participants']) {
 					$user = $_data['owner'] ? $_data['owner'] : $this->user;
 					$_data['participants'] = array(
 						$user => 'U'
 					);
 				}
-				if ( $this->dry_run ) {
+				if ($this->dry_run) {
 					//print_r($_data);
 					$this->results[$_action]++;
 					return true;
 				} else {
-					$result = $this->bo->save( $_data, $this->is_admin);
-					if(!$result) {
+					$result = $this->bo->save($_data, $this->is_admin);
+					if (!$result) {
 						$this->errors[$record_num] = lang('Unable to save');
 					} else {
 						$this->results[$_action]++;
@@ -345,9 +345,9 @@ 
 	 *
 	 * @param egw_record $row_entry
 	 */
-	protected function row_preview(importexport_iface_egw_record &$row_entry)
+	protected function row_preview(importexport_iface_egw_record&$row_entry)
 	{
-		$row_entry->participants = implode('<br />', $this->bo->participants(array('participants' => $row_entry->participants),true));
+		$row_entry->participants = implode('<br />', $this->bo->participants(array('participants' => $row_entry->participants), true));
 	}
 
 } // end of iface_export_plugin

calendar/inc/class.calendar_uilist.inc.php

Spacing +146 added lines, -146 removed lines

@@ -32,7 +32,7 @@ 
 	 *
 	 * @var mixed
 	 */
-	var $debug=false;
+	var $debug = false;
 	/**
 	 * Filternames
 	 *
@@ -50,15 +50,15 @@ 
 	 *
 	 * @param array $set_states=null to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
-	function __construct($set_states=null)
+	function __construct($set_states = null)
 	{
-		parent::__construct(true,$set_states);	// call the parent's constructor
+		parent::__construct(true, $set_states); // call the parent's constructor
 
 		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['calendar']['title'].' - '.lang('Listview').
 			// for a single owner we add it's name to the app-header
-			(count(explode(',',$this->owner)) == 1 ? ': '.$this->bo->participant_name($this->owner) : '');
+			(count(explode(',', $this->owner)) == 1 ? ': '.$this->bo->participant_name($this->owner) : '');
 
-		foreach($this->date_filters as $name => $label)
+		foreach ($this->date_filters as $name => $label)
 		{
 			$this->date_filters[$name] = lang($label);
 		}
@@ -82,15 +82,15 @@ 
 			'multiple'   => 0,
 			'view'	   => $this->bo->cal_prefs['mainscreen_showevents'],
 		));
-		egw_session::appsession('calendar_list','calendar','');	// in case there's already something set
+		egw_session::appsession('calendar_list', 'calendar', ''); // in case there's already something set
 
-		return $this->listview(null,'',true);
+		return $this->listview(null, '', true);
 	}
 
 	/**
 	 * Show the listview
 	 */
-	function listview($content=null,$msg='',$home=false)
+	function listview($content = null, $msg = '', $home = false)
 	{
 		if ($_GET['msg']) $msg .= $_GET['msg'];
 		if ($this->group_warning) $msg .= $this->group_warning;
@@ -98,7 +98,7 @@ 
 		$etpl = new etemplate_new('calendar.list');
 
 		// Handle merge from sidebox
-		if($_GET['merge'])
+		if ($_GET['merge'])
 		{
 			$content['nm']['action'] = 'document_'.$_GET['merge'];
 			$content['nm']['select_all'] = true;
@@ -107,7 +107,7 @@ 
 		if (is_array($content))
 		{
 			// handle a single button like actions
-			foreach(array('delete','timesheet','document') as $button)
+			foreach (array('delete', 'timesheet', 'document') as $button)
 			{
 				if ($content['nm']['rows'][$button])
 				{
@@ -120,7 +120,7 @@ 
 			if ($content['nm']['action'])
 			{
 				// Allow merge using the date range filter
-				if(strpos($content['nm']['action'],'document') !== false &&
+				if (strpos($content['nm']['action'], 'document') !== false &&
 					!count($content['nm']['selected']) && !$content['nm']['select_all']) {
 					$content['nm']['selected'][] = $this->get_merge_range($content['nm']);
 				}
@@ -130,42 +130,42 @@ 
 				}
 				else
 				{
-					if ($this->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
-						$success,$failed,$action_msg,'calendar_list',$msg, $content['nm']['checkboxes']['no_notifications']))
+					if ($this->action($content['nm']['action'], $content['nm']['selected'], $content['nm']['select_all'],
+						$success, $failed, $action_msg, 'calendar_list', $msg, $content['nm']['checkboxes']['no_notifications']))
 					{
-						$msg .= lang('%1 event(s) %2',$success,$action_msg);
+						$msg .= lang('%1 event(s) %2', $success, $action_msg);
 					}
-					elseif(is_null($msg))
+					elseif (is_null($msg))
 					{
-						$msg .= lang('%1 event(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
+						$msg .= lang('%1 event(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
 					}
 				}
 			}
 		}
 		$content = array(
-			'nm'  => egw_session::appsession('calendar_list','calendar'),
+			'nm'  => egw_session::appsession('calendar_list', 'calendar'),
 		);
 		if (!is_array($content['nm']))
 		{
 			$content['nm'] = array(
 				'get_rows'        =>	'calendar.calendar_uilist.get_rows',
-	 			'filter_no_lang'  => True,	// I  set no_lang for filter (=dont translate the options)
-				'no_filter2'      => True,	// I  disable the 2. filter (params are the same as for filter)
-				'no_cat'          => True,	// I  disable the cat-selectbox
+	 			'filter_no_lang'  => True, // I  set no_lang for filter (=dont translate the options)
+				'no_filter2'      => True, // I  disable the 2. filter (params are the same as for filter)
+				'no_cat'          => True, // I  disable the cat-selectbox
 				'filter'          => 'after',
-				'order'           => 'cal_start',// IO name of the column to sort after (optional for the sortheaders)
-				'sort'            => 'ASC',// IO direction of the sort: 'ASC' or 'DESC'
+				'order'           => 'cal_start', // IO name of the column to sort after (optional for the sortheaders)
+				'sort'            => 'ASC', // IO direction of the sort: 'ASC' or 'DESC'
 				'default_cols'    => '!week,weekday,cal_title,cal_description,recure,cal_location,cal_owner,cat_id,pm_id',
 				'filter_onchange' => "app.calendar.filter_change",
 				'header_left'     => 'calendar.list.dates',
-				'row_id'          => 'row_id',	// set in get rows "$event[id]:$event[recur_date]"
+				'row_id'          => 'row_id', // set in get rows "$event[id]:$event[recur_date]"
 				'row_modified'    => 'modified',
 				'favorites'       => true
 			);
 		}
 		$content['nm']['actions'] = $this->get_actions();
 
-		if (isset($_GET['filter']) && in_array($_GET['filter'],array_keys($this->date_filters)))
+		if (isset($_GET['filter']) && in_array($_GET['filter'], array_keys($this->date_filters)))
 		{
 			$content['nm']['filter'] = $_GET['filter'];
 		}
@@ -177,7 +177,7 @@ 
 		if (isset($_REQUEST['json_data']) && ($json_data = json_decode($_REQUEST['json_data'], true)) &&
 			!empty($json_data['request']['parameters'][0]))
 		{
-			parse_str(substr($json_data['request']['parameters'][0], 10), $params);	// cut off "/index.php?"
+			parse_str(substr($json_data['request']['parameters'][0], 10), $params); // cut off "/index.php?"
 			if (isset($params['keywords']))	// new search => set filters so every match is shown
 			{
 				$this->adjust_for_search($params['keywords'], $content['nm']);
@@ -185,22 +185,22 @@ 
 		}
 		if (isset($_REQUEST['keywords']))	// new search => set filters so every match is shown
 		{
-			$this->adjust_for_search($_REQUEST['keywords'],$content['nm']);
+			$this->adjust_for_search($_REQUEST['keywords'], $content['nm']);
 		}
 		$sel_options['filter'] = &$this->date_filters;
 
 		// Send categories for row styling - calendar uses no_cat, so they don't go automatically
-		$sel_options['category'] = array('' => lang('all')) + etemplate_widget_menupopup::typeOptions('select-cat', ',,calendar',$no_lang,false,$value['cat_id']);
+		$sel_options['category'] = array('' => lang('all')) + etemplate_widget_menupopup::typeOptions('select-cat', ',,calendar', $no_lang, false, $value['cat_id']);
 		// Prevent double encoding - widget does this on its own, but we're just grabbing the options
-		foreach($sel_options['category'] as &$label)
+		foreach ($sel_options['category'] as &$label)
 		{
-			if(!is_array($label))
+			if (!is_array($label))
 			{
-				$label = html_entity_decode($label, ENT_NOQUOTES,'utf-8');
+				$label = html_entity_decode($label, ENT_NOQUOTES, 'utf-8');
 			}
-			elseif($label['label'])
+			elseif ($label['label'])
 			{
-				$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES,'utf-8');
+				$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES, 'utf-8');
 			}
 		}
 
@@ -208,15 +208,15 @@ 
 		if ($this->prefs['limit_des_lines'] > 0 || (string)$this->prefs['limit_des_lines'] == '')
 		{
 			$content['css'] .= '<style type="text/css">@media screen { .listDescription {  max-height: '.
-				(($this->prefs['limit_des_lines'] ? $this->prefs['limit_des_lines'] : 5) * 1.35).	   // dono why em is not real lines
+				(($this->prefs['limit_des_lines'] ? $this->prefs['limit_des_lines'] : 5) * 1.35).// dono why em is not real lines
 				'em; overflow: auto; }}</style>';
 		}
 
-		if($msg)
+		if ($msg)
 		{
 			egw_framework::message($msg);
 		}
-		$html = $etpl->exec('calendar.calendar_uilist.listview',$content,$sel_options,$readonlys,array(),$home ? -1 : 0);
+		$html = $etpl->exec('calendar.calendar_uilist.listview', $content, $sel_options, $readonlys, array(), $home ? -1 : 0);
 
 		// Not sure why this has to be echoed instead of appended, but that's what works.
 		//echo calendar_uiviews::edit_series();
@@ -227,7 +227,7 @@ 
 	/**
 	 * set filter for search, so that everything is shown
 	 */
-	function adjust_for_search($keywords,&$params)
+	function adjust_for_search($keywords, &$params)
 	{
 		$params['search'] = $keywords;
 		$params['start']  = 0;
@@ -253,7 +253,7 @@ 
 	 * @param array &$rows returned rows/events
 	 * @param array &$readonlys eg. to disable buttons based on acl
 	 */
-	function get_rows(&$params,&$rows,&$readonlys)
+	function get_rows(&$params, &$rows, &$readonlys)
 	{
 		//echo "uilist::get_rows() params="; _debug_array($params);
 		if (isset($_GET['listview_days']) && is_numeric($_GET['listview_days']))
@@ -277,7 +277,7 @@ 
 				$this->manage_states(array('date' => $this->bo->date2string($params['startdate'])));
 			}
 		}
-		$old_params = egw_session::appsession('calendar_list','calendar');
+		$old_params = egw_session::appsession('calendar_list', 'calendar');
 		if (is_array($old_params))
 		{
 			if ($old_params['filter'] && $old_params['filter'] != $params['filter'])	// filter changed => order accordingly
@@ -287,58 +287,58 @@ 
 			}
 			if ($old_params['search'] != $params['search'])
 			{
-				$this->adjust_for_search($params['search'],$params);
+				$this->adjust_for_search($params['search'], $params);
 			}
 		}
-		if (!$params['csv_export']) egw_session::appsession('calendar_list','calendar',$params);
+		if (!$params['csv_export']) egw_session::appsession('calendar_list', 'calendar', $params);
 
 		// do we need to query custom fields and which
 		// Check stored preference if selectcols isn't available (ie: first call)
 		$select_cols = $params['selectcols'] ? $params['selectcols'] : $GLOBALS['egw_info']['user']['preferences']['calendar']['nextmatch-calendar.list.rows'];
-		if(!is_array($params['selectcols']))
+		if (!is_array($params['selectcols']))
 		{
-			$select_cols = explode(',',$select_cols);
+			$select_cols = explode(',', $select_cols);
 		}
-		if (in_array('cfs',$select_cols))
+		if (in_array('cfs', $select_cols))
 		{
 			$cfs = array();
-			foreach($select_cols as $col)
+			foreach ($select_cols as $col)
 			{
-				if ($col[0] == '#') $cfs[] = substr($col,1);
+				if ($col[0] == '#') $cfs[] = substr($col, 1);
 			}
 		}
 		$search_params = array(
-			'cat_id'  => $this->cat_id ? explode(',',$this->cat_id) : 0,
+			'cat_id'  => $this->cat_id ? explode(',', $this->cat_id) : 0,
 			'filter'  => $this->filter,
 			'query'   => $params['search'],
-			'offset'  => (int) $params['start'],
+			'offset'  => (int)$params['start'],
 			'num_rows'=> $params['num_rows'],
 			'order'   => $params['order'] ? $params['order'].' '.$params['sort'] : 'cal_start',
 			'cfs'	 => $params['csv_export'] ? array() : $cfs,
 		);
-		switch($params['filter'])
+		switch ($params['filter'])
 		{
 			case 'all':
 				break;
 			case 'before':
 				$search_params['end'] = $this->date;
-				$label = lang('Before %1',$this->bo->long_date($this->date));
+				$label = lang('Before %1', $this->bo->long_date($this->date));
 				break;
 			case 'custom':
 				$this->first = $search_params['start'] = $params['startdate'];
-				$this->last  = $search_params['end'] = strtotime('+1 day', $this->bo->date2ts($params['enddate']))-1;
-				$label = $this->bo->long_date($this->first,$this->last);
+				$this->last  = $search_params['end'] = strtotime('+1 day', $this->bo->date2ts($params['enddate'])) - 1;
+				$label = $this->bo->long_date($this->first, $this->last);
 				break;
 			case 'fixed':
 				if ($this->listview_days == 5 || $this->listview_days == 7)	// weekview
 				{
-					$this->first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day);
+					$this->first = $this->datetime->get_weekday_start($this->year, $this->month, $this->day);
 					$this->last = $this->bo->date2array($this->first);
-					$this->last['day'] += (int) $this->listview_days - 1;
+					$this->last['day'] += (int)$this->listview_days - 1;
 					$this->last['hour'] = 23; $this->last['minute'] = $this->last['sec'] = 59;
 					unset($this->last['raw']);
 					$this->last = $this->bo->date2ts($this->last);
-					$this->date_filters['fixed'] = $label = lang('Week').' '.adodb_date('W',$this->first).': '.$this->bo->long_date($this->first,$this->last);
+					$this->date_filters['fixed'] = $label = lang('Week').' '.adodb_date('W', $this->first).': '.$this->bo->long_date($this->first, $this->last);
 					$params['startdate'] = $search_params['start'] = $this->first;
 					$params['enddate'] = $search_params['end'] = $this->last;
 					break;
@@ -353,7 +353,7 @@ 
 					$this->first = $this->bo->date2ts($this->first);
 					$this->last = $this->bo->date2ts($this->last);
 					$this->last--;
-					$this->date_filters['fixed'] = $label = lang(adodb_date('F',$this->bo->date2ts($this->date))).' '.$this->year;
+					$this->date_filters['fixed'] = $label = lang(adodb_date('F', $this->bo->date2ts($this->date))).' '.$this->year;
 					$params['startdate'] = $search_params['start'] = $this->first;
 					$params['enddate'] = $search_params['end'] = $this->last;
 					break;
@@ -361,24 +361,24 @@ 
 				// fall through to after given date
 			case 'after':
 			default:
-				$label = lang('After %1',$this->bo->long_date($this->date));
+				$label = lang('After %1', $this->bo->long_date($this->date));
 				$search_params['start'] = $this->date;
 				break;
 		}
-		if ((int) $params['col_filter']['participant'])
+		if ((int)$params['col_filter']['participant'])
 		{
-			$search_params['users'] = (int) $params['col_filter']['participant'];
+			$search_params['users'] = (int)$params['col_filter']['participant'];
 		}
-		elseif(empty($params['search']))	// active search displays entries from all users
+		elseif (empty($params['search']))	// active search displays entries from all users
 		{
-			$search_params['users'] = explode(',',$this->owner);
+			$search_params['users'] = explode(',', $this->owner);
 		}
 		if ($params['col_filter'])
 		{
 			$col_filter = array();
-			foreach($params['col_filter'] as $name => $val)
+			foreach ($params['col_filter'] as $name => $val)
 			{
-				if (!in_array($name, array('participant','row_id')) && (string)$val !== '')
+				if (!in_array($name, array('participant', 'row_id')) && (string)$val !== '')
 				{
 					$col_filter[$name] = $val;
 				}
@@ -392,15 +392,15 @@ 
 			$rows['sel_options']['filter'] = $this->date_filters;
 			$rows['sel_options']['filter'][$params['filter']] = $label;
 		}
-		foreach((array) $this->bo->search($search_params, !empty($col_filter) ? $col_filter : null) as $event)
+		foreach ((array)$this->bo->search($search_params, !empty($col_filter) ? $col_filter : null) as $event)
 		{
-			if (!$this->bo->check_perms(EGW_ACL_EDIT,$event))
+			if (!$this->bo->check_perms(EGW_ACL_EDIT, $event))
 			{
 				$event['class'] .= 'rowNoEdit ';
 			}
 
 			// Delete disabled for other applications
-			if (!$this->bo->check_perms(EGW_ACL_DELETE,$event) || !is_numeric($event['id']))
+			if (!$this->bo->check_perms(EGW_ACL_DELETE, $event) || !is_numeric($event['id']))
 			{
 				$event['class'] .= 'rowNoDelete ';
 			}
@@ -414,39 +414,39 @@ 
 			$event['recure'] = $this->bo->recure2string($event);
 			if ($params['csv_export'])
 			{
-				$event['participants'] = implode(",\n",$this->bo->participants($event,true));
+				$event['participants'] = implode(",\n", $this->bo->participants($event, true));
 			}
 			else
 			{
-				$event['parts'] = implode(",\n",$this->bo->participants($event,true));
+				$event['parts'] = implode(",\n", $this->bo->participants($event, true));
 				$event['date'] = $this->bo->date2string($event['start']);
 			}
-			if (empty($event['description'])) $event['description'] = ' ';	// no description screws the titles horz. alignment
-			if (empty($event['location'])) $event['location'] = ' ';	// no location screws the owner horz. alignment
+			if (empty($event['description'])) $event['description'] = ' '; // no description screws the titles horz. alignment
+			if (empty($event['location'])) $event['location'] = ' '; // no location screws the owner horz. alignment
 
 			// respect category permissions
-			if(!empty($event['category']))
+			if (!empty($event['category']))
 			{
 				$event['category'] = $this->categories->check_list(EGW_ACL_READ, $event['category']);
 			}
 
-			if(!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i',$event['id'],$matches))
+			if (!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i', $event['id'], $matches))
 			{
 				$app = $matches[1];
 				$app_id = $matches[2];
 				$icons = array();
-				if (($is_private = calendar_bo::integration_get_private($app,$app_id,$event)))
+				if (($is_private = calendar_bo::integration_get_private($app, $app_id, $event)))
 				{
-					$icons[] = html::image('calendar','private');
+					$icons[] = html::image('calendar', 'private');
 				}
 				else
 				{
-					$icons = calendar_uiviews::integration_get_icons($app,$app_id,$event);
+					$icons = calendar_uiviews::integration_get_icons($app, $app_id, $event);
 				}
 			}
 			else
 			{
-				$is_private = !$this->bo->check_perms(EGW_ACL_READ,$event);
+				$is_private = !$this->bo->check_perms(EGW_ACL_READ, $event);
 			}
 			if ($is_private)
 			{
@@ -457,9 +457,9 @@ 
 			$event['app_id'] = $event['id'];
 
 			// Edit link
-			if($app && $app_id)
+			if ($app && $app_id)
 			{
-				$popup = calendar_uiviews::integration_get_popup($app,$app_id);
+				$popup = calendar_uiviews::integration_get_popup($app, $app_id);
 
 				// Need to strip off 'onclick'
 				$event['edit_link'] = preg_replace('/ ?onclick="(.+)"/i', '$1', $popup);
@@ -470,7 +470,7 @@ 
 				// populate js_integration_data, if not already set
 				if (!isset($js_integration_data[$app]))
 				{
-					$js_integration_data[$app] = calendar_bo::integration_get_data($app,'edit_link');
+					$js_integration_data[$app] = calendar_bo::integration_get_data($app, 'edit_link');
 					if (!is_array($js_integration_data[$app]) || !isset($js_integration_data[$app]['edit']))
 					{
 						$js_integration_data[$app]['edit'] = egw_link::get_registry($app, 'edit');
@@ -486,7 +486,7 @@ 
 			}
 			else
 			{
-				$view_link = egw::link('/index.php',array('menuaction'=>'calendar.calendar_uiforms.edit','cal_id'=>$event['id'],'date'=>$this->bo->date2string($event['start'])));
+				$view_link = egw::link('/index.php', array('menuaction'=>'calendar.calendar_uiforms.edit', 'cal_id'=>$event['id'], 'date'=>$this->bo->date2string($event['start'])));
 				$event['edit_link'] = $this->popup($view_link).'; return false;';
 			}
 
@@ -494,9 +494,9 @@ 
 			$event['row_id'] = $event['id'].($event['recur_type'] ? ':'.$event['recur_date'] : '');
 
 			// Format start and end with timezone
-			foreach(array('start','end') as $time)
+			foreach (array('start', 'end') as $time)
 			{
-				$event[$time] = egw_time::to($event[$time],'Y-m-d\TH:i:s\Z');
+				$event[$time] = egw_time::to($event[$time], 'Y-m-d\TH:i:s\Z');
 			}
 
 			$rows[] = $event;
@@ -506,19 +506,19 @@ 
 		// set js_calendar_integration object, to use it in app.js cal_open() function
 		$params['js_integration_data'] = json_encode($js_integration_data);
 
-		$wv=0;
-		$dv=0;
+		$wv = 0;
+		$dv = 0;
 		$params['options-selectcols']['week'] = lang('Week');
 		$params['options-selectcols']['weekday'] = lang('Weekday');
-		if ((substr($this->cal_prefs['nextmatch-calendar.list.rows'],0,4) == 'week' && strlen($this->cal_prefs['nextmatch-calendar.list.rows'])==4) || substr($this->cal_prefs['nextmatch-calendar.list.rows'],0,5) == 'week,')
+		if ((substr($this->cal_prefs['nextmatch-calendar.list.rows'], 0, 4) == 'week' && strlen($this->cal_prefs['nextmatch-calendar.list.rows']) == 4) || substr($this->cal_prefs['nextmatch-calendar.list.rows'], 0, 5) == 'week,')
 		{
-			$rows['format'] = '32';	// prefix date with week-number
-			$wv=1;
+			$rows['format'] = '32'; // prefix date with week-number
+			$wv = 1;
 		}
-		if (!(strpos($this->cal_prefs['nextmatch-calendar.list.rows'],'weekday')===FALSE))
+		if (!(strpos($this->cal_prefs['nextmatch-calendar.list.rows'], 'weekday') === FALSE))
 		{
 			$rows['format'] = '16';
-			$dv=1;
+			$dv = 1;
 		}
 		if ($wv && $dv)
 		{
@@ -545,35 +545,35 @@ 
 	 * @param string/array $session_name 'calendar_list'
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
-	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg,$skip_notification=false)
+	function action($action, $checked, $use_all, &$success, &$failed, &$action_msg, $session_name, &$msg, $skip_notification = false)
 	{
 		//error_log(__METHOD__."('$action', ".array2string($checked).', all='.(int)$use_all.", ...)");
 		$success = $failed = 0;
 		$msg = null;
 
 		// Split out combined values
-		if(strpos($action, 'status') !== false)
+		if (strpos($action, 'status') !== false)
 		{
 			list($action, $status) = explode('-', $action);
 		}
 		elseif (strpos($action, '_') !== false)
 		{
-			list($action, $settings) = explode('_', $action,2);
+			list($action, $settings) = explode('_', $action, 2);
 		}
 
 		if ($use_all)
 		{
 			// get the whole selection
-			$query = is_array($session_name) ? $session_name : egw_session::appsession($session_name,'calendar');
-			@set_time_limit(0);				// switch off the execution time limit, as for big selections it's too small
-			$query['num_rows'] = -1;		// all
-			$this->get_rows($query,$checked,$readonlys,!in_array($action,array('ical','document')));	   // true = only return the id's
+			$query = is_array($session_name) ? $session_name : egw_session::appsession($session_name, 'calendar');
+			@set_time_limit(0); // switch off the execution time limit, as for big selections it's too small
+			$query['num_rows'] = -1; // all
+			$this->get_rows($query, $checked, $readonlys, !in_array($action, array('ical', 'document'))); // true = only return the id's
 			// Get rid of any extras (rows that aren't events)
-			if(in_array($action,array('ical','document')))
+			if (in_array($action, array('ical', 'document')))
 			{
-				foreach($checked as $key => $event)
+				foreach ($checked as $key => $event)
 				{
-					if(!is_numeric($key))
+					if (!is_numeric($key))
 					{
 						unset($checked[$key]);
 					}
@@ -581,26 +581,26 @@ 
 			}
 		}
 		// for calendar integration we have to fetch all rows and unset the not selected ones, as we can not filter by id
-		elseif($action == 'document')
+		elseif ($action == 'document')
 		{
-			$query = is_array($session_name) ? $session_name : egw_session::appsession($session_name,'calendar');
-			@set_time_limit(0);				// switch off the execution time limit, as for big selections it's too small
-			$this->get_rows($query,$events,$readonlys);
-			foreach($events as $key => $event)
+			$query = is_array($session_name) ? $session_name : egw_session::appsession($session_name, 'calendar');
+			@set_time_limit(0); // switch off the execution time limit, as for big selections it's too small
+			$this->get_rows($query, $events, $readonlys);
+			foreach ($events as $key => $event)
 			{
-				if (!in_array($event['id'],$checked) && !in_array($event['id'].':'.$event['recur_date'], $checked)) unset($events[$key]);
+				if (!in_array($event['id'], $checked) && !in_array($event['id'].':'.$event['recur_date'], $checked)) unset($events[$key]);
 			}
 			$checked = array_values($events); // Clear keys
 		}
 
 		// Actions where one action is done to the group
-		switch($action)
+		switch ($action)
 		{
 			case 'ical':
 				// compile list of unique cal_id's, as iCal should contain whole series, not recurrences
 				// calendar_ical->exportVCal needs to read events again, to get them in server-time
 				$ids = array();
-				foreach($checked as $id)
+				foreach ($checked as $id)
 				{
 					if (is_array($id)) $id = $id['id'];
 					// get rid of recurrences, doublicate series and calendar-integration events
@@ -610,7 +610,7 @@ 
 					}
 				}
 				$boical = new calendar_ical();
-				$ical =& $boical->exportVCal($ids, '2.0', 'PUBLISH');
+				$ical = & $boical->exportVCal($ids, '2.0', 'PUBLISH');
 				html::content_header('event.ics', 'text/calendar', bytes($ical));
 				echo $ical;
 				common::egw_exit();
@@ -624,18 +624,18 @@ 
 		}
 
 		// Actions where the action is applied to each entry
-		if(strpos($action, 'timesheet') !== false)
+		if (strpos($action, 'timesheet') !== false)
 		{
 			$timesheet_bo = new timesheet_bo();
 		}
-		foreach($checked as &$id)
+		foreach ($checked as &$id)
 		{
 			$recur_date = $app = $app_id = null;
-			if(is_array($id) && $id['id'])
+			if (is_array($id) && $id['id'])
 			{
 				$id = $id['id'];
 			}
-			if(!(int)$id && preg_match('/^([a-z_-]+)([0-9]+)$/i',$id,$matches))
+			if (!(int)$id && preg_match('/^([a-z_-]+)([0-9]+)$/i', $id, $matches))
 			{
 				$app = $matches[1];
 				$app_id = $matches[2];
@@ -643,27 +643,27 @@ 
 			}
 			else
 			{
-				list($id,$recur_date) = explode(':',$id);
+				list($id, $recur_date) = explode(':', $id);
 			}
-			switch($action)
+			switch ($action)
 			{
 				case 'delete':
 					$action_msg = lang('deleted');
-					if($settings == 'series')
+					if ($settings == 'series')
 					{
 						// Delete the whole thing
 						$recur_date = 0;
 					}
-					if ($id && $this->bo->delete($id, $recur_date,false,$skip_notification))
+					if ($id && $this->bo->delete($id, $recur_date, false, $skip_notification))
 					{
 						$success++;
-						if(!$recur_date && $settings == 'series')
+						if (!$recur_date && $settings == 'series')
 						{
 							// If there are multiple events in a series selected, the next one could purge
-							foreach($checked as $key => $c_id)
+							foreach ($checked as $key => $c_id)
 							{
-								list($c_id,$recur_date) = explode(':',$c_id);
-								if($c_id == $id)
+								list($c_id, $recur_date) = explode(':', $c_id);
+								if ($c_id == $id)
 								{
 									unset($checked[$key]);
 								}
@@ -677,16 +677,16 @@ 
 					break;
 				case 'undelete':
 					$action_msg = lang('recovered');
-					if($settings == 'series')
+					if ($settings == 'series')
 					{
 						// unDelete the whole thing
 						$recur_date = 0;
 					}
-					if ($id && ($event = $this->bo->read($id, $recur_date)) && $this->bo->check_perms(EGW_ACL_EDIT,$id) &&
+					if ($id && ($event = $this->bo->read($id, $recur_date)) && $this->bo->check_perms(EGW_ACL_EDIT, $id) &&
 						is_array($event) && $event['deleted'])
 					{
 						$event['deleted'] = null;
-						if($this->bo->save($event))
+						if ($this->bo->save($event))
 						{
 							$success++;
 							break;
@@ -696,7 +696,7 @@ 
 					break;
 				case 'status':
 					$action_msg = lang('Status changed');
-					if($id && ($event = $this->bo->read($id, $recur_date)))
+					if ($id && ($event = $this->bo->read($id, $recur_date)))
 					{
 						$old_status = $event['participants'][$GLOBALS['egw_info']['user']['account_id']];
 						calendar_so::split_status($old_status, $quantity, $role);
@@ -704,8 +704,8 @@ 
 						{
 							//echo "<p>$uid: status changed '$data[old_status]' --> '$status<'/p>\n";
 							$new_status = calendar_so::combine_status($status, $quantity, $role);
-							if ($this->bo->set_status($event,$GLOBALS['egw_info']['user']['account_id'],$new_status,$recur_date,
-								false,true,$skip_notification))
+							if ($this->bo->set_status($event, $GLOBALS['egw_info']['user']['account_id'], $new_status, $recur_date,
+								false, true, $skip_notification))
 							{
 								$success++;
 								//$msg = lang('Status changed');
@@ -722,19 +722,19 @@ 
 					}
 					break;
 				case 'timesheet-add':
-					if($id && !$app)
+					if ($id && !$app)
 					{
 						$event = $this->bo->read($id, $recur_date);
 					}
 					elseif ($app)
 					{
-						$query = egw_session::appsession('calendar_list','calendar');
+						$query = egw_session::appsession('calendar_list', 'calendar');
 						$query['query'] = $app_id;
 						$query['search'] = $app_id;
 						$result = $this->bo->search($query);
 						$event = $result[$app.$app_id];
 					}
-					if(!$event)
+					if (!$event)
 					{
 						$failed++;
 						continue;
@@ -751,16 +751,16 @@ 
 					);
 
 					// Add global categories
-					$categories = explode(',',$event['category']);
+					$categories = explode(',', $event['category']);
 					$global_categories = array();
-					foreach($categories as $cat_id)
+					foreach ($categories as $cat_id)
 					{
-						if($GLOBALS['egw']->categories->is_global($cat_id))
+						if ($GLOBALS['egw']->categories->is_global($cat_id))
 						{
 							$global_categories[] = $cat_id;
 						}
 					}
-					if(count($global_categories))
+					if (count($global_categories))
 					{
 						$timesheet['cat_id'] = implode(',', $global_categories);
 					}
@@ -780,12 +780,12 @@ 
 						}
 					}
 
-					if(!$err)
+					if (!$err)
 					{
 						$success++;
 
 						// Can't link to just one of a recurring series of events
-						if(!$recur_date || $app) {
+						if (!$recur_date || $app) {
 							// Create link
 							$link_id = $app ? $app_id : $id;
 							egw_link::link($app ? $app : 'calendar', $link_id, 'timesheet', $timesheet_bo->data['ts_id']);
@@ -813,7 +813,7 @@ 
 	protected function get_merge_range($nm)
 	{
 		$checked = array();
-		if($nm['filter'] == 'fixed')
+		if ($nm['filter'] == 'fixed')
 		{
 			$checked['start'] = $nm['startdate'];
 			$last = $this->bo->date2array($nm['enddate']);
@@ -822,7 +822,7 @@ 
 		}
 		else
 		{
-			switch($nm['filter'])
+			switch ($nm['filter'])
 			{
 				case 'after':
 					$checked['start'] = $nm['startdate'] ? $nm['startdate'] : strtotime('today');
@@ -835,8 +835,8 @@ 
 					$checked['end'] = $nm['enddate'];
 					break;
 				default:
-					$date = date_create_from_format('Ymd',$this->date);
-					$checked['start']= $date->format('U');
+					$date = date_create_from_format('Ymd', $this->date);
+					$checked['start'] = $date->format('U');
 			}
 		}
 		return $checked;
@@ -860,7 +860,7 @@ 
 				'allowOnMultiple' => false,
 				'url' => 'menuaction=calendar.calendar_uiforms.edit&cal_id=$id',
 				'popup' => egw_link::get_registry('calendar', 'view_popup'),
-				'group' => $group=1,
+				'group' => $group = 1,
 				'onExecute' => 'javaScript:app.calendar.cal_open',
 				'disableClass' => 'rowNoView',
 			),
@@ -885,7 +885,7 @@ 
 				'group' => $group,
 			),
 		);
-		$status = array_map('lang',$this->bo->verbose_status);
+		$status = array_map('lang', $this->bo->verbose_status);
 		unset($status['G']);
 		$actions['status'] = array(
 			'caption' => 'Change your status',
@@ -894,7 +894,7 @@ 
 			'children' => $status,
 			'group' => ++$group,
 		);
-		++$group;	// integration with other apps: infolog, calendar, filemanager
+		++$group; // integration with other apps: infolog, calendar, filemanager
 		if ($GLOBALS['egw_info']['user']['apps']['filemanager'])
 		{
 			$actions['filemanager'] = array(
@@ -926,7 +926,7 @@ 
 				'url' => 'menuaction=timesheet.timesheet_ui.edit&link_app[]=$app&link_id[]=$id',
 				'group' => $group,
 				'allowOnMultiple' => false,
-				'hideOnDisabled' => true,	// show only one timesheet action in context menu
+				'hideOnDisabled' => true, // show only one timesheet action in context menu
 				'onExecute' => 'javaScript:app.calendar.cal_fix_app_id',
 				'popup' => egw_link::get_registry('timesheet', 'add_popup'),
 			);
@@ -935,7 +935,7 @@ 
 				'caption' => 'Timesheet',
 				'group' => $group,
 				'allowOnMultiple' => 'only',
-				'hideOnDisabled' => true,	// show only one timesheet action in context menu
+				'hideOnDisabled' => true, // show only one timesheet action in context menu
 			);
 		}
 		$actions['ical'] = array(
@@ -944,11 +944,11 @@ 
 			'group' => ++$group,
 			'hint' => 'Download this event as iCal',
 			'disableClass' => 'rowNoView',
-			'postSubmit' => true,	// download needs post submit (not Ajax) to work
+			'postSubmit' => true, // download needs post submit (not Ajax) to work
 		);
 		$actions['documents'] = calendar_merge::document_action(
 			$this->bo->cal_prefs['document_dir'], ++$group, 'Insert in document', 'document_',
-			$this->bo->cal_prefs['default_document'],bo_merge::getExportLimit('calendar')
+			$this->bo->cal_prefs['default_document'], bo_merge::getExportLimit('calendar')
 		);
 		++$group;
 		$actions['delete'] = array(
@@ -958,7 +958,7 @@ 
 			'disableClass' => 'rowNoDelete',
 		);
 		// Add in deleted for admins
-		if($GLOBALS['egw_info']['server']['calendar_delete_history'])
+		if ($GLOBALS['egw_info']['server']['calendar_delete_history'])
 		{
 			$actions['undelete'] = array(
 				'caption' => 'Un-delete',