EGroupware / egroupware

calendar/inc/class.calendar_bo.inc.php

Indentation +20 added lines, -20 removed lines

@@ -1490,13 +1490,13 @@ 
 	}
 
 	/**
-	* Converts a participant into a (readable) user- or resource-name
-	*
-	* @param string|int $id id of user or resource
-	* @param string|boolean $use_type =false type-letter or false
-	* @param boolean $append_email =false append email (Name <email>)
-	* @return string with name
-	*/
+	 * Converts a participant into a (readable) user- or resource-name
+	 *
+	 * @param string|int $id id of user or resource
+	 * @param string|boolean $use_type =false type-letter or false
+	 * @param boolean $append_email =false append email (Name <email>)
+	 * @return string with name
+	 */
 	function participant_name($id,$use_type=false, $append_email=false)
 	{
 		static $id2lid = array();
@@ -1525,13 +1525,13 @@ 
 	}
 
 	/**
-	* Converts participants array of an event into array of (readable) participant-names with status
-	*
-	* @param array $event event-data
-	* @param boolean $long_status =false should the long/verbose status or an icon be use
-	* @param boolean $show_group_invitation =false show group-invitations (status == 'G') or not (default)
-	* @return array with id / names with status pairs
-	*/
+	 * Converts participants array of an event into array of (readable) participant-names with status
+	 *
+	 * @param array $event event-data
+	 * @param boolean $long_status =false should the long/verbose status or an icon be use
+	 * @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)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($event['participants']));
@@ -1601,12 +1601,12 @@ 
 	}
 
 	/**
-	* Converts category string of an event into array of (readable) category-names
-	*
-	* @param string $category cat-id (multiple id's commaseparated)
-	* @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
-	*/
+	 * Converts category string of an event into array of (readable) category-names
+	 *
+	 * @param string $category cat-id (multiple id's commaseparated)
+	 * @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)
 	{
 		static $id2cat = array();

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -122,7 +122,7 @@ 
 	/**
 	 * @var array recur_types translates MCAL recur-types to verbose labels
 	 */
-	var $recur_types = Array(
+	var $recur_types = array(
 		MCAL_RECUR_NONE         => 'No recurrence',
 		MCAL_RECUR_DAILY        => 'Daily',
 		MCAL_RECUR_WEEKLY       => 'Weekly',
@@ -1897,7 +1897,7 @@ 
 	 * @param string $pattern pattern to search
 	 * @return array with cal_id - title pairs of the matching entries
 	 */
-	function link_query($pattern, Array &$options = array())
+	function link_query($pattern, array &$options = array())
 	{
 		$result = array();
 		$query = array(

Doc Comments +7 added lines, -12 removed lines

@@ -632,8 +632,8 @@ 
 	 * or an ExecMethod callback with parameters $id,$event
 	 *
 	 * @param string $app
-	 * @param int|string $id
-	 * @return string
+	 * @param string $id
+	 * @return boolean
 	 */
 	static function integration_get_private($app,$id,$event)
 	{
@@ -762,7 +762,7 @@ 
 	 * This methods operates in usertime, while $this->config['horizont'] is in servertime!
 	 *
 	 * @param array $event
-	 * @param mixed $start =0 minimum start-time for new recurrences or !$start = since the start of the event
+	 * @param integer $start =0 minimum start-time for new recurrences or !$start = since the start of the event
 	 */
 	function set_recurrences($event,$start=0)
 	{
@@ -982,10 +982,9 @@ 
 	 * Recurrences get calculated by rrule iterator implemented in calendar_rrule class.
 	 *
 	 * @param array $event repeating event whos repetions should be inserted
-	 * @param mixed $start start-date
+	 * @param mixed $_start start-date
 	 * @param mixed $end end-date
 	 * @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)
 	{
@@ -1139,7 +1138,7 @@ 
 	 *	even if you have no general read-grant from that user.
 	 *
 	 * @param int $needed necessary ACL right: Acl::{READ|EDIT|DELETE}
-	 * @param mixed $event event as array or the event-id or 0 for a general check
+	 * @param integer $event event as array or the event-id or 0 for a general check
 	 * @param int $other uid to check (if event==0) or 0 to check against $this->user
 	 * @param string $date_format ='ts' date-format used for reading: 'ts'=timestamp, 'array'=array, 'string'=iso8601 string for xmlrpc
 	 * @param mixed $date_to_read =null date used for reading, internal param for the caching
@@ -1312,8 +1311,6 @@ 
 	 * @param string $msg message with parameters/variables like lang(), eg. '%1'
 	 * @param boolean $backtrace =True include a function-backtrace, default True=On
 	 *	should only be set to False=Off, if your code ensures a call with backtrace=On was made before !!!
-	 * @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)
 	{
@@ -1378,7 +1375,7 @@ 
 	 * Formats one or two dates (range) as long date (full monthname), optionaly with a time
 	 *
 	 * @param mixed $_first first date
-	 * @param mixed $last =0 last date if != 0 (default)
+	 * @param integer $last =0 last date if != 0 (default)
 	 * @param boolean $display_time =false should a time be displayed too
 	 * @param boolean $display_day =false should a day-name prefix the date, eg. monday June 20, 2006
 	 * @return string with formated date
@@ -1847,7 +1844,6 @@ 
 	 *
 	 * Is called as hook to participate in the linking
 	 *
-	 * @param int|array $entry int cal_id or array with event
 	 * @param string|boolean string with title, null if not found or false if not read perms
 	 */
 	function link_title($event)
@@ -2036,6 +2032,7 @@ 
 	 *
 	 * @param array|int|string $entry array with event or cal_id, or cal_id:recur_date for virtual exceptions
 	 * @param string &$schedule_tag=null on return schedule-tag (egw_cal.cal_id:egw_cal.cal_etag, no participant modifications!)
+	 * @param string $schedule_tag
 	 * @return string|boolean string with etag or false
 	 */
 	function get_etag($entry, &$schedule_tag=null)
@@ -2076,7 +2073,6 @@ 
 	 * Hook for infolog  to set some extra data and links
 	 *
 	 * @param array $data event-array preset by infolog plus
-	 * @param int $data[id] cal_id
 	 * @return array with key => value pairs to set in new event and link_app/link_id arrays
 	 */
 	function infolog_set($data)
@@ -2128,7 +2124,6 @@ 
 	 * Hook for timesheet to set some extra data and links
 	 *
 	 * @param array $data
-	 * @param int $data[id] cal_id:recurrence
 	 * @return array with key => value pairs to set in new timesheet and link_app/link_id arrays
 	 */
 	function timesheet_set($data)

Braces +197 added lines, -49 removed lines

@@ -15,10 +15,13 @@ 
 use EGroupware\Api\Link;
 use EGroupware\Api\Acl;
 
-if (!defined('ACL_TYPE_IDENTIFER'))	// used to mark ACL-values for the debug_message methode
+if (!defined('ACL_TYPE_IDENTIFER'))
+{
+	// used to mark ACL-values for the debug_message methode
 {
 	define('ACL_TYPE_IDENTIFER','***ACL***');
 }
+}
 
 define('HOUR_s',60*60);
 define('DAY_s',24*HOUR_s);
@@ -219,7 +222,10 @@ 
 	 */
 	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();
 
@@ -305,7 +311,10 @@ 
 	 */
 	static function email_info($ids)
 	{
-		if (!$ids) return null;
+		if (!$ids)
+		{
+			return null;
+		}
 
 		$data = array();
 		foreach((array)$ids as $id)
@@ -398,10 +407,13 @@ 
 				}
 				if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy?self::ACL_FREEBUSY:0),0,$contact))
 				{
-					if ($contact && !in_array($contact,$contact_list))	// already added?
+					if ($contact && !in_array($contact,$contact_list))
+					{
+						// already added?
 					{
 						$contact_list[] = $contact;
 					}
+					}
 				}
 			}
 		}
@@ -461,21 +473,27 @@ 
 			{
 				foreach($this->enum_mailing_list($user, $ignore_acl, $use_freebusy) as $contact)
 				{
-					if ($contact && !in_array($contact,$users))	// already added?
+					if ($contact && !in_array($contact,$users))
+					{
+						// already added?
 					{
 						$users[] = $contact;
 					}
+					}
 				}
 				continue;
 			}
 			if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy?self::ACL_FREEBUSY:0),0,$user))
 			{
-				if ($user && !in_array($user,$users))	// already added?
+				if ($user && !in_array($user,$users))
+				{
+					// already added?
 				{
 					// General expansion check
 					if (!is_numeric($user) && $this->resources[$user[0]]['info'])
 					{
 						$info = $this->resource_info($user);
+				}
 						if($info && $info['resources'])
 						{
 							foreach($info['resources'] as $_user)
@@ -496,12 +514,18 @@ 
 				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;
+			if (!is_numeric($user))
+			{
+				continue;
+			}
 
 			// for groups we have to include the members
 			if ($GLOBALS['egw']->accounts->get_type($user) == 'g')
 			{
-				if ($no_enum_groups) continue;
+				if ($no_enum_groups)
+				{
+					continue;
+				}
 
 				$members = $GLOBALS['egw']->accounts->members($user, true);
 				if (is_array($members))
@@ -581,11 +605,14 @@ 
 		}
 
 		if (!isset($params['users']) || !$params['users'] ||
-			count($params['users']) == 1 && isset($params['users'][0]) && !$params['users'][0])	// null or '' casted to an array
+			count($params['users']) == 1 && isset($params['users'][0]) && !$params['users'][0])
+		{
+			// null or '' casted to an array
 		{
 			// for a search use all account you have read grants from
 			$params['users'] = $params['query'] ? array_keys($this->grants) : $this->user;
 		}
+		}
 		// resolve users to add memberships for users and members for groups
 		// for search, do NOT use freebusy rights, as it would allow to probe the content of event entries
 		$users = $this->resolve_users($params['users'], $params['filter'] == 'no-enum-groups', $params['ignore_acl'], empty($params['query']));
@@ -596,7 +623,10 @@ 
 			$params['private_grants'] = array();
 			foreach($this->grants as $user => $rights)
 			{
-				if ($rights & Acl::PRIVAT) $params['private_grants'][] = $user;
+				if ($rights & Acl::PRIVAT)
+				{
+					$params['private_grants'][] = $user;
+				}
 			}
 		}
 
@@ -611,7 +641,10 @@ 
 		{
 			return false;
 		}
-		if (isset($params['start'])) $start = $this->date2ts($params['start']);
+		if (isset($params['start']))
+		{
+			$start = $this->date2ts($params['start']);
+		}
 
 		if (isset($params['end']))
 		{
@@ -675,10 +708,13 @@ 
 				$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)
 			{
 				$e_start = max($this->date2ts($event['start']),$start);
@@ -730,7 +766,10 @@ 
 			$integration_data = calendar_so::get_integration_data();
 		}
 
-		if (!isset($integration_data[$app])) return null;
+		if (!isset($integration_data[$app]))
+		{
+			return null;
+		}
 
 		return $part ? $integration_data[$app][$part] : $integration_data[$app];
 	}
@@ -777,8 +816,14 @@ 
 	 */
 	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());
+		if ($event == false)
+		{
+			return;
+		}
+		if (!is_array($event['participants']))
+		{
+			error_log(__METHOD__.'('.array2string($event).', '.array2string($allowed_participants).') NO PARTICIPANTS '.function_backtrace());
+		}
 
 		$event = array(
 			'id'    => $event['id'],
@@ -823,19 +868,29 @@ 
 		}
 		$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 ($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']);
+		}
 			return;
 		}
 		if (!empty($GLOBALS['egw_info']['server']['calendar_horizont']))
 		{
 			$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 (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 ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 new horizont more then %3 days from now --> ignoring it',true,$new_horizont,(int)$this->config['horizont'],$maxdays);
+		}
 			$this->warnings['horizont'] = lang('Requested date %1 outside allowed range of %2 days: recurring events obmitted!', Api\DateTime::to($new_horizont,true), $maxdays);
 			return;
 		}
@@ -863,7 +918,10 @@ 
 		// update the horizont
 		Api\Config::save_value('horizont',$this->config['horizont'],'calendar');
 
-		if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) new horizont=%2, exiting',true,$new_horizont,(int)$this->config['horizont']);
+		if ($this->debug == 'check_move_horizont')
+		{
+			$this->debug_message('calendar_bo::check_move_horizont(%1) new horizont=%2, exiting',true,$new_horizont,(int)$this->config['horizont']);
+		}
 	}
 
 	/**
@@ -894,7 +952,10 @@ 
 				$event['end'] = $this->date2usertime($event_read['end']);
 			}
 		}
-		if (!$start) $start = $event['start'];
+		if (!$start)
+		{
+			$start = $event['start'];
+		}
 		$start_obj = new Api\DateTime($start);
 		$read_start = new Api\DateTime($event_read['start']);
 
@@ -936,7 +997,10 @@ 
 	 */
 	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";
+		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)
 		{
 			// convert timezone id of event to tzid (iCal id like 'Europe/Berlin')
@@ -1020,7 +1084,10 @@ 
 	 */
 	function date2usertime($ts,$date_format='ts')
 	{
-		if (empty($ts) || $date_format == 'server') return $ts;
+		if (empty($ts) || $date_format == 'server')
+		{
+			return $ts;
+		}
 
 		return Api\DateTime::server2user($ts,$date_format);
 	}
@@ -1038,9 +1105,15 @@ 
 	 */
 	function read($ids,$date=null,$ignore_acl=False,$date_format='ts',$clear_private_infos_users=null)
 	{
-		if (!$ids) return false;
+		if (!$ids)
+		{
+			return false;
+		}
 
-		if ($date) $date = $this->date2ts($date);
+		if ($date)
+		{
+			$date = $this->date2ts($date);
+		}
 
 		$return = null;
 
@@ -1205,7 +1278,10 @@ 
 	{
 		static $res_info_cache = array();
 
-		if (!is_scalar($uid)) throw new Api\Exception\WrongParameter(__METHOD__.'('.array2string($uid).') parameter must be scalar');
+		if (!is_scalar($uid))
+		{
+			throw new Api\Exception\WrongParameter(__METHOD__.'('.array2string($uid).') parameter must be scalar');
+		}
 
 		if (!isset($res_info_cache[$uid]))
 		{
@@ -1260,7 +1336,10 @@ 
 	 */
 	function check_perms($needed,$event=0,$other=0,$date_format='ts',$date_to_read=null,$user=null)
 	{
-		if (!$user) $user = $this->user;
+		if (!$user)
+		{
+			$user = $this->user;
+		}
 		if ($user == $this->user)
 		{
 			$grants = $this->grants;
@@ -1299,7 +1378,10 @@ 
 		$grant = $grants[$owner];
 
 		// now any ACL rights (but invite rights!) implicate FREEBUSY rights (at least READ has to include FREEBUSY)
-		if ($grant & ~self::ACL_INVITE) $grant |= self::ACL_FREEBUSY;
+		if ($grant & ~self::ACL_INVITE)
+		{
+			$grant |= self::ACL_FREEBUSY;
+		}
 
 		if (is_array($event) && ($needed == Acl::READ || $needed == self::ACL_FREEBUSY))
 		{
@@ -1325,7 +1407,10 @@ 
 					elseif (!is_numeric($uid))
 					{
 						// if the owner only grants self::ACL_FREEBUSY we are not interested in the recources explicit rights
-						if ($grant == self::ACL_FREEBUSY) continue;
+						if ($grant == self::ACL_FREEBUSY)
+						{
+							continue;
+						}
 						// if we have a resource as participant
 						$resource = $this->resource_info($uid);
 						$grant |= $resource['rights'];
@@ -1476,14 +1561,20 @@ 
 						$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);
 		}
 		error_log($msg);
-		if ($backtrace) error_log(function_backtrace(1));
+		if ($backtrace)
+		{
+			error_log(function_backtrace(1));
+		}
 	}
 
 	/**
@@ -1591,14 +1682,20 @@ 
 	function timespan($start_m,$end_m,$both=false)
 	{
 		$duration = $end_m - $start_m;
-		if ($end_m == 24*60-1) ++$duration;
+		if ($end_m == 24*60-1)
+		{
+			++$duration;
+		}
 		$duration = floor($duration/60).lang('h').($duration%60 ? $duration%60 : '');
 
 		$timespan = $t = Api\DateTime::to('20000101T'.sprintf('%02d',$start_m/60).sprintf('%02d',$start_m%60).'00', false);
 
-		if ($both)	// end-time too
+		if ($both)
+		{
+			// end-time too
 		{
 			$timespan .= ' - '.Api\DateTime::to('20000101T'.sprintf('%02d',$end_m/60).sprintf('%02d',$end_m%60).'00', false);
+		}
 			// dont double am/pm if they are the same in both times
 			if ($this->common_prefs['timeformat'] == 12 && substr($timespan,-2) == substr($t,-2))
 			{
@@ -1622,7 +1719,10 @@ 
 		static $id2lid = array();
 		static $id2email = array();
 
-		if ($use_type && $use_type != 'u') $id = $use_type.$id;
+		if ($use_type && $use_type != 'u')
+		{
+			$id = $use_type.$id;
+		}
 
 		if (!isset($id2lid[$id]))
 		{
@@ -1632,7 +1732,10 @@ 
 				if (($info = $this->resource_info($id)))
 				{
 					$id2lid[$id] = $info['name'] ? $info['name'] : $info['email'];
-					if ($info['name']) $id2email[$id] = $info['email'];
+					if ($info['name'])
+					{
+						$id2email[$id] = $info['email'];
+					}
 				}
 			}
 			else
@@ -1658,11 +1761,18 @@ 
 		$names = array();
 		foreach((array)$event['participants'] as $id => $status)
 		{
-			if (!is_string($status)) continue;
+			if (!is_string($status))
+			{
+				continue;
+			}
 			$quantity = $role = null;
 			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)
@@ -1735,7 +1845,10 @@ 
 
 		foreach(explode(',',$category) as $cat_id)
 		{
-			if (!$cat_id) continue;
+			if (!$cat_id)
+			{
+				continue;
+			}
 
 			if (!isset($id2cat[$cat_id]))
 			{
@@ -1801,7 +1914,10 @@ 
 	 */
 	public static function list_calendars($user, array $grants=null)
 	{
-		if (is_null($grants)) $grants = $GLOBALS['egw']->acl->get_grants('calendar', true, $user);
+		if (is_null($grants))
+		{
+			$grants = $GLOBALS['egw']->acl->get_grants('calendar', true, $user);
+		}
 
 		$users = $groups = array();
 		foreach(array_keys($grants) as $id)
@@ -1849,7 +1965,10 @@ 
 	 */
 	function recure2string($event)
 	{
-		if (!is_array($event)) return false;
+		if (!is_array($event))
+		{
+			return false;
+		}
 		return (string)calendar_rrule::event2rrule($event);
 	}
 
@@ -1868,7 +1987,10 @@ 
 	 */
 	function read_holidays($year=0)
 	{
-		if (!$year) $year = (int) date('Y',$this->now_su);
+		if (!$year)
+		{
+			$year = (int) date('Y',$this->now_su);
+		}
 
 		$holidays = calendar_holidays::read(
 				!empty($GLOBALS['egw_info']['server']['ical_holiday_url']) ?
@@ -1963,7 +2085,10 @@ 
 				}
 			}
 			$str_fields = implode(', ',$extra_fields);
-			if (is_array($extra_fields)) return $this->format_date($event['start']) . ': ' . $event['title'] . ($str_fields? ', ' . $str_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'];
 	}
@@ -1984,7 +2109,8 @@ 
 			'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)
@@ -2045,7 +2171,10 @@ 
 			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');
+				if ($type == 'forced')
+				{
+					$GLOBALS['egw']->preferences->add('calendar',$var,$default,'forced');
+				}
 				$this->cal_prefs[$var] = $default;
 				$need_save = True;
 			}
@@ -2065,7 +2194,10 @@ 
 	 */
 	static function freebusy_url($user='',$pw=null)
 	{
-		if (is_numeric($user)) $user = $GLOBALS['egw']->accounts->id2name($user);
+		if (is_numeric($user))
+		{
+			$user = $GLOBALS['egw']->accounts->id2name($user);
+		}
 
 		$credentials = '';
 
@@ -2133,13 +2265,19 @@ 
 	 */
 	public function get_ctag($user, $filter='owner', $master_only=false)
 	{
-		if ($this->debug > 1) $startime = microtime(true);
+		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!)
 
-		if ($this->debug > 1) error_log(__METHOD__. "($user, '$filter', $master_only) = $ctag = ".date('Y-m-d H:i:s',$ctag)." took ".(microtime(true)-$startime)." secs");
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__. "($user, '$filter', $master_only) = $ctag = ".date('Y-m-d H:i:s',$ctag)." took ".(microtime(true)-$startime)." secs");
+		}
 		return $ctag;
 	}
 
@@ -2181,15 +2319,21 @@ 
 				$content['link_app'][] = $link['app'];
 				$content['link_id'][]  = $link['id'];
 			}
-			if ($link['app'] == 'addressbook')	// prefering contact as primary contact over calendar entry set above
+			if ($link['app'] == 'addressbook')
+			{
+				// prefering contact as primary contact over calendar entry set above
 			{
 				$content['info_contact'] = 'addressbook:'.$link['id'];
 			}
+			}
 		}
 		// Copy same custom fields
 		foreach(array_keys(Api\Storage\Customfields::get('infolog')) as $name)
 		{
-			if ($this->customfields[$name]) $content['#'.$name] = $calendar['#'.$name];
+			if ($this->customfields[$name])
+			{
+				$content['#'.$name] = $calendar['#'.$name];
+			}
 		}
 		//error_log(__METHOD__.'('.array2string($data).') calendar='.array2string($calendar).' returning '.array2string($content));
 		return $content;
@@ -2212,7 +2356,11 @@ 
 			$set['ts_title'] = $this->link_title($event);
 			$set['start_time'] = Api\DateTime::to($event['start'],'H:i');
 			$set['ts_description'] = $event['description'];
-			if ($this->isWholeDay($event)) $event['end']++;	// whole day events are 1sec short
+			if ($this->isWholeDay($event))
+			{
+				$event['end']++;
+			}
+			// whole day events are 1sec short
 			$set['ts_duration']	= ($event['end'] - $event['start']) / 60;
 			$set['ts_quantity'] = ($event['end'] - $event['start']) / 3600;
 			$set['end_time'] = null;	// unset end-time

Spacing +302 added lines, -304 removed lines

@@ -17,12 +17,12 @@ 
 
 if (!defined('ACL_TYPE_IDENTIFER'))	// used to mark ACL-values for the debug_message methode
 {
-	define('ACL_TYPE_IDENTIFER','***ACL***');
+	define('ACL_TYPE_IDENTIFER', '***ACL***');
 }
 
-define('HOUR_s',60*60);
-define('DAY_s',24*HOUR_s);
-define('WEEK_s',7*DAY_s);
+define('HOUR_s', 60 * 60);
+define('DAY_s', 24 * HOUR_s);
+define('WEEK_s', 7 * DAY_s);
 
 /**
  * Required (!) include, as we use the MCAL_* constants, BEFORE instanciating (and therefore autoloading) the class
@@ -71,7 +71,7 @@ 
 	 *	4 = function-calls to exported conversation-functions like date2ts, date2array, ...
 	 *	5 = function-calls to private functions
 	 */
-	var $debug=false;
+	var $debug = false;
 
 	/**
 	 * @var int $now timestamp in server-time
@@ -101,12 +101,12 @@ 
 	/**
 	 * @var int $user nummerical id of the current user-id
 	 */
-	var $user=0;
+	var $user = 0;
 
 	/**
 	 * @var array $grants grants of the current user, array with user-id / ored-ACL-rights pairs
 	 */
-	var $grants=array();
+	var $grants = array();
 
 	/**
 	 * @var array $verbose_status translated 1-char status values to a verbose name, run through lang() by the constructor
@@ -219,15 +219,15 @@ 
 	 */
 	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->common_prefs =& $GLOBALS['egw_info']['user']['preferences']['common'];
-		$this->cal_prefs =& $GLOBALS['egw_info']['user']['preferences']['calendar'];
+		$this->common_prefs = & $GLOBALS['egw_info']['user']['preferences']['common'];
+		$this->cal_prefs = & $GLOBALS['egw_info']['user']['preferences']['calendar'];
 
 		$this->now = time();
-		$this->now_su = Api\DateTime::server2user($this->now,'ts');
+		$this->now_su = Api\DateTime::server2user($this->now, 'ts');
 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
@@ -236,7 +236,7 @@ 
 		if (!is_array($this->resources = Api\Cache::getSession('calendar', 'resources')))
 		{
 			$this->resources = array();
-			foreach(Api\Hooks::process('calendar_resources') as $app => $data)
+			foreach (Api\Hooks::process('calendar_resources') as $app => $data)
 			{
 				if ($data && $data['type'])
 				{
@@ -249,8 +249,8 @@ 
 				'app'  => 'email',
 			);
 			$this->resources['l'] = array(
-				'type' => 'l',// one char type-identifier for this resources
-				'info' => __CLASS__ .'::mailing_lists',// info method, returns array with id, type & name for a given id
+				'type' => 'l', // one char type-identifier for this resources
+				'info' => __CLASS__.'::mailing_lists', // info method, returns array with id, type & name for a given id
 				'app' => 'Distribution list'
 			);
 			$this->resources[''] = array(
@@ -258,22 +258,22 @@ 
 				'app' => 'api-accounts',
 			);
 			$this->resources['l'] = array(
-				'type' => 'l',// one char type-identifier for this resources
-				'info' => __CLASS__ .'::mailing_lists',// info method, returns array with id, type & name for a given id
+				'type' => 'l', // one char type-identifier for this resources
+				'info' => __CLASS__.'::mailing_lists', // info method, returns array with id, type & name for a given id
 				'app' => 'Distribution list'
 			);
 			Api\Cache::setSession('calendar', 'resources', $this->resources);
 		}
 		//error_log(__METHOD__ . " registered resources=". array2string($this->resources));
 
-		$this->config = Api\Config::read('calendar');	// only used for horizont, regular calendar config is under phpgwapi
+		$this->config = Api\Config::read('calendar'); // only used for horizont, regular calendar config is under phpgwapi
 		$this->require_acl_invite = $GLOBALS['egw_info']['server']['require_acl_invite'];
 
-		$this->categories = new Api\Categories($this->user,'calendar');
+		$this->categories = new Api\Categories($this->user, 'calendar');
 
 		$this->customfields = Api\Storage\Customfields::get('calendar');
 
-		foreach($this->alarms as $secs => &$label)
+		foreach ($this->alarms as $secs => &$label)
 		{
 			$label = self::secs2label($secs);
 		}
@@ -289,15 +289,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;
 	}
@@ -313,12 +313,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];
@@ -342,7 +342,7 @@ 
 	 */
 	static function mailing_lists($ids)
 	{
-		if(!is_array($ids))
+		if (!is_array($ids))
 		{
 			$ids = array($ids);
 		}
@@ -351,7 +351,7 @@ 
 		// Email list
 		$contacts_obj = new Api\Contacts();
 		$bo = new calendar_bo();
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			$list = $contacts_obj->read_list((int)$id);
 
@@ -378,22 +378,22 @@ 
 	 *
 	 * @return array
 	 */
-	public function enum_mailing_list($id, $ignore_acl= false, $use_freebusy = true)
+	public function enum_mailing_list($id, $ignore_acl = false, $use_freebusy = true)
 	{
 		$contact_list = array();
 		$contacts = new Api\Contacts();
-		if($contacts->check_list((int)substr($id,1), ACL::READ) || (int)substr($id,1) < 0)
+		if ($contacts->check_list((int)substr($id, 1), ACL::READ) || (int)substr($id, 1) < 0)
 		{
-			$options = array('list' => substr($id,1));
-			$lists = $contacts->search('',true,'','','',false,'AND',false,$options);
-			if(!$lists)
+			$options = array('list' => substr($id, 1));
+			$lists = $contacts->search('', true, '', '', '', false, 'AND', false, $options);
+			if (!$lists)
 			{
 				return $contact_list;
 			}
-			foreach($lists as &$contact)
+			foreach ($lists as &$contact)
 			{
 				// Check for user account
-				if (($account_id = $GLOBALS['egw']->accounts->name2id($contact['id'],'person_id')))
+				if (($account_id = $GLOBALS['egw']->accounts->name2id($contact['id'], 'person_id')))
 				{
 					$contact = ''.$account_id;
 				}
@@ -401,9 +401,9 @@ 
 				{
 					$contact = 'c'.$contact['id'];
 				}
-				if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy?self::ACL_FREEBUSY:0),0,$contact))
+				if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy ?self::ACL_FREEBUSY : 0), 0, $contact))
 				{
-					if ($contact && !in_array($contact,$contact_list))	// already added?
+					if ($contact && !in_array($contact, $contact_list))	// already added?
 					{
 						$contact_list[] = $contact;
 					}
@@ -422,12 +422,12 @@ 
 	function enum_groups(&$event)
 	{
 		$added = 0;
-		foreach(array_keys($event['participants']) as $uid)
+		foreach (array_keys($event['participants']) as $uid)
 		{
 			if (is_numeric($uid) && $GLOBALS['egw']->accounts->get_type($uid) == 'g' &&
 				($members = $GLOBALS['egw']->accounts->members($uid, true)))
 			{
-				foreach($members as $member)
+				foreach ($members as $member)
 				{
 					if (!isset($event['participants'][$member]))
 					{
@@ -449,7 +449,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))
 		{
@@ -457,35 +457,35 @@ 
 		}
 		// only query calendars of users, we have READ-grants from
 		$users = array();
-		foreach($_users as $user)
+		foreach ($_users as $user)
 		{
 			$user = trim($user);
 			
 			// Handle email lists
-			if(!is_numeric($user) && $user[0] == 'l')
+			if (!is_numeric($user) && $user[0] == 'l')
 			{
-				foreach($this->enum_mailing_list($user, $ignore_acl, $use_freebusy) as $contact)
+				foreach ($this->enum_mailing_list($user, $ignore_acl, $use_freebusy) as $contact)
 				{
-					if ($contact && !in_array($contact,$users))	// already added?
+					if ($contact && !in_array($contact, $users))	// already added?
 					{
 						$users[] = $contact;
 					}
 				}
 				continue;
 			}
-			if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy?self::ACL_FREEBUSY:0),0,$user))
+			if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy ?self::ACL_FREEBUSY : 0), 0, $user))
 			{
-				if ($user && !in_array($user,$users))	// already added?
+				if ($user && !in_array($user, $users))	// already added?
 				{
 					// General expansion check
 					if (!is_numeric($user) && $this->resources[$user[0]]['info'])
 					{
 						$info = $this->resource_info($user);
-						if($info && $info['resources'])
+						if ($info && $info['resources'])
 						{
-							foreach($info['resources'] as $_user)
+							foreach ($info['resources'] as $_user)
 							{
-								if($_user && !in_array($_user, $users))
+								if ($_user && !in_array($_user, $users))
 								{
 									$users[] = $_user;
 								}
@@ -498,7 +498,7 @@ 
 			}
 			elseif ($GLOBALS['egw']->accounts->get_type($user) != 'g')
 			{
-				continue;	// for non-groups (eg. users), we stop here if we have no read-rights
+				continue; // for non-groups (eg. users), we stop here if we have no read-rights
 			}
 			// the further code is only for real users
 			if (!is_numeric($user)) continue;
@@ -511,11 +511,11 @@ 
 				$members = $GLOBALS['egw']->accounts->members($user, true);
 				if (is_array($members))
 				{
-					foreach($members as $member)
+					foreach ($members as $member)
 					{
 						// use only members which gave the user a read-grant
 						if (!in_array($member, $users) &&
-							($ignore_acl || $this->check_perms(Acl::READ|($use_freebusy?self::ACL_FREEBUSY:0),0,$member)))
+							($ignore_acl || $this->check_perms(Acl::READ|($use_freebusy ?self::ACL_FREEBUSY : 0), 0, $member)))
 						{
 							$users[] = $member;
 						}
@@ -527,9 +527,9 @@ 
 				$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 				if (is_array($memberships))
 				{
-					foreach($memberships as $group)
+					foreach ($memberships as $group)
 					{
-						if (!in_array($group,$users))
+						if (!in_array($group, $users))
 						{
 							$users[] = $group;
 						}
@@ -572,18 +572,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);
 			}
 		}
 
@@ -601,9 +601,9 @@ 
 		if (!empty($params['query']))
 		{
 			$params['private_grants'] = array();
-			foreach($this->grants as $user => $rights)
+			foreach ($this->grants as $user => $rights)
 			{
-				if ($rights & Acl::PRIVAT) $params['private_grants'][] = $user;
+				if ($rights&Acl::PRIVAT) $params['private_grants'][] = $user;
 			}
 		}
 
@@ -629,49 +629,49 @@ 
 		$params['enum_recuring'] = $enum_recuring = $daywise || !isset($params['enum_recuring']) || !!$params['enum_recuring'];
 		$cat_id = isset($params['cat_id']) ? $params['cat_id'] : 0;
 		$filter = isset($params['filter']) ? $params['filter'] : 'all';
-		$offset = isset($params['offset']) && $params['offset'] !== false ? (int) $params['offset'] : false;
+		$offset = isset($params['offset']) && $params['offset'] !== false ? (int)$params['offset'] : false;
 		// socal::search() returns rejected group-invitations, as only the user not also the group is rejected
 		// as we cant remove them efficiantly in SQL, we kick them out here, but only if just one user is displayed
 		$users_in = (array)$params_in['users'];
-		$remove_rejected_by_user = !in_array($filter,array('all','rejected','everything')) &&
+		$remove_rejected_by_user = !in_array($filter, array('all', 'rejected', 'everything')) &&
 			count($users_in) == 1 && $users_in[0] > 0 ? $users_in[0] : null;
 		//error_log(__METHOD__.'('.array2string($params_in).", $sql_filter) params[users]=".array2string($params['users']).' --> remove_rejected_by_user='.array2string($remove_rejected_by_user));
 
 		if ($this->debug && ($this->debug > 1 || $this->debug == 'search'))
 		{
 			$this->debug_message('calendar_bo::search(%1) start=%2, end=%3, daywise=%4, cat_id=%5, filter=%6, query=%7, offset=%8, num_rows=%9, order=%10, sql_filter=%11)',
-				True,$params,$start,$end,$daywise,$cat_id,$filter,$params['query'],$offset,(int)$params['num_rows'],$params['order'],$params['sql_filter']);
+				True, $params, $start, $end, $daywise, $cat_id, $filter, $params['query'], $offset, (int)$params['num_rows'], $params['order'], $params['sql_filter']);
 		}
 		// date2ts(,true) converts to server time, db2data converts again to user-time
-		$events =& $this->so->search(isset($start) ? $this->date2ts($start,true) : null,isset($end) ? $this->date2ts($end,true) : null,
-			$users,$cat_id,$filter,$offset,(int)$params['num_rows'],$params,$remove_rejected_by_user);
+		$events = & $this->so->search(isset($start) ? $this->date2ts($start, true) : null, isset($end) ? $this->date2ts($end, true) : null,
+			$users, $cat_id, $filter, $offset, (int)$params['num_rows'], $params, $remove_rejected_by_user);
 
 		if (isset($params['cols']))
 		{
 			return $events;
 		}
 		$this->total = $this->so->total;
-		$this->db2data($events,isset($params['date_format']) ? $params['date_format'] : 'ts');
+		$this->db2data($events, isset($params['date_format']) ? $params['date_format'] : 'ts');
 
 		//echo "<p align=right>remove_rejected_by_user=$remove_rejected_by_user, filter=$filter, params[users]=".print_r($param['users'])."</p>\n";
-		foreach($events as $id => $event)
+		foreach ($events as $id => $event)
 		{
 			if ($params['enum_groups'] && $this->enum_groups($event))
 			{
 				$events[$id] = $event;
 			}
 			$matches = null;
-			if (!(int)$event['id'] && preg_match('/^([a-z_]+)([0-9]+)$/',$event['id'],$matches))
+			if (!(int)$event['id'] && preg_match('/^([a-z_]+)([0-9]+)$/', $event['id'], $matches))
 			{
-				$is_private = self::integration_get_private($matches[1],$matches[2],$event);
+				$is_private = self::integration_get_private($matches[1], $matches[2], $event);
 			}
 			else
 			{
-				$is_private = !$this->check_perms(Acl::READ,$event);
+				$is_private = !$this->check_perms(Acl::READ, $event);
 			}
 			if (!$params['ignore_acl'] && ($is_private || (!$event['public'] && $filter == 'hideprivate')))
 			{
-				$this->clear_private_infos($events[$id],$params['private_allowed'] ? $params['private_allowed'] : $users);
+				$this->clear_private_infos($events[$id], $params['private_allowed'] ? $params['private_allowed'] : $users);
 			}
 		}
 
@@ -679,18 +679,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;
@@ -699,23 +699,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;
@@ -728,9 +728,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))
 		{
@@ -752,14 +752,14 @@ 
 	 * @param int|string $id
 	 * @return string
 	 */
-	static function integration_get_private($app,$id,$event)
+	static function integration_get_private($app, $id, $event)
 	{
-		$app_data = self::integration_get_data($app,'is_private');
+		$app_data = self::integration_get_data($app, 'is_private');
 
 		// no method, fall back to link title
 		if (is_null($app_data))
 		{
-			$is_private = !Link::title($app,$id);
+			$is_private = !Link::title($app, $id);
 		}
 		// boolean value to make all events of $app public (false) or private (true)
 		elseif (is_bool($app_data))
@@ -768,7 +768,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;
@@ -782,7 +782,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());
@@ -798,19 +798,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'],
 		));
@@ -824,15 +824,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']))
@@ -840,15 +840,15 @@ 
 			$maxdays = abs($GLOBALS['egw_info']['server']['calendar_horizont']);
 		}
 		if (empty($maxdays)) $maxdays = 1000; // old default
-		if ($new_horizont > time()+$maxdays*DAY_s)		// some user tries to "look" more then the maximum number of days in the future
+		if ($new_horizont > time() + $maxdays * DAY_s)		// some user tries to "look" more then the maximum number of days in the future
 		{
-			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 new horizont more then %3 days from now --> ignoring it',true,$new_horizont,(int)$this->config['horizont'],$maxdays);
-			$this->warnings['horizont'] = lang('Requested date %1 outside allowed range of %2 days: recurring events obmitted!', Api\DateTime::to($new_horizont,true), $maxdays);
+			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 new horizont more then %3 days from now --> ignoring it', true, $new_horizont, (int)$this->config['horizont'], $maxdays);
+			$this->warnings['horizont'] = lang('Requested date %1 outside allowed range of %2 days: recurring events obmitted!', Api\DateTime::to($new_horizont, true), $maxdays);
 			return;
 		}
-		if ($new_horizont < time()+31*DAY_s)
+		if ($new_horizont < time() + 31 * DAY_s)
 		{
-			$new_horizont = time()+31*DAY_s;
+			$new_horizont = time() + 31 * DAY_s;
 		}
 		$old_horizont = $this->config['horizont'];
 		$this->config['horizont'] = $new_horizont;
@@ -856,21 +856,21 @@ 
 		// create further recurrences for all recurring and not yet (at the old horizont) ended events
 		if (($recuring = $this->so->unfinished_recuring($old_horizont)))
 		{
-			@set_time_limit(0);	// disable time-limit, in case it takes longer to calculate the recurrences
-			foreach($this->read(array_keys($recuring)) as $cal_id => $event)
+			@set_time_limit(0); // disable time-limit, in case it takes longer to calculate the recurrences
+			foreach ($this->read(array_keys($recuring)) as $cal_id => $event)
 			{
 				if ($this->debug == 'check_move_horizont')
 				{
-					$this->debug_message('calendar_bo::check_move_horizont(%1): calling set_recurrences(%2,%3)',true,$new_horizont,$event,$old_horizont);
+					$this->debug_message('calendar_bo::check_move_horizont(%1): calling set_recurrences(%2,%3)', true, $new_horizont, $event, $old_horizont);
 				}
 				// insert everything behind max(cal_start), which can be less then $old_horizont because of bugs in the past
-				$this->set_recurrences($event,Api\DateTime::server2user($recuring[$cal_id]+1));	// set_recurences operates in user-time!
+				$this->set_recurrences($event, Api\DateTime::server2user($recuring[$cal_id] + 1)); // set_recurences operates in user-time!
 			}
 		}
 		// update the horizont
-		Api\Config::save_value('horizont',$this->config['horizont'],'calendar');
+		Api\Config::save_value('horizont', $this->config['horizont'], 'calendar');
 
-		if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) new horizont=%2, exiting',true,$new_horizont,(int)$this->config['horizont']);
+		if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) new horizont=%2, exiting', true, $new_horizont, (int)$this->config['horizont']);
 	}
 
 	/**
@@ -881,11 +881,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']))
@@ -906,29 +906,29 @@ 
 		$read_start = new Api\DateTime($event_read['start']);
 
 		$events = array();
-		$this->insert_all_recurrences($event,$start,$this->date2usertime($this->config['horizont']),$events);
+		$this->insert_all_recurrences($event, $start, $this->date2usertime($this->config['horizont']), $events);
 
 		$exceptions = array();
-		foreach((array)$event['recur_exception'] as $exception)
+		foreach ((array)$event['recur_exception'] as $exception)
 		{
-			$exceptions[] = Api\DateTime::to($exception, true);	// true = date
+			$exceptions[] = Api\DateTime::to($exception, true); // true = date
 		}
-		foreach($events as $event)
+		foreach ($events as $event)
 		{
 			$is_exception = in_array(Api\DateTime::to($event['start'], true), $exceptions);
-			$start = $this->date2ts($event['start'],true);
+			$start = $this->date2ts($event['start'], true);
 			if ($event['whole_day'])
 			{
 				$start = new Api\DateTime($event['start'], Api\DateTime::$server_timezone);
-				$start->setTime(0,0,0);
+				$start->setTime(0, 0, 0);
 				$start = $start->format('ts');
 				$time = $this->so->startOfDay(new Api\DateTime($event['end'], Api\DateTime::$user_timezone));
 				$time->setTime(23, 59, 59);
-				$end = $this->date2ts($time,true);
+				$end = $this->date2ts($time, true);
 			}
 			else
 			{
-				$end = $this->date2ts($event['end'],true);
+				$end = $this->date2ts($event['end'], true);
 			}
 			//error_log(__METHOD__."() start=".Api\DateTime::to($start).", is_exception=".array2string($is_exception));
 			$this->so->recurrence($event['id'], $start, $end, $event['participants'], $is_exception);
@@ -944,7 +944,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)
@@ -957,65 +957,65 @@ 
 			// database returns timestamps as string, convert them to integer
 			// to avoid misinterpretation by Api\DateTime as Ymd string
 			// (this will fail on 32bit systems for times > 2038!)
-			$event['start'] = (int)$event['start'];	// this is for isWholeDay(), which also calls Api\DateTime
+			$event['start'] = (int)$event['start']; // this is for isWholeDay(), which also calls Api\DateTime
 			$event['end'] = (int)$event['end'];
 			$event['whole_day'] = self::isWholeDay($event);
 			if ($event['whole_day'] && $date_format != 'server')
 			{
 				// Adjust dates to user TZ
-				$stime =& $this->so->startOfDay(new Api\DateTime((int)$event['start'], Api\DateTime::$server_timezone), $event['tzid']);
+				$stime = & $this->so->startOfDay(new Api\DateTime((int)$event['start'], Api\DateTime::$server_timezone), $event['tzid']);
 				$event['start'] = Api\DateTime::to($stime, $date_format);
-				$time =& $this->so->startOfDay(new Api\DateTime((int)$event['end'], Api\DateTime::$server_timezone), $event['tzid']);
+				$time = & $this->so->startOfDay(new Api\DateTime((int)$event['end'], Api\DateTime::$server_timezone), $event['tzid']);
 				$time->setTime(23, 59, 59);
 				$event['end'] = Api\DateTime::to($time, $date_format);
 				if (!empty($event['recurrence']))
 				{
-					$time =& $this->so->startOfDay(new Api\DateTime((int)$event['recurrence'], Api\DateTime::$server_timezone), $event['tzid']);
+					$time = & $this->so->startOfDay(new Api\DateTime((int)$event['recurrence'], Api\DateTime::$server_timezone), $event['tzid']);
 					$event['recurrence'] = Api\DateTime::to($time, $date_format);
 				}
 				if (!empty($event['recur_enddate']))
 				{
-					$time =& $this->so->startOfDay(new Api\DateTime((int)$event['recur_enddate'], Api\DateTime::$server_timezone), $event['tzid']);
+					$time = & $this->so->startOfDay(new Api\DateTime((int)$event['recur_enddate'], Api\DateTime::$server_timezone), $event['tzid']);
 					$time->setTime(23, 59, 59);
 					$event['recur_enddate'] = Api\DateTime::to($time, $date_format);
 				}
-				$timestamps = array('modified','created','deleted');
+				$timestamps = array('modified', 'created', 'deleted');
 			}
 			else
 			{
-				$timestamps = array('start','end','modified','created','recur_enddate','recurrence','recur_date','deleted');
+				$timestamps = array('start', 'end', 'modified', 'created', 'recur_enddate', 'recurrence', 'recur_date', 'deleted');
 			}
 			// we convert here from the server-time timestamps to user-time and (optional) to a different date-format!
 			foreach ($timestamps as $ts)
 			{
 				if (!empty($event[$ts]))
 				{
-					$event[$ts] = $this->date2usertime((int)$event[$ts],$date_format);
+					$event[$ts] = $this->date2usertime((int)$event[$ts], $date_format);
 				}
 			}
 			// same with the recur exceptions
 			if (isset($event['recur_exception']) && is_array($event['recur_exception']))
 			{
-				foreach($event['recur_exception'] as &$date)
+				foreach ($event['recur_exception'] as &$date)
 				{
 					if ($event['whole_day'] && $date_format != 'server')
 					{
 						// Adjust dates to user TZ
-						$time =& $this->so->startOfDay(new Api\DateTime((int)$date, Api\DateTime::$server_timezone), $event['tzid']);
+						$time = & $this->so->startOfDay(new Api\DateTime((int)$date, Api\DateTime::$server_timezone), $event['tzid']);
 						$date = Api\DateTime::to($time, $date_format);
 					}
 					else
 					{
-						$date = $this->date2usertime((int)$date,$date_format);
+						$date = $this->date2usertime((int)$date, $date_format);
 					}
 				}
 			}
 			// same with the alarms
 			if (isset($event['alarm']) && is_array($event['alarm']))
 			{
-				foreach($event['alarm'] as &$alarm)
+				foreach ($event['alarm'] as &$alarm)
 				{
-					$alarm['time'] = $this->date2usertime((int)$alarm['time'],$date_format);
+					$alarm['time'] = $this->date2usertime((int)$alarm['time'], $date_format);
 				}
 			}
 		}
@@ -1028,11 +1028,11 @@ 
 	 * @param string $date_format ='ts' date-formats: 'ts'=timestamp, 'server'=timestamp in server-time, 'array'=array or string with date-format
 	 * @return mixed depending of $date_format
 	 */
-	function date2usertime($ts,$date_format='ts')
+	function date2usertime($ts, $date_format = 'ts')
 	{
 		if (empty($ts) || $date_format == 'server') return $ts;
 
-		return Api\DateTime::server2user($ts,$date_format);
+		return Api\DateTime::server2user($ts, $date_format);
 	}
 
 	/**
@@ -1046,7 +1046,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;
 
@@ -1055,21 +1055,21 @@ 
 		$return = null;
 
 		$check = $clear_private_infos_users ? self::ACL_FREEBUSY : Acl::READ;
-		if ($ignore_acl || is_array($ids) || ($return = $this->check_perms($check,$ids,0,$date_format,$date)))
+		if ($ignore_acl || is_array($ids) || ($return = $this->check_perms($check, $ids, 0, $date_format, $date)))
 		{
 			if (is_array($ids) || !isset(self::$cached_event['id']) || self::$cached_event['id'] != $ids ||
 				self::$cached_event_date_format != $date_format ||
 				self::$cached_event['recur_type'] != MCAL_RECUR_NONE && self::$cached_event_date != $date)
 			{
-				$events = $this->so->read($ids,$date ? $this->date2ts($date,true) : 0);
+				$events = $this->so->read($ids, $date ? $this->date2ts($date, true) : 0);
 
 				if ($events)
 				{
-					$this->db2data($events,$date_format);
+					$this->db2data($events, $date_format);
 
 					if (is_array($ids))
 					{
-						$return =& $events;
+						$return = & $events;
 					}
 					else
 					{
@@ -1085,13 +1085,13 @@ 
 				$return = self::$cached_event;
 			}
 		}
-		if ($clear_private_infos_users && !is_array($ids) && !$this->check_perms(Acl::READ,$return))
+		if ($clear_private_infos_users && !is_array($ids) && !$this->check_perms(Acl::READ, $return))
 		{
 			$this->clear_private_infos($return, (array)$clear_private_infos_users);
 		}
 		if ($this->debug && ($this->debug > 1 || $this->debug == 'read'))
 		{
-			$this->debug_message('calendar_bo::read(%1,%2,%3,%4,%5)=%6',True,$ids,$date,$ignore_acl,$date_format,$clear_private_infos_users,$return);
+			$this->debug_message('calendar_bo::read(%1,%2,%3,%4,%5)=%6', True, $ids, $date, $ignore_acl, $date_format, $clear_private_infos_users, $return);
 		}
 		return $return;
 	}
@@ -1109,17 +1109,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))
@@ -1128,39 +1128,38 @@ 
 			// insert at least the event itself, if it's behind the horizont
 			$event['recur_enddate'] = $this->date2ts($end) < $this->date2ts($event['end']) ? $event['end'] : $end;
 		}
-		$event['recur_enddate'] = is_a($event['recur_enddate'],'DateTime') ?
-				$event['recur_enddate'] :
-				new Api\DateTime($event['recur_enddate'], calendar_timezones::DateTimeZone($event['tzid']));
+		$event['recur_enddate'] = is_a($event['recur_enddate'], 'DateTime') ?
+				$event['recur_enddate'] : new Api\DateTime($event['recur_enddate'], calendar_timezones::DateTimeZone($event['tzid']));
 		// unset exceptions, as we need to add them as recurrence too, but marked as exception
 		unset($event['recur_exception']);
 		// loop over all recurrences and insert them, if they are after $start
- 		$rrule = calendar_rrule::event2rrule($event, !$event['whole_day'], Api\DateTime::$user_timezone->getName());	// true = we operate in usertime, like the rest of calendar_bo
-		foreach($rrule as $time)
+ 		$rrule = calendar_rrule::event2rrule($event, !$event['whole_day'], Api\DateTime::$user_timezone->getName()); // true = we operate in usertime, like the rest of calendar_bo
+		foreach ($rrule as $time)
 		{
-			$time->setUser();	// $time is in timezone of event, convert it to usertime used here
-			if($event['whole_day'])
+			$time->setUser(); // $time is in timezone of event, convert it to usertime used here
+			if ($event['whole_day'])
 			{
 				// All day events are processed in server timezone
 				$time->setServer();
-				$time->setTime(0,0,0);
+				$time->setTime(0, 0, 0);
 			}
-			if (($ts = $this->date2ts($time)) < $start-$event_length)
+			if (($ts = $this->date2ts($time)) < $start - $event_length)
 			{
 				//echo "<p>".$time." --> ignored as $ts < $start-$event_length</p>\n";
-				continue;	// to early or original event (returned by interator too)
+				continue; // to early or original event (returned by interator too)
 			}
 
 			$ts_end = $ts + $event_length;
 			// adjust ts_end for whole day events in case it does not fit due to
 			// spans over summer/wintertime adjusted days
-			if($event['whole_day'] && ($arr_end = $this->date2array($ts_end)) &&
+			if ($event['whole_day'] && ($arr_end = $this->date2array($ts_end)) &&
 				!($arr_end['hour'] == 23 && $arr_end['minute'] == 59 && $arr_end['second'] == 59))
 			{
 				$arr_end['hour'] = 23;
 				$arr_end['minute'] = 59;
 				$arr_end['second'] = 59;
 				$ts_end_guess = $this->date2ts($arr_end);
-				if($ts_end_guess - $ts_end > DAY_s/2)
+				if ($ts_end_guess - $ts_end > DAY_s / 2)
 				{
 					$ts_end = $ts_end_guess - DAY_s; // $ts_end_guess was one day too far in the future
 				}
@@ -1174,11 +1173,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);
 		}
 	}
 
@@ -1189,18 +1188,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;
 
@@ -1208,7 +1207,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);
 		}
 	}
 
@@ -1232,22 +1231,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'];
 				}
@@ -1256,7 +1255,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];
 	}
@@ -1277,7 +1276,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)
@@ -1286,13 +1285,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)
 		{
@@ -1302,15 +1301,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'];
@@ -1318,7 +1317,7 @@ 
 		$grant = $grants[$owner];
 
 		// now any ACL rights (but invite rights!) implicate FREEBUSY rights (at least READ has to include FREEBUSY)
-		if ($grant & ~self::ACL_INVITE) $grant |= self::ACL_FREEBUSY;
+		if ($grant&~self::ACL_INVITE) $grant |= self::ACL_FREEBUSY;
 
 		if (is_array($event) && ($needed == Acl::READ || $needed == self::ACL_FREEBUSY))
 		{
@@ -1327,15 +1326,15 @@ 
 			//
 			if ($event['participants'] && is_array($event['participants']))
 			{
-				foreach(array_keys($event['participants']) as $uid)
+				foreach (array_keys($event['participants']) as $uid)
 				{
-					if ($uid == $user || $uid < 0 && in_array($user, (array)$GLOBALS['egw']->accounts->members($uid,true)))
+					if ($uid == $user || $uid < 0 && in_array($user, (array)$GLOBALS['egw']->accounts->members($uid, true)))
 					{
 						// if we are a participant, we have an implicite FREEBUSY, READ and PRIVAT grant
-						$grant |= self::ACL_FREEBUSY | Acl::READ | Acl::PRIVAT;
+						$grant |= self::ACL_FREEBUSY|Acl::READ|Acl::PRIVAT;
 						break;
 					}
-					elseif ($grants[$uid] & Acl::READ)
+					elseif ($grants[$uid]&Acl::READ)
 					{
 						// if we have a READ grant from a participant, we dont give an implicit privat grant too
 						$grant |= Acl::READ;
@@ -1354,12 +1353,12 @@ 
 		}
 		if ($GLOBALS['egw']->accounts->get_type($owner) == 'g' && $needed == Acl::ADD)
 		{
-			$access = False;	// a group can't be the owner of an event
+			$access = False; // a group can't be the owner of an event
 		}
 		else
 		{
-			$access = $user == $owner || $grant & $needed
-				&& ($needed == self::ACL_FREEBUSY || !$private || $grant & Acl::PRIVAT);
+			$access = $user == $owner || $grant&$needed
+				&& ($needed == self::ACL_FREEBUSY || !$private || $grant&Acl::PRIVAT);
 		}
 		// do NOT allow users to purge deleted events, if we dont have 'userpurge' enabled
 		if ($access && $needed == Acl::DELETE && $event['deleted'] &&
@@ -1370,7 +1369,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;
@@ -1385,9 +1384,9 @@ 
 	 *	array with keys 'second', 'minute', 'hour', 'day' or 'mday' (depricated !), 'month' and 'year'
 	 * @param boolean $user2server =False conversion between user- and server-time; default False == Off
 	 */
-	static function date2ts($date,$user2server=False)
+	static function date2ts($date, $user2server = False)
 	{
-		return $user2server ? Api\DateTime::user2server($date,'ts') : Api\DateTime::to($date,'ts');
+		return $user2server ? Api\DateTime::user2server($date, 'ts') : Api\DateTime::to($date, 'ts');
 	}
 
 	/**
@@ -1397,9 +1396,9 @@ 
 	 * @param boolean $server2user conversation between user- and server-time default False == Off
 	 * @return array with keys 'second', 'minute', 'hour', 'day', 'month', 'year', 'raw' (timestamp) and 'full' (Ymd-string)
 	 */
-	static function date2array($date,$server2user=False)
+	static function date2array($date, $server2user = False)
 	{
-		return $server2user ? Api\DateTime::server2user($date,'array') : Api\DateTime::to($date,'array');
+		return $server2user ? Api\DateTime::server2user($date, 'array') : Api\DateTime::to($date, 'array');
 	}
 
 	/**
@@ -1410,9 +1409,9 @@ 
 	 * @param string $format ='Ymd' format of the date to return, eg. 'Y-m-d\TH:i:sO' (2005-11-01T15:30:00+0100)
 	 * @return string date formatted according to $format
 	 */
-	static function date2string($date,$server2user=False,$format='Ymd')
+	static function date2string($date, $server2user = False, $format = 'Ymd')
 	{
-		return $server2user ? Api\DateTime::server2user($date,$format) : Api\DateTime::to($date,$format);
+		return $server2user ? Api\DateTime::server2user($date, $format) : Api\DateTime::to($date, $format);
 	}
 
 	/**
@@ -1422,9 +1421,9 @@ 
 	 * @param string|boolean $format ='' default common_prefs[dateformat], common_prefs[timeformat], false=time only, true=date only
 	 * @return string the formated date (incl. time)
 	 */
-	static function format_date($date,$format='')
+	static function format_date($date, $format = '')
 	{
-		return Api\DateTime::to($date,$format);
+		return Api\DateTime::to($date, $format);
 	}
 
 	/**
@@ -1446,7 +1445,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',
@@ -1457,22 +1456,22 @@ 
 			Acl::PRIVAT => 'ACL_PRIVATE',
 			self::ACL_FREEBUSY => 'ACL_FREEBUSY',
 		);
-		for($i = 2; $i < func_num_args(); ++$i)
+		for ($i = 2; $i < func_num_args(); ++$i)
 		{
 			$param = func_get_arg($i);
 
 			if (is_null($param))
 			{
-				$param='NULL';
+				$param = 'NULL';
 			}
 			else
 			{
-				switch(gettype($param))
+				switch (gettype($param))
 				{
 					case 'string':
-						if (substr($param,0,strlen(ACL_TYPE_IDENTIFER))== ACL_TYPE_IDENTIFER)
+						if (substr($param, 0, strlen(ACL_TYPE_IDENTIFER)) == ACL_TYPE_IDENTIFER)
 						{
-							$param = (int) substr($param,strlen(ACL_TYPE_IDENTIFER));
+							$param = (int)substr($param, strlen(ACL_TYPE_IDENTIFER));
 							$param = (isset($acl2string[$param]) ? $acl2string[$param] : $acl2string[0])." ($param)";
 						}
 						else
@@ -1495,11 +1494,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));
@@ -1514,7 +1513,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)
@@ -1529,27 +1528,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)
 						{
@@ -1559,43 +1558,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;
 	}
@@ -1607,25 +1606,25 @@ 
 	 * @param int $end_m end time in minutes since 0h
 	 * @param boolean $both =false display the end-time too, duration is always displayed
 	 */
-	function timespan($start_m,$end_m,$both=false)
+	function timespan($start_m, $end_m, $both = false)
 	{
 		$duration = $end_m - $start_m;
-		if ($end_m == 24*60-1) ++$duration;
-		$duration = floor($duration/60).lang('h').($duration%60 ? $duration%60 : '');
+		if ($end_m == 24 * 60 - 1) ++$duration;
+		$duration = floor($duration / 60).lang('h').($duration % 60 ? $duration % 60 : '');
 
-		$timespan = $t = Api\DateTime::to('20000101T'.sprintf('%02d',$start_m/60).sprintf('%02d',$start_m%60).'00', false);
+		$timespan = $t = Api\DateTime::to('20000101T'.sprintf('%02d', $start_m / 60).sprintf('%02d', $start_m % 60).'00', false);
 
 		if ($both)	// end-time too
 		{
-			$timespan .= ' - '.Api\DateTime::to('20000101T'.sprintf('%02d',$end_m/60).sprintf('%02d',$end_m%60).'00', false);
+			$timespan .= ' - '.Api\DateTime::to('20000101T'.sprintf('%02d', $end_m / 60).sprintf('%02d', $end_m % 60).'00', false);
 			// dont double am/pm if they are the same in both times
-			if ($this->common_prefs['timeformat'] == 12 && substr($timespan,-2) == substr($t,-2))
+			if ($this->common_prefs['timeformat'] == 12 && substr($timespan, -2) == substr($t, -2))
 			{
-				$timespan = str_replace($t,substr($t,0,-3),$timespan);
+				$timespan = str_replace($t, substr($t, 0, -3), $timespan);
 			}
 			$timespan .= ':';
 		}
-		return $timespan . ' ' . $duration;
+		return $timespan.' '.$duration;
 	}
 
 	/**
@@ -1636,7 +1635,7 @@ 
 	* @param boolean $append_email =false append email (Name <email>)
 	* @return string with name
 	*/
-	function participant_name($id,$use_type=false, $append_email=false)
+	function participant_name($id, $use_type = false, $append_email = false)
 	{
 		static $id2lid = array();
 		static $id2email = array();
@@ -1657,7 +1656,7 @@ 
 			else
 			{
 				$id2lid[$id] = Api\Accounts::username($id);
-				$id2email[$id] = $GLOBALS['egw']->accounts->id2name($id,'account_email');
+				$id2email[$id] = $GLOBALS['egw']->accounts->id2name($id, 'account_email');
 			}
 		}
 		return $id2lid[$id].(($append_email || $id[0] == 'e') && $id2email[$id] ? ' <'.$id2email[$id].'>' : '');
@@ -1671,37 +1670,37 @@ 
 	* @param boolean $show_group_invitation =false show group-invitations (status == 'G') or not (default)
 	* @return array with id / names with status pairs
 	*/
-	function participants($event,$long_status=false,$show_group_invitation=false)
+	function participants($event, $long_status = false, $show_group_invitation = false)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($event['participants']));
 		$names = array();
-		foreach((array)$event['participants'] as $id => $status)
+		foreach ((array)$event['participants'] as $id => $status)
 		{
 			if (!is_string($status)) continue;
 			$quantity = $role = null;
-			calendar_so::split_status($status,$quantity,$role);
+			calendar_so::split_status($status, $quantity, $role);
 
-			if ($status == 'G' && !$show_group_invitation) continue;	// dont show group-invitation
+			if ($status == 'G' && !$show_group_invitation) continue; // dont show group-invitation
 
 			$lang_status = lang($this->verbose_status[$status]);
 			if (!$long_status)
 			{
-				switch($status[0])
+				switch ($status[0])
 				{
 					case 'A':	// accepted
-						$status = Api\Html::image('calendar','accepted',$lang_status);
+						$status = Api\Html::image('calendar', 'accepted', $lang_status);
 						break;
 					case 'R':	// rejected
-						$status = Api\Html::image('calendar','rejected',$lang_status);
+						$status = Api\Html::image('calendar', 'rejected', $lang_status);
 						break;
 					case 'T':	// tentative
-						$status = Api\Html::image('calendar','tentative',$lang_status);
+						$status = Api\Html::image('calendar', 'tentative', $lang_status);
 						break;
 					case 'U':	// no response = unknown
-						$status = Api\Html::image('calendar','needs-action',$lang_status);
+						$status = Api\Html::image('calendar', 'needs-action', $lang_status);
 						break;
 					case 'D':	// delegated
-						$status = Api\Html::image('calendar','forward',$lang_status);
+						$status = Api\Html::image('calendar', 'forward', $lang_status);
 						break;
 					case 'G':	// group invitation
 						// Todo: Image, seems not to be used
@@ -1723,13 +1722,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;
 			}
@@ -1746,13 +1745,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;
 
@@ -1767,7 +1766,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];
 			}
@@ -1779,12 +1778,12 @@ 
 	/**
 	 *  This is called only by list_cals().  It was moved here to remove fatal error in php5 beta4
 	 */
-	private static function _list_cals_add($id,&$users,&$groups)
+	private static function _list_cals_add($id, &$users, &$groups)
 	{
 		$name = Api\Accounts::username($id);
 		if (!($egw_name = $GLOBALS['egw']->accounts->id2name($id)))
 		{
-			return;	// do not return no longer existing accounts which eg. still mentioned in acl
+			return; // do not return no longer existing accounts which eg. still mentioned in acl
 		}
 		if (($type = $GLOBALS['egw']->accounts->get_type($id)) == 'g')
 		{
@@ -1796,7 +1795,7 @@ 
 		}
 		$arr[$id] = array(
 			'grantor' => $id,
-			'value'   => ($type == 'g' ? 'g_' : '') . $id,
+			'value'   => ($type == 'g' ? 'g_' : '').$id,
 			'name'    => $name,
 			'sname'	  => $egw_name
 		);
@@ -1818,26 +1817,26 @@ 
 	 * @param int $user account_id of user to generate list for
 	 * @param array $grants =null calendar grants from user, or null to query them from acl class
 	 */
-	public static function list_calendars($user, array $grants=null)
+	public static function list_calendars($user, array $grants = null)
 	{
 		if (is_null($grants)) $grants = $GLOBALS['egw']->acl->get_grants('calendar', true, $user);
 
 		$users = $groups = array();
-		foreach(array_keys($grants) as $id)
+		foreach (array_keys($grants) as $id)
 		{
-			self::_list_cals_add($id,$users,$groups);
+			self::_list_cals_add($id, $users, $groups);
 		}
 		if (($memberships = $GLOBALS['egw']->accounts->memberships($user, true)))
 		{
-			foreach($memberships as $group)
+			foreach ($memberships as $group)
 			{
-				self::_list_cals_add($group,$users,$groups);
+				self::_list_cals_add($group, $users, $groups);
 
-				if (($account_perms = $GLOBALS['egw']->acl->get_ids_for_location($group,Acl::READ,'calendar')))
+				if (($account_perms = $GLOBALS['egw']->acl->get_ids_for_location($group, Acl::READ, 'calendar')))
 				{
-					foreach($account_perms as $id)
+					foreach ($account_perms as $id)
 					{
-						self::_list_cals_add($id,$users,$groups);
+						self::_list_cals_add($id, $users, $groups);
 					}
 				}
 			}
@@ -1845,7 +1844,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
 	}
 
 	/**
@@ -1885,28 +1884,27 @@ 
 	 *	month: numerical month
 	 *	occurence: numerical year or 0 for every year
 	 */
-	function read_holidays($year=0)
+	function read_holidays($year = 0)
 	{
-		if (!$year) $year = (int) date('Y',$this->now_su);
+		if (!$year) $year = (int)date('Y', $this->now_su);
 
 		$holidays = calendar_holidays::read(
 				!empty($GLOBALS['egw_info']['server']['ical_holiday_url']) ?
-				$GLOBALS['egw_info']['server']['ical_holiday_url'] :
-				$GLOBALS['egw_info']['user']['preferences']['common']['country'], $year);
+				$GLOBALS['egw_info']['server']['ical_holiday_url'] : $GLOBALS['egw_info']['user']['preferences']['common']['country'], $year);
 
 		// search for birthdays
 		if ($GLOBALS['egw_info']['server']['hide_birthdays'] != 'yes')
 		{
 			$contacts = new Api\Contacts();
-			foreach($contacts->get_addressbooks() as $owner => $name)
+			foreach ($contacts->get_addressbooks() as $owner => $name)
 			{
 				$holidays += $contacts->read_birthdays($owner, $year);
 			}
 		}
 
-		if ((int) $this->debug >= 2 || $this->debug == 'read_holidays')
+		if ((int)$this->debug >= 2 || $this->debug == 'read_holidays')
 		{
-			$this->debug_message('calendar_bo::read_holidays(%1)=%2',true,$year,$holidays);
+			$this->debug_message('calendar_bo::read_holidays(%1)=%2', true, $year, $holidays);
 		}
 		return $holidays;
 	}
@@ -1917,10 +1915,10 @@ 
 	 * @param type $event
 	 * @return array array of selected calendar fields
 	 */
-	public static function get_link_options ($event = array())
+	public static function get_link_options($event = array())
 	{
-		unset($event);	// not used, but required by function signature
-		$options = array (
+		unset($event); // not used, but required by function signature
+		$options = array(
 			'end' => lang('End date'),
 			'id' => lang('ID'),
 			'owner' => lang('Event owner'),
@@ -1947,7 +1945,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);
 		}
@@ -1955,7 +1953,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)
@@ -1981,10 +1979,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'];
 	}
 
 	/**
@@ -2003,10 +2001,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);
 		}
@@ -2023,11 +2021,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);
 	}
 
 	/**
@@ -2043,36 +2041,36 @@ 
 		}
 		Api\Cache::setSession('calendar', 'default_prefs_set', 'set');
 
-		$default_prefs =& $GLOBALS['egw']->preferences->default['calendar'];
-		$forced_prefs  =& $GLOBALS['egw']->preferences->forced['calendar'];
+		$default_prefs = & $GLOBALS['egw']->preferences->default['calendar'];
+		$forced_prefs  = & $GLOBALS['egw']->preferences->forced['calendar'];
 
-		$subject = lang('Calendar Event') . ' - $$action$$: $$startdate$$ $$title$$'."\n";
+		$subject = lang('Calendar Event').' - $$action$$: $$startdate$$ $$title$$'."\n";
 		$values = array(
-			'notifyAdded'     => $subject . lang ('You have a meeting scheduled for %1','$$startdate$$'),
-			'notifyCanceled'  => $subject . lang ('Your meeting scheduled for %1 has been canceled','$$startdate$$'),
-			'notifyModified'  => $subject . lang ('Your meeting that had been scheduled for %1 has been rescheduled to %2','$$olddate$$','$$startdate$$'),
-			'notifyDisinvited'=> $subject . lang ('You have been disinvited from the meeting at %1','$$startdate$$'),
-			'notifyResponse'  => $subject . lang ('On %1 %2 %3 your meeting request for %4','$$date$$','$$fullname$$','$$action$$','$$startdate$$'),
-			'notifyAlarm'     => lang('Alarm for %1 at %2 in %3','$$title$$','$$startdate$$','$$location$$')."\n".lang ('Here is your requested alarm.'),
+			'notifyAdded'     => $subject.lang('You have a meeting scheduled for %1', '$$startdate$$'),
+			'notifyCanceled'  => $subject.lang('Your meeting scheduled for %1 has been canceled', '$$startdate$$'),
+			'notifyModified'  => $subject.lang('Your meeting that had been scheduled for %1 has been rescheduled to %2', '$$olddate$$', '$$startdate$$'),
+			'notifyDisinvited'=> $subject.lang('You have been disinvited from the meeting at %1', '$$startdate$$'),
+			'notifyResponse'  => $subject.lang('On %1 %2 %3 your meeting request for %4', '$$date$$', '$$fullname$$', '$$action$$', '$$startdate$$'),
+			'notifyAlarm'     => lang('Alarm for %1 at %2 in %3', '$$title$$', '$$startdate$$', '$$location$$')."\n".lang('Here is your requested alarm.'),
 			'interval'        => 30,
 		);
-		foreach($values as $var => $default)
+		foreach ($values as $var => $default)
 		{
-			$type = substr($var,0,6) == 'notify' ? 'forced' : 'default';
+			$type = substr($var, 0, 6) == 'notify' ? 'forced' : 'default';
 
 			// only set, if neither default nor forced pref exists
 			if ((!isset($default_prefs[$var]) || (string)$default_prefs[$var] === '') && (!isset($forced_prefs[$var]) || (string)$forced_prefs[$var] === ''))
 			{
-				$GLOBALS['egw']->preferences->add('calendar',$var,$default,'default');	// always store default, even if we have a forced too
-				if ($type == 'forced') $GLOBALS['egw']->preferences->add('calendar',$var,$default,'forced');
+				$GLOBALS['egw']->preferences->add('calendar', $var, $default, 'default'); // always store default, even if we have a forced too
+				if ($type == 'forced') $GLOBALS['egw']->preferences->add('calendar', $var, $default, 'forced');
 				$this->cal_prefs[$var] = $default;
 				$need_save = True;
 			}
 		}
 		if ($need_save)
 		{
-			$GLOBALS['egw']->preferences->save_repository(False,'default');
-			$GLOBALS['egw']->preferences->save_repository(False,'forced');
+			$GLOBALS['egw']->preferences->save_repository(False, 'default');
+			$GLOBALS['egw']->preferences->save_repository(False, 'forced');
 		}
 	}
 
@@ -2082,7 +2080,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);
 
@@ -2095,8 +2093,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'] : '').
@@ -2128,11 +2126,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'];
@@ -2150,15 +2148,15 @@ 
 	 * @param boolean $master_only =false only check recurance master (egw_cal_user.recur_date=0)
 	 * @return integer
 	 */
-	public function get_ctag($user, $filter='owner', $master_only=false)
+	public function get_ctag($user, $filter = 'owner', $master_only = false)
 	{
 		if ($this->debug > 1) $startime = microtime(true);
 
 		// resolve users to add memberships for users and members for groups
 		$users = $this->resolve_users($user);
-		$ctag = $users ? $this->so->get_ctag($users, $filter == 'owner', $master_only) : 0;	// no rights, return 0 as ctag (otherwise we get SQL error!)
+		$ctag = $users ? $this->so->get_ctag($users, $filter == 'owner', $master_only) : 0; // no rights, return 0 as ctag (otherwise we get SQL error!)
 
-		if ($this->debug > 1) error_log(__METHOD__. "($user, '$filter', $master_only) = $ctag = ".date('Y-m-d H:i:s',$ctag)." took ".(microtime(true)-$startime)." secs");
+		if ($this->debug > 1) error_log(__METHOD__."($user, '$filter', $master_only) = $ctag = ".date('Y-m-d H:i:s', $ctag)." took ".(microtime(true) - $startime)." secs");
 		return $ctag;
 	}
 
@@ -2178,7 +2176,7 @@ 
 
 		$content = array(
 			'info_cat'       => $GLOBALS['egw']->categories->check_list(Acl::READ, $calendar['category']),
-			'info_priority'  => $calendar['priority'] ,
+			'info_priority'  => $calendar['priority'],
 			'info_public'    => $calendar['public'] != 'private',
 			'info_subject'   => $calendar['title'],
 			'info_des'       => $calendar['description'],
@@ -2193,7 +2191,7 @@ 
 		$content['link_app'][] = $calendar['info_link']['app'];
 		$content['link_id'][]  = $calendar['info_link']['id'];
 		// Copy claendar's links
-		foreach(Link::get_links('calendar',$calendar['id'],'','link_lastmod DESC',true) as $link)
+		foreach (Link::get_links('calendar', $calendar['id'], '', 'link_lastmod DESC', true) as $link)
 		{
 			if ($link['app'] != Link::VFS_APPNAME)
 			{
@@ -2206,7 +2204,7 @@ 
 			}
 		}
 		// Copy same custom fields
-		foreach(array_keys(Api\Storage\Customfields::get('infolog')) as $name)
+		foreach (array_keys(Api\Storage\Customfields::get('infolog')) as $name)
 		{
 			if ($this->customfields[$name]) $content['#'.$name] = $calendar['#'.$name];
 		}
@@ -2224,20 +2222,20 @@ 
 	function timesheet_set($data)
 	{
 		$set = array();
-		list($id,$recurrence) = explode(':',$data['id']);
-		if ((int)$id && ($event = $this->read($id,$recurrence)))
+		list($id, $recurrence) = explode(':', $data['id']);
+		if ((int)$id && ($event = $this->read($id, $recurrence)))
 		{
 			$set['ts_start'] = $event['start'];
 			$set['ts_title'] = $this->link_title($event);
-			$set['start_time'] = Api\DateTime::to($event['start'],'H:i');
+			$set['start_time'] = Api\DateTime::to($event['start'], 'H:i');
 			$set['ts_description'] = $event['description'];
-			if ($this->isWholeDay($event)) $event['end']++;	// whole day events are 1sec short
+			if ($this->isWholeDay($event)) $event['end']++; // whole day events are 1sec short
 			$set['ts_duration']	= ($event['end'] - $event['start']) / 60;
 			$set['ts_quantity'] = ($event['end'] - $event['start']) / 3600;
-			$set['end_time'] = null;	// unset end-time
+			$set['end_time'] = null; // unset end-time
 			$set['cat_id'] = (int)$event['category'];
 
-			foreach(Link::get_links('calendar',$id,'','link_lastmod DESC',true) as $link)
+			foreach (Link::get_links('calendar', $id, '', 'link_lastmod DESC', true) as $link)
 			{
 				if ($link['app'] != 'timesheet' && $link['app'] != Link::VFS_APPNAME)
 				{

calendar/inc/class.calendar_timegrid_etemplate_widget.inc.php

Indentation +13 added lines, -13 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
-  * Egroupware
-  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
-  * @link http://www.egroupware.org
-  * @author Nathan Gray
-  * @version $Id$
-  */
+ * Egroupware
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @link http://www.egroupware.org
+ * @author Nathan Gray
+ * @version $Id$
+ */
 
 use EGroupware\Api;
 use EGroupware\Api\Etemplate;
@@ -22,13 +22,13 @@ 
  {
 
 	 /**
-	 * Set up what we know on the server side.
-	 *
-	 * Sending a first chunk of rows
-	 *
-	 * @param string $cname
-	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
-	 */
+	  * Set up what we know on the server side.
+	  *
+	  * Sending a first chunk of rows
+	  *
+	  * @param string $cname
+	  * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
+	  */
 	public function beforeSendToClient($cname, array $expand=null)
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);

Spacing +9 added lines, -9 removed lines

@@ -29,24 +29,24 @@
 	 * @param string $cname
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
-	public function beforeSendToClient($cname, array $expand=null)
+	public function beforeSendToClient($cname, array $expand = null)
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
-		$value =& self::get_array(self::$request->content, $form_name, true);
-		if(!is_array($value)) $value = array();
+		$value = & self::get_array(self::$request->content, $form_name, true);
+		if (!is_array($value)) $value = array();
 
-		foreach($value as &$events)
+		foreach ($value as &$events)
 		{
-			if(!is_array($events))
+			if (!is_array($events))
 			{
 				continue;
 			}
-			foreach($events as &$event)
+			foreach ($events as &$event)
 			{
-				if(!is_array($event)) continue;
-				foreach(array('start','end') as $date)
+				if (!is_array($event)) continue;
+				foreach (array('start', 'end') as $date)
 				{
-					$event[$date] = Api\DateTime::to($event[$date],'Y-m-d\TH:i:s\Z');
+					$event[$date] = Api\DateTime::to($event[$date], 'Y-m-d\TH:i:s\Z');
 				}
 			}
 		}

Braces +8 added lines, -2 removed lines

@@ -33,7 +33,10 @@ 
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 		$value =& self::get_array(self::$request->content, $form_name, true);
-		if(!is_array($value)) $value = array();
+		if(!is_array($value))
+		{
+			$value = array();
+		}
 
 		foreach($value as &$events)
 		{
@@ -43,7 +46,10 @@ 
 			}
 			foreach($events as &$event)
 			{
-				if(!is_array($event)) continue;
+				if(!is_array($event))
+				{
+					continue;
+				}
 				foreach(array('start','end') as $date)
 				{
 					$event[$date] = Api\DateTime::to($event[$date],'Y-m-d\TH:i:s\Z');

calendar/inc/class.calendar_tracking.inc.php

Indentation +8 added lines, -8 removed lines

@@ -132,10 +132,10 @@ 
 		}
 
 		/**
-		* Do some magic with the participants and recurrance.
-		* If this is one of a recurring event, append the recur_date to the participant field so we can
-		* filter by it later.
-		*/
+		 * Do some magic with the participants and recurrance.
+		 * If this is one of a recurring event, append the recur_date to the participant field so we can
+		 * filter by it later.
+		 */
 		if(is_array($data['participants']))
 		{
 			$participants = $data['participants'];
@@ -195,10 +195,10 @@ 
 	}
 
 	/**
-	* Do some magic with the participants and recurrance.
-	* If this is one of a recurring event, append the recur_date to the participant field so we can
-	* filter by it later.
-	*/
+	 * Do some magic with the participants and recurrance.
+	 * If this is one of a recurring event, append the recur_date to the participant field so we can
+	 * filter by it later.
+	 */
 	protected function alter_participants($participants)
 	{
 		$data = array();

Spacing +14 added lines, -14 removed lines

@@ -114,18 +114,18 @@ 
 	 */
 	public function __construct()
 	{
-		parent::__construct('calendar');	// adds custom fields
+		parent::__construct('calendar'); // adds custom fields
 	}
 
 	/**
 	 * Tracks the changes in one entry $data, by comparing it with the last version in $old
 	 * Overrides parent to reformat participants into a format parent can handle
 	 */
-	public function track(array $data,array $old=null,$user=null,$deleted=null,array $changed_fields=null)
+	public function track(array $data, array $old = null, $user = null, $deleted = null, array $changed_fields = null)
 	{
 		// Don't try to track dates on recurring events.
 		// It won't change for the base event, and any change to the time creates an exception
-		if($data['recur_type'])
+		if ($data['recur_type'])
 		{
 			unset($data['start']); unset($data['end']);
 			unset($old['start']); unset($old['end']);
@@ -136,7 +136,7 @@ 
 		* If this is one of a recurring event, append the recur_date to the participant field so we can
 		* filter by it later.
 		*/
-		if(is_array($data['participants']))
+		if (is_array($data['participants']))
 		{
 			$participants = $data['participants'];
 			$data['participants'] = array();
@@ -144,25 +144,25 @@ 
 		}
 		// if clients eg. CalDAV do NOT set participants, they are left untouched
 		// therefore we should not track them, as all updates then show up as all participants removed
-		elseif(!isset($data['participants']))
+		elseif (!isset($data['participants']))
 		{
 			unset($old['participants']);
 		}
-		if(is_array($old['participants']))
+		if (is_array($old['participants']))
 		{
 			$participants = $old['participants'];
 			$old['participants'] = array();
 			$old = array_merge($old, $this->alter_participants($participants));
 		}
-		parent::track($data,$old,$user,$deleted, $changed_fields);
+		parent::track($data, $old, $user, $deleted, $changed_fields);
 	}
 
 	/**
 	 * Overrides parent because calendar_boupdates handles the notifications
 	 */
-	public function do_notifications($data,$old,$deleted=null)
+	public function do_notifications($data, $old, $deleted = null)
 	{
-		unset($data, $old, $deleted);	// unused, but required by function signature
+		unset($data, $old, $deleted); // unused, but required by function signature
 		return true;
 	}
 
@@ -177,21 +177,21 @@ 
 	 * @param array $old = null
 	 * @return array of keys with different values in $data and $old
 	 */
-	public function changed_fields(array $data,array $old=null)
+	public function changed_fields(array $data, array $old = null)
 	{
-		if(is_array($data['participants']))
+		if (is_array($data['participants']))
 		{
 			$participants = $data['participants'];
 			$data['participants'] = array();
 			$data = array_merge($data, $this->alter_participants($participants));
 		}
-		if(is_array($old['participants']))
+		if (is_array($old['participants']))
 		{
 			$participants = $old['participants'];
 			$old['participants'] = array();
 			$old = array_merge($old, $this->alter_participants($participants));
 		}
-		return parent::changed_fields($data,$old);
+		return parent::changed_fields($data, $old);
 	}
 
 	/**
@@ -202,7 +202,7 @@ 
 	protected function alter_participants($participants)
 	{
 		$data = array();
-		foreach($participants as $uid => $status)
+		foreach ($participants as $uid => $status)
 		{
 			$quantity = $role = $user_type = $user_id = null;
 			calendar_so::split_status($status, $quantity, $role);

calendar/inc/class.calendar_so.inc.php

Indentation +1 added lines, -1 removed lines

@@ -1528,7 +1528,7 @@
 			if (!$set_recurrences)
 			{
 				$set_recurrences = (isset($event['cal_start']) && (int)$old_min != (int) $event['cal_start']) ||
-				    $event['recur_type'] != $old_repeats['recur_type'] || $event['recur_data'] != $old_repeats['recur_data'] ||
+					$event['recur_type'] != $old_repeats['recur_type'] || $event['recur_data'] != $old_repeats['recur_data'] ||
 					(int)$event['recur_interval'] != (int)$old_repeats['recur_interval'] || $event['tz_id'] != $old_tz_id;
 			}
 

Doc Comments +12 added lines, -36 removed lines

@@ -211,23 +211,11 @@ 
 	 * @param int $start startdate of the search/list (servertime)
 	 * @param int $end enddate of the search/list (servertime)
 	 * @param int|array $users user-id or array of user-id's, !$users means all entries regardless of users
-	 * @param int|array $cat_id =0 mixed category-id or array of cat-id's (incl. all sub-categories), default 0 = all
+	 * @param integer $cat_id =0 mixed category-id or array of cat-id's (incl. all sub-categories), default 0 = all
 	 * @param string $filter ='default' string filter-name: all (not rejected), accepted, unknown, tentative, rejected or everything (incl. rejected, deleted)
 	 * @param int|boolean $offset =False offset for a limited query or False (default)
 	 * @param int $num_rows =0 number of rows to return if offset set, default 0 = use default in user prefs
 	 * @param array $params =array()
-	 * @param string|array $params['query'] string: pattern so search for, if unset or empty all matching entries are returned (no search)
-	 *		Please Note: a search never returns repeating events more then once AND does not honor start+end date !!!
-	 *      array: everything is directly used as $where
-	 * @param string $params['order'] ='cal_start' column-names plus optional DESC|ASC separted by comma
-	 * @param string $params['sql_filter'] sql to be and'ed into query (fully quoted)
-	 * @param string|array $params['cols'] what to select, default "$this->repeats_table.*,$this->cal_table.*,cal_start,cal_end,cal_recur_date",
-	 * 						if specified and not false an iterator for the rows is returned
-	 * @param string $params['append'] SQL to append to the query before $order, eg. for a GROUP BY clause
-	 * @param array $params['cfs'] custom fields to query, null = none, array() = all, or array with cfs names
-	 * @param array $params['users'] raw parameter as passed to calendar_bo::search() no memberships resolved!
-	 * @param boolean $params['master_only'] =false, true only take into account participants/status from master (for AS)
-	 * @param boolean $params['enum_recuring'] =true enumerate recuring events
 	 * @param int $remove_rejected_by_user =null add join to remove entry, if given user has rejected it
 	 * @return array of events
 	 */
@@ -594,7 +582,7 @@ 
 	/**
 	 * generate SQL to filter after a given category (incl. subcategories)
 	 *
-	 * @param array|int $cat_id cat-id or array of cat-ids, or !$cat_id for none
+	 * @param integer $cat_id cat-id or array of cat-ids, or !$cat_id for none
 	 * @return string SQL to include in the query
 	 */
 	function cat_filter($cat_id)
@@ -682,24 +670,11 @@ 
 	 * @param int $start startdate of the search/list (servertime)
 	 * @param int $end enddate of the search/list (servertime)
 	 * @param int|array $users user-id or array of user-id's, !$users means all entries regardless of users
-	 * @param int|array $cat_id =0 mixed category-id or array of cat-id's (incl. all sub-categories), default 0 = all
+	 * @param integer $cat_id =0 mixed category-id or array of cat-id's (incl. all sub-categories), default 0 = all
 	 * @param string $filter ='all' string filter-name: all (not rejected), accepted, unknown, tentative, rejected or everything (incl. rejected, deleted)
 	 * @param int|boolean $offset =False offset for a limited query or False (default)
 	 * @param int $num_rows =0 number of rows to return if offset set, default 0 = use default in user prefs
 	 * @param array $params =array()
-	 * @param string|array $params['query'] string: pattern so search for, if unset or empty all matching entries are returned (no search)
-	 *		Please Note: a search never returns repeating events more then once AND does not honor start+end date !!!
-	 *      array: everything is directly used as $where
-	 * @param string $params['order'] ='cal_start' column-names plus optional DESC|ASC separted by comma
-	 * @param string|array $params['sql_filter'] sql to be and'ed into query (fully quoted), or usual filter array
-	 * @param string|array $params['cols'] what to select, default "$this->repeats_table.*,$this->cal_table.*,cal_start,cal_end,cal_recur_date",
-	 * 						if specified and not false an iterator for the rows is returned
-	 * @param string $params['append'] SQL to append to the query before $order, eg. for a GROUP BY clause
-	 * @param array $params['cfs'] custom fields to query, null = none, array() = all, or array with cfs names
-	 * @param array $params['users'] raw parameter as passed to calendar_bo::search() no memberships resolved!
-	 * @param boolean $params['master_only'] =false, true only take into account participants/status from master (for AS)
-	 * @param boolean $params['enum_recuring'] =true enumerate recuring events
-	 * @param boolean $params['use_so_events'] =false, true return result of new $this->events()
 	 * @param int $remove_rejected_by_user =null add join to remove entry, if given user has rejected it
 	 * @return Iterator|array of events
 	 */
@@ -1140,11 +1115,11 @@ 
 	 * Ask other apps if they want to participate in calendar search / display
 	 *
 	 * @param &$selects parts of union query
-	 * @param $start see search()
-	 * @param $end
+	 * @param integer $start see search()
+	 * @param integer $end
 	 * @param $users as used in calendar_so ($users_raw plus all members and memberships added by calendar_bo)
-	 * @param $cat_id
-	 * @param $filter
+	 * @param integer $cat_id
+	 * @param string $filter
 	 * @param $query
 	 * @param $users_raw as passed to calendar_bo::search (no members and memberships added)
 	 */
@@ -1312,6 +1287,7 @@ 
 	 * @param int &$set_recurrences_start=0 on return: time from which on the recurrences should be rebuilt, default 0=all
 	 * @param int $change_since =0 time from which on the repetitions should be changed, default 0=all
 	 * @param int &$etag etag=null etag to check or null, on return new etag
+	 * @param boolean $set_recurrences
 	 * @return boolean|int false on error, 0 if etag does not match, cal_id otherwise
 	 */
 	function save($event,&$set_recurrences,&$set_recurrences_start=0,$change_since=0,&$etag=null)
@@ -1722,7 +1698,7 @@ 
 	 * @param int $cal_id
 	 * @param int $start new starttime
 	 * @param int $end new endtime
-	 * @param int|boolean $change_since =0 false=new entry, > 0 time from which on the repetitions should be changed, default 0=all
+	 * @param integer $change_since =0 false=new entry, > 0 time from which on the repetitions should be changed, default 0=all
 	 * @param int $old_start =0 old starttime or (default) 0, to query it from the db
 	 * @param int $old_end =0 old starttime or (default) 0
 	 * @todo Recalculate recurrences, if timezone changes
@@ -1899,7 +1875,7 @@ 
 	 *
 	 * @param int $cal_id
 	 * @param array $participants uid => status pairs
-	 * @param int|boolean $change_since =0, false=new event,
+	 * @param integer $change_since =0, false=new event,
 	 * 		0=all, > 0 time from which on the repetitions should be changed
 	 * @param boolean $add_only =false
 	 *		false = add AND delete participants if needed (full list of participants required in $participants)
@@ -2045,7 +2021,7 @@ 
 	 * set the status of one participant for a given recurrence or for all recurrences since now (includes recur_date=0)
 	 *
 	 * @param int $cal_id
-	 * @param char $user_type 'u' regular user, 'r' resource, 'c' contact
+	 * @param string $user_type 'u' regular user, 'r' resource, 'c' contact
 	 * @param int|string $user_id
 	 * @param int|char $status numeric status (defines) or 1-char code: 'R', 'U', 'T' or 'A'
 	 * @param int $recur_date =0 date to change, or 0 = all since now
@@ -2962,7 +2938,7 @@ 
 	 * Updates the modification timestamp to force an etag, ctag and sync-token change
 	 *
 	 * @param int $id event id
-	 * @param int|boolean $update_master =false id of series master or true, to update series master too
+	 * @param boolean $update_master =false id of series master or true, to update series master too
 	 * @param int $time =null new timestamp, default current (server-)time
 	 * @param int $modifier =null uid of the modifier, default current user
 	 */

Upper-Lower-Casing +7 added lines, -7 removed lines

@@ -252,7 +252,7 @@ 
 			"	CASE WHEN recur_type IS NULL THEN egw_cal.range_start ELSE cal_start END AS cal_start,\n".
 			"	CASE WHEN recur_type IS NULL THEN egw_cal.range_end ELSE cal_end END AS cal_end\n".
 			// using time-limited range view, instead of complete table, give a big performance plus
-			"FROM $egw_cal\n".
+			"from $egw_cal\n".
 			"JOIN egw_cal_user ON egw_cal_user.cal_id=egw_cal.cal_id\n".
 			// need to left join dates, as egw_cal_user.recur_date is null for non-recuring event
 			"LEFT JOIN egw_cal_dates ON egw_cal_user.cal_id=egw_cal_dates.cal_id AND egw_cal_dates.cal_start=egw_cal_user.cal_recur_date\n".
@@ -345,7 +345,7 @@ 
 			$where[] = 'cal_start >= '.(int)$recur_date;
 			$group_by = 'GROUP BY '.$cols;
 			$cols .= ',MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end';
-			$join = "JOIN $this->dates_table ON $this->cal_table.cal_id=$this->dates_table.cal_id $join";
+			$join = "join $this->dates_table ON $this->cal_table.cal_id=$this->dates_table.cal_id $join";
 		}
 		else
 		{
@@ -874,7 +874,7 @@ 
 		$cal_table = $this->cal_range_view($start, $end, null, $filter == 'everything' ? null : $filter != 'deleted');
 		$cal_table_def = $this->db->get_table_definitions('calendar', $this->cal_table);
 
-		$join = "JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id ".
+		$join = "join $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id ".
 			"LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id ".
 			$rejected_by_user_join;
 		// dates table join only needed to enum recuring events, we use a time-range limited view here too
@@ -1401,7 +1401,7 @@ 
 			{
 				$old_repeats = $this->db->select($this->repeats_table, "$this->repeats_table.*,range_end AS recur_enddate",
 					"$this->repeats_table.cal_id=".(int)$cal_id, __LINE__, __FILE__,
-					false, '', 'calendar', 0, "JOIN $this->cal_table ON $this->repeats_table.cal_id=$this->cal_table.cal_id")->fetch();
+					false, '', 'calendar', 0, "join $this->cal_table ON $this->repeats_table.cal_id=$this->cal_table.cal_id")->fetch();
 			}
 			$where = array('cal_id' => $cal_id);
 			// read only timezone id, to check if it is changed
@@ -1766,13 +1766,13 @@ 
 		if ($move_start)
 		{
 			// move the recur-date of the participants
-			$this->db->query("UPDATE $this->user_table SET cal_recur_date=cal_recur_date+$move_start WHERE $where AND cal_recur_date ".
+			$this->db->query("update $this->user_table SET cal_recur_date=cal_recur_date+$move_start WHERE $where AND cal_recur_date ".
 				((int)$change_since ? '>= '.(int)$change_since : '!= 0'),__LINE__,__FILE__);
 		}
 		if ($move_start || $move_end)
 		{
 			// move the event and it's recurrences
-			$this->db->query("UPDATE $this->dates_table SET cal_start=cal_start+$move_start,cal_end=cal_end+$move_end WHERE $where".
+			$this->db->query("update $this->dates_table SET cal_start=cal_start+$move_start,cal_end=cal_end+$move_end WHERE $where".
 				((int) $change_since ? ' AND cal_start >= '.(int) $change_since : ''),__LINE__,__FILE__);
 		}
 		return $this->db->affected_rows();
@@ -2472,7 +2472,7 @@ 
 			),__LINE__,__FILE__,'calendar');
 
 			// delete calendar entries without participants (can happen if the deleted user is the only participants, but not the owner)
-			foreach($this->db->select($this->cal_table,"DISTINCT $this->cal_table.cal_id",'cal_user_id IS NULL',__LINE__,__FILE__,
+			foreach($this->db->select($this->cal_table,"distinct $this->cal_table.cal_id",'cal_user_id IS NULL',__LINE__,__FILE__,
 				False,'','calendar',0,"LEFT JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id") as $row)
 			{
 				$this->delete($row['cal_id']);

Braces +366 added lines, -96 removed lines

@@ -154,16 +154,32 @@ 
 	 */
 	protected function cal_range_view($start, $end, array $_where=null, $deleted=false)
 	{
-		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start)	// using view without start-date is slower!
+		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start)
 		{
-			return $this->cal_table;	// no need / use for a view
+			// using view without start-date is slower!
+		{
+			return $this->cal_table;
+		}
+		// no need / use for a view
 		}
 
 		$where = array();
-		if (isset($deleted)) $where[] = "cal_deleted IS ".($deleted ? '' : 'NOT').' NULL';
-		if ($end) $where[] = "range_start<".(int)$end;
-		if ($start) $where[] = "(range_end IS NULL OR range_end>".(int)$start.")";
-		if ($_where) $where = array_merge($where, $_where);
+		if (isset($deleted))
+		{
+			$where[] = "cal_deleted IS ".($deleted ? '' : 'NOT').' NULL';
+		}
+		if ($end)
+		{
+			$where[] = "range_start<".(int)$end;
+		}
+		if ($start)
+		{
+			$where[] = "(range_end IS NULL OR range_end>".(int)$start.")";
+		}
+		if ($_where)
+		{
+			$where = array_merge($where, $_where);
+		}
 
 		$sql = "(SELECT * FROM $this->cal_table WHERE ".$this->db->expression($this->cal_table, $where).") $this->cal_table";
 
@@ -184,16 +200,32 @@ 
 	 */
 	protected function dates_range_view($start, $end, array $_where=null, $deleted=false)
 	{
-		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start || !$end)	// using view without start- AND end-date is slower!
+		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start || !$end)
+		{
+			// using view without start- AND end-date is slower!
 		{
-			return $this->dates_table;	// no need / use for a view
+			return $this->dates_table;
+		}
+		// no need / use for a view
 		}
 
 		$where = array();
-		if (isset($deleted)) $where['recur_exception'] = $deleted;
-		if ($end) $where[] = "cal_start<".(int)$end;
-		if ($start) $where[] = "cal_end>".(int)$start;
-		if ($_where) $where = array_merge($where, $_where);
+		if (isset($deleted))
+		{
+			$where['recur_exception'] = $deleted;
+		}
+		if ($end)
+		{
+			$where[] = "cal_start<".(int)$end;
+		}
+		if ($start)
+		{
+			$where[] = "cal_end>".(int)$start;
+		}
+		if ($_where)
+		{
+			$where = array_merge($where, $_where);
+		}
 
 		// Api\Db::union uses Api\Db::select which check if join contains "WHERE"
 		// to support old join syntax like ", other_table WHERE ...",
@@ -243,7 +275,10 @@ 
 			throw new Api\Exception\AssertionFailed("Unsupported value for parameters!");
 		}
 		$where = is_array($params['query']) ? $params['query'] : array();
-		if ($cat_id) $where[] = $this->cat_filter($cat_id);
+		if ($cat_id)
+		{
+			$where[] = $this->cat_filter($cat_id);
+		}
 		$egw_cal = $this->cal_range_view($start, $end, $where, $filter == 'everything' ? null : $filter != 'deleted');
 
 		$status_filter = $this->status_filter($filter, $params['enum_recuring']);
@@ -264,7 +299,10 @@ 
 		if ($users)
 		{
 			// fix $users to also prefix system users and groups (with 'u')
-			if (!is_array($users)) $users = $users ? (array)$users : array();
+			if (!is_array($users))
+			{
+				$users = $users ? (array)$users : array();
+			}
 			foreach($users as &$uid)
 			{
 				$user_type = $user_id = null;
@@ -284,15 +322,22 @@ 
 			$sql .= " AND\n	".$params['sql_filter'];
 		}
 
-		if ($params['order'])	// only order if requested
+		if ($params['order'])
 		{
-			if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';		// gard against SQL injection
+			// only order if requested
+		{
+			if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';
+		}
+		// gard against SQL injection
 			$sql .= "\nORDER BY ".$params['order'];
 		}
 
-		if ($offset === false)	// return all rows --> Api\Db::query wants offset=0, num_rows=-1
+		if ($offset === false)
+		{
+			// return all rows --> Api\Db::query wants offset=0, num_rows=-1
 		{
 			$offset = 0;
+		}
 			$num_rows = -1;
 		}
 		$events =& $this->get_events($this->db->query($sql, __LINE__, __FILE__, $offset, $num_rows));
@@ -318,26 +363,35 @@ 
 		$join = "LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id";
 
 		$where = array();
-		if (is_scalar($ids) && !is_numeric($ids))	// a single uid
+		if (is_scalar($ids) && !is_numeric($ids))
+		{
+			// a single uid
 		{
 			// We want only the parents to match
 			$where['cal_uid'] = $ids;
+		}
 			$where['cal_reference'] = 0;
 		}
-		elseif(is_array($ids) && isset($ids[count($ids)-1]) || is_scalar($ids))	// one or more cal_id's
+		elseif(is_array($ids) && isset($ids[count($ids)-1]) || is_scalar($ids))
+		{
+			// one or more cal_id's
 		{
 			$where['cal_id'] = $ids;
 		}
+		}
 		else	// array with column => value pairs
 		{
 			$where = $ids;
 			unset($ids);	// otherwise users get not read!
 		}
-		if (isset($where['cal_id']))	// prevent non-unique column-name cal_id
+		if (isset($where['cal_id']))
+		{
+			// prevent non-unique column-name cal_id
 		{
 			$where[] = $this->db->expression($this->cal_table, $this->cal_table.'.',array(
 				'cal_id' => $where['cal_id'],
 			));
+		}
 			unset($where['cal_id']);
 		}
 		if ((int) $recur_date)
@@ -387,10 +441,16 @@ 
 			$row['recur_exception'] = $row['alarm'] = array();
 			$events[$row['cal_id']] = Api\Db::strip_array_keys($row,'cal_');
 		}
-		if (!$events) return $events;
+		if (!$events)
+		{
+			return $events;
+		}
 
 		$ids = array_keys($events);
-		if (count($ids) == 1) $ids = $ids[0];
+		if (count($ids) == 1)
+		{
+			$ids = $ids[0];
+		}
 
 		foreach ($events as &$event)
 		{
@@ -464,10 +524,13 @@ 
 			'cal_id'      => $ids,
 			'cal_recur_date' => $recur_date,
 			"cal_status NOT IN ('X','E')",
-		),__LINE__,__FILE__,false,'ORDER BY cal_user_type DESC,cal_recur_date ASC,'.self::STATUS_SORT,'calendar') as $row)	// DESC puts users before resources and contacts
+		),__LINE__,__FILE__,false,'ORDER BY cal_user_type DESC,cal_recur_date ASC,'.self::STATUS_SORT,'calendar') as $row)
+		{
+			// DESC puts users before resources and contacts
 		{
 			// combine all participant data in uid and status values
 			$uid    = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
+		}
 			$status = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
 
 			$events[$row['cal_id']]['participants'][$uid] = $status;
@@ -524,7 +587,10 @@ 
 			$last_request = time();
 		}
 		$signature = serialize(func_get_args());
-		if (isset($ctags[$signature])) return $ctags[$signature];
+		if (isset($ctags[$signature]))
+		{
+			return $ctags[$signature];
+		}
 
 		$types = array();
 		foreach((array)$users as $uid)
@@ -557,7 +623,10 @@ 
 			// owner can only by users, no groups or resources
 			foreach($users as $key => $user)
 			{
-				if (!($user > 0)) unset($users[$key]);
+				if (!($user > 0))
+				{
+					unset($users[$key]);
+				}
 			}
 			$where = $this->db->expression($this->user_table, '(', $where, ' OR ').
 				$this->db->expression($this->cal_table, array(
@@ -579,7 +648,10 @@ 
 	 */
 	function get_cal_data(array $query, $cols='cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified')
 	{
-		if (!is_array($cols)) $cols = explode(',', $cols);
+		if (!is_array($cols))
+		{
+			$cols = explode(',', $cols);
+		}
 
 		// special handling of cal_user_modified "pseudo" column
 		if (($key = array_search('cal_user_modified', $cols)) !== false)
@@ -604,7 +676,10 @@ 
 		{
 			$cats = $GLOBALS['egw']->categories->return_all_children($cat_id);
 			array_walk($cats,create_function('&$val,$key','$val = (int) $val;'));
-			if (is_array($cat_id) && count($cat_id)==1) $cat_id = $cat_id[0];
+			if (is_array($cat_id) && count($cat_id)==1)
+			{
+				$cat_id = $cat_id[0];
+			}
 			$sql = '(cal_category'.(count($cats) > 1 ? " IN ('".implode("','",$cats)."')" : '='.$this->db->quote((int)$cat_id));
 			foreach($cats as $cat)
 			{
@@ -663,10 +738,13 @@ 
 				$where[] = "$this->user_table.cal_status NOT IN ('X','E')";
 				break;
 			default:
-				if ($enum_recuring)	// regular UI
+				if ($enum_recuring)
+				{
+					// regular UI
 				{
 					$where[] = "$this->user_table.cal_status NOT IN ('R','X','E')";
 				}
+				}
 				else	// CalDAV / eSync / iCal need to include 'E' = exceptions
 				{
 					$where[] = "$this->user_table.cal_status NOT IN ('R','X')";
@@ -805,7 +883,10 @@ 
 						$user_ids = array();
 						foreach($ids as $user_id)
 						{
-							if ($GLOBALS['egw']->accounts->get_type($user_id) === 'u') $user_ids[] = $user_id;
+							if ($GLOBALS['egw']->accounts->get_type($user_id) === 'u')
+							{
+								$user_ids[] = $user_id;
+							}
 						}
 						$owner_or = $this->db->expression($cal_table_def,array('cal_owner' => $user_ids));
 					}
@@ -825,7 +906,10 @@ 
 				}
 			}
 			// this is only used, when we cannot use UNIONS
-			if (!$useUnionQuery) $where[] = '('.implode(' OR ',$to_or).')';
+			if (!$useUnionQuery)
+			{
+				$where[] = '('.implode(' OR ',$to_or).')';
+			}
 
 			$where = $this->status_filter($filter, $params['enum_recuring'], $where);
 		}
@@ -844,7 +928,11 @@ 
 				$where[] = '('.((int)$start).' < range_end OR range_end IS NULL)';
 			}
 		}
-		if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';		// gard against SQL injection
+		if (!preg_match('/^[a-z_ ,c]+$/i',$params['order']))
+		{
+			$params['order'] = 'cal_start';
+		}
+		// gard against SQL injection
 
 		// if not enum recuring events, we have to use minimum start- AND end-dates, otherwise we get more then one event per cal_id!
 		if (!$params['enum_recuring'])
@@ -854,9 +942,15 @@ 
 			// in case cal_start is used in a query, eg. calendar_ical::find_event
 			$where = str_replace(array('cal_start','cal_end'), array('range_start','(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id)'), $where);
 			$params['order'] = str_replace('cal_start', 'range_start', $params['order']);
-			if ($end) $where[] = (int)$end.' > range_start';
+			if ($end)
+			{
+				$where[] = (int)$end.' > range_start';
+			}
   		}
-		elseif ($end) $where[] = (int)$end.' > cal_start';
+  		elseif ($end)
+		{
+			$where[] = (int)$end.' > cal_start';
+		}
 
 		if ($remove_rejected_by_user && $filter != 'everything')
 		{
@@ -870,7 +964,10 @@ 
 				'rejected_by_user.cal_status IS NULL',
 				"rejected_by_user.cal_status NOT IN ('R','X')",
 			);
-			if ($filter == 'owner') $or_required[] = 'cal_owner='.(int)$remove_rejected_by_user;
+			if ($filter == 'owner')
+			{
+				$or_required[] = 'cal_owner='.(int)$remove_rejected_by_user;
+			}
 			$where[] = '('.implode(' OR ',$or_required).')';
 		}
 		// using a time-range and deleted attribute limited view instead of full table
@@ -892,7 +989,10 @@ 
 		if ($useUnionQuery)
 		{
 			// allow apps to supply participants and/or icons
-			if (!isset($params['cols'])) $cols .= ',NULL AS participants,NULL AS icons';
+			if (!isset($params['cols']))
+			{
+				$cols .= ',NULL AS participants,NULL AS icons';
+			}
 
 			// changed the original OR in the query into a union, to speed up the query execution under MySQL 5
 			// with time-range views benefit is now at best slim for huge tables or none at all!
@@ -947,9 +1047,12 @@ 
 					$selects[count($selects)-1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
 				}
 			}
-			if (is_numeric($offset) && !$params['no_total'])	// get the total too
+			if (is_numeric($offset) && !$params['no_total'])
+			{
+				// get the total too
 			{
 				$save_selects = $selects;
+			}
 				// we only select cal_table.cal_id (and not cal_table.*) to be able to use DISTINCT (eg. MsSQL does not allow it for text-columns)
 				foreach(array_keys($selects) as $key)
 				{
@@ -960,14 +1063,20 @@ 
 							array('range_start AS cal_start','range_end AS cal_end'), $selects[$key]['cols']);
 					}
 				}
-				if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+				if (!isset($params['cols']) && !$params['no_integration'])
+				{
+					self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+				}
 
 				$this->total = $this->db->union($selects,__LINE__,__FILE__)->NumRows();
 
 				// restore original cols / selects
 				$selects = $save_selects; unset($save_selects);
 			}
-			if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+			if (!isset($params['cols']) && !$params['no_integration'])
+			{
+				self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+			}
 
 			$rs = $this->db->union($selects,__LINE__,__FILE__,$params['order'],$offset,$num_rows);
 		}
@@ -985,9 +1094,12 @@ 
 				'table_def' => $cal_table_def,
 			));
 
-			if (is_numeric($offset) && !$params['no_total'])	// get the total too
+			if (is_numeric($offset) && !$params['no_total'])
+			{
+				// get the total too
 			{
 				$save_selects = $selects;
+			}
 				// we only select cal_table.cal_id (and not cal_table.*) to be able to use DISTINCT (eg. MsSQL does not allow it for text-columns)
 				$selects[0]['cols'] = "$this->cal_table.cal_id,cal_start";
 				if (!isset($params['cols']) && !$params['no_integration'] && $this->db->capabilities['union'])
@@ -1015,7 +1127,10 @@ 
 		foreach($rs as $row)
 		{
 			$id = $row['cal_id'];
-			if (is_numeric($id)) $ids[] = $id;
+			if (is_numeric($id))
+			{
+				$ids[] = $id;
+			}
 
 			if ($row['cal_recur_date'])
 			{
@@ -1035,7 +1150,10 @@ 
 			$row['recur_exception'] = $row['alarm'] = array();
 
 			// compile a list of recurrences per cal_id
-			if (!in_array($id,(array)$recur_ids[$row['cal_id']])) $recur_ids[$row['cal_id']][] = $id;
+			if (!in_array($id,(array)$recur_ids[$row['cal_id']]))
+			{
+				$recur_ids[$row['cal_id']][] = $id;
+			}
 
 			$events[$id] = Api\Db::strip_array_keys($row,'cal_');
 		}
@@ -1054,10 +1172,16 @@ 
 					//'cal_id' => array_unique($ids),
 					'cal_recur_date' => $recur_dates,
 				),__LINE__,__FILE__,false,'ORDER BY cal_id,cal_user_type DESC,'.self::STATUS_SORT,'calendar',-1,$join='',
-				$this->db->get_table_definitions('calendar',$this->user_table)) as $row)	// DESC puts users before resources and contacts
+				$this->db->get_table_definitions('calendar',$this->user_table)) as $row)
+			{
+				// DESC puts users before resources and contacts
 			{
 				$id = $row['cal_id'];
-				if ($row['cal_recur_date']) $id .= '-'.$row['cal_recur_date'];
+			}
+				if ($row['cal_recur_date'])
+				{
+					$id .= '-'.$row['cal_recur_date'];
+				}
 
 				// combine all participant data in uid and status values
 				$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
@@ -1076,7 +1200,10 @@ 
 				}
 
 				// set data, if recurrence is requested
-				if (isset($events[$id])) $events[$id]['participants'][$uid] = $status;
+				if (isset($events[$id]))
+				{
+					$events[$id]['participants'][$uid] = $status;
+				}
 			}
 			// query recurrance exceptions, if needed: enum_recuring && !daywise is used in calendar_groupdav::get_series($uid,...)
 			if (!$params['enum_recuring'] || !$params['daywise'])
@@ -1092,7 +1219,10 @@ 
 					{
 						foreach($events as $id => $event)
 						{
-							if ($event['id'] == $row['cal_id']) break;
+							if ($event['id'] == $row['cal_id'])
+							{
+								break;
+							}
 						}
 					}
 					$events[$id]['recur_exception'][] = $row['cal_start'];
@@ -1102,7 +1232,10 @@ 
 			if (!is_null($params['cfs']))
 			{
 				$where = array('cal_id' => $ids);
-				if ($params['cfs']) $where['cal_extra_name'] = $params['cfs'];
+				if ($params['cfs'])
+				{
+					$where['cal_extra_name'] = $params['cfs'];
+				}
 				foreach($this->db->select($this->extra_table,'*',$where,
 					__LINE__,__FILE__,false,'','calendar') as $row)
 				{
@@ -1122,14 +1255,20 @@ 
 				{
 					$event_start = $alarm['time'] + $alarm['offset'];
 
-					if (isset($events[$cal_id]))	// none recuring event
+					if (isset($events[$cal_id]))
+					{
+						// none recuring event
 					{
 						$events[$cal_id]['alarm'][$id] = $alarm;
 					}
-					elseif (isset($events[$cal_id.'-'.$event_start]))	// recuring event
+					}
+					elseif (isset($events[$cal_id.'-'.$event_start]))
+					{
+						// recuring event
 					{
 						$events[$cal_id.'-'.$event_start]['alarm'][$id] = $alarm;
 					}
+					}
 				}
 			}
 		}
@@ -1229,10 +1368,13 @@ 
 			}
 			foreach((array)$cols as $col)
 			{
-				if (substr($col,0,7) == 'egw_cal')	// remove table name
+				if (substr($col,0,7) == 'egw_cal')
+				{
+					// remove table name
 				{
 					$col = preg_replace('/^egw_cal[a-z_]*\./','',$col);
 				}
+				}
 				if (isset($app_cols[$col]))
 				{
 					$return_cols[] = $app_cols[$col];
@@ -1326,7 +1468,11 @@ 
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
 		{
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
-			if (empty($minimum_uid_length) || $minimum_uid_length<=1) $minimum_uid_length = 8; // we just do not accept no uid, or uid way to short!
+			if (empty($minimum_uid_length) || $minimum_uid_length<=1)
+			{
+				$minimum_uid_length = 8;
+			}
+			// we just do not accept no uid, or uid way to short!
 		}
 		else
 		{
@@ -1374,7 +1520,10 @@ 
 			}
 		}
 		// set range_start/_end, but only if we have cal_start/_end, as otherwise we destroy present values!
-		if (isset($event['cal_start'])) $event['range_start'] = $event['cal_start'];
+		if (isset($event['cal_start']))
+		{
+			$event['range_start'] = $event['cal_start'];
+		}
 		if (isset($event['cal_end']))
 		{
 			$event['range_end'] = $event['recur_type'] == MCAL_RECUR_NONE ? $event['cal_end'] :
@@ -1395,7 +1544,10 @@ 
 		$event['cal_category'] = implode(',',$categories);
 
 		// make sure recurring events never reference to an other recurrent event
-		if ($event['recur_type'] != MCAL_RECUR_NONE) $event['cal_reference'] = 0;
+		if ($event['recur_type'] != MCAL_RECUR_NONE)
+		{
+			$event['cal_reference'] = 0;
+		}
 
 		if ($cal_id)
 		{
@@ -1412,7 +1564,10 @@ 
 			{
 				$old_tz_id = $this->db->select($this->cal_table,'tz_id',$where,__LINE__,__FILE__,'calendar')->fetchColumn();
 			}
-			if (!is_null($etag)) $where['cal_etag'] = $etag;
+			if (!is_null($etag))
+			{
+				$where['cal_etag'] = $etag;
+			}
 
 			unset($event['cal_etag']);
 			$event[] = 'cal_etag=cal_etag+1';	// always update the etag, even if none given to check
@@ -1423,14 +1578,24 @@ 
 			{
 				return 0;	// wrong etag, someone else updated the entry
 			}
-			if (!is_null($etag)) ++$etag;
+			if (!is_null($etag))
+			{
+				++$etag;
+			}
 		}
 		else
 		{
 			// new event
-			if (!$event['cal_owner']) $event['cal_owner'] = $GLOBALS['egw_info']['user']['account_id'];
+			if (!$event['cal_owner'])
+			{
+				$event['cal_owner'] = $GLOBALS['egw_info']['user']['account_id'];
+			}
 
-			if (!$event['cal_id'] && !isset($event['cal_uid'])) $event['cal_uid'] = '';	// uid is NOT NULL!
+			if (!$event['cal_id'] && !isset($event['cal_uid']))
+			{
+				$event['cal_uid'] = '';
+			}
+			// uid is NOT NULL!
 
 			$this->db->insert($this->cal_table,$event,false,__LINE__,__FILE__,'calendar');
 			if (!($cal_id = $this->db->get_last_insert_id($this->cal_table,'cal_id')))
@@ -1582,8 +1747,7 @@ 
 					// recurrences need to be truncated
 					if((int)$event['recur_enddate'] > 0 &&
 						((int)$old_repeats['recur_enddate'] == 0 || (int)$old_repeats['recur_enddate'] > (int)$event['recur_enddate'])
-					)
-					{
+					) {
 						$this->db->delete($this->user_table,array('cal_id' => $cal_id,'cal_recur_date >= '.($event['recur_enddate'] + 1*DAY_s)),__LINE__,__FILE__,'calendar');
 						$this->db->delete($this->dates_table,array('cal_id' => $cal_id,'cal_start >= '.($event['recur_enddate'] + 1*DAY_s)),__LINE__,__FILE__,'calendar');
 					}
@@ -1591,8 +1755,7 @@ 
 					// recurrences need to be expanded
 					if(((int)$event['recur_enddate'] == 0 && (int)$old_repeats['recur_enddate'] > 0)
 						|| ((int)$event['recur_enddate'] > 0 && (int)$old_repeats['recur_enddate'] > 0 && (int)$old_repeats['recur_enddate'] < (int)$event['recur_enddate'])
-					)
-					{
+					) {
 						$set_recurrences = true;
 						$set_recurrences_start = ($old_repeats['recur_enddate'] + 1*DAY_s);
 					}
@@ -1739,12 +1902,18 @@ 
 	{
 		//echo "<p>socal::move($cal_id,$start,$end,$change_since,$old_start,$old_end)</p>\n";
 
-		if (!(int) $cal_id) return false;
+		if (!(int) $cal_id)
+		{
+			return false;
+		}
 
 		if (!$old_start)
 		{
-			if ($change_since !== false) $row = $this->db->select($this->dates_table,'MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
+			if ($change_since !== false)
+			{
+				$row = $this->db->select($this->dates_table,'MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
 				array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetch();
+			}
 			// if no recurrence found, create one with the new dates
 			if ($change_since === false || !$row || !$row['cal_start'] || !$row['cal_end'])
 			{
@@ -1846,7 +2015,10 @@ 
 			$user_type = $uid[0];
 			$email = substr($uid, 1);
 			$matches = null;
-			if (preg_match('/<([^<>]+)>$/', $email, $matches)) $email = $matches[1];
+			if (preg_match('/<([^<>]+)>$/', $email, $matches))
+			{
+				$email = $matches[1];
+			}
 			$user_id = md5(trim(strtolower($email)));
 		}
 		else
@@ -1866,8 +2038,14 @@ 
 	 */
 	static function combine_status($status,$quantity=1,$role='REQ-PARTICIPANT')
 	{
-		if ((int)$quantity > 1) $status .= (int)$quantity;
-		if ($role != 'REQ-PARTICIPANT') $status .= $role;
+		if ((int)$quantity > 1)
+		{
+			$status .= (int)$quantity;
+		}
+		if ($role != 'REQ-PARTICIPANT')
+		{
+			$status .= $role;
+		}
 
 		return $status;
 	}
@@ -1888,8 +2066,14 @@ 
 		$matches = null;
 		if (is_string($status) && strlen($status) > 1 && preg_match('/^.([0-9]*)(.*)$/',$status,$matches))
 		{
-			if ((int)$matches[1] > 0) $quantity = (int)$matches[1];
-			if ($matches[2]) $role = $matches[2];
+			if ((int)$matches[1] > 0)
+			{
+				$quantity = (int)$matches[1];
+			}
+			if ($matches[2])
+			{
+				$role = $matches[2];
+			}
 			$status = $status[0];
 		}
 		elseif ($status === true)
@@ -2000,9 +2184,13 @@ 
 			}
 		}
 
-		if (count($participants))	// participants which need to be added
+		if (count($participants))
+		{
+			// participants which need to be added
 		{
-			if (!count($recurrences)) $recurrences[] = 0;   // insert the default recurrence
+			if (!count($recurrences)) $recurrences[] = 0;
+		}
+		// insert the default recurrence
 
 			$delete_deleted = array();
 
@@ -2074,7 +2262,10 @@ 
 			return false;
 		}
 
-		if (is_numeric($status)) $status = $status_code_short[$status];
+		if (is_numeric($status))
+		{
+			$status = $status_code_short[$status];
+		}
 
 		$uid = self::combine_user($user_type, $user_id);
 		$user_id_md5 = null;
@@ -2094,16 +2285,25 @@ 
 			$where[] = '(cal_recur_date=0 OR cal_recur_date >= '.time().')';
 		}
 
-		if ($status == 'G')		// remove group invitations, as we dont store them in the db
+		if ($status == 'G')
+		{
+			// remove group invitations, as we dont store them in the db
 		{
 			$this->db->delete($this->user_table,$where,__LINE__,__FILE__,'calendar');
+		}
 			$ret = $this->db->affected_rows();
 		}
 		else
 		{
 			$set = array('cal_status' => $status);
-			if ($user_type == 'e' || $attendee) $set['cal_user_attendee'] = $attendee ? $attendee : $user_id;
-			if (!is_null($role) && $role != 'REQ-PARTICIPANT') $set['cal_role'] = $role;
+			if ($user_type == 'e' || $attendee)
+			{
+				$set['cal_user_attendee'] = $attendee ? $attendee : $user_id;
+			}
+			if (!is_null($role) && $role != 'REQ-PARTICIPANT')
+			{
+				$set['cal_role'] = $role;
+			}
 			$this->db->insert($this->user_table,$set,$where,__LINE__,__FILE__,'calendar');
 			// for new or changed group-invitations, remove previously deleted members, so they show up again
 			if (($ret = $this->db->affected_rows()) && $user_type == 'u' && $user_id < 0)
@@ -2136,7 +2336,10 @@ 
 	{
 		//error_log(__METHOD__."($cal_id, $start, $end, ".array2string($participants).", ".array2string($exception));
 		$update = array('cal_end' => $end);
-		if (isset($exception)) $update['recur_exception'] = $exception;
+		if (isset($exception))
+		{
+			$update['recur_exception'] = $exception;
+		}
 
 		$this->db->insert($this->dates_table, $update, array(
 			'cal_id' => $cal_id,
@@ -2151,7 +2354,11 @@ 
 		{
 			foreach($participants as $uid => $status)
 			{
-				if ($status == 'G') continue;	// dont save group-invitations
+				if ($status == 'G')
+				{
+					continue;
+				}
+				// dont save group-invitations
 
 				$type = '';
 				$id = null;
@@ -2380,7 +2587,10 @@ 
 		}
 		$alarm['cal_id'] = $cal_id;		// we need the back-reference
 		// add an alarm uid, if none is given
-		if (empty($alarm['uid']) && class_exists('Horde_Support_Uuid')) $alarm['uid'] = (string)new Horde_Support_Uuid;
+		if (empty($alarm['uid']) && class_exists('Horde_Support_Uuid'))
+		{
+			$alarm['uid'] = (string)new Horde_Support_Uuid;
+		}
 		//error_log(__METHOD__.__LINE__.' Save Alarm for CalID:'.$cal_id.'->'.array2string($alarm).'-->'.$id.'#'.function_backtrace());
 		// allways store job with the alarm owner as job-owner to get eg. the correct from address
 		if (!$this->async->set_timer($alarm['time'],$id,'calendar.calendar_boupdate.send_alarm',$alarm,$alarm['owner']))
@@ -2389,10 +2599,16 @@ 
 		}
 
 		// update the modification information of the related event
-		if ($update_modified) $this->updateModified($cal_id, true);
+		if ($update_modified)
+		{
+			$this->updateModified($cal_id, true);
+		}
 
 		// update cache, if used
-		if (isset(self::$alarm_cache)) $this->read_alarms($cal_id, true);
+		if (isset(self::$alarm_cache))
+		{
+			$this->read_alarms($cal_id, true);
+		}
 
 		return $id;
 	}
@@ -2415,7 +2631,10 @@ 
 				$this->async->cancel_timer($id);
 			}
 			// update cache, if used
-			if (isset(self::$alarm_cache)) $this->read_alarms($cal_id, false);
+			if (isset(self::$alarm_cache))
+			{
+				$this->read_alarms($cal_id, false);
+			}
 		}
 		return count($alarms);
 	}
@@ -2438,7 +2657,10 @@ 
 		$ret = $this->async->cancel_timer($id);
 
 		// update cache, if used
-		if (isset(self::$alarm_cache)) $this->read_alarms($cal_id, true);
+		if (isset(self::$alarm_cache))
+		{
+			$this->read_alarms($cal_id, true);
+		}
 
 		return $ret;
 	}
@@ -2462,11 +2684,14 @@ 
 			$user_id = null;
 			self::split_user($old_user,$user_type,$user_id);
 
-			if ($user_type == 'u')	// only accounts can be owners of events
+			if ($user_type == 'u')
+			{
+				// only accounts can be owners of events
 			{
 				foreach($this->db->select($this->cal_table,'cal_id',array('cal_owner' => $old_user),__LINE__,__FILE__,false,'','calendar') as $row)
 				{
 					$this->delete($row['cal_id']);
+			}
 				}
 			}
 			$this->db->delete($this->user_table,array(
@@ -2494,11 +2719,14 @@ 
 			{
 				$ids[] = $row['cal_id'];
 			}
-			if ($ids) $this->db->delete($this->user_table,array(
+			if ($ids)
+			{
+				$this->db->delete($this->user_table,array(
 				'cal_user_type' => 'u',
 				'cal_user_id' => $old_user,
 				'cal_id' => $ids,
 			),__LINE__,__FILE__,'calendar');
+			}
 			// now change participant in the rest to contain new user instead of old user
 			$this->db->update($this->user_table,array(
 				'cal_user_id' => $new_user,
@@ -2523,8 +2751,14 @@ 
 	{
 		$participant_status = array();
 		$where = array('cal_id' => $cal_id);
-		if ($start != 0 && $end == 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
-		if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		if ($start != 0 && $end == 0)
+		{
+			$where[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
+		}
+		if ($start == 0 && $end != 0)
+		{
+			$where[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		}
 		if ($start != 0 && $end != 0)
 		{
 			$where[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start .
@@ -2535,7 +2769,10 @@ 
 			// inititalize the array
 			$participant_status[$row['cal_recur_date']] = null;
 		}
-		if (is_null($uid)) return $participant_status;
+		if (is_null($uid))
+		{
+			return $participant_status;
+		}
 		$user_type = $user_id = null;
 		self::split_user($uid, $user_type, $user_id, true);
 
@@ -2544,8 +2781,14 @@ 
 			'cal_user_type'	=> $user_type ? $user_type : 'u',
 			'cal_user_id'   => $user_id,
 		);
-		if ($start != 0 && $end == 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
-		if ($start == 0 && $end != 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		if ($start != 0 && $end == 0)
+		{
+			$where2[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
+		}
+		if ($start == 0 && $end != 0)
+		{
+			$where2[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		}
 		if ($start != 0 && $end != 0)
 		{
 			$where2[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start .
@@ -2635,17 +2878,26 @@ 
 	 */
 	function get_recurrence_exceptions($event, $tz_id=null, $start=0, $end=0, $filter='all')
 	{
-		if (!is_array($event)) return false;
+		if (!is_array($event))
+		{
+			return false;
+		}
 		$cal_id = (int) $event['id'];
 		//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 		//		"($cal_id, $tz_id, $filter): " . $event['tzid']);
-		if (!$cal_id || $event['recur_type'] == MCAL_RECUR_NONE) return false;
+		if (!$cal_id || $event['recur_type'] == MCAL_RECUR_NONE)
+		{
+			return false;
+		}
 
 		$days = array();
 
 		$expand_all = (!$this->isWholeDay($event) && $tz_id && $tz_id != $event['tzid']);
 
-		if ($filter == 'tz_only' && !$expand_all) return $days;
+		if ($filter == 'tz_only' && !$expand_all)
+		{
+			return $days;
+		}
 
 		$remote = in_array($filter, array('tz_rrule', 'rrule'));
 
@@ -2688,7 +2940,10 @@ 
 					$remote_rrule->next_no_exception();
 				}
 				$egw_rrule->next_no_exception();
-				if (!$egw_rrule->valid()) return $days;
+				if (!$egw_rrule->valid())
+				{
+					return $days;
+				}
 			}
 			$day = $egw_rrule->current();
 			$locts = (int)Api\DateTime::to($day,'server');
@@ -2842,7 +3097,11 @@ 
 			}
 		}
 
-		if (empty($participants)) return false; // occurrence does not exist at all yet
+		if (empty($participants))
+		{
+			return false;
+		}
+		// occurrence does not exist at all yet
 
 		foreach ($recurrence_zero as $uid => $status)
 		{
@@ -2899,7 +3158,9 @@ 
 			}
 			if (!isset($participants[$uid])
 				|| $participants[$uid] != $status)
-				return true;
+			{
+							return true;
+			}
 			unset($participants[$uid]);
 		}
 		return (!empty($participants));
@@ -2913,7 +3174,10 @@ 
 	 */
 	function isWholeDay($event)
 	{
-		if (!isset($event['start']) || !isset($event['end'])) return false;
+		if (!isset($event['start']) || !isset($event['end']))
+		{
+			return false;
+		}
 
 		if (empty($event['tzid']))
 		{
@@ -2975,8 +3239,14 @@ 
 	 */
 	function updateModified($id, $update_master=false, $time=null, $modifier=null)
 	{
-		if (is_null($time) || !$time) $time = time();
-		if (is_null($modifier)) $modifier = $GLOBALS['egw_info']['user']['account_id'];
+		if (is_null($time) || !$time)
+		{
+			$time = time();
+		}
+		if (is_null($modifier))
+		{
+			$modifier = $GLOBALS['egw_info']['user']['account_id'];
+		}
 
 		$this->db->update($this->cal_table,
 			array('cal_modified' => $time, 'cal_modifier' => $modifier),

Spacing +391 added lines, -394 removed lines

@@ -19,40 +19,40 @@ 
 /**
  * some necessary defines used by the calendar
  */
-if(!extension_loaded('mcal'))
+if (!extension_loaded('mcal'))
 {
-	define('MCAL_RECUR_NONE',0);
-	define('MCAL_RECUR_DAILY',1);
-	define('MCAL_RECUR_WEEKLY',2);
-	define('MCAL_RECUR_MONTHLY_MDAY',3);
-	define('MCAL_RECUR_MONTHLY_WDAY',4);
-	define('MCAL_RECUR_YEARLY',5);
-	define('MCAL_RECUR_SECONDLY',6);
-	define('MCAL_RECUR_MINUTELY',7);
-	define('MCAL_RECUR_HOURLY',8);
-
-	define('MCAL_M_SUNDAY',1);
-	define('MCAL_M_MONDAY',2);
-	define('MCAL_M_TUESDAY',4);
-	define('MCAL_M_WEDNESDAY',8);
-	define('MCAL_M_THURSDAY',16);
-	define('MCAL_M_FRIDAY',32);
-	define('MCAL_M_SATURDAY',64);
-
-	define('MCAL_M_WEEKDAYS',62);
-	define('MCAL_M_WEEKEND',65);
-	define('MCAL_M_ALLDAYS',127);
+	define('MCAL_RECUR_NONE', 0);
+	define('MCAL_RECUR_DAILY', 1);
+	define('MCAL_RECUR_WEEKLY', 2);
+	define('MCAL_RECUR_MONTHLY_MDAY', 3);
+	define('MCAL_RECUR_MONTHLY_WDAY', 4);
+	define('MCAL_RECUR_YEARLY', 5);
+	define('MCAL_RECUR_SECONDLY', 6);
+	define('MCAL_RECUR_MINUTELY', 7);
+	define('MCAL_RECUR_HOURLY', 8);
+
+	define('MCAL_M_SUNDAY', 1);
+	define('MCAL_M_MONDAY', 2);
+	define('MCAL_M_TUESDAY', 4);
+	define('MCAL_M_WEDNESDAY', 8);
+	define('MCAL_M_THURSDAY', 16);
+	define('MCAL_M_FRIDAY', 32);
+	define('MCAL_M_SATURDAY', 64);
+
+	define('MCAL_M_WEEKDAYS', 62);
+	define('MCAL_M_WEEKEND', 65);
+	define('MCAL_M_ALLDAYS', 127);
 }
 
-define('REJECTED',0);
-define('NO_RESPONSE',1);
-define('TENTATIVE',2);
-define('ACCEPTED',3);
-define('DELEGATED',4);
+define('REJECTED', 0);
+define('NO_RESPONSE', 1);
+define('TENTATIVE', 2);
+define('ACCEPTED', 3);
+define('DELEGATED', 4);
 
-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);
 
 /**
  * Class to store all calendar data (storage object)
@@ -100,7 +100,7 @@ 
 	 * name of the main calendar table and prefix for all other calendar tables
 	 */
 	var $cal_table = 'egw_cal';
-	var $extra_table,$repeats_table,$user_table,$dates_table,$all_tables;
+	var $extra_table, $repeats_table, $user_table, $dates_table, $all_tables;
 
 	/**
 	 * reference to global db-object
@@ -136,7 +136,7 @@ 
 		$this->db = $GLOBALS['egw']->db;
 
 		$this->all_tables = array($this->cal_table);
-		foreach(array('extra','repeats','user','dates') as $name)
+		foreach (array('extra', 'repeats', 'user', 'dates') as $name)
 		{
 			$vname = $name.'_table';
 			$this->all_tables[] = $this->$vname = $this->cal_table.'_'.$name;
@@ -152,11 +152,11 @@ 
 	 * @param boolean $deleted =false
 	 * @return string
 	 */
-	protected function cal_range_view($start, $end, array $_where=null, $deleted=false)
+	protected function cal_range_view($start, $end, array $_where = null, $deleted = false)
 	{
 		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start)	// using view without start-date is slower!
 		{
-			return $this->cal_table;	// no need / use for a view
+			return $this->cal_table; // no need / use for a view
 		}
 
 		$where = array();
@@ -182,11 +182,11 @@ 
 	 * @param boolean $deleted =false
 	 * @return string
 	 */
-	protected function dates_range_view($start, $end, array $_where=null, $deleted=false)
+	protected function dates_range_view($start, $end, array $_where = null, $deleted = false)
 	{
 		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start || !$end)	// using view without start- AND end-date is slower!
 		{
-			return $this->dates_table;	// no need / use for a view
+			return $this->dates_table; // no need / use for a view
 		}
 
 		$where = array();
@@ -231,14 +231,14 @@ 
 	 * @param int $remove_rejected_by_user =null add join to remove entry, if given user has rejected it
 	 * @return array of events
 	 */
-	function &events($start,$end,$users,$cat_id=0,$filter='all',$offset=False,$num_rows=0,array $params=array(),$remove_rejected_by_user=null)
+	function &events($start, $end, $users, $cat_id = 0, $filter = 'all', $offset = False, $num_rows = 0, array $params = array(), $remove_rejected_by_user = null)
 	{
-		error_log(__METHOD__.'('.($start ? date('Y-m-d H:i',$start) : '').','.($end ? date('Y-m-d H:i',$end) : '').','.array2string($users).','.array2string($cat_id).",'$filter',".array2string($offset).",$num_rows,".array2string($params).') '.function_backtrace());
+		error_log(__METHOD__.'('.($start ? date('Y-m-d H:i', $start) : '').','.($end ? date('Y-m-d H:i', $end) : '').','.array2string($users).','.array2string($cat_id).",'$filter',".array2string($offset).",$num_rows,".array2string($params).') '.function_backtrace());
 		$start_time = microtime(true);
 		// not everything is supported by now
 		if (!$start || !$end || is_string($params['query']) ||
 			//in_array($filter,array('owner','deleted')) ||
-			$params['enum_recuring']===false)
+			$params['enum_recuring'] === false)
 		{
 			throw new Api\Exception\AssertionFailed("Unsupported value for parameters!");
 		}
@@ -265,7 +265,7 @@ 
 		{
 			// fix $users to also prefix system users and groups (with 'u')
 			if (!is_array($users)) $users = $users ? (array)$users : array();
-			foreach($users as &$uid)
+			foreach ($users as &$uid)
 			{
 				$user_type = $user_id = null;
 				self::split_user($uid, $user_type, $user_id, true);
@@ -286,7 +286,7 @@ 
 
 		if ($params['order'])	// only order if requested
 		{
-			if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';		// gard against SQL injection
+			if (!preg_match('/^[a-z_ ,c]+$/i', $params['order'])) $params['order'] = 'cal_start'; // gard against SQL injection
 			$sql .= "\nORDER BY ".$params['order'];
 		}
 
@@ -295,8 +295,8 @@ 
 			$offset = 0;
 			$num_rows = -1;
 		}
-		$events =& $this->get_events($this->db->query($sql, __LINE__, __FILE__, $offset, $num_rows));
-		error_log(__METHOD__."(...) $sql --> ".number_format(microtime(true)-$start_time, 3));
+		$events = & $this->get_events($this->db->query($sql, __LINE__, __FILE__, $offset, $num_rows));
+		error_log(__METHOD__."(...) $sql --> ".number_format(microtime(true) - $start_time, 3));
 		return $events;
 	}
 
@@ -309,12 +309,12 @@ 
 	 * @param int $recur_date =0 if set read the next recurrence at or after the timestamp, default 0 = read the initital one
 	 * @return array|boolean array with cal_id => event array pairs or false if entry not found
 	 */
-	function read($ids,$recur_date=0)
+	function read($ids, $recur_date = 0)
 	{
 		//error_log(__METHOD__.'('.array2string($ids).",$recur_date) ".function_backtrace());
 		$cols = self::get_columns('calendar', $this->cal_table);
 		$cols[0] = $this->db->to_varchar($this->cal_table.'.cal_id');
-		$cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,".implode(',',$cols);
+		$cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,".implode(',', $cols);
 		$join = "LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id";
 
 		$where = array();
@@ -324,23 +324,23 @@ 
 			$where['cal_uid'] = $ids;
 			$where['cal_reference'] = 0;
 		}
-		elseif(is_array($ids) && isset($ids[count($ids)-1]) || is_scalar($ids))	// one or more cal_id's
+		elseif (is_array($ids) && isset($ids[count($ids) - 1]) || is_scalar($ids))	// one or more cal_id's
 		{
 			$where['cal_id'] = $ids;
 		}
 		else	// array with column => value pairs
 		{
 			$where = $ids;
-			unset($ids);	// otherwise users get not read!
+			unset($ids); // otherwise users get not read!
 		}
 		if (isset($where['cal_id']))	// prevent non-unique column-name cal_id
 		{
-			$where[] = $this->db->expression($this->cal_table, $this->cal_table.'.',array(
+			$where[] = $this->db->expression($this->cal_table, $this->cal_table.'.', array(
 				'cal_id' => $where['cal_id'],
 			));
 			unset($where['cal_id']);
 		}
-		if ((int) $recur_date)
+		if ((int)$recur_date)
 		{
 			$where[] = 'cal_start >= '.(int)$recur_date;
 			$group_by = 'GROUP BY '.$cols;
@@ -353,7 +353,7 @@ 
 		}
 		$cols .= ',range_end-1 AS recur_enddate';
 
-		$events =& $this->get_events($this->db->select($this->cal_table, $cols, $where, __LINE__, __FILE__, false, $group_by, 'calendar', 0, $join), $recur_date);
+		$events = & $this->get_events($this->db->select($this->cal_table, $cols, $where, __LINE__, __FILE__, false, $group_by, 'calendar', 0, $join), $recur_date);
 
 		return $events ? $events : false;
 	}
@@ -365,7 +365,7 @@ 
 	 * @param int $recur_date =0
 	 * @return array
 	 */
-	protected function &get_events($rs, $recur_date=0)
+	protected function &get_events($rs, $recur_date = 0)
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
 		{
@@ -377,7 +377,7 @@ 
 		}
 
 		$events = array();
-		foreach($rs as $row)
+		foreach ($rs as $row)
 		{
 			if (!$row['recur_type'])
 			{
@@ -385,7 +385,7 @@ 
 				unset($row['recur_enddate']);
 			}
 			$row['recur_exception'] = $row['alarm'] = array();
-			$events[$row['cal_id']] = Api\Db::strip_array_keys($row,'cal_');
+			$events[$row['cal_id']] = Api\Db::strip_array_keys($row, 'cal_');
 		}
 		if (!$events) return $events;
 
@@ -397,26 +397,26 @@ 
 			if (!isset($event['uid']) || strlen($event['uid']) < $minimum_uid_length)
 			{
 				// event (without uid), not strong enough uid => create new uid
-				$event['uid'] = Api\CalDAV::generate_uid('calendar',$event['id']);
+				$event['uid'] = Api\CalDAV::generate_uid('calendar', $event['id']);
 				$this->db->update($this->cal_table, array('cal_uid' => $event['uid']),
-					array('cal_id' => $event['id']),__LINE__,__FILE__,'calendar');
+					array('cal_id' => $event['id']), __LINE__, __FILE__, 'calendar');
 			}
 			if (!(int)$recur_date && $event['recur_type'] != MCAL_RECUR_NONE)
 			{
-				foreach($this->db->select($this->dates_table, 'cal_id,cal_start', array(
+				foreach ($this->db->select($this->dates_table, 'cal_id,cal_start', array(
 					'cal_id' => $ids,
 					'recur_exception' => true,
 				), __LINE__, __FILE__, false, 'ORDER BY cal_id,cal_start', 'calendar') as $row)
 				{
 					$events[$row['cal_id']]['recur_exception'][] = $row['cal_start'];
 				}
-				break;	// as above select read all exceptions (and I dont think too short uid problem still exists)
+				break; // as above select read all exceptions (and I dont think too short uid problem still exists)
 			}
 			// make sure we fetch only real exceptions (deleted occurrences of a series should not show up)
-			if (($recur_date &&	$event['recur_type'] != MCAL_RECUR_NONE))
+			if (($recur_date && $event['recur_type'] != MCAL_RECUR_NONE))
 			{
 				//_debug_array(__METHOD__.__LINE__.' recur_date:'.$recur_date.' check cal_start:'.$event['start']);
-				foreach($this->db->select($this->dates_table, 'cal_id,cal_start', array(
+				foreach ($this->db->select($this->dates_table, 'cal_id,cal_start', array(
 					'cal_id' => $event['id'],
 					'cal_start' => $event['start'],
 					'recur_exception' => true,
@@ -432,7 +432,7 @@ 
 						'cal_deleted' => NULL
 					), __LINE__, __FILE__, false, '', 'calendar')->fetchColumn())
 					{
-						$e = $this->read($event['id'],$event['start']+1);
+						$e = $this->read($event['id'], $event['start'] + 1);
 						$event = $e[$event['id']];
 						break;
 					}
@@ -454,21 +454,21 @@ 
 			if ($recur_date)
 			{
 				// also remember recur_date, maybe we need it later, duno now
-				$recur_date = array(0,$events[$ids]['recur_date'] = $events[$ids]['start']);
+				$recur_date = array(0, $events[$ids]['recur_date'] = $events[$ids]['start']);
 			}
 		}
 
 		// participants, if a recur_date give, we read that recurance, plus the one users from the default entry with recur_date=0
 		// sorting by cal_recur_date ASC makes sure recurence status always overwrites series status
-		foreach($this->db->select($this->user_table,'*',array(
+		foreach ($this->db->select($this->user_table, '*', array(
 			'cal_id'      => $ids,
 			'cal_recur_date' => $recur_date,
 			"cal_status NOT IN ('X','E')",
-		),__LINE__,__FILE__,false,'ORDER BY cal_user_type DESC,cal_recur_date ASC,'.self::STATUS_SORT,'calendar') as $row)	// DESC puts users before resources and contacts
+		), __LINE__, __FILE__, false, 'ORDER BY cal_user_type DESC,cal_recur_date ASC,'.self::STATUS_SORT, 'calendar') as $row)	// DESC puts users before resources and contacts
 		{
 			// combine all participant data in uid and status values
 			$uid    = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
-			$status = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
+			$status = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
 
 			$events[$row['cal_id']]['participants'][$uid] = $status;
 			$events[$row['cal_id']]['participant_types'][$row['cal_user_type']][is_numeric($uid) ? $uid : substr($uid, 1)] = $status;
@@ -477,7 +477,7 @@ 
 		}
 
 		// custom fields
-		foreach($this->db->select($this->extra_table,'*',array('cal_id'=>$ids),__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->extra_table, '*', array('cal_id'=>$ids), __LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			$events[$row['cal_id']]['#'.$row['cal_extra_name']] = $row['cal_extra_value'];
 		}
@@ -485,7 +485,7 @@ 
 		// alarms
 		if (is_array($ids))
 		{
-			foreach($this->read_alarms((array)$ids) as $cal_id => $alarms)
+			foreach ($this->read_alarms((array)$ids) as $cal_id => $alarms)
 			{
 				$events[$cal_id]['alarm'] = $alarms;
 			}
@@ -514,11 +514,11 @@ 
 	 * @param boolean $master_only =false only check recurance master (egw_cal_user.recur_date=0)
 	 * @return int maximum modification timestamp
 	 */
-	function get_ctag($users, $owner_too=false,$master_only=false)
+	function get_ctag($users, $owner_too = false, $master_only = false)
 	{
-		static $ctags = array();	// some per-request caching
+		static $ctags = array(); // some per-request caching
 		static $last_request = null;
-		if (!isset($last_request) || time()-$last_request > self::MAX_CTAG_CACHE_TIME)
+		if (!isset($last_request) || time() - $last_request > self::MAX_CTAG_CACHE_TIME)
 		{
 			$ctags = array();
 			$last_request = time();
@@ -527,13 +527,13 @@ 
 		if (isset($ctags[$signature])) return $ctags[$signature];
 
 		$types = array();
-		foreach((array)$users as $uid)
+		foreach ((array)$users as $uid)
 		{
 			$type = $id = null;
 			self::split_user($uid, $type, $id, true);
 			$types[$type][] = $id;
 		}
-		foreach($types as $type => $ids)
+		foreach ($types as $type => $ids)
 		{
 			$where = array(
 				'cal_user_type' => $type,
@@ -555,17 +555,17 @@ 
 		if ($owner_too)
 		{
 			// owner can only by users, no groups or resources
-			foreach($users as $key => $user)
+			foreach ($users as $key => $user)
 			{
 				if (!($user > 0)) unset($users[$key]);
 			}
 			$where = $this->db->expression($this->user_table, '(', $where, ' OR ').
 				$this->db->expression($this->cal_table, array(
 					'cal_owner' => $users,
-				),')');
+				), ')');
 		}
-		return $ctags[$signature] = $this->db->select($this->user_table,'MAX(cal_modified)',
-			$where,__LINE__,__FILE__,false,'','calendar',0,'JOIN egw_cal ON egw_cal.cal_id=egw_cal_user.cal_id')->fetchColumn();
+		return $ctags[$signature] = $this->db->select($this->user_table, 'MAX(cal_modified)',
+			$where, __LINE__, __FILE__, false, '', 'calendar', 0, 'JOIN egw_cal ON egw_cal.cal_id=egw_cal_user.cal_id')->fetchColumn();
 	}
 
 	/**
@@ -577,7 +577,7 @@ 
 	 * @param string|array $cols ='cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified' cols to query
 	 * @return Iterator as Api\Db::select
 	 */
-	function get_cal_data(array $query, $cols='cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified')
+	function get_cal_data(array $query, $cols = 'cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified')
 	{
 		if (!is_array($cols)) $cols = explode(',', $cols);
 
@@ -603,12 +603,12 @@ 
 		if ($cat_id)
 		{
 			$cats = $GLOBALS['egw']->categories->return_all_children($cat_id);
-			array_walk($cats,create_function('&$val,$key','$val = (int) $val;'));
-			if (is_array($cat_id) && count($cat_id)==1) $cat_id = $cat_id[0];
-			$sql = '(cal_category'.(count($cats) > 1 ? " IN ('".implode("','",$cats)."')" : '='.$this->db->quote((int)$cat_id));
-			foreach($cats as $cat)
+			array_walk($cats, create_function('&$val,$key', '$val = (int) $val;'));
+			if (is_array($cat_id) && count($cat_id) == 1) $cat_id = $cat_id[0];
+			$sql = '(cal_category'.(count($cats) > 1 ? " IN ('".implode("','", $cats)."')" : '='.$this->db->quote((int)$cat_id));
+			foreach ($cats as $cat)
 			{
-				$sql .= ' OR '.$this->db->concat("','",'cal_category',"','").' LIKE '.$this->db->quote('%,'.$cat.',%');
+				$sql .= ' OR '.$this->db->concat("','", 'cal_category', "','").' LIKE '.$this->db->quote('%,'.$cat.',%');
 			}
 			$sql .= ') ';
 		}
@@ -623,13 +623,13 @@ 
 	 * @param array $where =array() array to add filters too
 	 * @return array
 	 */
-	protected function status_filter($filter, $enum_recuring=true, array $where=array())
+	protected function status_filter($filter, $enum_recuring = true, array $where = array())
 	{
-		if($filter != 'deleted' && $filter != 'everything')
+		if ($filter != 'deleted' && $filter != 'everything')
 		{
 			$where[] = 'cal_deleted IS NULL';
 		}
-		switch($filter)
+		switch ($filter)
 		{
 			case 'everything':	// no filter at all
 				break;
@@ -703,7 +703,7 @@ 
 	 * @param int $remove_rejected_by_user =null add join to remove entry, if given user has rejected it
 	 * @return Iterator|array of events
 	 */
-	function &search($start,$end,$users,$cat_id=0,$filter='all',$offset=False,$num_rows=0,array $params=array(),$remove_rejected_by_user=null)
+	function &search($start, $end, $users, $cat_id = 0, $filter = 'all', $offset = False, $num_rows = 0, array $params = array(), $remove_rejected_by_user = null)
 	{
 		//error_log(__METHOD__.'('.($start ? date('Y-m-d H:i',$start) : '').','.($end ? date('Y-m-d H:i',$end) : '').','.array2string($users).','.array2string($cat_id).",'$filter',".array2string($offset).",$num_rows,".array2string($params).') '.function_backtrace());
 
@@ -726,7 +726,7 @@ 
 		{
 			$all_cols = self::get_columns('calendar', $this->cal_table);
 			$all_cols[0] = $this->db->to_varchar($this->cal_table.'.cal_id');
-			$cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,range_end - 1 AS recur_enddate,".implode(',',$all_cols).",cal_start,cal_end,$this->user_table.cal_recur_date";
+			$cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,range_end - 1 AS recur_enddate,".implode(',', $all_cols).",cal_start,cal_end,$this->user_table.cal_recur_date";
 		}
 		$where = array();
 		if (is_array($params['query']))
@@ -735,26 +735,26 @@ 
 		}
 		elseif ($params['query'])
 		{
-			if(is_numeric($params['query']))
+			if (is_numeric($params['query']))
 			{
-				$where[] = $this->cal_table.'.cal_id = ' . (int)$params['query'];
+				$where[] = $this->cal_table.'.cal_id = '.(int)$params['query'];
 			}
 			else
 			{
-				foreach(array('cal_title','cal_description','cal_location') as $col)
+				foreach (array('cal_title', 'cal_description', 'cal_location') as $col)
 				{
 					$to_or[] = $col.' '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%'.$params['query'].'%');
 				}
-				$where[] = '('.implode(' OR ',$to_or).')';
+				$where[] = '('.implode(' OR ', $to_or).')';
 			}
 
 			// Searching - restrict private to own or private grant
 			if (!isset($params['private_grants']))
 			{
 				$params['private_grants'] = $GLOBALS['egw']->acl->get_ids_for_location($GLOBALS['egw_info']['user']['account_id'], Acl::PRIVAT, 'calendar');
-				$params['private_grants'][] = $GLOBALS['egw_info']['user']['account_id'];	// db query does NOT return current user
+				$params['private_grants'][] = $GLOBALS['egw_info']['user']['account_id']; // db query does NOT return current user
 			}
-			$private_filter = '(cal_public=1 OR cal_public=0 AND '.$this->db->expression($this->cal_table, array('cal_owner' => $params['private_grants'])) . ')';
+			$private_filter = '(cal_public=1 OR cal_public=0 AND '.$this->db->expression($this->cal_table, array('cal_owner' => $params['private_grants'])).')';
 			$where[] = $private_filter;
 		}
 		if (!empty($params['sql_filter']))
@@ -763,7 +763,7 @@ 
 			{
 				$where[] = $params['sql_filter'];
 			}
-			elseif(is_array($params['sql_filter']))
+			elseif (is_array($params['sql_filter']))
 			{
 				$where = array_merge($where, $params['sql_filter']);
 			}
@@ -772,11 +772,11 @@ 
 		if ($users)
 		{
 			$users_by_type = array();
-			foreach((array)$users as $user)
+			foreach ((array)$users as $user)
 			{
 				if (is_numeric($user))
 				{
-					$users_by_type['u'][] = (int) $user;
+					$users_by_type['u'][] = (int)$user;
 				}
 				else
 				{
@@ -787,45 +787,45 @@ 
 			}
 			$to_or = $user_or = array();
 			$owner_or = null;
-			$table_def = $this->db->get_table_definitions('calendar',$this->user_table);
-			foreach($users_by_type as $type => $ids)
+			$table_def = $this->db->get_table_definitions('calendar', $this->user_table);
+			foreach ($users_by_type as $type => $ids)
 			{
 				// when we are able to use Union Querys, we do not OR our query, we save the needed parts for later construction of the union
 				if ($useUnionQuery)
 				{
-					$user_or[] = $this->db->expression($table_def,$this->user_table.'.',array(
+					$user_or[] = $this->db->expression($table_def, $this->user_table.'.', array(
 						'cal_user_type' => $type,
-					),' AND '.$this->user_table.'.',array(
+					), ' AND '.$this->user_table.'.', array(
 						'cal_user_id'   => $ids,
 					));
 					if ($type == 'u' && $filter == 'owner')
 					{
-						$cal_table_def = $this->db->get_table_definitions('calendar',$this->cal_table);
+						$cal_table_def = $this->db->get_table_definitions('calendar', $this->cal_table);
 						// only users can be owners, no need to add groups
 						$user_ids = array();
-						foreach($ids as $user_id)
+						foreach ($ids as $user_id)
 						{
 							if ($GLOBALS['egw']->accounts->get_type($user_id) === 'u') $user_ids[] = $user_id;
 						}
-						$owner_or = $this->db->expression($cal_table_def,array('cal_owner' => $user_ids));
+						$owner_or = $this->db->expression($cal_table_def, array('cal_owner' => $user_ids));
 					}
 				}
 				else
 				{
-					$to_or[] = $this->db->expression($table_def,$this->user_table.'.',array(
+					$to_or[] = $this->db->expression($table_def, $this->user_table.'.', array(
 						'cal_user_type' => $type,
-					),' AND '.$this->user_table.'.',array(
+					), ' AND '.$this->user_table.'.', array(
 						'cal_user_id'   => $ids,
 					));
 					if ($type == 'u' && $filter == 'owner')
 					{
-						$cal_table_def = $this->db->get_table_definitions('calendar',$this->cal_table);
-						$to_or[] = $this->db->expression($cal_table_def,array('cal_owner' => $ids));
+						$cal_table_def = $this->db->get_table_definitions('calendar', $this->cal_table);
+						$to_or[] = $this->db->expression($cal_table_def, array('cal_owner' => $ids));
 					}
 				}
 			}
 			// this is only used, when we cannot use UNIONS
-			if (!$useUnionQuery) $where[] = '('.implode(' OR ',$to_or).')';
+			if (!$useUnionQuery) $where[] = '('.implode(' OR ', $to_or).')';
 
 			$where = $this->status_filter($filter, $params['enum_recuring'], $where);
 		}
@@ -844,15 +844,15 @@ 
 				$where[] = '('.((int)$start).' < range_end OR range_end IS NULL)';
 			}
 		}
-		if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';		// gard against SQL injection
+		if (!preg_match('/^[a-z_ ,c]+$/i', $params['order'])) $params['order'] = 'cal_start'; // gard against SQL injection
 
 		// if not enum recuring events, we have to use minimum start- AND end-dates, otherwise we get more then one event per cal_id!
 		if (!$params['enum_recuring'])
 		{
 			$where[] = "$this->user_table.cal_recur_date=0";
-			$cols = str_replace(array('cal_start','cal_end'),array('range_start AS cal_start','(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id) AS cal_end'),$cols);
+			$cols = str_replace(array('cal_start', 'cal_end'), array('range_start AS cal_start', '(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id) AS cal_end'), $cols);
 			// in case cal_start is used in a query, eg. calendar_ical::find_event
-			$where = str_replace(array('cal_start','cal_end'), array('range_start','(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id)'), $where);
+			$where = str_replace(array('cal_start', 'cal_end'), array('range_start', '(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id)'), $where);
 			$params['order'] = str_replace('cal_start', 'range_start', $params['order']);
 			if ($end) $where[] = (int)$end.' > range_start';
   		}
@@ -864,14 +864,13 @@ 
 				" ON $this->cal_table.cal_id=rejected_by_user.cal_id".
 				" AND rejected_by_user.cal_user_type='u'".
 				" AND rejected_by_user.cal_user_id=".$this->db->quote($remove_rejected_by_user).
-				" AND ".(!$params['enum_recuring'] ? 'rejected_by_user.cal_recur_date=0' :
-					'(recur_type IS NULL AND rejected_by_user.cal_recur_date=0 OR cal_start=rejected_by_user.cal_recur_date)');
+				" AND ".(!$params['enum_recuring'] ? 'rejected_by_user.cal_recur_date=0' : '(recur_type IS NULL AND rejected_by_user.cal_recur_date=0 OR cal_start=rejected_by_user.cal_recur_date)');
 			$or_required = array(
 				'rejected_by_user.cal_status IS NULL',
 				"rejected_by_user.cal_status NOT IN ('R','X')",
 			);
 			if ($filter == 'owner') $or_required[] = 'cal_owner='.(int)$remove_rejected_by_user;
-			$where[] = '('.implode(' OR ',$or_required).')';
+			$where[] = '('.implode(' OR ', $or_required).')';
 		}
 		// using a time-range and deleted attribute limited view instead of full table
 		$cal_table = $this->cal_range_view($start, $end, null, $filter == 'everything' ? null : $filter != 'deleted');
@@ -883,18 +882,18 @@ 
 		// dates table join only needed to enum recuring events, we use a time-range limited view here too
 		if ($params['enum_recuring'])
 		{
-			$join = "JOIN ".$this->dates_table.	// using dates_table direct seems quicker then an other view
+			$join = "JOIN ".$this->dates_table.// using dates_table direct seems quicker then an other view
 				//$this->dates_range_view($start, $end, null, $filter == 'everything' ? null : $filter == 'deleted').
 				" ON $this->cal_table.cal_id=$this->dates_table.cal_id ".$join;
 		}
 
 		// Check for some special sorting, used by planner views
-		if($params['order'] == 'participants , cal_non_blocking DESC')
+		if ($params['order'] == 'participants , cal_non_blocking DESC')
 		{
 			$order = ($GLOBALS['egw_info']['user']['preferences']['common']['account_display'] == 'lastname' ? 'n_family' : 'n_fileas');
 			$cols .= ",egw_addressbook.{$order}";
 			$join .= "LEFT JOIN egw_addressbook ON ".
-					($this->db->Type == 'pgsql'? "egw_addressbook.account_id::varchar = ":"egw_addressbook.account_id = ").
+					($this->db->Type == 'pgsql' ? "egw_addressbook.account_id::varchar = " : "egw_addressbook.account_id = ").
 					"{$this->user_table}.cal_user_id";
 			$params['order'] = "$order, cal_non_blocking DESC";
 		}
@@ -927,29 +926,29 @@ 
 			// as replace the OR by construction of a suitable UNION for performance reasons
 			if ($owner_or || $user_or)
 			{
-				foreach($user_or as $user_sql)
+				foreach ($user_or as $user_sql)
 				{
 					$selects[] = $select;
-					$selects[count($selects)-1]['where'][] = $user_sql;
+					$selects[count($selects) - 1]['where'][] = $user_sql;
 					if ($params['enum_recuring'])
 					{
-						$selects[count($selects)-1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
+						$selects[count($selects) - 1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
 						$selects[] = $select;
-						$selects[count($selects)-1]['where'][] = $user_sql;
-						$selects[count($selects)-1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
+						$selects[count($selects) - 1]['where'][] = $user_sql;
+						$selects[count($selects) - 1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
 					}
 				}
 				// if the query is to be filtered by owner we need to add more selects for the union
 				if ($owner_or)
 				{
 					$selects[] = $select;
-					$selects[count($selects)-1]['where'][] = $owner_or;
+					$selects[count($selects) - 1]['where'][] = $owner_or;
 					if ($params['enum_recuring'])
 					{
-						$selects[count($selects)-1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
+						$selects[count($selects) - 1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
 						$selects[] = $select;
-						$selects[count($selects)-1]['where'][] = $owner_or;
-						$selects[count($selects)-1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
+						$selects[count($selects) - 1]['where'][] = $owner_or;
+						$selects[count($selects) - 1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
 					}
 				}
 			}
@@ -959,34 +958,34 @@ 
 				$selects[] = $select;
 				if ($params['enum_recuring'])
 				{
-					$selects[count($selects)-1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
+					$selects[count($selects) - 1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
 					$selects[] = $select;
-					$selects[count($selects)-1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
+					$selects[count($selects) - 1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
 				}
 			}
 			if (is_numeric($offset) && !$params['no_total'])	// get the total too
 			{
 				$save_selects = $selects;
 				// we only select cal_table.cal_id (and not cal_table.*) to be able to use DISTINCT (eg. MsSQL does not allow it for text-columns)
-				foreach(array_keys($selects) as $key)
+				foreach (array_keys($selects) as $key)
 				{
 					$selects[$key]['cols'] = "$this->repeats_table.recur_type,range_end AS recur_enddate,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,".$this->db->to_varchar($this->cal_table.'.cal_id').",cal_start,cal_end,$this->user_table.cal_recur_date";
 					if (!$params['enum_recuring'])
 					{
-						$selects[$key]['cols'] = str_replace(array('cal_start','cal_end'),
-							array('range_start AS cal_start','range_end AS cal_end'), $selects[$key]['cols']);
+						$selects[$key]['cols'] = str_replace(array('cal_start', 'cal_end'),
+							array('range_start AS cal_start', 'range_end AS cal_end'), $selects[$key]['cols']);
 					}
 				}
-				if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+				if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects, $start, $end, $users, $cat_id, $filter, $params['query'], $params['users']);
 
-				$this->total = $this->db->union($selects,__LINE__,__FILE__)->NumRows();
+				$this->total = $this->db->union($selects, __LINE__, __FILE__)->NumRows();
 
 				// restore original cols / selects
 				$selects = $save_selects; unset($save_selects);
 			}
-			if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+			if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects, $start, $end, $users, $cat_id, $filter, $params['query'], $params['users']);
 
-			$rs = $this->db->union($selects,__LINE__,__FILE__,$params['order'],$offset,$num_rows);
+			$rs = $this->db->union($selects, __LINE__, __FILE__, $params['order'], $offset, $num_rows);
 		}
 		else	// MsSQL oder MySQL 3.23
 		{
@@ -1009,27 +1008,27 @@ 
 				$selects[0]['cols'] = "$this->cal_table.cal_id,cal_start";
 				if (!isset($params['cols']) && !$params['no_integration'] && $this->db->capabilities['union'])
 				{
-					self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+					self::get_union_selects($selects, $start, $end, $users, $cat_id, $filter, $params['query'], $params['users']);
 				}
 				$this->total = $this->db->union($selects, __LINE__, __FILE__)->NumRows();
 				$selects = $save_selects;
 			}
 			if (!isset($params['cols']) && !$params['no_integration'] && $this->db->capabilities['union'])
 			{
-				self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+				self::get_union_selects($selects, $start, $end, $users, $cat_id, $filter, $params['query'], $params['users']);
 			}
-			$rs = $this->db->union($selects,__LINE__,__FILE__,$params['order'],$offset,$num_rows);
+			$rs = $this->db->union($selects, __LINE__, __FILE__, $params['order'], $offset, $num_rows);
 		}
 		//error_log(__METHOD__."() useUnionQuery=$useUnionQuery --> query took ".(microtime(true)-$starttime).'s '.$rs->sql);
 
 		if (isset($params['cols']))
 		{
-			return $rs;	// if colums are specified we return the recordset / iterator
+			return $rs; // if colums are specified we return the recordset / iterator
 		}
 		// Todo: return $this->get_events($rs);
 
 		$events = $ids = $recur_dates = $recur_ids = array();
-		foreach($rs as $row)
+		foreach ($rs as $row)
 		{
 			$id = $row['cal_id'];
 			if (is_numeric($id)) $ids[] = $id;
@@ -1041,9 +1040,9 @@ 
 			}
 			if ($row['participants'])
 			{
-				$row['participants'] = explode(',',$row['participants']);
+				$row['participants'] = explode(',', $row['participants']);
 				$row['participants'] = array_combine($row['participants'],
-					array_fill(0,count($row['participants']),''));
+					array_fill(0, count($row['participants']), ''));
 			}
 			else
 			{
@@ -1052,9 +1051,9 @@ 
 			$row['recur_exception'] = $row['alarm'] = array();
 
 			// compile a list of recurrences per cal_id
-			if (!in_array($id,(array)$recur_ids[$row['cal_id']])) $recur_ids[$row['cal_id']][] = $id;
+			if (!in_array($id, (array)$recur_ids[$row['cal_id']])) $recur_ids[$row['cal_id']][] = $id;
 
-			$events[$id] = Api\Db::strip_array_keys($row,'cal_');
+			$events[$id] = Api\Db::strip_array_keys($row, 'cal_');
 		}
 		//_debug_array($events);
 		if (count($ids))
@@ -1064,26 +1063,26 @@ 
 			// now ready all users with the given cal_id AND (cal_recur_date=0 or the fitting recur-date)
 			// This will always read the first entry of each recuring event too, we eliminate it later
 			$recur_dates[] = 0;
-			$utcal_id_view = " (SELECT * FROM ".$this->user_table." WHERE cal_id IN (".implode(',',$ids).")".
+			$utcal_id_view = " (SELECT * FROM ".$this->user_table." WHERE cal_id IN (".implode(',', $ids).")".
 				($filter != 'everything' ? " AND cal_status NOT IN ('X','E')" : '').") utcalid ";
 			//$utrecurdate_view = " (select * from ".$this->user_table." where cal_recur_date in (".implode(',',array_unique($recur_dates)).")) utrecurdates ";
-			foreach($this->db->select($utcal_id_view,'*',array(
+			foreach ($this->db->select($utcal_id_view, '*', array(
 					//'cal_id' => array_unique($ids),
 					'cal_recur_date' => $recur_dates,
-				),__LINE__,__FILE__,false,'ORDER BY cal_id,cal_user_type DESC,'.self::STATUS_SORT,'calendar',-1,$join='',
-				$this->db->get_table_definitions('calendar',$this->user_table)) as $row)	// DESC puts users before resources and contacts
+				), __LINE__, __FILE__, false, 'ORDER BY cal_id,cal_user_type DESC,'.self::STATUS_SORT, 'calendar', -1, $join = '',
+				$this->db->get_table_definitions('calendar', $this->user_table)) as $row)	// DESC puts users before resources and contacts
 			{
 				$id = $row['cal_id'];
 				if ($row['cal_recur_date']) $id .= '-'.$row['cal_recur_date'];
 
 				// combine all participant data in uid and status values
 				$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
-				$status = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
+				$status = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
 
 				// set accept/reject/tentative of series for all recurrences
 				if (!$row['cal_recur_date'])
 				{
-					foreach((array)$recur_ids[$row['cal_id']] as $i)
+					foreach ((array)$recur_ids[$row['cal_id']] as $i)
 					{
 						if (isset($events[$i]) && !isset($events[$i]['participants'][$uid]))
 						{
@@ -1098,16 +1097,16 @@ 
 			// query recurrance exceptions, if needed: enum_recuring && !daywise is used in calendar_groupdav::get_series($uid,...)
 			if (!$params['enum_recuring'] || !$params['daywise'])
 			{
-				foreach($this->db->select($this->dates_table, 'cal_id,cal_start', array(
+				foreach ($this->db->select($this->dates_table, 'cal_id,cal_start', array(
 					'cal_id' => $ids,
 					'recur_exception' => true,
 				), __LINE__, __FILE__, false, 'ORDER BY cal_id,cal_start', 'calendar') as $row)
 				{
 					// for enum_recurring events are not indexed by cal_id, but $cal_id.'-'.$cal_start
 					// find master, which is first recurrence
-					if (!isset($events[$id=$row['cal_id']]))
+					if (!isset($events[$id = $row['cal_id']]))
 					{
-						foreach($events as $id => $event)
+						foreach ($events as $id => $event)
 						{
 							if ($event['id'] == $row['cal_id']) break;
 						}
@@ -1120,10 +1119,10 @@ 
 			{
 				$where = array('cal_id' => $ids);
 				if ($params['cfs']) $where['cal_extra_name'] = $params['cfs'];
-				foreach($this->db->select($this->extra_table,'*',$where,
-					__LINE__,__FILE__,false,'','calendar') as $row)
+				foreach ($this->db->select($this->extra_table, '*', $where,
+					__LINE__, __FILE__, false, '', 'calendar') as $row)
 				{
-					foreach((array)$recur_ids[$row['cal_id']] as $id)
+					foreach ((array)$recur_ids[$row['cal_id']] as $id)
 					{
 						if (isset($events[$id]))
 						{
@@ -1133,9 +1132,9 @@ 
 				}
 			}
 			// alarms
-			foreach($this->read_alarms($ids) as $cal_id => $alarms)
+			foreach ($this->read_alarms($ids) as $cal_id => $alarms)
 			{
-				foreach($alarms as $id => $alarm)
+				foreach ($alarms as $id => $alarm)
 				{
 					$event_start = $alarm['time'] + $alarm['offset'];
 
@@ -1172,16 +1171,16 @@ 
 	 * @param $query
 	 * @param $users_raw as passed to calendar_bo::search (no members and memberships added)
 	 */
-	private static function get_union_selects(array &$selects,$start,$end,$users,$cat_id,$filter,$query,$users_raw)
+	private static function get_union_selects(array &$selects, $start, $end, $users, $cat_id, $filter, $query, $users_raw)
 	{
-		if (in_array(basename($_SERVER['SCRIPT_FILENAME']),array('groupdav.php','rpc.php','xmlrpc.php','/activesync/index.php')) ||
-			!in_array($GLOBALS['egw_info']['flags']['currentapp'],array('calendar','home')))
+		if (in_array(basename($_SERVER['SCRIPT_FILENAME']), array('groupdav.php', 'rpc.php', 'xmlrpc.php', '/activesync/index.php')) ||
+			!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('calendar', 'home')))
 		{
-			return;    // disable integration for GroupDAV, SyncML, ...
+			return; // disable integration for GroupDAV, SyncML, ...
 		}
 		self::$integration_data = Api\Hooks::process(array(
 			'location' => 'calendar_search_union',
-			'cols'  => $selects[0]['cols'],    // cols to return
+			'cols'  => $selects[0]['cols'], // cols to return
 			'start' => $start,
 			'end'   => $end,
 			'users' => $users,
@@ -1190,12 +1189,12 @@ 
 			'filter'=> $filter,
 			'query' => $query,
 		));
-		foreach(self::$integration_data as $data)
+		foreach (self::$integration_data as $data)
 		{
 			if (is_array($data['selects']))
 			{
 				//echo $app; _debug_array($data);
-				$selects = array_merge($selects,$data['selects']);
+				$selects = array_merge($selects, $data['selects']);
 			}
 		}
 	}
@@ -1220,35 +1219,35 @@ 
 	 * @param string $required_app ='calendar'
 	 * @return string cols for union query to match ones supplied in $required
 	 */
-	public static function union_cols(array $app_cols,$required,$required_app='calendar')
+	public static function union_cols(array $app_cols, $required, $required_app = 'calendar')
 	{
 		// remove evtl. used DISTINCT, we currently dont need it
-		if (($distinct = substr($required,0,9) == 'DISTINCT '))
+		if (($distinct = substr($required, 0, 9) == 'DISTINCT '))
 		{
-			$required = substr($required,9);
+			$required = substr($required, 9);
 		}
 		$return_cols = array();
-		foreach(is_array($required) ? $required : explode(',',$required) as $cols)
+		foreach (is_array($required) ? $required : explode(',', $required) as $cols)
 		{
 			$matches = null;
-			if (substr($cols,-2) == '.*')
+			if (substr($cols, -2) == '.*')
 			{
-				$cols = self::get_columns($required_app,substr($cols,0,-2));
+				$cols = self::get_columns($required_app, substr($cols, 0, -2));
 			}
 			// remove CAST added for PostgreSQL from eg. "CAST(egw_cal.cal_id AS varchar)"
 			elseif (preg_match('/CAST\(([a-z0-9_.]+) AS [a-z0-9_]+\)/i', $cols, $matches))
 			{
 				$cols = $matches[1];
 			}
-			elseif (strpos($cols,' AS ') !== false)
+			elseif (strpos($cols, ' AS ') !== false)
 			{
-				list(,$cols) = explode(' AS ',$cols);
+				list(,$cols) = explode(' AS ', $cols);
 			}
-			foreach((array)$cols as $col)
+			foreach ((array)$cols as $col)
 			{
-				if (substr($col,0,7) == 'egw_cal')	// remove table name
+				if (substr($col, 0, 7) == 'egw_cal')	// remove table name
 				{
-					$col = preg_replace('/^egw_cal[a-z_]*\./','',$col);
+					$col = preg_replace('/^egw_cal[a-z_]*\./', '', $col);
 				}
 				if (isset($app_cols[$col]))
 				{
@@ -1261,7 +1260,7 @@ 
 			}
 		}
 		//error_log(__METHOD__."(".array2string($app_cols).", ".array2string($required).", '$required_app') returning ".array2string(implode(',',$return_cols)));
-		return implode(',',$return_cols);
+		return implode(',', $return_cols);
 	}
 
 	/**
@@ -1271,21 +1270,21 @@ 
 	 * @param string $table
 	 * @return array of column names
 	 */
-	static private function get_columns($app,$table)
+	static private function get_columns($app, $table)
 	{
 		if ($table != 'egw_cal')
 		{
-			$table_def = $GLOBALS['egw']->db->get_table_definitions($app,$table);
+			$table_def = $GLOBALS['egw']->db->get_table_definitions($app, $table);
 			$cols = array_keys($table_def['fd']);
 		}
 		else
 		{
 			// special handling for egw_cal, as old databases have a different column order!!!
-			$cols =& Api\Cache::getSession(__CLASS__,$table);
+			$cols = & Api\Cache::getSession(__CLASS__, $table);
 
 			if (is_null($cols))
 			{
-				$meta = $GLOBALS['egw']->db->metadata($table,true);
+				$meta = $GLOBALS['egw']->db->metadata($table, true);
 				$cols = array_keys($meta['meta']);
 			}
 		}
@@ -1338,12 +1337,12 @@ 
 	 * @param int &$etag etag=null etag to check or null, on return new etag
 	 * @return boolean|int false on error, 0 if etag does not match, cal_id otherwise
 	 */
-	function save($event,&$set_recurrences,&$set_recurrences_start=0,$change_since=0,&$etag=null)
+	function save($event, &$set_recurrences, &$set_recurrences_start = 0, $change_since = 0, &$etag = null)
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
 		{
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
-			if (empty($minimum_uid_length) || $minimum_uid_length<=1) $minimum_uid_length = 8; // we just do not accept no uid, or uid way to short!
+			if (empty($minimum_uid_length) || $minimum_uid_length <= 1) $minimum_uid_length = 8; // we just do not accept no uid, or uid way to short!
 		}
 		else
 		{
@@ -1354,7 +1353,7 @@ 
 
 		//error_log(__METHOD__.'('.array2string($event).",$set_recurrences,$change_since,$etag) ".function_backtrace());
 
-		$cal_id = (int) $event['id'];
+		$cal_id = (int)$event['id'];
 		unset($event['id']);
 		$set_recurrences = $set_recurrences || !$cal_id && $event['recur_type'] != MCAL_RECUR_NONE;
 
@@ -1365,9 +1364,9 @@ 
 		}
 
 		// add colum prefix 'cal_' if there's not already a 'recur_' prefix
-		foreach($event as $col => $val)
+		foreach ($event as $col => $val)
 		{
-			if ($col[0] != '#' && substr($col,0,6) != 'recur_' && substr($col,0,6) != 'range_' && $col != 'alarm' && $col != 'tz_id' && $col != 'caldav_name')
+			if ($col[0] != '#' && substr($col, 0, 6) != 'recur_' && substr($col, 0, 6) != 'range_' && $col != 'alarm' && $col != 'tz_id' && $col != 'caldav_name')
 			{
 				$event['cal_'.$col] = $val;
 				unset($event[$col]);
@@ -1377,13 +1376,12 @@ 
 		if (isset($event['cal_start'])) $event['range_start'] = $event['cal_start'];
 		if (isset($event['cal_end']))
 		{
-			$event['range_end'] = $event['recur_type'] == MCAL_RECUR_NONE ? $event['cal_end'] :
-				($event['recur_enddate'] ? $event['recur_enddate'] : null);
+			$event['range_end'] = $event['recur_type'] == MCAL_RECUR_NONE ? $event['cal_end'] : ($event['recur_enddate'] ? $event['recur_enddate'] : null);
 		}
 		// ensure that we find mathing entries later on
 		if (!is_array($event['cal_category']))
 		{
-			$categories = array_unique(explode(',',$event['cal_category']));
+			$categories = array_unique(explode(',', $event['cal_category']));
 			sort($categories);
 		}
 		else
@@ -1392,7 +1390,7 @@ 
 		}
 		sort($categories, SORT_NUMERIC);
 
-		$event['cal_category'] = implode(',',$categories);
+		$event['cal_category'] = implode(',', $categories);
 
 		// make sure recurring events never reference to an other recurrent event
 		if ($event['recur_type'] != MCAL_RECUR_NONE) $event['cal_reference'] = 0;
@@ -1410,18 +1408,18 @@ 
 			// read only timezone id, to check if it is changed
 			if ($event['recur_type'] != MCAL_RECUR_NONE)
 			{
-				$old_tz_id = $this->db->select($this->cal_table,'tz_id',$where,__LINE__,__FILE__,'calendar')->fetchColumn();
+				$old_tz_id = $this->db->select($this->cal_table, 'tz_id', $where, __LINE__, __FILE__, 'calendar')->fetchColumn();
 			}
 			if (!is_null($etag)) $where['cal_etag'] = $etag;
 
 			unset($event['cal_etag']);
-			$event[] = 'cal_etag=cal_etag+1';	// always update the etag, even if none given to check
+			$event[] = 'cal_etag=cal_etag+1'; // always update the etag, even if none given to check
 
-			$this->db->update($this->cal_table,$event,$where,__LINE__,__FILE__,'calendar');
+			$this->db->update($this->cal_table, $event, $where, __LINE__, __FILE__, 'calendar');
 
 			if (!is_null($etag) && $this->db->affected_rows() < 1)
 			{
-				return 0;	// wrong etag, someone else updated the entry
+				return 0; // wrong etag, someone else updated the entry
 			}
 			if (!is_null($etag)) ++$etag;
 		}
@@ -1430,10 +1428,10 @@ 
 			// new event
 			if (!$event['cal_owner']) $event['cal_owner'] = $GLOBALS['egw_info']['user']['account_id'];
 
-			if (!$event['cal_id'] && !isset($event['cal_uid'])) $event['cal_uid'] = '';	// uid is NOT NULL!
+			if (!$event['cal_id'] && !isset($event['cal_uid'])) $event['cal_uid'] = ''; // uid is NOT NULL!
 
-			$this->db->insert($this->cal_table,$event,false,__LINE__,__FILE__,'calendar');
-			if (!($cal_id = $this->db->get_last_insert_id($this->cal_table,'cal_id')))
+			$this->db->insert($this->cal_table, $event, false, __LINE__, __FILE__, 'calendar');
+			if (!($cal_id = $this->db->get_last_insert_id($this->cal_table, 'cal_id')))
 			{
 				return false;
 			}
@@ -1443,7 +1441,7 @@ 
 		// event without uid or not strong enough uid
 		if (!isset($event['cal_uid']) || strlen($event['cal_uid']) < $minimum_uid_length)
 		{
-			$update['cal_uid'] = $event['cal_uid'] = Api\CalDAV::generate_uid('calendar',$cal_id);
+			$update['cal_uid'] = $event['cal_uid'] = Api\CalDAV::generate_uid('calendar', $cal_id);
 		}
 		// set caldav_name, if not given by caller
 		if (empty($event['caldav_name']) && version_compare($GLOBALS['egw_info']['apps']['calendar']['version'], '1.9.003', '>='))
@@ -1452,37 +1450,37 @@ 
 		}
 		if ($update)
 		{
-			$this->db->update($this->cal_table, $update, array('cal_id' => $cal_id),__LINE__,__FILE__,'calendar');
+			$this->db->update($this->cal_table, $update, array('cal_id' => $cal_id), __LINE__, __FILE__, 'calendar');
 		}
 
 		if ($event['recur_type'] == MCAL_RECUR_NONE)
 		{
-			$this->db->delete($this->dates_table,array(
+			$this->db->delete($this->dates_table, array(
 				'cal_id' => $cal_id),
-				__LINE__,__FILE__,'calendar');
+				__LINE__, __FILE__, 'calendar');
 
 			// delete all user-records, with recur-date != 0
-			$this->db->delete($this->user_table,array(
+			$this->db->delete($this->user_table, array(
 				'cal_id' => $cal_id, 'cal_recur_date != 0'),
-				__LINE__,__FILE__,'calendar');
+				__LINE__, __FILE__, 'calendar');
 
-			$this->db->delete($this->repeats_table,array(
+			$this->db->delete($this->repeats_table, array(
 				'cal_id' => $cal_id),
-				__LINE__,__FILE__,'calendar');
+				__LINE__, __FILE__, 'calendar');
 
 			// add exception marker to master, so participants added to exceptions *only* get found
 			if ($event['cal_reference'])
 			{
 				$master_participants = array();
-				foreach($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee', array(
+				foreach ($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee', array(
 					'cal_id' => $event['cal_reference'],
 					'cal_recur_date' => 0,
-					"cal_status != 'X'",	// deleted need to be replaced with exception marker too
+					"cal_status != 'X'", // deleted need to be replaced with exception marker too
 				), __LINE__, __FILE__, 'calendar') as $row)
 				{
 					$master_participants[] = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
 				}
-				foreach(array_diff(array_keys((array)$event['cal_participants']), $master_participants) as $uid)
+				foreach (array_diff(array_keys((array)$event['cal_participants']), $master_participants) as $uid)
 				{
 					$user_type = $user_id = null;
 					self::split_user($uid, $user_type, $user_id, true);
@@ -1501,10 +1499,10 @@ 
 		else // write information about recuring event, if recur_type is present in the array
 		{
 			// fetch information about the currently saved (old) event
-			$old_min = (int) $this->db->select($this->dates_table,'MIN(cal_start)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
-			$old_duration = (int) $this->db->select($this->dates_table,'MIN(cal_end)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn() - $old_min;
+			$old_min = (int)$this->db->select($this->dates_table, 'MIN(cal_start)', array('cal_id'=>$cal_id), __LINE__, __FILE__, false, '', 'calendar')->fetchColumn();
+			$old_duration = (int)$this->db->select($this->dates_table, 'MIN(cal_end)', array('cal_id'=>$cal_id), __LINE__, __FILE__, false, '', 'calendar')->fetchColumn() - $old_min;
 			$old_exceptions = array();
-			foreach($this->db->select($this->dates_table, 'cal_start', array(
+			foreach ($this->db->select($this->dates_table, 'cal_start', array(
 				'cal_id' => $cal_id,
 				'recur_exception' => true
 			), __LINE__, __FILE__, false, 'ORDER BY cal_start', 'calendar') as $row)
@@ -1523,8 +1521,8 @@ 
 				'cal_recur_date' => 0,
 			);
 			$old_participants = array();
-			foreach ($this->db->select($this->user_table,'cal_user_type,cal_user_id,cal_user_attendee,cal_status,cal_quantity,cal_role', $where,
-				__LINE__,__FILE__,false,'','calendar') as $row)
+			foreach ($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee,cal_status,cal_quantity,cal_role', $where,
+				__LINE__, __FILE__, false, '', 'calendar') as $row)
 			{
 				$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
 				$status = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
@@ -1534,7 +1532,7 @@ 
 			// re-check: did so much recurrence data change that we have to rebuild it from scratch?
 			if (!$set_recurrences)
 			{
-				$set_recurrences = (isset($event['cal_start']) && (int)$old_min != (int) $event['cal_start']) ||
+				$set_recurrences = (isset($event['cal_start']) && (int)$old_min != (int)$event['cal_start']) ||
 				    $event['recur_type'] != $old_repeats['recur_type'] || $event['recur_data'] != $old_repeats['recur_data'] ||
 					(int)$event['recur_interval'] != (int)$old_repeats['recur_interval'] || $event['tz_id'] != $old_tz_id;
 			}
@@ -1543,22 +1541,22 @@ 
 			{
 				// too much recurrence data has changed, we have to do a rebuild from scratch
 				// delete all, but the lowest dates record
-				$this->db->delete($this->dates_table,array(
+				$this->db->delete($this->dates_table, array(
 					'cal_id' => $cal_id,
 					'cal_start > '.(int)$old_min,
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 
 				// delete all user-records, with recur-date != 0
-				$this->db->delete($this->user_table,array(
+				$this->db->delete($this->user_table, array(
 					'cal_id' => $cal_id,
 					'cal_recur_date != 0',
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 			}
 			else
 			{
 				// we adjust some possibly changed recurrences manually
 				// deleted exceptions: re-insert recurrences into the user and dates table
-				if (count($deleted_exceptions = array_diff($old_exceptions,$event['recur_exception'])))
+				if (count($deleted_exceptions = array_diff($old_exceptions, $event['recur_exception'])))
 				{
 					if (isset($event['cal_participants']))
 					{
@@ -1569,7 +1567,7 @@ 
 						// use old default
 						$participants = $old_participants;
 					}
-					foreach($deleted_exceptions as $id => $deleted_exception)
+					foreach ($deleted_exceptions as $id => $deleted_exception)
 					{
 						// rebuild participants for the re-inserted recurrence
 						$this->recurrence($cal_id, $deleted_exception, $deleted_exception + $old_duration, $participants);
@@ -1577,24 +1575,24 @@ 
 				}
 
 				// check if recurrence enddate was adjusted
-				if(isset($event['recur_enddate']))
+				if (isset($event['recur_enddate']))
 				{
 					// recurrences need to be truncated
-					if((int)$event['recur_enddate'] > 0 &&
+					if ((int)$event['recur_enddate'] > 0 &&
 						((int)$old_repeats['recur_enddate'] == 0 || (int)$old_repeats['recur_enddate'] > (int)$event['recur_enddate'])
 					)
 					{
-						$this->db->delete($this->user_table,array('cal_id' => $cal_id,'cal_recur_date >= '.($event['recur_enddate'] + 1*DAY_s)),__LINE__,__FILE__,'calendar');
-						$this->db->delete($this->dates_table,array('cal_id' => $cal_id,'cal_start >= '.($event['recur_enddate'] + 1*DAY_s)),__LINE__,__FILE__,'calendar');
+						$this->db->delete($this->user_table, array('cal_id' => $cal_id, 'cal_recur_date >= '.($event['recur_enddate'] + 1 * DAY_s)), __LINE__, __FILE__, 'calendar');
+						$this->db->delete($this->dates_table, array('cal_id' => $cal_id, 'cal_start >= '.($event['recur_enddate'] + 1 * DAY_s)), __LINE__, __FILE__, 'calendar');
 					}
 
 					// recurrences need to be expanded
-					if(((int)$event['recur_enddate'] == 0 && (int)$old_repeats['recur_enddate'] > 0)
+					if (((int)$event['recur_enddate'] == 0 && (int)$old_repeats['recur_enddate'] > 0)
 						|| ((int)$event['recur_enddate'] > 0 && (int)$old_repeats['recur_enddate'] > 0 && (int)$old_repeats['recur_enddate'] < (int)$event['recur_enddate'])
 					)
 					{
 						$set_recurrences = true;
-						$set_recurrences_start = ($old_repeats['recur_enddate'] + 1*DAY_s);
+						$set_recurrences_start = ($old_repeats['recur_enddate'] + 1 * DAY_s);
 					}
 					//error_log(__METHOD__."() event[recur_enddate]=$event[recur_enddate], old_repeats[recur_enddate]=$old_repeats[recur_enddate] --> set_recurrences=".array2string($set_recurrences).", set_recurrences_start=$set_recurrences_start");
 				}
@@ -1603,9 +1601,9 @@ 
 				if (count($event['recur_exception']))
 				{
 					// added and existing exceptions: delete the execeptions from the user table, it could be the first time
-					$this->db->delete($this->user_table,array('cal_id' => $cal_id,'cal_recur_date' => $event['recur_exception']),__LINE__,__FILE__,'calendar');
+					$this->db->delete($this->user_table, array('cal_id' => $cal_id, 'cal_recur_date' => $event['recur_exception']), __LINE__, __FILE__, 'calendar');
 					// update recur_exception flag based on current exceptions
-					$this->db->update($this->dates_table, 'recur_exception='.$this->db->expression($this->dates_table,array(
+					$this->db->update($this->dates_table, 'recur_exception='.$this->db->expression($this->dates_table, array(
 						'cal_start' => $event['recur_exception'],
 					)), array(
 						'cal_id' => $cal_id,
@@ -1614,27 +1612,27 @@ 
 			}
 
 			// write the repeats table
-			unset($event[0]);	// unset the 'etag=etag+1', as it's not in the repeats table
-			$this->db->insert($this->repeats_table,$event,array('cal_id' => $cal_id),__LINE__,__FILE__,'calendar');
+			unset($event[0]); // unset the 'etag=etag+1', as it's not in the repeats table
+			$this->db->insert($this->repeats_table, $event, array('cal_id' => $cal_id), __LINE__, __FILE__, 'calendar');
 		}
 		// update start- and endtime if present in the event-array, evtl. we need to move all recurrences
 		if (isset($event['cal_start']) && isset($event['cal_end']))
 		{
-			$this->move($cal_id,$event['cal_start'],$event['cal_end'],!$cal_id ? false : $change_since, $old_min, $old_min +  $old_duration);
+			$this->move($cal_id, $event['cal_start'], $event['cal_end'], !$cal_id ? false : $change_since, $old_min, $old_min + $old_duration);
 		}
 		// update participants if present in the event-array
 		if (isset($event['cal_participants']))
 		{
-			$this->participants($cal_id,$event['cal_participants'],!$cal_id ? false : $change_since);
+			$this->participants($cal_id, $event['cal_participants'], !$cal_id ? false : $change_since);
 		}
 		// Custom fields
 		Api\Storage\Customfields::handle_files('calendar', $cal_id, $event);
 
-		foreach($event as $name => $value)
+		foreach ($event as $name => $value)
 		{
 			if ($name[0] == '#')
 			{
-				if (is_array($value) && array_key_exists('id',$value))
+				if (is_array($value) && array_key_exists('id', $value))
 				{
 					//error_log(__METHOD__.__LINE__."$name => ".array2string($value).function_backtrace());
 					$value = $value['id'];
@@ -1642,19 +1640,19 @@ 
 				}
 				if ($value)
 				{
-					$this->db->insert($this->extra_table,array(
-						'cal_extra_value'	=> is_array($value) ? implode(',',$value) : $value,
-					),array(
+					$this->db->insert($this->extra_table, array(
+						'cal_extra_value'	=> is_array($value) ? implode(',', $value) : $value,
+					), array(
 						'cal_id'			=> $cal_id,
-						'cal_extra_name'	=> substr($name,1),
-					),__LINE__,__FILE__,'calendar');
+						'cal_extra_name'	=> substr($name, 1),
+					), __LINE__, __FILE__, 'calendar');
 				}
 				else
 				{
-					$this->db->delete($this->extra_table,array(
+					$this->db->delete($this->extra_table, array(
 						'cal_id'			=> $cal_id,
-						'cal_extra_name'	=> substr($name,1),
-					),__LINE__,__FILE__,'calendar');
+						'cal_extra_name'	=> substr($name, 1),
+					), __LINE__, __FILE__, 'calendar');
 				}
 			}
 		}
@@ -1665,9 +1663,9 @@ 
 			{
 				if ($alarm['id'] && strpos($alarm['id'], 'cal:'.$cal_id.':') !== 0)
 				{
-					unset($alarm['id']);	// unset the temporary id to add the alarm
+					unset($alarm['id']); // unset the temporary id to add the alarm
 				}
-				if(!isset($alarm['offset']))
+				if (!isset($alarm['offset']))
 				{
 					$alarm['offset'] = $event['cal_start'] - $alarm['time'];
 				}
@@ -1678,14 +1676,14 @@ 
 
 				if ($alarm['time'] < time() && !self::shift_alarm($event, $alarm))
 				{
-					continue;	// pgoerzen: don't add alarm in the past
+					continue; // pgoerzen: don't add alarm in the past
 				}
-				$this->save_alarm($cal_id, $alarm, false);	// false: not update modified, we do it anyway
+				$this->save_alarm($cal_id, $alarm, false); // false: not update modified, we do it anyway
 			}
 		}
 		if (is_null($etag))
 		{
-			$etag = $this->db->select($this->cal_table,'cal_etag',array('cal_id' => $cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
+			$etag = $this->db->select($this->cal_table, 'cal_etag', array('cal_id' => $cal_id), __LINE__, __FILE__, false, '', 'calendar')->fetchColumn();
 		}
 
 		// if event is an exception: update modified of master, to force etag, ctag and sync-token change
@@ -1705,7 +1703,7 @@ 
 	 *	are dealing with, default is now.
 	 * @return boolean true if alarm could be shifted, false if not
 	 */
-	public static function shift_alarm(array $_event, array &$alarm, $timestamp=null)
+	public static function shift_alarm(array $_event, array &$alarm, $timestamp = null)
 	{
 		if ($_event['recur_type'] == MCAL_RECUR_NONE)
 		{
@@ -1716,7 +1714,7 @@ 
 		$rrule = calendar_rrule::event2rrule($event, false);
 		foreach ($rrule as $time)
 		{
-			if ($start < ($ts = Api\DateTime::to($time,'server')))
+			if ($start < ($ts = Api\DateTime::to($time, 'server')))
 			{
 				$alarm['time'] = $ts - $alarm['offset'];
 				return true;
@@ -1737,34 +1735,34 @@ 
 	 * @todo Recalculate recurrences, if timezone changes
 	 * @return int|boolean number of moved recurrences or false on error
 	 */
-	function move($cal_id,$start,$end,$change_since=0,$old_start=0,$old_end=0)
+	function move($cal_id, $start, $end, $change_since = 0, $old_start = 0, $old_end = 0)
 	{
 		//echo "<p>socal::move($cal_id,$start,$end,$change_since,$old_start,$old_end)</p>\n";
 
-		if (!(int) $cal_id) return false;
+		if (!(int)$cal_id) return false;
 
 		if (!$old_start)
 		{
-			if ($change_since !== false) $row = $this->db->select($this->dates_table,'MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
-				array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetch();
+			if ($change_since !== false) $row = $this->db->select($this->dates_table, 'MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
+				array('cal_id'=>$cal_id), __LINE__, __FILE__, false, '', 'calendar')->fetch();
 			// if no recurrence found, create one with the new dates
 			if ($change_since === false || !$row || !$row['cal_start'] || !$row['cal_end'])
 			{
-				$this->db->insert($this->dates_table,array(
+				$this->db->insert($this->dates_table, array(
 					'cal_id'    => $cal_id,
 					'cal_start' => $start,
 					'cal_end'   => $end,
-				),false,__LINE__,__FILE__,'calendar');
+				), false, __LINE__, __FILE__, 'calendar');
 
 				return 1;
 			}
-			$move_start = (int) ($start-$row['cal_start']);
-			$move_end   = (int) ($end-$row['cal_end']);
+			$move_start = (int)($start - $row['cal_start']);
+			$move_end   = (int)($end - $row['cal_end']);
 		}
 		else
 		{
-			$move_start = (int) ($start-$old_start);
-			$move_end   = (int) ($end-$old_end);
+			$move_start = (int)($start - $old_start);
+			$move_end   = (int)($end - $old_end);
 		}
 		$where = 'cal_id='.(int)$cal_id;
 
@@ -1772,13 +1770,13 @@ 
 		{
 			// move the recur-date of the participants
 			$this->db->query("UPDATE $this->user_table SET cal_recur_date=cal_recur_date+$move_start WHERE $where AND cal_recur_date ".
-				((int)$change_since ? '>= '.(int)$change_since : '!= 0'),__LINE__,__FILE__);
+				((int)$change_since ? '>= '.(int)$change_since : '!= 0'), __LINE__, __FILE__);
 		}
 		if ($move_start || $move_end)
 		{
 			// move the event and it's recurrences
 			$this->db->query("UPDATE $this->dates_table SET cal_start=cal_start+$move_start,cal_end=cal_end+$move_end WHERE $where".
-				((int) $change_since ? ' AND cal_start >= '.(int) $change_since : ''),__LINE__,__FILE__);
+				((int)$change_since ? ' AND cal_start >= '.(int)$change_since : ''), __LINE__, __FILE__);
 		}
 		return $this->db->affected_rows();
 	}
@@ -1797,8 +1795,7 @@ 
 		}
 		if (is_array($attendee))
 		{
-			$email = !empty($attendee['email']) ? $user_attendee['email'] :
-				(strtolower(substr($attendee['url'], 0, 7)) == 'mailto:' ? substr($user_attendee['url'], 7) : $attendee['url']);
+			$email = !empty($attendee['email']) ? $user_attendee['email'] : (strtolower(substr($attendee['url'], 0, 7)) == 'mailto:' ? substr($user_attendee['url'], 7) : $attendee['url']);
 			$attendee = !empty($attendee['cn']) ? $attendee['cn'].' <'.$email.'>' : $email;
 		}
 		return $attendee;
@@ -1811,11 +1808,11 @@ 
 	 * @param string|array $attendee attendee information: email, json or array with attr cn and url
 	 * @return string|int combined id
 	 */
-	static function combine_user($user_type, $user_id, $attendee=null)
+	static function combine_user($user_type, $user_id, $attendee = null)
 	{
 		if (!$user_type || $user_type == 'u')
 		{
-			return (int) $user_id;
+			return (int)$user_id;
 		}
 		if ($user_type == 'e' && $attendee)
 		{
@@ -1835,12 +1832,12 @@ 
 	 * @param string|int &$user_id id
 	 * @param boolean $md5_email =false md5 hash user_id for email / user_type=="e"
 	 */
-	static function split_user($uid, &$user_type, &$user_id, $md5_email=false)
+	static function split_user($uid, &$user_type, &$user_id, $md5_email = false)
 	{
 		if (is_numeric($uid))
 		{
 			$user_type = 'u';
-			$user_id = (int) $uid;
+			$user_id = (int)$uid;
 		}
 		// create md5 hash from lowercased and trimed raw email ("rb@stylite.de", not "Ralf Becker <rb@stylite.de>")
 		elseif ($md5_email && $uid[0] == 'e')
@@ -1854,7 +1851,7 @@ 
 		else
 		{
 			$user_type = $uid[0];
-			$user_id = substr($uid,1);
+			$user_id = substr($uid, 1);
 		}
 	}
 
@@ -1866,7 +1863,7 @@ 
 	 * @param string $role ='REQ-PARTICIPANT'
 	 * @return string
 	 */
-	static function combine_status($status,$quantity=1,$role='REQ-PARTICIPANT')
+	static function combine_status($status, $quantity = 1, $role = 'REQ-PARTICIPANT')
 	{
 		if ((int)$quantity > 1) $status .= (int)$quantity;
 		if ($role != 'REQ-PARTICIPANT') $status .= $role;
@@ -1882,13 +1879,13 @@ 
 	 * @param string &$role=null only O: role
 	 * @return string status U, T, A or R, same as $status parameter on return
 	 */
-	static function split_status(&$status,&$quantity=null,&$role=null)
+	static function split_status(&$status, &$quantity = null, &$role = null)
 	{
 		$quantity = 1;
 		$role = 'REQ-PARTICIPANT';
 		//error_log(__METHOD__.__LINE__.array2string($status));
 		$matches = null;
-		if (is_string($status) && strlen($status) > 1 && preg_match('/^.([0-9]*)(.*)$/',$status,$matches))
+		if (is_string($status) && strlen($status) > 1 && preg_match('/^.([0-9]*)(.*)$/', $status, $matches))
 		{
 			if ((int)$matches[1] > 0) $quantity = (int)$matches[1];
 			if ($matches[2]) $role = $matches[2];
@@ -1915,14 +1912,14 @@ 
 	 *		true = only add participants if needed, no participant will be deleted (participants to check/add required in $participants)
 	 * @return int|boolean number of updated recurrences or false on error
 	 */
-	function participants($cal_id,$participants,$change_since=0,$add_only=false)
+	function participants($cal_id, $participants, $change_since = 0, $add_only = false)
 	{
 		//error_log(__METHOD__."($cal_id,".array2string($participants).",$change_since,$add_only");
 
 		$recurrences = array();
 
 		// remove group-invitations, they are NOT stored in the db
-		foreach($participants as $uid => $status)
+		foreach ($participants as $uid => $status)
 		{
 			if ($status[0] == 'G')
 			{
@@ -1931,7 +1928,7 @@ 
 		}
 		$where = array('cal_id' => $cal_id);
 
-		if ((int) $change_since)
+		if ((int)$change_since)
 		{
 			$where[] = '(cal_recur_date=0 OR cal_recur_date >= '.(int)$change_since.')';
 		}
@@ -1939,31 +1936,31 @@ 
 		if ($change_since !== false)
 		{
 			// find all existing recurrences
-			foreach($this->db->select($this->user_table,'DISTINCT cal_recur_date',$where,__LINE__,__FILE__,false,'','calendar') as $row)
+			foreach ($this->db->select($this->user_table, 'DISTINCT cal_recur_date', $where, __LINE__, __FILE__, false, '', 'calendar') as $row)
 			{
 				$recurrences[] = $row['cal_recur_date'];
 			}
 
 			// update existing entries
-			$existing_entries = $this->db->select($this->user_table,'*',$where,__LINE__,__FILE__,false,'ORDER BY cal_recur_date DESC','calendar');
+			$existing_entries = $this->db->select($this->user_table, '*', $where, __LINE__, __FILE__, false, 'ORDER BY cal_recur_date DESC', 'calendar');
 
 			// create a full list of participants which already exist in the db
 			// with status, quantity and role of the earliest recurence
 			$old_participants = array();
-			foreach($existing_entries as $row)
+			foreach ($existing_entries as $row)
 			{
 				$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
 				if ($row['cal_recur_date'] || !isset($old_participants[$uid]))
 				{
-					$old_participants[$uid] = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
+					$old_participants[$uid] = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
 				}
 			}
 
 			// tag participants which should be deleted
-			if($add_only === false)
+			if ($add_only === false)
 			{
 				$deleted = array();
-				foreach($existing_entries as $row)
+				foreach ($existing_entries as $row)
 				{
 					$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
 					// delete not longer set participants
@@ -1976,7 +1973,7 @@ 
 
 			// only keep added OR status (incl. quantity!) changed participants for further steps
 			// we do not touch unchanged (!) existing ones
-			foreach($participants as $uid => $status)
+			foreach ($participants as $uid => $status)
 			{
 				if ($old_participants[$uid] === $status)
 				{
@@ -1988,46 +1985,46 @@ 
 			if ($add_only === false && count($deleted))
 			{
 				$to_or = array();
-				$table_def = $this->db->get_table_definitions('calendar',$this->user_table);
-				foreach($deleted as $type => $ids)
+				$table_def = $this->db->get_table_definitions('calendar', $this->user_table);
+				foreach ($deleted as $type => $ids)
 				{
-					$to_or[] = $this->db->expression($table_def,array(
+					$to_or[] = $this->db->expression($table_def, array(
 						'cal_user_type' => $type,
 						'cal_user_id'   => $ids,
 					));
 				}
-				$where[] = '('.implode(' OR ',$to_or).')';
-				$where[] = "cal_status!='E'";	// do NOT delete exception marker
-				$this->db->update($this->user_table,array('cal_status'=>'X'),$where,__LINE__,__FILE__,'calendar');
+				$where[] = '('.implode(' OR ', $to_or).')';
+				$where[] = "cal_status!='E'"; // do NOT delete exception marker
+				$this->db->update($this->user_table, array('cal_status'=>'X'), $where, __LINE__, __FILE__, 'calendar');
 			}
 		}
 
 		if (count($participants))	// participants which need to be added
 		{
-			if (!count($recurrences)) $recurrences[] = 0;   // insert the default recurrence
+			if (!count($recurrences)) $recurrences[] = 0; // insert the default recurrence
 
 			$delete_deleted = array();
 
 			// update participants
-			foreach($participants as $uid => $status)
+			foreach ($participants as $uid => $status)
 			{
 				$type = $id = $quantity = $role = null;
 				self::split_user($uid, $type, $id, true);
-				self::split_status($status,$quantity,$role);
+				self::split_status($status, $quantity, $role);
 				$set = array(
 					'cal_status'	  => $status,
 					'cal_quantity'	  => $quantity,
 					'cal_role'        => $role,
 					'cal_user_attendee' => $type == 'e' ? substr($uid, 1) : null,
 				);
-				foreach($recurrences as $recur_date)
+				foreach ($recurrences as $recur_date)
 				{
-					$this->db->insert($this->user_table,$set,array(
+					$this->db->insert($this->user_table, $set, array(
 						'cal_id'	      => $cal_id,
 						'cal_recur_date'  => $recur_date,
 						'cal_user_type'   => $type,
 						'cal_user_id' 	  => $id,
-					),__LINE__,__FILE__,'calendar');
+					), __LINE__, __FILE__, 'calendar');
 				}
 				// for new or changed group-invitations, remove previously deleted members, so they show up again
 				if ($uid < 0)
@@ -2037,13 +2034,13 @@ 
 			}
 			if ($delete_deleted)
 			{
-				$this->db->delete($this->user_table, $where=array(
+				$this->db->delete($this->user_table, $where = array(
 					'cal_id' => $cal_id,
 					'cal_recur_date' => $recurrences,
 					'cal_user_type' => 'u',
 					'cal_user_id' => array_unique($delete_deleted),
 					'cal_status' => 'X',
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 				//error_log(__METHOD__."($cal_id, ".array2string($participants).", since=$change_since, add_only=$add_only) db->delete('$this->user_table', ".array2string($where).") affected ".$this->db->affected_rows().' rows');
 			}
 		}
@@ -2062,7 +2059,7 @@ 
 	 * @param string $attendee =null extra attendee information to set for all types (incl. accounts!)
 	 * @return int number of changed recurrences
 	 */
-	function set_status($cal_id,$user_type,$user_id,$status,$recur_date=0,$role=null,$attendee=null)
+	function set_status($cal_id, $user_type, $user_id, $status, $recur_date = 0, $role = null, $attendee = null)
 	{
 		static $status_code_short = array(
 			REJECTED 	=> 'R',
@@ -2087,7 +2084,7 @@ 
 			'cal_user_type'	=> $user_type,
 			'cal_user_id'   => $user_id_md5,
 		);
-		if ((int) $recur_date)
+		if ((int)$recur_date)
 		{
 			$where['cal_recur_date'] = $recur_date;
 		}
@@ -2098,7 +2095,7 @@ 
 
 		if ($status == 'G')		// remove group invitations, as we dont store them in the db
 		{
-			$this->db->delete($this->user_table,$where,__LINE__,__FILE__,'calendar');
+			$this->db->delete($this->user_table, $where, __LINE__, __FILE__, 'calendar');
 			$ret = $this->db->affected_rows();
 		}
 		else
@@ -2106,7 +2103,7 @@ 
 			$set = array('cal_status' => $status);
 			if ($user_type == 'e' || $attendee) $set['cal_user_attendee'] = $attendee ? $attendee : $user_id;
 			if (!is_null($role) && $role != 'REQ-PARTICIPANT') $set['cal_role'] = $role;
-			$this->db->insert($this->user_table,$set,$where,__LINE__,__FILE__,'calendar');
+			$this->db->insert($this->user_table, $set, $where, __LINE__, __FILE__, 'calendar');
 			// for new or changed group-invitations, remove previously deleted members, so they show up again
 			if (($ret = $this->db->affected_rows()) && $user_type == 'u' && $user_id < 0)
 			{
@@ -2119,7 +2116,7 @@ 
 		// update modified and modifier in main table
 		if ($ret)
 		{
-			$this->updateModified($cal_id, true);	// true = update series master too
+			$this->updateModified($cal_id, true); // true = update series master too
 		}
 		//error_log(__METHOD__."($cal_id,$user_type,$user_id,$status,$recur_date) = $ret");
 		return $ret;
@@ -2134,7 +2131,7 @@ 
 	 * @param array $participants uid => status pairs
 	 * @param boolean $exception =null true or false to set recure_exception flag, null leave it unchanged (new are by default no exception)
 	 */
-	function recurrence($cal_id,$start,$end,$participants,$exception=null)
+	function recurrence($cal_id, $start, $end, $participants, $exception = null)
 	{
 		//error_log(__METHOD__."($cal_id, $start, $end, ".array2string($participants).", ".array2string($exception));
 		$update = array('cal_end' => $end);
@@ -2143,7 +2140,7 @@ 
 		$this->db->insert($this->dates_table, $update, array(
 			'cal_id' => $cal_id,
 			'cal_start'  => $start,
-		),__LINE__,__FILE__,'calendar');
+		), __LINE__, __FILE__, 'calendar');
 
 		if (!is_array($participants))
 		{
@@ -2151,26 +2148,26 @@ 
 		}
 		if ($exception !== true)
 		{
-			foreach($participants as $uid => $status)
+			foreach ($participants as $uid => $status)
 			{
-				if ($status == 'G') continue;	// dont save group-invitations
+				if ($status == 'G') continue; // dont save group-invitations
 
 				$type = '';
 				$id = null;
 				self::split_user($uid, $type, $id, true);
 				$quantity = $role = null;
-				self::split_status($status,$quantity,$role);
-				$this->db->insert($this->user_table,array(
+				self::split_status($status, $quantity, $role);
+				$this->db->insert($this->user_table, array(
 					'cal_status'	=> $status,
 					'cal_quantity'	=> $quantity,
 					'cal_role'		=> $role,
 					'cal_user_attendee' => $type == 'e' ? substr($uid, 1) : null,
-				),array(
+				), array(
 					'cal_id'		 => $cal_id,
 					'cal_recur_date' => $start,
 					'cal_user_type'  => $type,
 					'cal_user_id' 	 => $id,
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 			}
 		}
 	}
@@ -2184,7 +2181,7 @@ 
 	function unfinished_recuring($time)
 	{
 		$ids = array();
-		foreach($rs=$this->db->select($this->repeats_table, "$this->repeats_table.cal_id,MAX(cal_start) AS cal_start",
+		foreach ($rs = $this->db->select($this->repeats_table, "$this->repeats_table.cal_id,MAX(cal_start) AS cal_start",
 			'(range_end IS NULL OR range_end > '.(int)$time.')',
 			__LINE__, __FILE__, false, "GROUP BY $this->repeats_table.cal_id,range_end", 'calendar', 0,
 			" JOIN $this->cal_table ON $this->repeats_table.cal_id=$this->cal_table.cal_id".
@@ -2210,9 +2207,9 @@ 
 		// update timestamp of series master, updates own timestamp too, which does not hurt ;-)
 		$this->updateModified($cal_id, true);
 
-		foreach($this->all_tables as $table)
+		foreach ($this->all_tables as $table)
 		{
-			$this->db->delete($table,array('cal_id'=>$cal_id),__LINE__,__FILE__,'calendar');
+			$this->db->delete($table, array('cal_id'=>$cal_id), __LINE__, __FILE__, 'calendar');
 		}
 	}
 
@@ -2228,19 +2225,19 @@ 
 	function purge($date)
 	{
 		// with new range_end we simple delete all with range_end < $date (range_end NULL is never returned)
-		foreach($this->db->select($this->cal_table, 'cal_id', 'range_end < '.(int)$date, __LINE__, __FILE__, false, '', 'calendar') as $row)
+		foreach ($this->db->select($this->cal_table, 'cal_id', 'range_end < '.(int)$date, __LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			//echo __METHOD__." About to delete".$row['cal_id']."\r\n";
-			foreach($this->all_tables as $table)
+			foreach ($this->all_tables as $table)
 			{
 				$this->db->delete($table, array('cal_id'=>$row['cal_id']), __LINE__, __FILE__, 'calendar');
 			}
 			// handle sync
-			$this->db->update('egw_api_content_history',array(
+			$this->db->update('egw_api_content_history', array(
 				'sync_deleted' => time(),
-			),array(
+			), array(
 				'sync_appname' => 'calendar',
-				'sync_contentid' => $row['cal_id'],	// sync_contentid is varchar(60)!
+				'sync_contentid' => $row['cal_id'], // sync_contentid is varchar(60)!
 			), __LINE__, __FILE__, 'calendar');
 			// handle links
 			Link::unlink('', 'calendar', $row['cal_id']);
@@ -2263,23 +2260,23 @@ 
 	 * @param boolean $update_cache =null true: re-read given $cal_id, false: delete given $cal_id
 	 * @return array of (cal_id => array of) alarms with alarm-id as key
 	 */
-	function read_alarms($cal_id, $update_cache=null)
+	function read_alarms($cal_id, $update_cache = null)
 	{
 		if (!isset(self::$alarm_cache) && is_array($cal_id))
 		{
 			self::$alarm_cache = array();
 			if (($jobs = $this->async->read('cal:%')))
 			{
-				foreach($jobs as $id => $job)
+				foreach ($jobs as $id => $job)
 				{
-					$alarm         = $job['data'];	// text, enabled
+					$alarm         = $job['data']; // text, enabled
 					$alarm['id']   = $id;
 					$alarm['time'] = $job['next'];
 
 					self::$alarm_cache[$alarm['cal_id']][$id] = $alarm;
 				}
 			}
-			unset($update_cache);	// just done
+			unset($update_cache); // just done
 		}
 		$alarms = array();
 
@@ -2287,13 +2284,13 @@ 
 		{
 			if (isset($update_cache))
 			{
-				foreach((array)$cal_id as $id)
+				foreach ((array)$cal_id as $id)
 				{
 					if ($update_cache === false)
 					{
 						unset(self::$alarm_cache[$cal_id]);
 					}
-					elseif($update_cache === true)
+					elseif ($update_cache === true)
 					{
 						self::$alarm_cache[$cal_id] = $this->read_alarms_nocache($cal_id);
 					}
@@ -2305,7 +2302,7 @@ 
 			}
 			else
 			{
-				foreach($cal_id as $id)
+				foreach ($cal_id as $id)
 				{
 					$alarms[$id] = (array)self::$alarm_cache[$id];
 				}
@@ -2320,9 +2317,9 @@ 
 	{
 		if (($jobs = $this->async->read('cal:'.(int)$cal_id.':%')))
 		{
-			foreach($jobs as $id => $job)
+			foreach ($jobs as $id => $job)
 			{
-				$alarm         = $job['data'];	// text, enabled
+				$alarm         = $job['data']; // text, enabled
 				$alarm['id']   = $id;
 				$alarm['time'] = $job['next'];
 
@@ -2345,8 +2342,8 @@ 
 		{
 			return False;
 		}
-		list($alarm_id,$job) = each($jobs);
-		$alarm         = $job['data'];	// text, enabled
+		list($alarm_id, $job) = each($jobs);
+		$alarm         = $job['data']; // text, enabled
 		$alarm['id']   = $alarm_id;
 		$alarm['time'] = $job['next'];
 
@@ -2362,12 +2359,12 @@ 
 	 * @param boolean $update_modified =true call update modified, default true
 	 * @return string id of the alarm
 	 */
-	function save_alarm($cal_id, $alarm, $update_modified=true)
+	function save_alarm($cal_id, $alarm, $update_modified = true)
 	{
 		//error_log(__METHOD__."($cal_id, ".array2string($alarm).', '.array2string($update_modified).') '.function_backtrace());
 		if (!($id = $alarm['id']))
 		{
-			$alarms = $this->read_alarms($cal_id);	// find a free alarm#
+			$alarms = $this->read_alarms($cal_id); // find a free alarm#
 			$n = count($alarms);
 			do
 			{
@@ -2380,12 +2377,12 @@ 
 		{
 			$this->async->cancel_timer($id);
 		}
-		$alarm['cal_id'] = $cal_id;		// we need the back-reference
+		$alarm['cal_id'] = $cal_id; // we need the back-reference
 		// add an alarm uid, if none is given
 		if (empty($alarm['uid']) && class_exists('Horde_Support_Uuid')) $alarm['uid'] = (string)new Horde_Support_Uuid;
 		//error_log(__METHOD__.__LINE__.' Save Alarm for CalID:'.$cal_id.'->'.array2string($alarm).'-->'.$id.'#'.function_backtrace());
 		// allways store job with the alarm owner as job-owner to get eg. the correct from address
-		if (!$this->async->set_timer($alarm['time'],$id,'calendar.calendar_boupdate.send_alarm',$alarm,$alarm['owner']))
+		if (!$this->async->set_timer($alarm['time'], $id, 'calendar.calendar_boupdate.send_alarm', $alarm, $alarm['owner']))
 		{
 			return False;
 		}
@@ -2412,7 +2409,7 @@ 
 		//error_log(__METHOD__."($cal_id) ".function_backtrace());
 		if (($alarms = $this->read_alarms($cal_id)))
 		{
-			foreach(array_keys($alarms) as $id)
+			foreach (array_keys($alarms) as $id)
 			{
 				$this->async->cancel_timer($id);
 			}
@@ -2432,7 +2429,7 @@ 
 	{
 		//error_log(__METHOD__."('$id') ".function_backtrace());
 		// update the modification information of the related event
-		list(,$cal_id) = explode(':',$id);
+		list(,$cal_id) = explode(':', $id);
 		if ($cal_id)
 		{
 			$this->updateModified($cal_id, true);
@@ -2451,7 +2448,7 @@ 
 	 * @param array|int $old_user integer old user or array with keys 'account_id' and 'new_owner' as the deleteaccount hook uses it
 	 * @param int $new_user =null
 	 */
-	function deleteaccount($old_user, $new_user=null)
+	function deleteaccount($old_user, $new_user = null)
 	{
 		if (is_array($old_user))
 		{
@@ -2462,52 +2459,52 @@ 
 		{
 			$user_type = '';
 			$user_id = null;
-			self::split_user($old_user,$user_type,$user_id);
+			self::split_user($old_user, $user_type, $user_id);
 
 			if ($user_type == 'u')	// only accounts can be owners of events
 			{
-				foreach($this->db->select($this->cal_table,'cal_id',array('cal_owner' => $old_user),__LINE__,__FILE__,false,'','calendar') as $row)
+				foreach ($this->db->select($this->cal_table, 'cal_id', array('cal_owner' => $old_user), __LINE__, __FILE__, false, '', 'calendar') as $row)
 				{
 					$this->delete($row['cal_id']);
 				}
 			}
-			$this->db->delete($this->user_table,array(
+			$this->db->delete($this->user_table, array(
 				'cal_user_type' => $user_type,
 				'cal_user_id'   => $user_id,
-			),__LINE__,__FILE__,'calendar');
+			), __LINE__, __FILE__, 'calendar');
 
 			// delete calendar entries without participants (can happen if the deleted user is the only participants, but not the owner)
-			foreach($this->db->select($this->cal_table,"DISTINCT $this->cal_table.cal_id",'cal_user_id IS NULL',__LINE__,__FILE__,
-				False,'','calendar',0,"LEFT JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id") as $row)
+			foreach ($this->db->select($this->cal_table, "DISTINCT $this->cal_table.cal_id", 'cal_user_id IS NULL', __LINE__, __FILE__,
+				False, '', 'calendar', 0, "LEFT JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id") as $row)
 			{
 				$this->delete($row['cal_id']);
 			}
 		}
 		else
 		{
-			$this->db->update($this->cal_table,array('cal_owner' => $new_user),array('cal_owner' => $old_user),__LINE__,__FILE__,'calendar');
+			$this->db->update($this->cal_table, array('cal_owner' => $new_user), array('cal_owner' => $old_user), __LINE__, __FILE__, 'calendar');
 			// delete participation of old user, if new user is already a participant
 			$ids = array();
-			foreach($this->db->select($this->user_table,'cal_id',array(		// MySQL does NOT allow to run this as delete!
+			foreach ($this->db->select($this->user_table, 'cal_id', array(		// MySQL does NOT allow to run this as delete!
 				'cal_user_type' => 'u',
 				'cal_user_id' => $old_user,
 				"cal_id IN (SELECT cal_id FROM $this->user_table other WHERE other.cal_id=cal_id AND other.cal_user_id=".$this->db->quote($new_user)." AND cal_user_type='u')",
-			),__LINE__,__FILE__,false,'','calendar') as $row)
+			), __LINE__, __FILE__, false, '', 'calendar') as $row)
 			{
 				$ids[] = $row['cal_id'];
 			}
-			if ($ids) $this->db->delete($this->user_table,array(
+			if ($ids) $this->db->delete($this->user_table, array(
 				'cal_user_type' => 'u',
 				'cal_user_id' => $old_user,
 				'cal_id' => $ids,
-			),__LINE__,__FILE__,'calendar');
+			), __LINE__, __FILE__, 'calendar');
 			// now change participant in the rest to contain new user instead of old user
-			$this->db->update($this->user_table,array(
+			$this->db->update($this->user_table, array(
 				'cal_user_id' => $new_user,
-			),array(
+			), array(
 				'cal_user_type' => 'u',
 				'cal_user_id' => $old_user,
-			),__LINE__,__FILE__,'calendar');
+			), __LINE__, __FILE__, 'calendar');
 		}
 	}
 
@@ -2521,18 +2518,18 @@ 
 	 *
 	 * @return array recur_date => status pairs (index 0 => main status)
 	 */
-	function get_recurrences($cal_id, $uid=null, $start=0, $end=0)
+	function get_recurrences($cal_id, $uid = null, $start = 0, $end = 0)
 	{
 		$participant_status = array();
 		$where = array('cal_id' => $cal_id);
-		if ($start != 0 && $end == 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
-		if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		if ($start != 0 && $end == 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date >= '.(int)$start.')';
+		if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date <= '.(int)$end.')';
 		if ($start != 0 && $end != 0)
 		{
-			$where[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start .
-						' AND cal_recur_date <= ' . (int)$end . '))';
+			$where[] = '(cal_recur_date = 0 OR (cal_recur_date >= '.(int)$start.
+						' AND cal_recur_date <= '.(int)$end.'))';
 		}
-		foreach($this->db->select($this->user_table,'DISTINCT cal_recur_date',$where,__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->user_table, 'DISTINCT cal_recur_date', $where, __LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			// inititalize the array
 			$participant_status[$row['cal_recur_date']] = null;
@@ -2546,17 +2543,17 @@ 
 			'cal_user_type'	=> $user_type ? $user_type : 'u',
 			'cal_user_id'   => $user_id,
 		);
-		if ($start != 0 && $end == 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
-		if ($start == 0 && $end != 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		if ($start != 0 && $end == 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date >= '.(int)$start.')';
+		if ($start == 0 && $end != 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date <= '.(int)$end.')';
 		if ($start != 0 && $end != 0)
 		{
-			$where2[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start .
-						' AND cal_recur_date <= ' . (int)$end . '))';
+			$where2[] = '(cal_recur_date = 0 OR (cal_recur_date >= '.(int)$start.
+						' AND cal_recur_date <= '.(int)$end.'))';
 		}
-		foreach ($this->db->select($this->user_table,'cal_recur_date,cal_status,cal_quantity,cal_role',$where2,
-				__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->user_table, 'cal_recur_date,cal_status,cal_quantity,cal_role', $where2,
+				__LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
-			$status = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
+			$status = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
 			$participant_status[$row['cal_recur_date']] = $status;
 		}
 		return $participant_status;
@@ -2605,8 +2602,8 @@ 
 			'cal_uid'		=> $uid,
 		);
 		$related = array();
-		foreach ($this->db->select($this->cal_table,'cal_id,cal_reference',$where,
-				__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->cal_table, 'cal_id,cal_reference', $where,
+				__LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			if ($row['cal_reference'] != 0)
 			{
@@ -2635,10 +2632,10 @@ 
 	 *
 	 * @return array		Array of exception days (false for non-recurring events).
 	 */
-	function get_recurrence_exceptions($event, $tz_id=null, $start=0, $end=0, $filter='all')
+	function get_recurrence_exceptions($event, $tz_id = null, $start = 0, $end = 0, $filter = 'all')
 	{
 		if (!is_array($event)) return false;
-		$cal_id = (int) $event['id'];
+		$cal_id = (int)$event['id'];
 		//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 		//		"($cal_id, $tz_id, $filter): " . $event['tzid']);
 		if (!$cal_id || $event['recur_type'] == MCAL_RECUR_NONE) return false;
@@ -2662,27 +2659,27 @@ 
 		while ($egw_rrule->valid())
 		{
 			while ($egw_rrule->exceptions &&
-				in_array($egw_rrule->current->format('Ymd'),$egw_rrule->exceptions))
+				in_array($egw_rrule->current->format('Ymd'), $egw_rrule->exceptions))
 			{
-				if (in_array($filter, array('map','tz_map','rrule','tz_rrule')))
+				if (in_array($filter, array('map', 'tz_map', 'rrule', 'tz_rrule')))
 				{
 					 // real exception
-					$locts = (int)Api\DateTime::to($egw_rrule->current(),'server');
+					$locts = (int)Api\DateTime::to($egw_rrule->current(), 'server');
 					if ($expand_all)
 					{
-						$remts = (int)Api\DateTime::to($remote_rrule->current(),'server');
+						$remts = (int)Api\DateTime::to($remote_rrule->current(), 'server');
 						if ($remote)
 						{
-							$days[$locts]= $remts;
+							$days[$locts] = $remts;
 						}
 						else
 						{
-							$days[$remts]= $locts;
+							$days[$remts] = $locts;
 						}
 					}
 					else
 					{
-						$days[$locts]= $locts;
+						$days[$locts] = $locts;
 					}
 				}
 				if ($expand_all)
@@ -2693,14 +2690,14 @@ 
 				if (!$egw_rrule->valid()) return $days;
 			}
 			$day = $egw_rrule->current();
-			$locts = (int)Api\DateTime::to($day,'server');
+			$locts = (int)Api\DateTime::to($day, 'server');
 			$tz_exception = ($filter == 'tz_rrule');
 			//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 			//	'()[EVENT Server]: ' . $day->format('Ymd\THis') . " ($locts)");
 			if ($expand_all)
 			{
 				$remote_day = $remote_rrule->current();
-				$remts = (int)Api\DateTime::to($remote_day,'server');
+				$remts = (int)Api\DateTime::to($remote_day, 'server');
 			//	error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 			//	'()[EVENT Device]: ' . $remote_day->format('Ymd\THis') . " ($remts)");
 			}
@@ -2719,11 +2716,11 @@ 
 						//	'() tz exception: ' . $day->format('Ymd\THis'));
 						if ($remote)
 						{
-							$days[$locts]= $remts;
+							$days[$locts] = $remts;
 						}
 						else
 						{
-							$days[$remts]= $locts;
+							$days[$remts] = $locts;
 						}
 					}
 				}
@@ -2745,18 +2742,18 @@ 
 							{
 								if ($remote)
 								{
-									$days[$locts]= $remts;
+									$days[$locts] = $remts;
 								}
 								else
 								{
-									$days[$remts]= $locts;
+									$days[$remts] = $locts;
 								}
 							}
 						}
 					}
 					elseif ($filter != 'map')
 					{
-						$days[$locts]= $locts;
+						$days[$locts] = $locts;
 					}
 				}
 				elseif (($filter == 'map' || filter == 'tz_map') &&
@@ -2766,11 +2763,11 @@ 
 					if ($expand_all)
 					{
 
-						$days[$remts]= $locts;
+						$days[$remts] = $locts;
 					}
 					else
 					{
-						$days[$locts]= $locts;
+						$days[$locts] = $locts;
 					}
 				}
 			}
@@ -2794,9 +2791,9 @@ 
 	 */
 	function status_pseudo_exception($cal_id, $recur_date, $filter)
 	{
-		static $recurrence_zero=null;
-		static $cached_id=null;
-		static $user=null;
+		static $recurrence_zero = null;
+		static $cached_id = null;
+		static $user = null;
 
 		if (!isset($cached_id) || $cached_id != $cal_id)
 		{
@@ -2807,8 +2804,8 @@ 
 				'cal_id' => $cal_id,
 				'cal_recur_date' => 0,
 			);
-			foreach ($this->db->select($this->user_table,'cal_user_type,cal_user_id,cal_user_attendee,cal_status',$where,
-				__LINE__,__FILE__,false,'','calendar') as $row)
+			foreach ($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee,cal_status', $where,
+				__LINE__, __FILE__, false, '', 'calendar') as $row)
 			{
 				switch ($row['cal_user_type'])
 				{
@@ -2831,8 +2828,8 @@ 
 			'cal_id' => $cal_id,
 			'cal_recur_date' => $recur_date,
 		);
-		foreach ($this->db->select($this->user_table,'cal_user_type,cal_user_id,cal_user_attendee,cal_status',$where,
-			__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee,cal_status', $where,
+			__LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			switch ($row['cal_user_type'])
 			{
@@ -2929,14 +2926,14 @@ 
 			}
 			$timezone = self::$tz_cache[$event['tzid']];
 		}
-		$start_time = new Api\DateTime($event['start'],Api\DateTime::$server_timezone);
+		$start_time = new Api\DateTime($event['start'], Api\DateTime::$server_timezone);
 		$start_time->setTimezone($timezone);
-		$end_time = new Api\DateTime($event['end'],Api\DateTime::$server_timezone);
+		$end_time = new Api\DateTime($event['end'], Api\DateTime::$server_timezone);
 		$end_time->setTimezone($timezone);
 		//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 		//	'(): ' . $start . '-' . $end);
-		$start = Api\DateTime::to($start_time,'array');
-		$end = Api\DateTime::to($end_time,'array');
+		$start = Api\DateTime::to($start_time, 'array');
+		$end = Api\DateTime::to($end_time, 'array');
 
 
 		return !$start['hour'] && !$start['minute'] && $end['hour'] == 23 && $end['minute'] == 59;
@@ -2950,7 +2947,7 @@ 
 	 *
 	 * @return DateTime
 	 */
-	function &startOfDay(Api\DateTime $time, $tz_id=null)
+	function &startOfDay(Api\DateTime $time, $tz_id = null)
 	{
 		if (empty($tz_id))
 		{
@@ -2975,14 +2972,14 @@ 
 	 * @param int $time =null new timestamp, default current (server-)time
 	 * @param int $modifier =null uid of the modifier, default current user
 	 */
-	function updateModified($id, $update_master=false, $time=null, $modifier=null)
+	function updateModified($id, $update_master = false, $time = null, $modifier = null)
 	{
 		if (is_null($time) || !$time) $time = time();
 		if (is_null($modifier)) $modifier = $GLOBALS['egw_info']['user']['account_id'];
 
 		$this->db->update($this->cal_table,
 			array('cal_modified' => $time, 'cal_modifier' => $modifier),
-			array('cal_id' => $id), __LINE__,__FILE__, 'calendar');
+			array('cal_id' => $id), __LINE__, __FILE__, 'calendar');
 
 		// if event is an exception: update modified of master, to force etag, ctag and sync-token change
 		if ($update_master)

api/asyncservices.php

Spacing +10 added lines, -11 removed lines

@@ -15,7 +15,7 @@ 
 use EGroupware\Api\Asyncservice;
 
 if (!isset($_REQUEST['domain'])) $_REQUEST['domain'] = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : 'default';
-$path_to_egroupware = realpath(__DIR__.'/..');	//  need to be adapted if this script is moved somewhere else
+$path_to_egroupware = realpath(__DIR__.'/..'); //  need to be adapted if this script is moved somewhere else
 
 // remove the comment from one of the following lines to enable loging
 // define('ASYNC_LOG','C:\\async.log');		// Windows
@@ -25,8 +25,8 @@ 
 if (defined('ASYNC_LOG'))
 {
 	$msg = date('Y/m/d H:i:s ').$_REQUEST['domain'].": asyncservice started\n";
-	$f = fopen(ASYNC_LOG,'a+');
-	fwrite($f,$msg);
+	$f = fopen(ASYNC_LOG, 'a+');
+	fwrite($f, $msg);
 	fclose($f);
 }
 $GLOBALS['egw_info']['flags'] = array(
@@ -43,8 +43,8 @@ 
 	}
 	if (defined('ASYNC_LOG'))
 	{
-		$f = fopen(ASYNC_LOG,'a+');
-		fwrite($f,$msg);
+		$f = fopen(ASYNC_LOG, 'a+');
+		fwrite($f, $msg);
 		fclose($f);
 	}
 	die($msg);
@@ -63,8 +63,8 @@ 
 	}
 	if (defined('ASYNC_LOG'))
 	{
-		$f = fopen(ASYNC_LOG,'a+');
-		fwrite($f,$msg);
+		$f = fopen(ASYNC_LOG, 'a+');
+		fwrite($f, $msg);
 		fclose($f);
 	}
 	die($msg);
@@ -75,8 +75,7 @@ 
 $async = new Asyncservice();
 $num = $async->check_run(isset($_REQUEST['run_by']) ? $_REQUEST['run_by'] : 'crontab');
 
-$msg = date('Y/m/d H:i:s ').$_REQUEST['domain'].': '.($num === false ? 'An error occured: can not obtain semaphore!' :
-	($num ? "$num job(s) executed" : 'Nothing to execute'))."\n\n";
+$msg = date('Y/m/d H:i:s ').$_REQUEST['domain'].': '.($num === false ? 'An error occured: can not obtain semaphore!' : ($num ? "$num job(s) executed" : 'Nothing to execute'))."\n\n";
 
 if (isset($_SERVER['HTTP_HOST']))
 {
@@ -87,7 +86,7 @@ 
 
 if (defined('ASYNC_LOG'))
 {
-	$f = fopen(ASYNC_LOG,'a+');
-	fwrite($f,$msg);
+	$f = fopen(ASYNC_LOG, 'a+');
+	fwrite($f, $msg);
 	fclose($f);
 }

Braces +4 added lines, -1 removed lines

@@ -14,7 +14,10 @@
 
 use EGroupware\Api\Asyncservice;
 
-if (!isset($_REQUEST['domain'])) $_REQUEST['domain'] = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : 'default';
+if (!isset($_REQUEST['domain']))
+{
+	$_REQUEST['domain'] = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : 'default';
+}
 $path_to_egroupware = realpath(__DIR__.'/..');	//  need to be adapted if this script is moved somewhere else
 
 // remove the comment from one of the following lines to enable loging

api/images.php

Spacing +6 added lines, -6 removed lines

@@ -28,17 +28,17 @@ 
 
 include '../header.inc.php';
 
-$content = json_encode(Api\Image::map(preg_match('/^[a-z0-9_-]+$/i',$_GET['template']) ? $_GET['template'] : null, $_GET['svg']),
-	JSON_FORCE_OBJECT |	// export empty php-arrays as empty objects, not empty arrays
-	JSON_UNESCAPED_SLASHES | // do not escape slashes, smaller and better readable
+$content = json_encode(Api\Image::map(preg_match('/^[a-z0-9_-]+$/i', $_GET['template']) ? $_GET['template'] : null, $_GET['svg']),
+	JSON_FORCE_OBJECT|// export empty php-arrays as empty objects, not empty arrays
+	JSON_UNESCAPED_SLASHES|// do not escape slashes, smaller and better readable
 	(!empty($_GET['debug']) ? JSON_PRETTY_PRINT : 0));
 
 // use an etag over the image mapp
 $etag = '"'.md5($content).'"';
 
 // headers to allow caching, egw_framework specifies etag on url to force reload, even with Expires header
-Api\Session::cache_control(86400);	// cache for one day
-Header('Content-Type: '.(empty($_GET['debug'])?'text/javascript':'application/json').'; charset=utf-8');
+Api\Session::cache_control(86400); // cache for one day
+Header('Content-Type: '.(empty($_GET['debug']) ? 'text/javascript' : 'application/json').'; charset=utf-8');
 Header('ETag: '.$etag);
 
 // if servers send a If-None-Match header, response with 304 Not Modified, if etag matches
@@ -51,7 +51,7 @@ 
 if (empty($_GET['debug'])) $content = 'egw.set_images('.$content.", egw && egw.window !== window);\n";
 
 // we run our own gzip compression, to set a correct Content-Length of the encoded content
-if (in_array('gzip', explode(',',$_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
+if (in_array('gzip', explode(',', $_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
 {
 	$content = gzencode($content);
 	header('Content-Encoding: gzip');

Braces +4 added lines, -1 removed lines

@@ -48,7 +48,10 @@
 	exit;
 }
 
-if (empty($_GET['debug'])) $content = 'egw.set_images('.$content.", egw && egw.window !== window);\n";
+if (empty($_GET['debug']))
+{
+	$content = 'egw.set_images('.$content.", egw && egw.window !== window);\n";
+}
 
 // we run our own gzip compression, to set a correct Content-Length of the encoded content
 if (in_array('gzip', explode(',',$_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))

api/src/Framework/IncludeMgr.php

Spacing +10 added lines, -10 removed lines

@@ -80,7 +80,7 @@ 
 	private function parse_file($file)
 	{
 		// file is from url and can contain query-params, eg. /phpgwapi/inc/jscalendar-setup.php?dateformat=d.m.Y&lang=de
-		if (strpos($file,'?') !== false) list($file) = explode('?',$file);
+		if (strpos($file, '?') !== false) list($file) = explode('?', $file);
 
 		// Mark the file as parsed
 		$this->parsed_files[$file] = true;
@@ -284,17 +284,17 @@ 
 	 * @returns the correct path on the server if the file is found or false, if the
 	 *  file is not found or no further processing is needed.
 	 */
-	private function translate_params($package, $file=null, $app='api')
+	private function translate_params($package, $file = null, $app = 'api')
 	{
 		if ($package[0] == '/' && is_readable(EGW_SERVER_ROOT.parse_url($path = $package, PHP_URL_PATH)) ||
 			// fix old /phpgwapi/js/ path by replacing it with /api/js/
 			substr($package, 0, 13) == '/phpgwapi/js/' && is_readable(EGW_SERVER_ROOT.parse_url($path = str_replace('/phpgwapi/js/', '/api/js/', $package), PHP_URL_PATH)) ||
 			$package[0] == '/' && is_readable(EGW_SERVER_ROOT.($path = $package)) ||
-			$package == '.' && is_readable(EGW_SERVER_ROOT.($path="/$app/js/$file.js")) ||
-			is_readable(EGW_SERVER_ROOT.($path="/$app/js/$package/$file.js")) ||
+			$package == '.' && is_readable(EGW_SERVER_ROOT.($path = "/$app/js/$file.js")) ||
+			is_readable(EGW_SERVER_ROOT.($path = "/$app/js/$package/$file.js")) ||
 			// fix not found by using app='api'
-			$app != 'api' && is_readable(EGW_SERVER_ROOT.($path="/api/js/$package/$file.js")) ||
-			$app != 'phpgwapi' && is_readable(EGW_SERVER_ROOT.($path="/phpgwapi/js/$package/$file.js")))
+			$app != 'api' && is_readable(EGW_SERVER_ROOT.($path = "/api/js/$package/$file.js")) ||
+			$app != 'phpgwapi' && is_readable(EGW_SERVER_ROOT.($path = "/phpgwapi/js/$package/$file.js")))
 		{
 			// normalise /./ to /
 			$path = str_replace('/./', '/', $path);
@@ -305,7 +305,7 @@ 
 			// 	adding the ctime to all js files...
 			if (is_array($file))
 			{
-				foreach($file as $name => $val)
+				foreach ($file as $name => $val)
 				{
 					$args .= (empty($args) ? '?' : '&').$name.'='.urlencode($val);
 				}
@@ -375,7 +375,7 @@ 
 	 * @param array $files
 	 * @param boolean $clear_files =false if true clear list of files, before including given ones
 	 */
-	public function include_files(array $files, $clear_files=false)
+	public function include_files(array $files, $clear_files = false)
 	{
 		if ($clear_files) $this->included_files = array();
 
@@ -391,7 +391,7 @@ 
 	 * @param boolean $clear_files =false if true clear list of files after returning them
 	 * @return array
 	 */
-	public function get_included_files($clear_files=false)
+	public function get_included_files($clear_files = false)
 	{
 		$ret = array_keys($this->included_files);
 		if ($clear_files) $this->included_files = array();
@@ -424,7 +424,7 @@ 
 
 	$paths = !empty($_GET['path']) ? (array)$_GET['path'] : (array)'/stylite/js/filemanager/filemanager.js';
 
-	foreach($paths as $path)
+	foreach ($paths as $path)
 	{
 		echo "\t<h1>".htmlspecialchars($path)."</h1>\n";
 		$mgr->include_js_file($path);

Braces +16 added lines, -4 removed lines

@@ -80,7 +80,10 @@ 
 	private function parse_file($file)
 	{
 		// file is from url and can contain query-params, eg. /phpgwapi/inc/jscalendar-setup.php?dateformat=d.m.Y&lang=de
-		if (strpos($file,'?') !== false) list($file) = explode('?',$file);
+		if (strpos($file,'?') !== false)
+		{
+			list($file) = explode('?',$file);
+		}
 
 		// Mark the file as parsed
 		$this->parsed_files[$file] = true;
@@ -326,12 +329,15 @@ 
 			}
 		}
 
-		if (self::$DEBUG_MODE) // DEBUG_MODE is currently ALWAYS true. Comment this code out if you don't want error messages.
+		if (self::$DEBUG_MODE)
+		{
+			// DEBUG_MODE is currently ALWAYS true. Comment this code out if you don't want error messages.
 		{
 			//error_log(__METHOD__."($package,$file,$app) $path NOT found".($this->debug_processing_file ? " while processing file '{$this->debug_processing_file}'." : "!").' '.function_backtrace());
 		}
 
 		return false;
+		}
 	}
 
 	/**
@@ -377,7 +383,10 @@ 
 	 */
 	public function include_files(array $files, $clear_files=false)
 	{
-		if ($clear_files) $this->included_files = array();
+		if ($clear_files)
+		{
+			$this->included_files = array();
+		}
 
 		foreach ($files as $file)
 		{
@@ -394,7 +403,10 @@ 
 	public function get_included_files($clear_files=false)
 	{
 		$ret = array_keys($this->included_files);
-		if ($clear_files) $this->included_files = array();
+		if ($clear_files)
+		{
+			$this->included_files = array();
+		}
 		return $ret;
 	}
 

api/src/Framework/Template.php

Spacing +34 added lines, -34 removed lines

@@ -32,7 +32,7 @@ 
 	 *	- function-name like set_var to get eg. all assignments or
 	 *	- handle- / variable-names - if you are only interested in some variables ;-)
 	 */
-	var $debug = False;	// array('cat_list','cat_list_t');
+	var $debug = False; // array('cat_list','cat_list_t');
 
 	/**
 	 * $file[handle] = 'filename';
@@ -128,9 +128,9 @@ 
 	 */
 	function set_file($handle, $filename = '')
 	{
-		if ($this->debug && $this->check_debug('set_file',$handle,$filename))
+		if ($this->debug && $this->check_debug('set_file', $handle, $filename))
 		{
-			echo "<p>Template::set_file('".print_r($handle,true)."','$filename')</p>\n";
+			echo "<p>Template::set_file('".print_r($handle, true)."','$filename')</p>\n";
 		}
 		if (!is_array($handle))
 		{
@@ -143,7 +143,7 @@ 
 		}
 		else
 		{
-			foreach($handle as $h => $f)
+			foreach ($handle as $h => $f)
 			{
 				$this->file[$h] = $this->filename($f);
 			}
@@ -160,7 +160,7 @@ 
 	 */
 	function set_block($parent, $handle, $name = '')
 	{
-		if ($this->debug && $this->check_debug('set_block',$parent,$handle,$name))
+		if ($this->debug && $this->check_debug('set_block', $parent, $handle, $name))
 		{
 			echo "<p>Template::set_block('$parent','$handle','$name')</p>\n";
 		}
@@ -177,14 +177,14 @@ 
 		$qhandle = preg_quote($handle);
 		$reg = "/<!--\\s+BEGIN $qhandle\\s+-->(.*)\n\\s*<!--\\s+END $qhandle\\s+-->/s";
 		$match = null;
-		if (!preg_match($reg,$str,$match))
+		if (!preg_match($reg, $str, $match))
 		{
 			// unfortunaly some apps set non-existing blocks, therefor I have to disable this diagnostics again for now
 			$this->halt("set_block: unable to find block '$handle' in '$parent'=<pre>".htmlspecialchars($str)."</pre> this->root=$this->root");
 			// return False;
 		}
-		$this->set_var($handle,$match[1]);
-		$this->set_var($parent,preg_replace($reg, '{' . "$name}",$str));
+		$this->set_var($handle, $match[1]);
+		$this->set_var($parent, preg_replace($reg, '{'."$name}", $str));
 	}
 
 	/* public: set_var(array $values)
@@ -205,18 +205,18 @@ 
 				$varname => $value
 			);
 		}
-		foreach($varname as $k => $v)
+		foreach ($varname as $k => $v)
 		{
 			if (!empty($k))
 			{
-				if ($this->debug && $this->check_debug('set_var',$k))
+				if ($this->debug && $this->check_debug('set_var', $k))
 				{
 					echo "<p>Template::set_var('$k','$v')</p>\n";
 				}
 				$this->varkeys[$k] = $this->varname($k);
 				$this->varvals[$k] = $this->egroupware_hack ? str_replace(
-					array('phpGroupWare','www.phpgroupware.org'),
-					array('eGroupWare','www.eGroupWare.org'),$v
+					array('phpGroupWare', 'www.phpgroupware.org'),
+					array('eGroupWare', 'www.eGroupWare.org'), $v
 				) : $v;
 			}
 		}
@@ -230,7 +230,7 @@ 
 	 */
 	function subst($handle)
 	{
-		if ($this->debug && $this->check_debug('subst',$handle))
+		if ($this->debug && $this->check_debug('subst', $handle))
 		{
 			echo "<p>Template::subst('$handle')</p>\n";
 		}
@@ -241,7 +241,7 @@ 
 		}
 
 		$str = $this->get_var($handle);
-		foreach($this->varkeys as $k => $v)
+		foreach ($this->varkeys as $k => $v)
 		{
 			$str = str_replace($v, $this->varvals[$k], $str);
 		}
@@ -276,7 +276,7 @@ 
 			$str = $this->subst($handle);
 			if ($append)
 			{
-				$this->set_var($target, $this->get_var($target) . $str);
+				$this->set_var($target, $this->get_var($target).$str);
 			}
 			else
 			{
@@ -285,7 +285,7 @@ 
 		}
 		else
 		{
-			foreach($handle as $h)
+			foreach ($handle as $h)
 			{
 				$str = $this->subst($h);
 				$this->set_var($target, $str);
@@ -332,7 +332,7 @@ 
 	 */
 	function get_vars()
 	{
-		foreach(array_keys($this->varkeys) as $k)
+		foreach (array_keys($this->varkeys) as $k)
 		{
 			$result[$k] = $this->varvals[$k];
 		}
@@ -353,7 +353,7 @@ 
 		}
 		else
 		{
-			foreach(array_keys($varname) as $k)
+			foreach (array_keys($varname) as $k)
 			{
 				$result[$k] = $this->varvals[$k];
 			}
@@ -382,7 +382,7 @@ 
 		{
 			return false;
 		}
-		foreach($m as $v)
+		foreach ($m as $v)
 		{
 			if (!isset($this->varkeys[$v]))
 			{
@@ -448,15 +448,15 @@ 
 	 * @param string $root ='' default $this->root
 	 * @param int $time =1
 	 */
-	protected function filename($filename,$root='',$time=1)
+	protected function filename($filename, $root = '', $time = 1)
 	{
-		if($root == '')
+		if ($root == '')
 		{
 			$root = $this->root;
 		}
-		if(substr($filename, 0, 1) != '/')
+		if (substr($filename, 0, 1) != '/')
 		{
-			$new_filename = $root . '/' . $filename;
+			$new_filename = $root.'/'.$filename;
 		}
 		else
 		{
@@ -465,14 +465,14 @@ 
 
 		if (!file_exists($new_filename))
 		{
-			if($time==2)
+			if ($time == 2)
 			{
 				$this->halt("filename: file $new_filename does not exist.");
 			}
 			else
 			{
-				$new_root = dirname($root) . DIRECTORY_SEPARATOR . 'default';
-				$new_filename = $this->filename(str_replace($root.'/','',$new_filename),$new_root,2);
+				$new_root = dirname($root).DIRECTORY_SEPARATOR.'default';
+				$new_filename = $this->filename(str_replace($root.'/', '', $new_filename), $new_root, 2);
 			}
 		}
 		return $new_filename;
@@ -491,9 +491,9 @@ 
 	 */
 	function loadfile($handle)
 	{
-		if ($this->debug && $this->check_debug('loadfile',$handle))
+		if ($this->debug && $this->check_debug('loadfile', $handle))
 		{
-			echo "<p>Template::loadfile('$handle') file=<pre>\n".print_r($this->file,True)."</pre>\n";
+			echo "<p>Template::loadfile('$handle') file=<pre>\n".print_r($this->file, True)."</pre>\n";
 			echo "<p>backtrace: ".function_backtrace()."</p>\n";
 		}
 		if (isset($this->varkeys[$handle]) && !empty($this->varvals[$handle]))
@@ -502,9 +502,9 @@ 
 		}
 		if (!isset($this->file[$handle]))
 		{
-			if ($this->debug && $this->check_debug('loadfile',$handle))
+			if ($this->debug && $this->check_debug('loadfile', $handle))
 			{
-				echo "varkeys =<pre>".print_r($this->varkeys,True)."</pre>varvals =<pre>".print_r($this->varvals,True)."</pre>\n";
+				echo "varkeys =<pre>".print_r($this->varkeys, True)."</pre>varvals =<pre>".print_r($this->varvals, True)."</pre>\n";
 			}
 			$this->halt("loadfile: $handle is not a valid handle.");
 			return false;
@@ -549,10 +549,10 @@ 
 	{
 		if (!$this->debug) return False;
 
-		foreach(func_get_args() as $arg)
+		foreach (func_get_args() as $arg)
 		{
 			if (!is_array($this->debug) && $this->debug === $arg ||
-				(is_array($this->debug) && (@$this->debug[$arg] || in_array($arg,$this->debug,True))))
+				(is_array($this->debug) && (@$this->debug[$arg] || in_array($arg, $this->debug, True))))
 			{
 				return True;
 			}
@@ -601,8 +601,8 @@ 
 		{
 			$GLOBALS['egw_info']['server']['template_set'] = 'idots';
 		}
-		$tpldir         = EGW_SERVER_ROOT . '/' . $appname . '/templates/' . $GLOBALS['egw_info']['server']['template_set'];
-		$tpldir_default = EGW_SERVER_ROOT . '/' . $appname . '/templates/default';
+		$tpldir         = EGW_SERVER_ROOT.'/'.$appname.'/templates/'.$GLOBALS['egw_info']['server']['template_set'];
+		$tpldir_default = EGW_SERVER_ROOT.'/'.$appname.'/templates/default';
 
 		if (@is_dir($tpldir))
 		{

Braces +4 added lines, -1 removed lines

@@ -547,7 +547,10 @@
 
 	function check_debug()
 	{
-		if (!$this->debug) return False;
+		if (!$this->debug)
+		{
+			return False;
+		}
 
 		foreach(func_get_args() as $arg)
 		{

Doc Comments +6 added lines, -1 removed lines

@@ -156,7 +156,7 @@ 
 	 * @param string $parent name of tempalte containing $handle
 	 * @param string $handle name of part
 	 * @param string $name name of variable/placeholder
-	 * @return boolean
+	 * @return false|null
 	 */
 	function set_block($parent, $handle, $name = '')
 	{
@@ -311,6 +311,8 @@ 
 
 	/**
 	 * This is short for finish parse
+	 * @param string $target
+	 * @param string $handle
 	 */
 	function fp($target, $handle, $append = False)
 	{
@@ -319,6 +321,8 @@ 
 
 	/**
 	 * This is a short cut for print finish parse
+	 * @param string $target
+	 * @param string $handle
 	 */
 	function pfp($target, $handle, $append = False)
 	{
@@ -365,6 +369,7 @@ 
 	 * Return undefined variables/placeholders of a handle
 	 *
 	 * @param string handle handle of a template
+	 * @param string $handle
 	 * @return array|boolean array with undefined variables as key and value, or false if none
 	 */
 	function get_undefined($handle)

api/src/Framework/Tutorial.php

Spacing +7 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 	 *
 	 * @param array $content
 	 */
-	function popup ($content=null)
+	function popup($content = null)
 	{
 		// check and if not done register tutorial_menu hook
 		if (!Api\Hooks::exists('sidebox_all', 'api') ||
@@ -48,7 +48,7 @@ 
 		if (!is_array($content))
 		{
 			// Get tutorial object id
-			$tuid_indx = explode('-',$_GET['tuid']);
+			$tuid_indx = explode('-', $_GET['tuid']);
 			$appName = $tuid_indx[0];
 			$lang = $tuid_indx[1];
 			$id = $tuid_indx[2];
@@ -57,7 +57,7 @@ 
 		{
 			$appName = $content['list']['apps'];
 			$lang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
-			$id ="0";
+			$id = "0";
 		}
 		// read tutorials json file to fetch data
 		$tutorials = json_decode(self::getJsonData(), true);
@@ -74,8 +74,7 @@ 
 		if (in_array($appName, array_keys($GLOBALS['egw_info']['user']['apps'])) || $appName === "introduction")
 		{
 			// fallback to english video
-			$tutorial = $tutorials[$appName][$lang][$id]? $tutorials[$appName][$lang][$id]:
-				$tutorials[$appName]['en'][$id];
+			$tutorial = $tutorials[$appName][$lang][$id] ? $tutorials[$appName][$lang][$id] : $tutorials[$appName]['en'][$id];
 
 			$list = array(
 				'apps' => $appName,
@@ -86,7 +85,7 @@ 
 				$v ['onclick'] = 'app[egw.app_name()].tutorial_videoOnClick("'.$v['src'].'")';
 				array_push($list, $v);
 			}
-			$content = array (
+			$content = array(
 				'src' => $tutorial['src'],
 				'title' => $tutorial['title'],
 				'desc' => $tutorial['desc'],
@@ -137,13 +136,13 @@ 
 	public static function tutorial_menu()
 	{
 		if (Api\Header\UserAgent::mobile()) return;
-		$tutorials = json_decode(self::getJsonData(),true);
+		$tutorials = json_decode(self::getJsonData(), true);
 		$appname = $GLOBALS['egw_info']['flags']['currentapp'];
 		if (!is_array($tutorials[$appname])) return false;
 		if (!$GLOBALS['egw_info']['server']['egw_tutorial_disable']
 			|| $GLOBALS['egw_info']['server']['egw_tutorial_disable'] == 'intro')
 		{
-			$file = Array (
+			$file = Array(
 				array(
 					'text'    => '<div id="egw_tutorial_'.$appname.'_sidebox" class="egwTutorial"/>',
 					'no_lang' => true,

Braces +16 added lines, -4 removed lines

@@ -65,7 +65,10 @@ 
 		foreach (array_keys($tutorials) as $app)
 		{
 			// show only apps user has access to them
-			if (in_array($app, array_keys($GLOBALS['egw_info']['user']['apps']))) $apps [$app] = $app;
+			if (in_array($app, array_keys($GLOBALS['egw_info']['user']['apps'])))
+			{
+				$apps [$app] = $app;
+			}
 		}
 		$sel_options = array(
 			'apps' => $apps,
@@ -122,7 +125,10 @@ 
 		{
 			$json = file_get_contents('http://www.egroupware.de/videos/tutorials.json');
 			// Fallback tutorials.json
-			if (!$json) $json = file_get_contents('api/setup/tutorials.json');
+			if (!$json)
+			{
+				$json = file_get_contents('api/setup/tutorials.json');
+			}
 			// Cache the json object for two hours
 			Api\Cache::setCache(Api\Cache::TREE, __CLASS__, 'egw_tutorial_json', $json, 7200);
 		}
@@ -136,10 +142,16 @@ 
 	 */
 	public static function tutorial_menu()
 	{
-		if (Api\Header\UserAgent::mobile()) return;
+		if (Api\Header\UserAgent::mobile())
+		{
+			return;
+		}
 		$tutorials = json_decode(self::getJsonData(),true);
 		$appname = $GLOBALS['egw_info']['flags']['currentapp'];
-		if (!is_array($tutorials[$appname])) return false;
+		if (!is_array($tutorials[$appname]))
+		{
+			return false;
+		}
 		if (!$GLOBALS['egw_info']['server']['egw_tutorial_disable']
 			|| $GLOBALS['egw_info']['server']['egw_tutorial_disable'] == 'intro')
 		{

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 		if (!$GLOBALS['egw_info']['server']['egw_tutorial_disable']
 			|| $GLOBALS['egw_info']['server']['egw_tutorial_disable'] == 'intro')
 		{
-			$file = Array (
+			$file = array (
 				array(
 					'text'    => '<div id="egw_tutorial_'.$appname.'_sidebox" class="egwTutorial"/>',
 					'no_lang' => true,