EGroupware / egroupware

calendar/inc/class.calendar_ical.inc.php

Spacing +264 added lines, -265 removed lines

@@ -64,39 +64,39 @@ 
 	 * @var array $priority_egw2ical conversion of the priority egw => ical
 	 */
 	var $priority_egw2ical = array(
-		0 => 0,		// undefined
-		1 => 9,		// low
-		2 => 5,		// normal
-		3 => 1,		// high
+		0 => 0, // undefined
+		1 => 9, // low
+		2 => 5, // normal
+		3 => 1, // high
 	);
 
 	/**
 	 * @var array $priority_ical2egw conversion of the priority ical => egw
 	 */
 	var $priority_ical2egw = array(
-		0 => 0,		// undefined
-		9 => 1,	8 => 1, 7 => 1, 6 => 1,	// low
-		5 => 2,		// normal
-		4 => 3, 3 => 3, 2 => 3, 1 => 3,	// high
+		0 => 0, // undefined
+		9 => 1, 8 => 1, 7 => 1, 6 => 1, // low
+		5 => 2, // normal
+		4 => 3, 3 => 3, 2 => 3, 1 => 3, // high
 	);
 
 	/**
 	 * @var array $priority_egw2funambol conversion of the priority egw => funambol
 	 */
 	var $priority_egw2funambol = array(
-		0 => 1,		// undefined (mapped to normal since undefined does not exist)
-		1 => 0,		// low
-		2 => 1,		// normal
-		3 => 2,		// high
+		0 => 1, // undefined (mapped to normal since undefined does not exist)
+		1 => 0, // low
+		2 => 1, // normal
+		3 => 2, // high
 	);
 
 	/**
 	 * @var array $priority_funambol2egw conversion of the priority funambol => egw
 	 */
 	var $priority_funambol2egw = array(
-		0 => 1,		// low
-		1 => 2,		// normal
-		2 => 3,		// high
+		0 => 1, // low
+		1 => 2, // normal
+		2 => 3, // high
 	);
 
 	/**
@@ -166,7 +166,7 @@ 
 	 * @var boolean
 	 */
 	var $log = false;
-	var $logfile="/tmp/log-vcal";
+	var $logfile = "/tmp/log-vcal";
 
 
 	/**
@@ -197,7 +197,7 @@ 
 	 * @param int|string $current_user =0 uid of current user to only export that one as participant for method=REPLY
 	 * @return string|boolean string with iCal or false on error (e.g. no permission to read the event)
 	 */
-	function &exportVCal($events, $version='1.0', $method='PUBLISH', $recur_date=0, $principalURL='', $charset='UTF-8', $current_user=0)
+	function &exportVCal($events, $version = '1.0', $method = 'PUBLISH', $recur_date = 0, $principalURL = '', $charset = 'UTF-8', $current_user = 0)
 	{
 		if ($this->log)
 		{
@@ -228,13 +228,13 @@ 
 
 		if (!is_array($this->supportedFields)) $this->setSupportedFields();
 
-		if ($this->productManufacturer == '' )
+		if ($this->productManufacturer == '')
 		{	// syncevolution is broken
 			$version = '2.0';
 		}
 
 		$vcal = new Horde_Icalendar;
-		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
+		$vcal->setAttribute('PRODID', '-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
 		$vcal->setAttribute('VERSION', $version);
 		if ($method) $vcal->setAttribute('METHOD', $method);
@@ -264,15 +264,15 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								'() User does not have the permission to read event ' . $event['id']. "\n",
-								3,$this->logfile);
+								'() User does not have the permission to read event '.$event['id']."\n",
+								3, $this->logfile);
 						}
 						return -1; // Permission denied
 					}
 				}
 				else
 				{
-					$retval = false;  // Entry does not exist
+					$retval = false; // Entry does not exist
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
@@ -286,7 +286,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					'() export event UID: ' . $event['uid'] . ".\n",
+					'() export event UID: '.$event['uid'].".\n",
 					3, $this->logfile);
 			}
 
@@ -311,8 +311,8 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					'(' . $event['id']. ',' . $recurrence . ")\n" .
-					array2string($event)."\n",3,$this->logfile);
+					'('.$event['id'].','.$recurrence.")\n".
+					array2string($event)."\n", 3, $this->logfile);
 			}
 
 			if ($recurrence)
@@ -333,7 +333,7 @@ 
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 								"(, $recurrence) Gratuitous pseudo exception, skipped ...\n",
-								3,$this->logfile);
+								3, $this->logfile);
 						}
 						continue; // unsupported status only exception
 					}
@@ -343,13 +343,13 @@ 
 					$days = $this->so->get_recurrence_exceptions($master, $tzid, 0, 0, 'rrule');
 					if ($this->log)
 					{
-						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-							array2string($days)."\n",3,$this->logfile);
+						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+							array2string($days)."\n", 3, $this->logfile);
 					}
 					$recurrence = $days[$recurrence]; // use remote representation
 				}
 				// force single event
-				foreach (array('recur_enddate','recur_interval','recur_exception','recur_data','recur_date','id','etag') as $name)
+				foreach (array('recur_enddate', 'recur_interval', 'recur_exception', 'recur_data', 'recur_date', 'id', 'etag') as $name)
 				{
 					unset($event[$name]);
 				}
@@ -357,7 +357,7 @@ 
 			}
 
 			// check if tzid of event (not only recuring ones) is already added to export
-			if ($tzid && $tzid != 'UTC' && !in_array($tzid,$vtimezones_added))
+			if ($tzid && $tzid != 'UTC' && !in_array($tzid, $vtimezones_added))
 			{
 				// check if we have vtimezone component data for tzid of event, if not default to user timezone (default to server tz)
 				if (calendar_timezones::add_vtimezone($vcal, $tzid) ||
@@ -375,7 +375,7 @@ 
 			{
 				// Append UID to DESCRIPTION
 				if (!preg_match('/\[UID:.+\]/m', $event['description'])) {
-					$event['description'] .= "\n[UID:" . $event['uid'] . "]";
+					$event['description'] .= "\n[UID:".$event['uid']."]";
 				}
 			}
 
@@ -396,14 +396,14 @@ 
 				$exceptions = array();
 
 				// dont use "virtual" exceptions created by participant status for GroupDAV or file export
-				if (!in_array($this->productManufacturer,array('file','groupdav')))
+				if (!in_array($this->productManufacturer, array('file', 'groupdav')))
 				{
 					$filter = isset($this->supportedFields['participants']) ? 'rrule' : 'tz_rrule';
 					$exceptions = $this->so->get_recurrence_exceptions($event, $tzid, 0, 0, $filter);
 					if ($this->log)
 					{
-						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS)\n" .
-							array2string($exceptions)."\n",3,$this->logfile);
+						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS)\n".
+							array2string($exceptions)."\n", 3, $this->logfile);
 					}
 				}
 				elseif (is_array($event['recur_exception']))
@@ -420,8 +420,8 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							'(' . $event['id'] . ") [$icalFieldName] not supported\n",
-							3,$this->logfile);
+							'('.$event['id'].") [$icalFieldName] not supported\n",
+							3, $this->logfile);
 					}
 					continue;
 				}
@@ -438,23 +438,23 @@ 
 
 							if (!($info = $this->resource_info($uid))) continue;
 
-							if (in_array($status, array('X','E'))) continue;	// dont include deleted participants
+							if (in_array($status, array('X', 'E'))) continue; // dont include deleted participants
 
 							if ($this->log)
 							{
-								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-									'()attendee:' . array2string($info) ."\n",3,$this->logfile);
+								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+									'()attendee:'.array2string($info)."\n", 3, $this->logfile);
 							}
 							$participantCN = str_replace(array('\\', ',', ';', ':'),
 												array('\\\\', '\\,', '\\;', '\\:'),
 												trim(empty($info['cn']) ? $info['name'] : $info['cn']));
 							if ($version == '1.0')
 							{
-								$participantURL = trim('"' . $participantCN . '"' . (empty($info['email']) ? '' : ' <' . $info['email'] .'>'));
+								$participantURL = trim('"'.$participantCN.'"'.(empty($info['email']) ? '' : ' <'.$info['email'].'>'));
 							}
 							else
 							{
-								$participantURL = empty($info['email']) ? '' : 'mailto:' . $info['email'];
+								$participantURL = empty($info['email']) ? '' : 'mailto:'.$info['email'];
 							}
 							// RSVP={TRUE|FALSE}	// resonse expected, not set in eGW => status=U
 							$rsvp = $status == 'U' ? 'TRUE' : 'FALSE';
@@ -482,7 +482,7 @@ 
 										($members = $GLOBALS['egw']->accounts->members($uid, true)) && in_array($this->user, $members))
 									{
 										$user = $this->resource_info($this->user);
-										$attributes['ATTENDEE'][] = 'mailto:' . $user['email'];
+										$attributes['ATTENDEE'][] = 'mailto:'.$user['email'];
 			    						$parameters['ATTENDEE'][] = array(
 			    							'CN'		=>	$user['name'],
 			    							'ROLE'		=> 'REQ-PARTICIPANT',
@@ -524,7 +524,7 @@ 
 							if (!empty($rsvp)) $options['RSVP'] = $rsvp;
 							if (!empty($info['email']) && $participantURL != 'mailto:'.$info['email'])
 							{
-								$options['EMAIL'] = $info['email'];	// only add EMAIL attribute, if not already URL, as eg. Akonadi is reported to have problems with it
+								$options['EMAIL'] = $info['email']; // only add EMAIL attribute, if not already URL, as eg. Akonadi is reported to have problems with it
 							}
 							if ($info['type'] != 'e') $options['X-EGROUPWARE-UID'] = (string)$uid;
 							if ($quantity > 1) $options['X-EGROUPWARE-QUANTITY'] = (string)$quantity;
@@ -534,7 +534,7 @@ 
 						break;
 
 					case 'CLASS':
-						if ($event['public']) continue;	// public is default, no need to export, fails CalDAVTester if added as default
+						if ($event['public']) continue; // public is default, no need to export, fails CalDAVTester if added as default
 						$attributes['CLASS'] = $event['public'] ? 'PUBLIC' : 'PRIVATE';
 						// Apple iCal on OS X uses X-CALENDARSERVER-ACCESS: CONFIDENTIAL on VCALANDAR (not VEVENT!)
 						if (!$event['public'] && $this->productManufacturer == 'groupdav')
@@ -546,16 +546,16 @@ 
     				case 'ORGANIZER':
 	    				if (!$organizerURL)
 	    				{
-	    					$organizerCN = '"' . trim($GLOBALS['egw']->accounts->id2name($event['owner'],'account_firstname')
-			    				. ' ' . $GLOBALS['egw']->accounts->id2name($event['owner'],'account_lastname')) . '"';
-			    			$organizerEMail = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
+	    					$organizerCN = '"'.trim($GLOBALS['egw']->accounts->id2name($event['owner'], 'account_firstname')
+			    				. ' '.$GLOBALS['egw']->accounts->id2name($event['owner'], 'account_lastname')).'"';
+			    			$organizerEMail = $GLOBALS['egw']->accounts->id2name($event['owner'], 'account_email');
 			    			if ($version == '1.0')
 			    			{
-		    					$organizerURL = trim($organizerCN . (empty($organizerURL) ? '' : ' <' . $organizerURL .'>'));
+		    					$organizerURL = trim($organizerCN.(empty($organizerURL) ? '' : ' <'.$organizerURL.'>'));
 			    			}
 			    			else
 			    			{
-		    					$organizerURL = empty($organizerEMail) ? '' : 'mailto:' . $organizerEMail;
+		    					$organizerURL = empty($organizerEMail) ? '' : 'mailto:'.$organizerEMail;
 			    			}
 			    			$organizerUID = $event['owner'];
 		    				if (!isset($event['participants'][$event['owner']]))
@@ -588,7 +588,7 @@ 
 					case 'DTSTART':
 						if (empty($event['whole_day']))
 						{
-							$attributes['DTSTART'] = self::getDateTime($event['start'],$tzid,$parameters['DTSTART']);
+							$attributes['DTSTART'] = self::getDateTime($event['start'], $tzid, $parameters['DTSTART']);
 						}
 						break;
 
@@ -599,27 +599,27 @@ 
 							if ($tzid == 'UTC' && $event['end'] - $event['start'] <= 86400)
 								$attributes['duration'] = $event['end'] - $event['start'];
 							else
-							$attributes['DTEND'] = self::getDateTime($event['end'],$tzid,$parameters['DTEND']);
+							$attributes['DTEND'] = self::getDateTime($event['end'], $tzid, $parameters['DTEND']);
 						}
 						else
 						{
 							// write start + end of whole day events as dates
-							$event['end-nextday'] = $event['end'] + 12*3600;	// we need the date of the next day, as DTEND is non-inclusive (= exclusive) in rfc2445
-							foreach (array('start' => 'DTSTART','end-nextday' => 'DTEND') as $f => $t)
+							$event['end-nextday'] = $event['end'] + 12 * 3600; // we need the date of the next day, as DTEND is non-inclusive (= exclusive) in rfc2445
+							foreach (array('start' => 'DTSTART', 'end-nextday' => 'DTEND') as $f => $t)
 							{
-								$time = new Api\DateTime($event[$f],Api\DateTime::$server_timezone);
-								$arr = Api\DateTime::to($time,'array');
-								$vevent->setAttribute($t, array('year' => $arr['year'],'month' => $arr['month'],'mday' => $arr['day']),
+								$time = new Api\DateTime($event[$f], Api\DateTime::$server_timezone);
+								$arr = Api\DateTime::to($time, 'array');
+								$vevent->setAttribute($t, array('year' => $arr['year'], 'month' => $arr['month'], 'mday' => $arr['day']),
 									array('VALUE' => 'DATE'));
 							}
 							unset($attributes['DTSTART']);
 							// Outlook does NOT care about type of DTSTART/END, only setting X-MICROSOFT-CDO-ALLDAYEVENT is used to determine an event is a whole-day event
-							$vevent->setAttribute('X-MICROSOFT-CDO-ALLDAYEVENT','TRUE');
+							$vevent->setAttribute('X-MICROSOFT-CDO-ALLDAYEVENT', 'TRUE');
 						}
 						break;
 
 					case 'RRULE':
-						if ($event['recur_type'] == MCAL_RECUR_NONE) break;		// no recuring event
+						if ($event['recur_type'] == MCAL_RECUR_NONE) break; // no recuring event
 						$rriter = calendar_rrule::event2rrule($event, false, $tzid);
 						$rrule = $rriter->generate_rrule($version);
 						if ($event['recur_enddate'])
@@ -638,16 +638,16 @@ 
 						{
 							if ($event['recur_enddate'] && $tzid)
 							{
-								$rrule['UNTIL'] = self::getDateTime($rrule['UNTIL'],$tzid);
+								$rrule['UNTIL'] = self::getDateTime($rrule['UNTIL'], $tzid);
 							}
 							$attributes['RRULE'] = $rrule['FREQ'].' '.$rrule['UNTIL'];
 						}
 						else // $version == '2.0'
 						{
 							$attributes['RRULE'] = '';
-							foreach($rrule as $n => $v)
+							foreach ($rrule as $n => $v)
 							{
-								$attributes['RRULE'] .= ($attributes['RRULE']?';':'').$n.'='.$v;
+								$attributes['RRULE'] .= ($attributes['RRULE'] ? ';' : '').$n.'='.$v;
 							}
 						}
 						break;
@@ -662,7 +662,7 @@ 
 								{
 									// current Horde_Icalendar 2.1.4 exports EXDATE always in UTC, so we should not set a timezone here
 									// Apple calendar on OS X 10.11.4 uses a timezone, so does Horde eg. for Recurrence-ID
-									$event['recur_exception'][$key] = self::getDateTime($timestamp,$tzid);//,$parameters['EXDATE']);
+									$event['recur_exception'][$key] = self::getDateTime($timestamp, $tzid); //,$parameters['EXDATE']);
 								}
 							}
 							else
@@ -670,9 +670,9 @@ 
 								// use 'DATE' instead of 'DATE-TIME' on whole day events
 								foreach ($event['recur_exception'] as $id => $timestamp)
 								{
-									$time = new Api\DateTime($timestamp,Api\DateTime::$server_timezone);
+									$time = new Api\DateTime($timestamp, Api\DateTime::$server_timezone);
 									$time->setTimezone(self::$tz_cache[$event['tzid']]);
-									$arr = Api\DateTime::to($time,'array');
+									$arr = Api\DateTime::to($time, 'array');
 									$days[$id] = array(
 										'year'  => $arr['year'],
 										'month' => $arr['month'],
@@ -687,21 +687,21 @@ 
 						break;
 
 					case 'PRIORITY':
-						if (!$event['priority']) continue;	// 0=undefined is default, no need to export, fails CalDAVTester if our default is added
+						if (!$event['priority']) continue; // 0=undefined is default, no need to export, fails CalDAVTester if our default is added
 						if ($this->productManufacturer == 'funambol' &&
 							(strpos($this->productName, 'outlook') !== false
 								|| strpos($this->productName, 'pocket pc') !== false))
 						{
-							$attributes['PRIORITY'] = (int) $this->priority_egw2funambol[$event['priority']];
+							$attributes['PRIORITY'] = (int)$this->priority_egw2funambol[$event['priority']];
 						}
 						else
 						{
-							$attributes['PRIORITY'] = (int) $this->priority_egw2ical[$event['priority']];
+							$attributes['PRIORITY'] = (int)$this->priority_egw2ical[$event['priority']];
 						}
 						break;
 
 					case 'TRANSP':
-						if (!$event['non_blocking']) continue;	// OPAQUE is default, no need to export, fails CalDAVTester if added as default
+						if (!$event['non_blocking']) continue; // OPAQUE is default, no need to export, fails CalDAVTester if added as default
 						if ($version == '1.0')
 						{
 							$attributes['TRANSP'] = ($event['non_blocking'] ? 1 : 0);
@@ -740,13 +740,13 @@ 
 							// We handle a pseudo exception
 							if (empty($event['whole_day']))
 							{
-								$attributes[$icalFieldName] = self::getDateTime($recur_date,$tzid,$parameters[$icalFieldName]);
+								$attributes[$icalFieldName] = self::getDateTime($recur_date, $tzid, $parameters[$icalFieldName]);
 							}
 							else
 							{
-								$time = new Api\DateTime($recur_date,Api\DateTime::$server_timezone);
+								$time = new Api\DateTime($recur_date, Api\DateTime::$server_timezone);
 								$time->setTimezone(self::$tz_cache[$event['tzid']]);
-								$arr = Api\DateTime::to($time,'array');
+								$arr = Api\DateTime::to($time, 'array');
 								$vevent->setAttribute($icalFieldName, array(
 									'year' => $arr['year'],
 									'month' => $arr['month'],
@@ -758,17 +758,17 @@ 
 						elseif ($event['recurrence'] && $event['reference'])
 						{
 							// $event['reference'] is a calendar_id, not a timestamp
-							if (!($revent = $this->read($event['reference']))) break;	// referenced event does not exist
+							if (!($revent = $this->read($event['reference']))) break; // referenced event does not exist
 
 							if (empty($revent['whole_day']))
 							{
-								$attributes[$icalFieldName] = self::getDateTime($event['recurrence'],$tzid,$parameters[$icalFieldName]);
+								$attributes[$icalFieldName] = self::getDateTime($event['recurrence'], $tzid, $parameters[$icalFieldName]);
 							}
 							else
 							{
-								$time = new Api\DateTime($event['recurrence'],Api\DateTime::$server_timezone);
+								$time = new Api\DateTime($event['recurrence'], Api\DateTime::$server_timezone);
 								$time->setTimezone(self::$tz_cache[$event['tzid']]);
-								$arr = Api\DateTime::to($time,'array');
+								$arr = Api\DateTime::to($time, 'array');
 								$vevent->setAttribute($icalFieldName, array(
 									'year' => $arr['year'],
 									'month' => $arr['month'],
@@ -792,9 +792,9 @@ 
 							$noTruncate = $this->clientProperties[$icalFieldName]['NoTruncate'];
 							if ($this->log && $size > 0)
 							{
-								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-									"() $icalFieldName Size: $size, NoTruncate: " .
-									($noTruncate ? 'TRUE' : 'FALSE') . "\n",3,$this->logfile);
+								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+									"() $icalFieldName Size: $size, NoTruncate: ".
+									($noTruncate ? 'TRUE' : 'FALSE')."\n", 3, $this->logfile);
 							}
 							//Horde::logMessage("vCalendar $icalFieldName Size: $size, NoTruncate: " .
 							//	($noTruncate ? 'TRUE' : 'FALSE'), __FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -812,8 +812,8 @@ 
 							{
 								if ($this->log)
 								{
-									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-										"() $icalFieldName omitted due to maximum size $size\n",3,$this->logfile);
+									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+										"() $icalFieldName omitted due to maximum size $size\n", 3, $this->logfile);
 								}
 								//Horde::logMessage("vCalendar $icalFieldName omitted due to maximum size $size",
 								//	__FILE__, __LINE__, PEAR_LOG_WARNING);
@@ -823,8 +823,8 @@ 
 							$value = substr($value, 0, $size - 1);
 							if ($this->log)
 							{
-								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-									"() $icalFieldName truncated to maximum size $size\n",3,$this->logfile);
+								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+									"() $icalFieldName truncated to maximum size $size\n", 3, $this->logfile);
 							}
 							//Horde::logMessage("vCalendar $icalFieldName truncated to maximum size $size",
 							//	__FILE__, __LINE__, PEAR_LOG_INFO);
@@ -839,7 +839,7 @@ 
 			// for CalDAV add all X-Properties previously parsed
 			if ($this->productManufacturer == 'groupdav' || $this->productManufacturer == 'file')
 			{
-				foreach($event as $name => $value)
+				foreach ($event as $name => $value)
 				{
 					if (substr($name, 0, 2) == '##')
 					{
@@ -911,8 +911,8 @@ 
 						$values['AALARM']['repeat count'] = '';
 						$values['AALARM']['display text'] = $description;
 					}
-					$attributes['DALARM'] = self::getDateTime($alarmData['time'],$tzid,$parameters['DALARM']);
-					$attributes['AALARM'] = self::getDateTime($alarmData['time'],$tzid,$parameters['AALARM']);
+					$attributes['DALARM'] = self::getDateTime($alarmData['time'], $tzid, $parameters['DALARM']);
+					$attributes['AALARM'] = self::getDateTime($alarmData['time'], $tzid, $parameters['AALARM']);
 					// lets take only the first alarm
 					break;
 				}
@@ -949,7 +949,7 @@ 
 						$alarmData['offset'] = false;
 					}
 
-					$valarm = Horde_Icalendar::newComponent('VALARM',$vevent);
+					$valarm = Horde_Icalendar::newComponent('VALARM', $vevent);
 					if ($alarmData['offset'] !== false)
 					{
 						$valarm->setAttribute('TRIGGER', -$alarmData['offset'],
@@ -958,7 +958,7 @@ 
 					else
 					{
 						$params = array('VALUE' => 'DATE-TIME');
-						$value = self::getDateTime($alarmData['time'],$tzid,$params);
+						$value = self::getDateTime($alarmData['time'], $tzid, $params);
 						$valarm->setAttribute('TRIGGER', $value, $params);
 					}
 					if (!empty($alarmData['uid']))
@@ -969,7 +969,7 @@ 
 					// set evtl. existing attributes set by iCal clients not used by EGroupware
 					if (isset($alarmData['attrs']))
 					{
-						foreach($alarmData['attrs'] as $attr => $data)
+						foreach ($alarmData['attrs'] as $attr => $data)
 						{
 							$valarm->setAttribute($attr, $data['value'], $data['params']);
 						}
@@ -977,11 +977,11 @@ 
 					// set default ACTION and DESCRIPTION, if not set by a client
 					if (!isset($alarmData['attrs']) || !isset($alarmData['attrs']['ACTION']))
 					{
-						$valarm->setAttribute('ACTION','DISPLAY');
+						$valarm->setAttribute('ACTION', 'DISPLAY');
 					}
 					if (!isset($alarmData['attrs']) || !isset($alarmData['attrs']['DESCRIPTION']))
 					{
-						$valarm->setAttribute('DESCRIPTION',$event['title'] ? $event['title'] : $description);
+						$valarm->setAttribute('DESCRIPTION', $event['title'] ? $event['title'] : $description);
 					}
 					$vevent->addComponent($valarm);
 				}
@@ -989,15 +989,15 @@ 
 
 			foreach ($attributes as $key => $value)
 			{
-				foreach (is_array($value) && $parameters[$key]['VALUE']!='DATE' ? $value : array($value) as $valueID => $valueData)
+				foreach (is_array($value) && $parameters[$key]['VALUE'] != 'DATE' ? $value : array($value) as $valueID => $valueData)
 				{
-					$valueData = Api\Translation::convert($valueData,Api\Translation::charset(),$charset);
-                    $paramData = (array) Api\Translation::convert(is_array($value) ?
+					$valueData = Api\Translation::convert($valueData, Api\Translation::charset(), $charset);
+                    $paramData = (array)Api\Translation::convert(is_array($value) ?
                     		$parameters[$key][$valueID] : $parameters[$key],
-                            Api\Translation::charset(),$charset);
-                    $valuesData = (array) Api\Translation::convert($values[$key],
-                    		Api\Translation::charset(),$charset);
-                    $content = $valueData . implode(';', $valuesData);
+                            Api\Translation::charset(), $charset);
+                    $valuesData = (array)Api\Translation::convert($values[$key],
+                    		Api\Translation::charset(), $charset);
+                    $content = $valueData.implode(';', $valuesData);
 
 					if ($version == '1.0' && (preg_match('/[^\x20-\x7F]/', $content) ||
 						($paramData['CN'] && preg_match('/[^\x20-\x7F]/', $paramData['CN']))))
@@ -1047,10 +1047,10 @@ 
 		$retval = $events_exported ? $vcal->exportvCalendar() : false;
  		if ($this->log)
  		{
- 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-				"() '$this->productManufacturer','$this->productName'\n",3,$this->logfile);
- 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-				"()\n".array2string($retval)."\n",3,$this->logfile);
+ 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+				"() '$this->productManufacturer','$this->productName'\n", 3, $this->logfile);
+ 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+				"()\n".array2string($retval)."\n", 3, $this->logfile);
  		}
 		return $retval;
 	}
@@ -1063,15 +1063,15 @@ 
 	 * @param array &$params=null parameter array to set TZID
 	 * @return mixed attribute value to set: integer timestamp if $tzid == 'UTC' otherwise Ymd\THis string IN $tzid
 	 */
-	static function getDateTime($time,$tzid,array &$params=null)
+	static function getDateTime($time, $tzid, array &$params = null)
 	{
 		if (empty($tzid) || $tzid == 'UTC')
 		{
-			return Api\DateTime::to($time,'ts');
+			return Api\DateTime::to($time, 'ts');
 		}
-		if (!is_a($time,'DateTime'))
+		if (!is_a($time, 'DateTime'))
 		{
-			$time = new Api\DateTime($time,Api\DateTime::$server_timezone);
+			$time = new Api\DateTime($time, Api\DateTime::$server_timezone);
 		}
 		if (!isset(self::$tz_cache[$tzid]))
 		{
@@ -1106,11 +1106,11 @@ 
 	 * @param string $caldav_name=null name from CalDAV client or null (to use default)
 	 * @return int|boolean|null cal_id > 0 on success, false on failure or 0 for a failed etag|permission denied or null for "403 Forbidden"
 	 */
-	function importVCal($_vcalData, $cal_id=-1, $etag=null, $merge=false, $recur_date=0, $principalURL='', $user=null, $charset=null, $caldav_name=null,$skip_notification=false)
+	function importVCal($_vcalData, $cal_id = -1, $etag = null, $merge = false, $recur_date = 0, $principalURL = '', $user = null, $charset = null, $caldav_name = null, $skip_notification = false)
 	{
 		//error_log(__METHOD__."(, $cal_id, $etag, $merge, $recur_date, $principalURL, $user, $charset, $caldav_name)");
 		$this->events_imported = 0;
-		$replace = $delete_exceptions= false;
+		$replace = $delete_exceptions = false;
 
 		if (!is_array($this->supportedFields)) $this->setSupportedFields();
 
@@ -1118,7 +1118,7 @@ 
 		{
 			return false;
 		}
-		if (!is_array($events)) $cal_id = -1;	// just to be sure, as iterator does NOT allow array access (eg. $events[0])
+		if (!is_array($events)) $cal_id = -1; // just to be sure, as iterator does NOT allow array access (eg. $events[0])
 
 		if ($cal_id > 0)
 		{
@@ -1126,7 +1126,7 @@ 
 			{
 				$replace = $recur_date == 0;
 				$events[0]['id'] = $cal_id;
-				if (!is_null($etag)) $events[0]['etag'] = (int) $etag;
+				if (!is_null($etag)) $events[0]['etag'] = (int)$etag;
 				if ($recur_date) $events[0]['recurrence'] = $recur_date;
 			}
 			elseif (($foundEvent = $this->find_event(array('id' => $cal_id), 'exact')) &&
@@ -1178,7 +1178,7 @@ 
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 					."($cal_id, $etag, $recur_date, $principalURL, $user, $charset)\n"
-					. array2string($event)."\n",3,$this->logfile);
+					. array2string($event)."\n", 3, $this->logfile);
 			}
 
 			$updated_id = false;
@@ -1201,14 +1201,14 @@ 
 					{
 						if ($delete_exceptions)
 						{
-							$this->delete($id,0,false,$skip_notification);
+							$this->delete($id, 0, false, $skip_notification);
 						}
 						else
 						{
 							if (!($exception = $this->read($id))) continue;
 							$exception['uid'] = Api\CalDAV::generate_uid('calendar', $id);
 							$exception['reference'] = $exception['recurrence'] = 0;
-							$this->update($exception, true,true,false,true,$msg,$skip_notification);
+							$this->update($exception, true, true, false, true, $msg, $skip_notification);
 						}
 					}
 				}
@@ -1225,7 +1225,7 @@ 
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 						. "(UPDATE Event)\n"
-						. array2string($event_info['stored_event'])."\n",3,$this->logfile);
+						. array2string($event_info['stored_event'])."\n", 3, $this->logfile);
 				}
 				if (empty($event['uid']))
 				{
@@ -1247,7 +1247,7 @@ 
 								if ($this->log)
 								{
 									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-										"() Restore status for $uid\n",3,$this->logfile);
+										"() Restore status for $uid\n", 3, $this->logfile);
 								}
 								$event['participants'][$uid] = $event_info['stored_event']['participants'][$uid];
 							}
@@ -1271,7 +1271,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"()[MERGE]\n",3,$this->logfile);
+							"()[MERGE]\n", 3, $this->logfile);
 					}
 					// overwrite with server data for merge
 					foreach ($event_info['stored_event'] as $key => $value)
@@ -1301,7 +1301,7 @@ 
 				else
 				{
 					// no merge
-					if(!isset($this->supportedFields['category']) || !isset($event['category']))
+					if (!isset($this->supportedFields['category']) || !isset($event['category']))
 					{
 						$event['category'] = $event_info['stored_event']['category'];
 					}
@@ -1313,7 +1313,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"() No participants\n",3,$this->logfile);
+							"() No participants\n", 3, $this->logfile);
 						}
 
 						// If this is an updated meeting, and the client doesn't support
@@ -1332,7 +1332,7 @@ 
 								if ($this->log)
 								{
 									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-										"() Restore resource $uid to status $status\n",3,$this->logfile);
+										"() Restore resource $uid to status $status\n", 3, $this->logfile);
 								}
 								// Add it back in
 								$event['participants'][$uid] = $status;
@@ -1420,8 +1420,7 @@ 
 						}
 						// for resources check which new-status to give (eg. with direct booking permision 'A' instead 'U')
 						$event['participants'][$user] = calendar_so::combine_status(
-							$user < 0 || !isset($this->resources[$user[0]]['new_status']) ? 'U' :
-							ExecMethod($this->resources[$user[0]]['new_status'], substr($user, 1)));
+							$user < 0 || !isset($this->resources[$user[0]]['new_status']) ? 'U' : ExecMethod($this->resources[$user[0]]['new_status'], substr($user, 1)));
 					}
 				}
 				// check if an owner is set and the current user has add rights
@@ -1486,9 +1485,9 @@ 
 
 			if ($this->log)
 			{
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ . '('
-					. $event_info['type'] . ")\n"
-					. array2string($event)."\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'('
+					. $event_info['type'].")\n"
+					. array2string($event)."\n", 3, $this->logfile);
 			}
 
 			// Android (any maybe others) delete recurrences by setting STATUS: CANCELLED
@@ -1496,10 +1495,10 @@ 
 			if (in_array($event_info['type'], array('SERIES-EXCEPTION', 'SERIES-EXCEPTION-PROPAGATE', 'SERIES-PSEUDO-EXCEPTION')) &&
 				$event['status'] == 'CANCELLED')
 			{
-				if (!$this->delete($event['id'] ? $event['id'] : $cal_id, $event['recurrence'],false,$skip_notification))
+				if (!$this->delete($event['id'] ? $event['id'] : $cal_id, $event['recurrence'], false, $skip_notification))
 				{
 					// delete fails (because no rights), reject recurrence
-					$this->set_status($event['id'] ? $event['id'] : $cal_id, $this->user, 'R', $event['recurrence'],false,true,$skip_notification);
+					$this->set_status($event['id'] ? $event['id'] : $cal_id, $this->user, 'R', $event['recurrence'], false, true, $skip_notification);
 				}
 				continue;
 			}
@@ -1511,7 +1510,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SINGLE\n",3,$this->logfile);
+							"(): event SINGLE\n", 3, $this->logfile);
 					}
 
 					// update the event
@@ -1521,7 +1520,7 @@ 
 						$event['reference'] = 0;
 						$event_to_store = $event; // prevent $event from being changed by the update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 					break;
@@ -1530,7 +1529,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SERIES-MASTER\n",3,$this->logfile);
+							"(): event SERIES-MASTER\n", 3, $this->logfile);
 					}
 
 					// remove all known pseudo exceptions and update the event
@@ -1540,8 +1539,8 @@ 
 						$days = $this->so->get_recurrence_exceptions($event_info['stored_event'], $this->tzid, 0, 0, $filter);
 						if ($this->log)
 						{
-							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS MAPPING):\n" .
-								array2string($days)."\n",3,$this->logfile);
+							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS MAPPING):\n".
+								array2string($days)."\n", 3, $this->logfile);
 						}
 						if (is_array($days))
 						{
@@ -1559,7 +1558,7 @@ 
 
 						$event_to_store = $event; // prevent $event from being changed by the update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 					break;
@@ -1569,7 +1568,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SERIES-EXCEPTION\n",3,$this->logfile);
+							"(): event SERIES-EXCEPTION\n", 3, $this->logfile);
 					}
 
 					// update event
@@ -1625,13 +1624,13 @@ 
 							$event['owner'] = $event_info['master_event']['owner'];
 							$event_to_store = $event_info['master_event']; // prevent the master_event from being changed by the update method
 							$this->server2usertime($event_to_store);
-							$this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+							$this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 							unset($event_to_store);
 						}
 
 						$event_to_store = $event; // prevent $event from being changed by update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 					break;
@@ -1640,7 +1639,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SERIES-PSEUDO-EXCEPTION\n",3,$this->logfile);
+							"(): event SERIES-PSEUDO-EXCEPTION\n", 3, $this->logfile);
 					}
 					//Horde::logMessage('importVCAL event SERIES-PSEUDO-EXCEPTION',
 					//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -1661,7 +1660,7 @@ 
 						// save the series master with the adjusted exceptions
 						$event_to_store = $event_info['master_event']; // prevent the master_event from being changed by the update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true, true, false, false,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, false, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 
@@ -1688,13 +1687,13 @@ 
 							if ($event_info['acl_edit'])
 							{
 								// update all participants if we have the right to do that
-								$this->update_status($event, $event_info['stored_event'],0,$skip_notification);
+								$this->update_status($event, $event_info['stored_event'], 0, $skip_notification);
 							}
 							elseif (isset($event['participants'][$this->user]) || isset($event_info['stored_event']['participants'][$this->user]))
 							{
 								// update the users status only
 								$this->set_status($event_info['stored_event']['id'], $this->user,
-									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), 0, true,true,$skip_notification);
+									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), 0, true, true, $skip_notification);
 							}
 						}
 						break;
@@ -1706,13 +1705,13 @@ 
 							if ($event_info['acl_edit'])
 							{
 								// update all participants if we have the right to do that
-								$this->update_status($event, $event_info['stored_event'], $recurrence,$skip_notification);
+								$this->update_status($event, $event_info['stored_event'], $recurrence, $skip_notification);
 							}
 							elseif (isset($event['participants'][$this->user]) || isset($event_info['master_event']['participants'][$this->user]))
 							{
 								// update the users status only
 								$this->set_status($event_info['master_event']['id'], $this->user,
-									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), $recurrence, true,true,$skip_notification);
+									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), $recurrence, true, true, $skip_notification);
 							}
 						}
 						break;
@@ -1729,7 +1728,7 @@ 
 					break;
 
 				case 'SERIES-PSEUDO-EXCEPTION':
-					$return_id = is_array($event_info['master_event']) ? $event_info['master_event']['id'] . ':' . $event['recurrence'] : false;
+					$return_id = is_array($event_info['master_event']) ? $event_info['master_event']['id'].':'.$event['recurrence'] : false;
 					break;
 
 				case 'SERIES-EXCEPTION-PROPAGATE':
@@ -1742,7 +1741,7 @@ 
 					{
 						// we did not have sufficient rights to propagate the status only exception to a real one
 						// we have to keep the SERIES-PSEUDO-EXCEPTION id and keep the event untouched
-						$return_id = $event_info['master_event']['id'] . ':' . $event['recurrence'];
+						$return_id = $event_info['master_event']['id'].':'.$event['recurrence'];
 					}
 					break;
 			}
@@ -1756,8 +1755,8 @@ 
 			if ($this->log)
 			{
 				$event_info['stored_event'] = $this->read($event_info['stored_event']['id']);
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()[$updated_id]\n" .
-					array2string($event_info['stored_event'])."\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()[$updated_id]\n".
+					array2string($event_info['stored_event'])."\n", 3, $this->logfile);
 			}
 		}
 		date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
@@ -1777,10 +1776,10 @@ 
 	{
 		if ($this->debug) error_log(__METHOD__."(".array2string($event).', old_alarms='.array2string($old_alarms).", $user,)");
 		$modified = 0;
-		foreach($event['alarm'] as &$alarm)
+		foreach ($event['alarm'] as &$alarm)
 		{
 			// check if alarm is already stored or from other users
-			foreach($old_alarms as $id => $old_alarm)
+			foreach ($old_alarms as $id => $old_alarm)
 			{
 				// not current users alarm --> ignore
 				if (!$old_alarm['all'] && $old_alarm['owner'] != $user)
@@ -1817,7 +1816,7 @@ 
 			}
 		}
 		// remove all old alarms left from current user
-		foreach($old_alarms as $id => $old_alarm)
+		foreach ($old_alarms as $id => $old_alarm)
 		{
 			// not current users alarm --> ignore
 			if (!$old_alarm['all'] && $old_alarm['owner'] != $user)
@@ -1840,7 +1839,7 @@ 
 	 * @param string $what ='value'
 	 * @return mixed
 	 */
-	static function _get_attribute($components,$name,$what='value')
+	static function _get_attribute($components, $name, $what = 'value')
 	{
 		foreach ($components as $attribute)
 		{
@@ -1875,7 +1874,7 @@ 
 						case 'DURATION':
 							if (isset($vattr['params']['RELATED']) && $vattr['params']['RELATED'] == 'END')
 							{
-								$alarm['offset'] = $duration -$vattr['value'];
+								$alarm['offset'] = $duration - $vattr['value'];
 							}
 							elseif (isset($vattr['params']['RELATED']) && $vattr['params']['RELATED'] != 'START')
 							{
@@ -1891,7 +1890,7 @@ 
 							$alarm['time'] = $vattr['value'];
 							break;
 						default:
-							error_log('VALARM/TRIGGER: unsupported value type:' . $vtype);
+							error_log('VALARM/TRIGGER: unsupported value type:'.$vtype);
 					}
 					break;
 
@@ -1916,9 +1915,9 @@ 
 		return 0;
 	}
 
-	function setSupportedFields($_productManufacturer='', $_productName='')
+	function setSupportedFields($_productManufacturer = '', $_productName = '')
 	{
-		$state =& $_SESSION['SyncML.state'];
+		$state = & $_SESSION['SyncML.state'];
 		if (isset($state))
 		{
 			$deviceInfo = $state->getClientDeviceInfo();
@@ -2215,10 +2214,10 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				'(' . $this->productManufacturer .
-				', '. $this->productName .', ' .
-				($this->tzid ? $this->tzid : Api\DateTime::$user_timezone->getName()) .
-				', ' . $this->calendarOwner . ")\n" , 3, $this->logfile);
+				'('.$this->productManufacturer.
+				', '.$this->productName.', '.
+				($this->tzid ? $this->tzid : Api\DateTime::$user_timezone->getName()).
+				', '.$this->calendarOwner.")\n", 3, $this->logfile);
 		}
 
 		//Horde::logMessage('setSupportedFields(' . $this->productManufacturer . ', '
@@ -2236,12 +2235,12 @@ 
      *                         utf-8 for new format, iso-8859-1 for old format.
 	 * @return Iterator|array|boolean Iterator if resource given or array of events on success, false on failure
 	 */
-	function icaltoegw($_vcalData, $principalURL='', $charset=null)
+	function icaltoegw($_vcalData, $principalURL = '', $charset = null)
 	{
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($principalURL, $charset)\n" .
-				array2string($_vcalData)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($principalURL, $charset)\n".
+				array2string($_vcalData)."\n", 3, $this->logfile);
 		}
 
 		if (!is_array($this->supportedFields)) $this->setSupportedFields();
@@ -2276,14 +2275,14 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					"(): No vCalendar Container found!\n",3,$this->logfile);
+					"(): No vCalendar Container found!\n", 3, $this->logfile);
 			}
 			date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
 			return false;
 		}
 		foreach ($vcal->getComponents() as $component)
 		{
-			if (($event = $this->_ical2egw_callback($component,$this->tzid,$principalURL,$vcal)))
+			if (($event = $this->_ical2egw_callback($component, $this->tzid, $principalURL, $vcal)))
 			{
 				$events[] = $event;
 			}
@@ -2328,13 +2327,13 @@ 
 	 * @param Horde_Icalendar $container =null container to access attributes on container
 	 * @return array|boolean event array or false if $component is no Horde_Icalendar_Vevent
 	 */
-	function _ical2egw_callback(Horde_Icalendar $component, $tzid, $principalURL='', Horde_Icalendar $container=null)
+	function _ical2egw_callback(Horde_Icalendar $component, $tzid, $principalURL = '', Horde_Icalendar $container = null)
 	{
 		//unset($component->_container); _debug_array($component);
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'() '.get_class($component)." found\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'() '.get_class($component)." found\n", 3, $this->logfile);
 		}
 
 		// eg. Mozilla holiday calendars contain only a X-WR-TIMEZONE on vCalendar component
@@ -2389,16 +2388,16 @@ 
 	 * @param Horde_Icalendar $container =null container to access attributes on container
 	 * @return array|boolean			event on success, false on failure
 	 */
-	function vevent2egw($component, $version, $supportedFields, $principalURL='', $check_component='Horde_Icalendar_Vevent', Horde_Icalendar $container=null)
+	function vevent2egw($component, $version, $supportedFields, $principalURL = '', $check_component = 'Horde_Icalendar_Vevent', Horde_Icalendar $container = null)
 	{
-		unset($principalURL);	// not longer used, but required in function signature
+		unset($principalURL); // not longer used, but required in function signature
 
 		if ($check_component && !is_a($component, $check_component))
 		{
 			if ($this->log)
 			{
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'()' .
-					get_class($component)." found\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'()'.
+					get_class($component)." found\n", 3, $this->logfile);
 			}
 			return false;
 		}
@@ -2414,11 +2413,11 @@ 
 
 		$isDate = false;
 		$event		= array();
-		$alarms		= array();
-		$vcardData	= array(
+		$alarms = array();
+		$vcardData = array(
 			'recur_type'		=> MCAL_RECUR_NONE,
 			'recur_exception'	=> array(),
-			'priority'          => 0,	// iCalendar default is 0=undefined, not EGroupware 5=normal
+			'priority'          => 0, // iCalendar default is 0=undefined, not EGroupware 5=normal
 		);
 		// we need to parse DTSTART, DTEND or DURATION (in that order!) first
 		foreach (array_merge(
@@ -2435,7 +2434,7 @@ 
 						$isDate = true;
 					}
 					$dtstart_ts = is_numeric($attributes['value']) ? $attributes['value'] : $this->date2ts($attributes['value']);
-					$vcardData['start']	= $dtstart_ts;
+					$vcardData['start'] = $dtstart_ts;
 
 					if ($this->tzid)
 					{
@@ -2458,18 +2457,18 @@ 
 								}
 								else
 								{
-									error_log(__METHOD__ . '() unknown TZID='
-										. $attributes['params']['TZID'] . ', defaulting to timezone "'
-										. date_default_timezone_get() . '".'.array2string($tz));
-									$event['tzid'] = date_default_timezone_get();	// default to current timezone
+									error_log(__METHOD__.'() unknown TZID='
+										. $attributes['params']['TZID'].', defaulting to timezone "'
+										. date_default_timezone_get().'".'.array2string($tz));
+									$event['tzid'] = date_default_timezone_get(); // default to current timezone
 								}
 							}
-							catch(Exception $e)
+							catch (Exception $e)
 							{
-								error_log(__METHOD__ . '() unknown TZID='
-									. $attributes['params']['TZID'] . ', defaulting to timezone "'
-									. date_default_timezone_get() . '".'.$e->getMessage());
-								$event['tzid'] = date_default_timezone_get();	// default to current timezone
+								error_log(__METHOD__.'() unknown TZID='
+									. $attributes['params']['TZID'].', defaulting to timezone "'
+									. date_default_timezone_get().'".'.$e->getMessage());
+								$event['tzid'] = date_default_timezone_get(); // default to current timezone
 							}
 						}
 						else
@@ -2484,11 +2483,11 @@ 
 
 				case 'DTEND':
 					$dtend_ts = is_numeric($attributes['value']) ? $attributes['value'] : $this->date2ts($attributes['value']);
-					if (date('H:i:s',$dtend_ts) == '00:00:00')
+					if (date('H:i:s', $dtend_ts) == '00:00:00')
 					{
 						$dtend_ts -= 1;
 					}
-					$vcardData['end']	= $dtend_ts;
+					$vcardData['end'] = $dtend_ts;
 					break;
 
 				case 'DURATION':	// clients can use DTSTART+DURATION, instead of DTSTART+DTEND
@@ -2508,7 +2507,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-					. "() DTSTART missing!\n",3,$this->logfile);
+					. "() DTSTART missing!\n", 3, $this->logfile);
 			}
 			return false; // not a valid entry
 		}
@@ -2520,7 +2519,7 @@ 
 				case 'X-MICROSOFT-CDO-ALLDAYEVENT':
 					if (isset($supportedFields['whole_day']))
 					{
-						$event['whole_day'] = (isset($attributes['value'])?strtoupper($attributes['value'])=='TRUE':true);
+						$event['whole_day'] = (isset($attributes['value']) ? strtoupper($attributes['value']) == 'TRUE' : true);
 					}
 					break;
 				case 'AALARM':
@@ -2550,32 +2549,32 @@ 
 					$vcardData['recurrence'] = $attributes['value'];
 					break;
 				case 'LOCATION':
-					$vcardData['location']	= str_replace("\r\n", "\n", $attributes['value']);
+					$vcardData['location'] = str_replace("\r\n", "\n", $attributes['value']);
 					break;
 				case 'RRULE':
 					$recurence = $attributes['value'];
 					$vcardData['recur_interval'] = 1;
-					$type = preg_match('/FREQ=([^;: ]+)/i',$recurence,$matches) ? $matches[1] : $recurence[0];
+					$type = preg_match('/FREQ=([^;: ]+)/i', $recurence, $matches) ? $matches[1] : $recurence[0];
 					// vCard 2.0 values for all types
-					if (preg_match('/UNTIL=([0-9TZ]+)/',$recurence,$matches))
+					if (preg_match('/UNTIL=([0-9TZ]+)/', $recurence, $matches))
 					{
 						$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($matches[1]);
 						// If it couldn't be parsed, treat it as not set
-						if(is_string($vcardData['recur_enddate']))
+						if (is_string($vcardData['recur_enddate']))
 						{
 							unset($vcardData['recur_enddate']);
 						}
 					}
-					elseif (preg_match('/COUNT=([0-9]+)/',$recurence,$matches))
+					elseif (preg_match('/COUNT=([0-9]+)/', $recurence, $matches))
 					{
 						$vcardData['recur_count'] = (int)$matches[1];
 					}
-					if (preg_match('/INTERVAL=([0-9]+)/',$recurence,$matches))
+					if (preg_match('/INTERVAL=([0-9]+)/', $recurence, $matches))
 					{
-						$vcardData['recur_interval'] = (int) $matches[1] ? (int) $matches[1] : 1;
+						$vcardData['recur_interval'] = (int)$matches[1] ? (int)$matches[1] : 1;
 					}
 					$vcardData['recur_data'] = 0;
-					switch($type)
+					switch ($type)
 					{
 						case 'D':	// 1.0
 							$recurenceMatches = null;
@@ -2599,20 +2598,20 @@ 
 						case 'W':
 						case 'WEEKLY':
 							$days = array();
-							if (preg_match('/W(\d+) *((?i: [AEFHMORSTUW]{2})+)?( +([^ ]*))$/',$recurence, $recurenceMatches))		// 1.0
+							if (preg_match('/W(\d+) *((?i: [AEFHMORSTUW]{2})+)?( +([^ ]*))$/', $recurence, $recurenceMatches))		// 1.0
 							{
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								if (empty($recurenceMatches[2]))
 								{
-									$days[0] = strtoupper(substr(date('D', $vcardData['start']),0,2));
+									$days[0] = strtoupper(substr(date('D', $vcardData['start']), 0, 2));
 								}
 								else
 								{
-									$days = explode(' ',trim($recurenceMatches[2]));
+									$days = explode(' ', trim($recurenceMatches[2]));
 								}
 
 								$repeatMatches = null;
-								if (preg_match('/#(\d+)/',$recurenceMatches[4],$repeatMatches))
+								if (preg_match('/#(\d+)/', $recurenceMatches[4], $repeatMatches))
 								{
 									if ($repeatMatches[1]) $vcardData['recur_count'] = $repeatMatches[1];
 								}
@@ -2623,21 +2622,21 @@ 
 
 								$recur_days = $this->recur_days_1_0;
 							}
-							elseif (preg_match('/BYDAY=([^;: ]+)/',$recurence,$recurenceMatches))	// 2.0
+							elseif (preg_match('/BYDAY=([^;: ]+)/', $recurence, $recurenceMatches))	// 2.0
 							{
-								$days = explode(',',$recurenceMatches[1]);
+								$days = explode(',', $recurenceMatches[1]);
 								$recur_days = $this->recur_days;
 							}
 							else	// no day given, use the day of dtstart
 							{
-								$vcardData['recur_data'] |= 1 << (int)date('w',$vcardData['start']);
+								$vcardData['recur_data'] |= 1 << (int)date('w', $vcardData['start']);
 								$vcardData['recur_type'] = MCAL_RECUR_WEEKLY;
 							}
 							if ($days)
 							{
 								foreach ($recur_days as $id => $day)
 								{
-									if (in_array(strtoupper(substr($day,0,2)),$days))
+									if (in_array(strtoupper(substr($day, 0, 2)), $days))
 									{
 										$vcardData['recur_data'] |= $id;
 									}
@@ -2653,17 +2652,17 @@ 
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_count'] = $recurenceMatches[2];
 							}
-							elseif (preg_match('/MD(\d+)(?: [^ ]+)? ([0-9TZ]+)/',$recurence, $recurenceMatches))
+							elseif (preg_match('/MD(\d+)(?: [^ ]+)? ([0-9TZ]+)/', $recurence, $recurenceMatches))
 							{
 								$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_MDAY;
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
 							}
-							elseif (preg_match('/MP(\d+) (.*) (.*) (.*)/',$recurence, $recurenceMatches))
+							elseif (preg_match('/MP(\d+) (.*) (.*) (.*)/', $recurence, $recurenceMatches))
 							{
 								$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_WDAY;
 								$vcardData['recur_interval'] = $recurenceMatches[1];
-								if (preg_match('/#(\d+)/',$recurenceMatches[4],$recurenceMatches))
+								if (preg_match('/#(\d+)/', $recurenceMatches[4], $recurenceMatches))
 								{
 									$vcardData['recur_count'] = $recurenceMatches[1];
 								}
@@ -2680,7 +2679,7 @@ 
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_count'] = $recurenceMatches[2];
 							}
-							elseif (preg_match('/YM(\d+)(?: [^ ]+)? ([0-9TZ]+)/',$recurence, $recurenceMatches))
+							elseif (preg_match('/YM(\d+)(?: [^ ]+)? ([0-9TZ]+)/', $recurence, $recurenceMatches))
 							{
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
@@ -2694,11 +2693,11 @@ 
 							}
 							// handle FREQ=YEARLY;BYDAY= as FREQ=MONTHLY;BYDAY= with 12*INTERVAL
 							$vcardData['recur_interval'] = $vcardData['recur_interval'] ?
-								12*$vcardData['recur_interval'] : 12;
+								12 * $vcardData['recur_interval'] : 12;
 							// fall-through
 						case 'MONTHLY':
 							// does currently NOT parse BYDAY or BYMONTH, it has to be specified/identical to DTSTART
-							$vcardData['recur_type'] = strpos($recurence,'BYDAY') !== false ?
+							$vcardData['recur_type'] = strpos($recurence, 'BYDAY') !== false ?
 								MCAL_RECUR_MONTHLY_WDAY : MCAL_RECUR_MONTHLY_MDAY;
 							break;
 					}
@@ -2754,11 +2753,11 @@ 
 						(strpos($this->productName, 'outlook') !== false
 							|| strpos($this->productName, 'pocket pc') !== false))
 					{
-						$vcardData['priority'] = (int) $this->priority_funambol2egw[$attributes['value']];
+						$vcardData['priority'] = (int)$this->priority_funambol2egw[$attributes['value']];
 					}
 					else
 					{
-						$vcardData['priority'] = (int) $this->priority_ical2egw[$attributes['value']];
+						$vcardData['priority'] = (int)$this->priority_ical2egw[$attributes['value']];
 					}
 					break;
 				case 'CATEGORIES':
@@ -2772,10 +2771,10 @@ 
 					}
 					break;
 				case 'ORGANIZER':
-					$event['organizer'] = $attributes['value'];	// no egw field, but needed in AS
-					if (strtolower(substr($event['organizer'],0,7)) == 'mailto:')
+					$event['organizer'] = $attributes['value']; // no egw field, but needed in AS
+					if (strtolower(substr($event['organizer'], 0, 7)) == 'mailto:')
 					{
-						$event['organizer'] = substr($event['organizer'],7);
+						$event['organizer'] = substr($event['organizer'], 7);
 					}
 					if (!empty($attributes['params']['CN']))
 					{
@@ -2812,19 +2811,19 @@ 
 					}
 					// try parsing email and cn from attendee
 					elseif (preg_match('/mailto:([@.a-z0-9_-]+)|mailto:"?([.a-z0-9_ -]*)"?[ ]*<([@.a-z0-9_-]*)>/i',
-						$attributes['value'],$matches))
+						$attributes['value'], $matches))
 					{
 						$email = $matches[1] ? $matches[1] : $matches[3];
-						$cn = isset($matches[2]) ? $matches[2]: '';
+						$cn = isset($matches[2]) ? $matches[2] : '';
 					}
 					elseif (!empty($attributes['value']) &&
 						preg_match('/"?([.a-z0-9_ -]*)"?[ ]*<([@.a-z0-9_-]*)>/i',
-						$attributes['value'],$matches))
+						$attributes['value'], $matches))
 					{
 						$cn = $matches[1];
 						$email = $matches[2];
 					}
-					elseif (strpos($attributes['value'],'@') !== false)
+					elseif (strpos($attributes['value'], '@') !== false)
 					{
 						$email = $attributes['value'];
 					}
@@ -2841,7 +2840,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-								. "(): Found X-EGROUPWARE-UID: '$uid'\n",3,$this->logfile);
+								. "(): Found X-EGROUPWARE-UID: '$uid'\n", 3, $this->logfile);
 						}
 					}
 					elseif ($attributes['value'] == 'Unknown')
@@ -2859,7 +2858,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-								. "() Found account: '$uid', '$cn', '$email'\n",3,$this->logfile);
+								. "() Found account: '$uid', '$cn', '$email'\n", 3, $this->logfile);
 						}
 					}
 					if (!$uid)
@@ -2876,9 +2875,9 @@ 
 							$cn = str_replace(array('\\,', '\\;', '\\:', '\\\\'),
 										array(',', ';', ':', '\\'),
 										$attributes['params']['CN']);
-							if ($cn[0] == '"' && substr($cn,-1) == '"')
+							if ($cn[0] == '"' && substr($cn, -1) == '"')
 							{
-								$cn = substr($cn,1,-1);
+								$cn = substr($cn, 1, -1);
 							}
 							// not searching for $cn, as match can be not unique or without an email address
 							// --> notification will fail, better store just as email
@@ -2887,19 +2886,19 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-								. "() Search participant: '$cn', '$email'\n",3,$this->logfile);
+								. "() Search participant: '$cn', '$email'\n", 3, $this->logfile);
 						}
 
 						//elseif (//$attributes['params']['CUTYPE'] == 'GROUP'
-						if (preg_match('/(.*) '. lang('Group') . '/', $cn, $matches))
+						if (preg_match('/(.*) '.lang('Group').'/', $cn, $matches))
 						{
 							// we found a group
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-									. "() Found group: '$matches[1]', '$cn', '$email'\n",3,$this->logfile);
+									. "() Found group: '$matches[1]', '$cn', '$email'\n", 3, $this->logfile);
 							}
-							if (($uid =  $GLOBALS['egw']->accounts->name2id($matches[1], 'account_lid', 'g')))
+							if (($uid = $GLOBALS['egw']->accounts->name2id($matches[1], 'account_lid', 'g')))
 							{
 								//Horde::logMessage("vevent2egw: group participant $uid",
 								//			__FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -2913,7 +2912,7 @@ 
 										//Horde::logMessage("vevent2egw: set status to " . $status,
 										//		__FILE__, __LINE__, PEAR_LOG_DEBUG);
 										$vcardData['participants'][$this->user] =
-											calendar_so::combine_status($status,$quantity,$role);
+											calendar_so::combine_status($status, $quantity, $role);
 									}
 								}
 								$status = 'U'; // keep the group
@@ -2922,36 +2921,36 @@ 
 						}
 						elseif (empty($searcharray))
 						{
-							continue;	// participants without email AND CN --> ignore it
+							continue; // participants without email AND CN --> ignore it
 						}
 						elseif ((list($data) = $this->addressbook->search($searcharray,
-							array('id','egw_addressbook.account_id as account_id','n_fn'),
+							array('id', 'egw_addressbook.account_id as account_id', 'n_fn'),
 							'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC',
-							'','',false,'OR')))
+							'', '', false, 'OR')))
 						{
 							// found an addressbook entry
 							$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-									. "() Found addressbook entry: '$uid', '$cn', '$email'\n",3,$this->logfile);
+									. "() Found addressbook entry: '$uid', '$cn', '$email'\n", 3, $this->logfile);
 							}
 						}
 						else
 						{
 							if (!$email)
 							{
-								$email = 'no-email@egroupware.org';	// set dummy email to store the CN
+								$email = 'no-email@egroupware.org'; // set dummy email to store the CN
 							}
-							$uid = 'e'. ($cn ? $cn . ' <' . $email . '>' : $email);
+							$uid = 'e'.($cn ? $cn.' <'.$email.'>' : $email);
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-									. "() Not Found, create dummy: '$uid', '$cn', '$email'\n",3,$this->logfile);
+									. "() Not Found, create dummy: '$uid', '$cn', '$email'\n", 3, $this->logfile);
 							}
 						}
 					}
-					switch($attributes['name'])
+					switch ($attributes['name'])
 					{
 						case 'ATTENDEE':
 							if (!isset($attributes['params']['ROLE']) &&
@@ -2965,7 +2964,7 @@ 
 								// keep role 'CHAIR' from an external organizer, even if he is a regular participant with a different role
 								// as this is currently the only way to store an external organizer and send him iMip responses
 								$q = $r = null;
-								if (isset($vcardData['participants'][$uid]) && ($s=$vcardData['participants'][$uid]) &&
+								if (isset($vcardData['participants'][$uid]) && ($s = $vcardData['participants'][$uid]) &&
 									calendar_so::split_status($s, $q, $r) && $r == 'CHAIR')
 								{
 									$role = 'CHAIR';
@@ -2979,7 +2978,7 @@ 
 									if (!$this->calendarOwner && is_numeric($uid) && $role == 'CHAIR')
 										$component->getAttribute('ORGANIZER');
 								}
-								catch(Horde_Icalendar_Exception $e)
+								catch (Horde_Icalendar_Exception $e)
 								{
 									// we can store the ORGANIZER as event owner
 									$event['owner'] = $uid;
@@ -3035,7 +3034,7 @@ 
 					break;
 
 				case 'ATTACH':
-					if ($attributes['params'] && !empty($attributes['params']['FMTTYPE'])) break;	// handeled by managed attachment code
+					if ($attributes['params'] && !empty($attributes['params']['FMTTYPE'])) break; // handeled by managed attachment code
 					// fall throught to store external attachment url
 				default:	// X- attribute or other by EGroupware unsupported property
 					//error_log(__METHOD__."() $attributes[name] = ".array2string($attributes));
@@ -3093,7 +3092,7 @@ 
 					if ($event['recur_type'] != MCAL_RECUR_NONE)
 					{
 						$event['reference'] = 0;
-						foreach (array('recur_interval','recur_enddate','recur_data','recur_exception','recur_count') as $r)
+						foreach (array('recur_interval', 'recur_enddate', 'recur_data', 'recur_exception', 'recur_count') as $r)
 						{
 							if (isset($vcardData[$r]))
 							{
@@ -3116,12 +3115,12 @@ 
 			// reset recure_enddate to 00:00:00 on the last day
 			$rriter = calendar_rrule::event2rrule($event, false);
 			$last = $rriter->normalize_enddate();
-			if(!is_object($last))
+			if (!is_object($last))
 			{
-				if($this->log)
+				if ($this->log)
 				{
-					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-					" Unable to determine recurrence end date.  \n".array2string($event),3, $this->logfile);
+					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+					" Unable to determine recurrence end date.  \n".array2string($event), 3, $this->logfile);
 				}
 				return false;
 			}
@@ -3130,16 +3129,16 @@ 
 			$event['recur_enddate'] = Api\DateTime::to($last, 'server');
 		}
 		// translate COUNT into an enddate, as we only store enddates
-		elseif($event['recur_count'])
+		elseif ($event['recur_count'])
 		{
 			$rriter = calendar_rrule::event2rrule($event, false);
 			$last = $rriter->count2date($event['recur_count']);
-			if(!is_object($last))
+			if (!is_object($last))
 			{
-				if($this->log)
+				if ($this->log)
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__,
-					" Unable to determine recurrence end date.  \n".array2string($event),3, $this->logfile);
+					" Unable to determine recurrence end date.  \n".array2string($event), 3, $this->logfile);
 				}
 				return false;
 			}
@@ -3153,7 +3152,7 @@ 
 			if ($this->productManufacturer == 'groupdav' && $container &&
 				($x_calendarserver_access = $container->getAttribute('X-CALENDARSERVER-ACCESS')))
 			{
-				$event['public'] =  (int)(strtoupper($x_calendarserver_access) == 'PUBLIC');
+				$event['public'] = (int)(strtoupper($x_calendarserver_access) == 'PUBLIC');
 			}
 			//error_log(__METHOD__."() X-CALENDARSERVER-ACCESS=".array2string($x_calendarserver_access).' --> public='.array2string($event['public']));
 		}
@@ -3174,15 +3173,15 @@ 
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($event)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($event)."\n", 3, $this->logfile);
 		}
 		//Horde::logMessage("vevent2egw:\n" . print_r($event, true),
         //    	__FILE__, __LINE__, PEAR_LOG_DEBUG);
 		return $event;
 	}
 
-	function search($_vcalData, $contentID=null, $relax=false, $charset=null)
+	function search($_vcalData, $contentID = null, $relax = false, $charset = null)
 	{
 		if (($events = $this->icaltoegw($_vcalData, $charset)))
 		{
@@ -3203,8 +3202,8 @@ 
 			}
 			if ($this->log)
 			{
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."() found:\n" .
-					array2string($events)."\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."() found:\n".
+					array2string($events)."\n", 3, $this->logfile);
 			}
 		}
 		return array();
@@ -3222,23 +3221,23 @@ 
 	 * @param array $extra =null extra attributes to add
 	 * 	X-CALENDARSERVER-MASK-UID can be used to not include an event specified by this uid as busy
 	 */
-	function freebusy($user,$end=null,$utc=true, $charset='UTF-8', $start=null, $method='PUBLISH', array $extra=null)
+	function freebusy($user, $end = null, $utc = true, $charset = 'UTF-8', $start = null, $method = 'PUBLISH', array $extra = null)
 	{
-		if (!$start) $start = time();	// default now
-		if (!$end) $end = time() + 100*DAY_s;	// default next 100 days
+		if (!$start) $start = time(); // default now
+		if (!$end) $end = time() + 100 * DAY_s; // default next 100 days
 
 		$vcal = new Horde_Icalendar;
-		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
+		$vcal->setAttribute('PRODID', '-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
-		$vcal->setAttribute('VERSION','2.0');
-		$vcal->setAttribute('METHOD',$method);
+		$vcal->setAttribute('VERSION', '2.0');
+		$vcal->setAttribute('METHOD', $method);
 
-		$vfreebusy = Horde_Icalendar::newComponent('VFREEBUSY',$vcal);
+		$vfreebusy = Horde_Icalendar::newComponent('VFREEBUSY', $vcal);
 
 		$attributes = array(
 			'DTSTAMP' => time(),
-			'DTSTART' => $this->date2ts($start,true),	// true = server-time
-			'DTEND' => $this->date2ts($end,true),	// true = server-time
+			'DTSTART' => $this->date2ts($start, true), // true = server-time
+			'DTEND' => $this->date2ts($end, true), // true = server-time
 		);
 		if (!$utc)
 		{
@@ -3249,9 +3248,9 @@ 
 		}
 		if (is_null($extra)) $extra = array(
 			'URL' => $this->freebusy_url($user),
-			'ORGANIZER' => 'mailto:'.$GLOBALS['egw']->accounts->id2name($user,'account_email'),
+			'ORGANIZER' => 'mailto:'.$GLOBALS['egw']->accounts->id2name($user, 'account_email'),
 		);
-		foreach($attributes+$extra as $attr => $value)
+		foreach ($attributes + $extra as $attr => $value)
 		{
 			$vfreebusy->setAttribute($attr, $value);
 		}
@@ -3274,16 +3273,16 @@ 
 
 				if ($utc)
 				{
-					$vfreebusy->setAttribute('FREEBUSY',array(array(
+					$vfreebusy->setAttribute('FREEBUSY', array(array(
 						'start' => $event['start'],
 						'end' => $event['end'],
 					)), array('FBTYPE' => $fbtype));
 				}
 				else
 				{
-					$vfreebusy->setAttribute('FREEBUSY',array(array(
-						'start' => date('Ymd\THis',$event['start']),
-						'end' => date('Ymd\THis',$event['end']),
+					$vfreebusy->setAttribute('FREEBUSY', array(array(
+						'start' => date('Ymd\THis', $event['start']),
+						'end' => date('Ymd\THis', $event['end']),
 					)), array('FBTYPE' => $fbtype));
 				}
 			}

calendar/inc/class.calendar_import_csv.inc.php

Spacing +55 added lines, -55 removed lines

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

calendar/inc/class.calendar_zpush.inc.php

Spacing +178 added lines, -179 removed lines

@@ -84,19 +84,19 @@ 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
 		$cals_pref = $GLOBALS['egw_info']['user']['preferences']['activesync']['calendar-cals'];
-		$cals = $cals_pref ? explode(',',$cals_pref) : array('P');	// implicit default of 'P'
+		$cals = $cals_pref ? explode(',', $cals_pref) : array('P'); // implicit default of 'P'
 		$folderlist = array();
 
 		foreach ($this->calendar->list_cals() as $entry)
 		{
 			$account_id = $entry['grantor'];
-			if (in_array('A',$cals) || in_array($account_id,$cals) ||
-				$account_id == $GLOBALS['egw_info']['user']['account_id'] ||	// always incl. own calendar!
-				$account_id == $GLOBALS['egw_info']['user']['account_primary_group'] && in_array('G',$cals))
+			if (in_array('A', $cals) || in_array($account_id, $cals) ||
+				$account_id == $GLOBALS['egw_info']['user']['account_id'] || // always incl. own calendar!
+				$account_id == $GLOBALS['egw_info']['user']['account_primary_group'] && in_array('G', $cals))
 			{
 				$folderlist[] = $f = array(
-					'id'	=>	$this->backend->createID('calendar',$account_id),
-					'mod'	=>	$GLOBALS['egw']->accounts->id2name($account_id,'account_fullname'),
+					'id'	=>	$this->backend->createID('calendar', $account_id),
+					'mod'	=>	$GLOBALS['egw']->accounts->id2name($account_id, 'account_fullname'),
 					'parent'=>	'0',
 				);
 			}
@@ -120,7 +120,7 @@ 
 		$folderObj = new SyncFolder();
 		$folderObj->serverid = $id;
 		$folderObj->parentid = '0';
-		$folderObj->displayname = $GLOBALS['egw']->accounts->id2name($owner,'account_fullname');
+		$folderObj->displayname = $GLOBALS['egw']->accounts->id2name($owner, 'account_fullname');
 		if ($owner == $GLOBALS['egw_info']['user']['account_id'])
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_APPOINTMENT;
@@ -154,7 +154,7 @@ 
 
 		$stat = array(
 			'id'	 => $id,
-			'mod'	=> $GLOBALS['egw']->accounts->id2name($owner,'account_fullname'),
+			'mod'	=> $GLOBALS['egw']->accounts->id2name($owner, 'account_fullname'),
 			'parent' => '0',
 		);
 		//error_log(__METHOD__."('$id') folderObj=".array2string($stat));
@@ -178,19 +178,19 @@ 
 	 * @param array $not_uids =null uids NOT to return for meeting requests
 	 * @return array
   	 */
-	function GetMessageList($id, $cutoffdate=NULL, array $not_uids=null)
+	function GetMessageList($id, $cutoffdate = NULL, array $not_uids = null)
 	{
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$id',$cutoffdate)");
 		$type = $user = null;
-		$this->backend->splitID($id,$type,$user);
+		$this->backend->splitID($id, $type, $user);
 
-		if (!$cutoffdate) $cutoffdate = $this->bo->now - 100*24*3600;	// default three month back -30 breaks all sync recurrences
+		if (!$cutoffdate) $cutoffdate = $this->bo->now - 100 * 24 * 3600; // default three month back -30 breaks all sync recurrences
 
 		$filter = array(
 			'users' => $user,
-			'start' => $cutoffdate,	// default one month back -30 breaks all sync recurrences
+			'start' => $cutoffdate, // default one month back -30 breaks all sync recurrences
 			'enum_recuring' => false,
 			'daywise' => false,
 			'date_format' => 'server',
@@ -199,7 +199,7 @@ 
 			'filter' => $user == $GLOBALS['egw_info']['user']['account_id'] ? (is_array($not_uids) ? 'unknown' : 'default') : 'default',
 			// @todo return only etag relevant information (seems not to work ...)
 			//'cols'		=> array('egw_cal.cal_id', 'cal_start',	'recur_type', 'cal_modified', 'cal_uid', 'cal_etag'),
-			'query' => array('cal_recurrence' => 0),	// do NOT return recurrence exceptions
+			'query' => array('cal_recurrence' => 0), // do NOT return recurrence exceptions
 		);
 
 		$messagelist = array();
@@ -230,7 +230,7 @@ 
 	 * @param int $cutoffdate =null
 	 * @return array
 	 */
-	function GetMeetingRequests(array $not_uids, $cutoffdate=NULL)
+	function GetMeetingRequests(array $not_uids, $cutoffdate = NULL)
 	{
 		unset($not_uids, $cutoffdate);
 		return array();
@@ -256,7 +256,7 @@ 
 	 */
 	function StatMeetingRequest($id)
 	{
-		$folderid = $this->backend->createID('calendar', $GLOBALS['egw_info']['user']['account_id']);	// users personal calendar
+		$folderid = $this->backend->createID('calendar', $GLOBALS['egw_info']['user']['account_id']); // users personal calendar
 
 		$ret = $this->StatMessage($folderid, abs($id));
 		$ret['id'] = $id;
@@ -275,9 +275,9 @@ 
 	 * @param bool $mimesupport
 	 * @return SyncMail
 	 */
-	function GetMeetingRequest($id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)
+	function GetMeetingRequest($id, $truncsize, $bodypreference = false, $optionbodypreference = false, $mimesupport = 0)
 	{
-		unset($truncsize, $optionbodypreference, $mimesupport);	// not used, but required by function signature
+		unset($truncsize, $optionbodypreference, $mimesupport); // not used, but required by function signature
 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
@@ -290,13 +290,13 @@ 
 			$message = new SyncMail();
 			$message->read = false;
 			$message->subject = $event['title'];
-			$message->importance = 1;	// 0=Low, 1=Normal, 2=High
+			$message->importance = 1; // 0=Low, 1=Normal, 2=High
 			$message->datereceived = $event['created'];
 			$message->to = $message->displayto = $GLOBALS['egw_info']['user']['account_email'];
-			$message->from = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_fullname').
-				' <'.$GLOBALS['egw']->accounts->id2name($event['owner'],'account_email').'>';
+			$message->from = $GLOBALS['egw']->accounts->id2name($event['owner'], 'account_fullname').
+				' <'.$GLOBALS['egw']->accounts->id2name($event['owner'], 'account_email').'>';
 			$message->internetcpid = 65001;
-			$message->contentclass="urn:content-classes:message";
+			$message->contentclass = "urn:content-classes:message";
 
 			$message->meetingrequest = self::meetingRequest($event);
 			$message->messageclass = "IPM.Schedule.Meeting.Request";
@@ -311,7 +311,7 @@ 
 			else
 			{
 				$message->airsyncbasebody = new SyncAirSyncBaseBody();
-				$message->airsyncbasenativebodytype=1;
+				$message->airsyncbasenativebodytype = 1;
 				$this->backend->note2messagenote($event['description'], $bodypreference, $message->airsyncbasebody);
 			}
 		}
@@ -346,12 +346,12 @@ 
 			$as_tz = self::tz2as($event['tzid']);
 			$message->timezone = base64_encode(self::_getSyncBlobFromTZ($as_tz));
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			unset($e);
 			// ignore exception, simply set no timezone, as it is optional
 		}
 		// copying timestamps (they are already read in servertime, so non tz conversation)
-		foreach(array(
+		foreach (array(
 			'start' => 'starttime',
 			'end'   => 'endtime',
 			'created' => 'dtstamp',
@@ -361,10 +361,10 @@ 
 		}
 		if (($message->alldayevent = (int)calendar_bo::isWholeDay($event)))
 		{
-			++$message->endtime;	// EGw all-day-events are 1 sec shorter!
+			++$message->endtime; // EGw all-day-events are 1 sec shorter!
 		}
 		// copying strings
-		foreach(array(
+		foreach (array(
 			'title' => 'subject',
 			'location' => 'location',
 		) as $key => $attr)
@@ -373,16 +373,16 @@ 
 		}
 		$message->organizer = $event['organizer'];
 
-		$message->sensitivity = $event['public'] ? 0 : 2;	// 0=normal, 1=personal, 2=private, 3=confidential
+		$message->sensitivity = $event['public'] ? 0 : 2; // 0=normal, 1=personal, 2=private, 3=confidential
 
 		// busystatus=(0=free|1=tentative|2=busy|3=out-of-office), EGw has non_blocking=0|1
 		$message->busystatus = $event['non_blocking'] ? 0 : 2;
 
 		// ToDo: recurring events: InstanceType, RecurrenceId, Recurrences; ...
-		$message->instancetype = 0;	// 0=Single, 1=Master recurring, 2=Single recuring, 3=Exception
+		$message->instancetype = 0; // 0=Single, 1=Master recurring, 2=Single recuring, 3=Exception
 
-		$message->responserequested = 1;	//0=No, 1=Yes
-		$message->disallownewtimeproposal = 1;	//1=forbidden, 0=allowed
+		$message->responserequested = 1; //0=No, 1=Yes
+		$message->disallownewtimeproposal = 1; //1=forbidden, 0=allowed
 		//$message->messagemeetingtype;	// email2
 
 		// ToDo: alarme: Reminder
@@ -428,14 +428,14 @@ 
 			// check if event already exist (invitation of or already imported by other user)
 			if (!($event = $this->calendar->read($parsed_event['uid'], 0, false, 'server')))
 			{
-				$event = $parsed_event;	// create new event from external invitation
+				$event = $parsed_event; // create new event from external invitation
 			}
-			elseif(!isset($event['participants'][$uid]))
+			elseif (!isset($event['participants'][$uid]))
 			{
 				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.'('.array2string($requestid).", $folderid, $response) current user ($uid) is NO participant of event ".array2string($event));
 				// maybe we should silently add him, as he might not have the rights to add him himself with calendar->update ...
 			}
-			elseif($event['deleted'])
+			elseif ($event['deleted'])
 			{
 				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.'('.array2string($requestid).", $folderid, $response) event ($uid) deleted on server --> return false");
 				return false;
@@ -458,7 +458,7 @@ 
 		else
 		{
 			$event['participants'][$uid] = $status;
-			$ret = $this->calendar->update($event, true);	// true = ignore conflicts, as there seems no conflict handling in AS
+			$ret = $this->calendar->update($event, true); // true = ignore conflicts, as there seems no conflict handling in AS
 		}
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.'('.array2string($requestid).", '$folderid', $response) returning ".array2string($ret));
 		return $ret;
@@ -470,10 +470,10 @@ 
 	 * @var array
 	 */
 	static $status2as = array(
-		'U' => 0,	// unknown
-		'T' => 2,	// tentative
-		'A' => 3,	// accepted
-		'R' => 4,	// decline
+		'U' => 0, // unknown
+		'T' => 2, // tentative
+		'A' => 3, // accepted
+		'R' => 4, // decline
 		// 5 = not responded
 	);
 	/**
@@ -482,9 +482,9 @@ 
 	 * @var array
 	 */
 	static $role2as = array(
-		'REQ-PARTICIPANT' => 1,	// required
-		'CHAIR' => 1,			// required
-		'OPT-PARTICIPANT' => 2,	// optional
+		'REQ-PARTICIPANT' => 1, // required
+		'CHAIR' => 1, // required
+		'OPT-PARTICIPANT' => 2, // optional
 		'NON-PARTICIPANT' => 2,
 		// 3 = ressource
 	);
@@ -496,8 +496,8 @@ 
 	static $recur_type2as = array(
 		calendar_rrule::DAILY => 0,
 		calendar_rrule::WEEKLY => 1,
-		calendar_rrule::MONTHLY_MDAY => 2,	// monthly
-		calendar_rrule::MONTHLY_WDAY => 3,	// monthly on nth day
+		calendar_rrule::MONTHLY_MDAY => 2, // monthly
+		calendar_rrule::MONTHLY_WDAY => 3, // monthly on nth day
 		calendar_rrule::YEARLY => 5,
 		// 6 = yearly on nth day (same as 5 on non-leapyears or before March on leapyears)
 	);
@@ -524,7 +524,7 @@ 
 	 */
 	public function ChangeMessage($folderid, $_id, $message, $contentParameters)
 	{
-		unset($contentParameters);	// unused, but required by function signature
+		unset($contentParameters); // unused, but required by function signature
 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
@@ -534,7 +534,7 @@ 
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', $_id, ".array2string($message).") type='$type', account=$account");
 
-		list($id,$recur_date) = explode(':', $_id);
+		list($id, $recur_date) = explode(':', $_id);
 
 		if ($type != 'calendar' || $id && !($old_event = $this->calendar->read($id, $recur_date, false, 'server')))
 		{
@@ -547,21 +547,21 @@ 
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid',$id:$recur_date,".array2string($message).") handling of virtual exception not yet implemented!");
 			//error_log(__METHOD__."('$folderid',$id:$recur_date,".array2string($message).") handling of virtual exception not yet implemented!");
 		}
-		if (!$this->calendar->check_perms($id ? Acl::EDIT : Acl::ADD, $old_event ? $old_event : 0,$account))
+		if (!$this->calendar->check_perms($id ? Acl::EDIT : Acl::ADD, $old_event ? $old_event : 0, $account))
 		{
 			// @todo: write in users calendar and make account only a participant
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid',$id,...) no rights to add/edit event!");
 			//error_log(__METHOD__."('$folderid',$id,".array2string($message).") no rights to add/edit event!");
 			return false;
 		}
-		if (!$id) $old_event['owner'] = $account;	// we do NOT allow to change the owner of existing events
+		if (!$id) $old_event['owner'] = $account; // we do NOT allow to change the owner of existing events
 
 		$event = $this->message2event($message, $account, $old_event);
 
 		// store event, ignore conflicts and skip notifications, as AS clients do their own notifications
 		$skip_notification = false;
 		if (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']) &&
-			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']=='send')
+			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations'] == 'send')
 		{
 			$skip_notification = true; // to avoid double notification from client AND Server
 		}
@@ -574,16 +574,16 @@ 
 		// store non-delete exceptions
 		if ($message->exceptions)
 		{
-			foreach($message->exceptions as $exception)
+			foreach ($message->exceptions as $exception)
 			{
 				if (!$exception->deleted)
 				{
 					$ex_event = $event;
 					unset($ex_event['id']);
 					unset($ex_event['etag']);
-					foreach(array_keys($ex_event) as $name)
+					foreach (array_keys($ex_event) as $name)
 					{
-						if (substr($name,0,6) == 'recur_') unset($ex_event[$name]);
+						if (substr($name, 0, 6) == 'recur_') unset($ex_event[$name]);
 					}
 					$ex_event['recur_type'] = calendar_rrule::NONE;
 
@@ -591,10 +591,10 @@ 
 						'user' => $account,
 						'enum_recuring' => false,
 						'daywise' => false,
-						'filter' => 'owner',  // return all possible entries
+						'filter' => 'owner', // return all possible entries
 						'query' => array(
 							'cal_uid' => $event['uid'],
-							'cal_recurrence' => $exception->exceptionstarttime,	// in servertime
+							'cal_recurrence' => $exception->exceptionstarttime, // in servertime
 						),
 					))))
 					{
@@ -606,7 +606,7 @@ 
 						$participants = $event['participants'];
 					}
 					$save_event = $this->message2event($exception, $account, $ex_event);
-					$save_event['participants'] = $participants;	// not contained in $exception
+					$save_event['participants'] = $participants; // not contained in $exception
 					$save_event['reference'] = $event['id'];
 					$save_event['recurrence'] = Api\DateTime::server2user($exception->exceptionstarttime);
 					$ex_ok = $this->calendar->save($save_event);
@@ -628,10 +628,10 @@ 
 	 * @param array $event =array()
 	 * @return array
 	 */
-	private function message2event(SyncAppointment $message, $account, $event=array())
+	private function message2event(SyncAppointment $message, $account, $event = array())
 	{
 		// timestamps (created & modified are updated automatically)
-		foreach(array(
+		foreach (array(
 			'start' => 'starttime',
 			'end' => 'endtime',
 		) as $key => $attr)
@@ -639,7 +639,7 @@ 
 			if (isset($message->$attr)) $event[$key] = Api\DateTime::server2user($message->$attr);
 		}
 		// copying strings
-		foreach(array(
+		foreach (array(
 			'title' => 'subject',
 			'uid'   => 'uid',
 			'location' => 'location',
@@ -654,7 +654,7 @@ 
 		{
 			$event['description'] = $description;
 		}
-		$event['public'] = (int)($message->sensitivity < 1);	// 0=normal, 1=personal, 2=private, 3=confidential
+		$event['public'] = (int)($message->sensitivity < 1); // 0=normal, 1=personal, 2=private, 3=confidential
 
 		// busystatus=(0=free|1=tentative|2=busy|3=out-of-office), EGw has non_blocking=0|1
 		if (isset($message->busystatus))
@@ -664,21 +664,21 @@ 
 
 		if (($event['whole_day'] = $message->alldayevent))
 		{
-			if ($event['end'] == $event['start']) $event['end'] += 24*3600;	// some clients send equal start&end for 1day
-			$event['end']--;	// otherwise our whole-day event code in save makes it one more day!
+			if ($event['end'] == $event['start']) $event['end'] += 24 * 3600; // some clients send equal start&end for 1day
+			$event['end']--; // otherwise our whole-day event code in save makes it one more day!
 		}
 
 		$participants = array();
-		foreach((array)$message->attendees as $attendee)
+		foreach ((array)$message->attendees as $attendee)
 		{
-			if ($attendee->type == 3) continue;	// we can not identify resources and re-add them anyway later
+			if ($attendee->type == 3) continue; // we can not identify resources and re-add them anyway later
 
 			$matches = null;
-			if (preg_match('/^noreply-(.*)-uid@egroupware.org$/',$attendee->email,$matches))
+			if (preg_match('/^noreply-(.*)-uid@egroupware.org$/', $attendee->email, $matches))
 			{
 				$uid = $matches[1];
 			}
-			elseif (!($uid = $GLOBALS['egw']->accounts->name2id($attendee->email,'account_email')))
+			elseif (!($uid = $GLOBALS['egw']->accounts->name2id($attendee->email, 'account_email')))
 			{
 				$search = array(
 					'email' => $attendee->email,
@@ -688,13 +688,13 @@ 
 				// search addressbook for participant
 				if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
 				if ((list($data) = $this->addressbook->search($search,
-					array('id','egw_addressbook.account_id as account_id','n_fn'),
+					array('id', 'egw_addressbook.account_id as account_id', 'n_fn'),
 					'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC',
-					'','',false,'OR')))
+					'', '', false, 'OR')))
 				{
 					$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
 				}
-				elseif($attendee->name === $attendee->email || empty($attendee->name))	// dont store empty or email as name
+				elseif ($attendee->name === $attendee->email || empty($attendee->name))	// dont store empty or email as name
 				{
 					$uid = 'e'.$attendee->email;
 				}
@@ -712,8 +712,8 @@ 
 				//ZLog::Write(LOGLEVEL_DEBUG, "old status for $uid is status=$status, quantity=$quantitiy, role=$role");
 			}
 			// check if just email is an existing attendee (iOS returns email as name too!), keep it to keep status/role if not set
-			elseif ($event['id'] && (isset($event['participants'][$u='e'.$attendee->email]) ||
-				(isset($event['participants'][$u='e'.$attendee->name.' <'.$attendee->email.'>']))))
+			elseif ($event['id'] && (isset($event['participants'][$u = 'e'.$attendee->email]) ||
+				(isset($event['participants'][$u = 'e'.$attendee->name.' <'.$attendee->email.'>']))))
 			{
 				$status = $event['participants'][$u];
 				calendar_so::split_status($status, $quantity, $role);
@@ -726,9 +726,9 @@ 
 				$role = 'REQ-PARTICIPANT';
 				//ZLog::Write(LOGLEVEL_DEBUG, "default status for $uid is status=$status, quantity=$quantitiy, role=$role");
 			}
-			if ($role == 'CHAIR') $chair_set = true;	// by role from existing participant
+			if ($role == 'CHAIR') $chair_set = true; // by role from existing participant
 
-			if (isset($attendee->attendeestatus) && ($s = array_search($attendee->attendeestatus,self::$status2as)))
+			if (isset($attendee->attendeestatus) && ($s = array_search($attendee->attendeestatus, self::$status2as)))
 			{
 				$status = $s;
 			}
@@ -738,29 +738,29 @@ 
 				$chair_set = true;
 			}
 			elseif (isset($attendee->attendeetype) &&
-				!($role == 'CHAIR' && !is_numeric($uid)) &&	// do not override our external ORGANIZER
-				($r = array_search($attendee->attendeetype,self::$role2as)) &&
+				!($role == 'CHAIR' && !is_numeric($uid)) && // do not override our external ORGANIZER
+				($r = array_search($attendee->attendeetype, self::$role2as)) &&
 				(int)self::$role2as[$role] != $attendee->attendeetype)	// if old role gives same type, use old role, as we have a lot more roles then AS
 			{
 				$role = $r;
 			}
 			//ZLog::Write(LOGLEVEL_DEBUG, "-> status for $uid is status=$status ($s), quantity=$quantitiy, role=$role ($r)");
-			$participants[$uid] = calendar_so::combine_status($status,$quantitiy,$role);
+			$participants[$uid] = calendar_so::combine_status($status, $quantitiy, $role);
 		}
 		// if organizer is not already participant, add him as chair
-		if (($uid = $GLOBALS['egw']->accounts->name2id($message->organizeremail,'account_email')) && !isset($participants[$uid]))
+		if (($uid = $GLOBALS['egw']->accounts->name2id($message->organizeremail, 'account_email')) && !isset($participants[$uid]))
 		{
 			$participants[$uid] = calendar_so::combine_status($uid == $GLOBALS['egw_info']['user']['account_id'] ?
-				'A' : 'U',1,'CHAIR');
+				'A' : 'U', 1, 'CHAIR');
 			$chair_set = true;
 		}
 		// preserve all resource types not account, contact or email (eg. resources) for existing events
 		// $account is also preserved, as AS does not add him as participant!
-		foreach((array)$event['participant_types'] as $type => $parts)
+		foreach ((array)$event['participant_types'] as $type => $parts)
 		{
-			if (in_array($type,array('c','e'))) continue;	// they are correctly representable in AS
+			if (in_array($type, array('c', 'e'))) continue; // they are correctly representable in AS
 
-			foreach($parts as $id => $status)
+			foreach ($parts as $id => $status)
 			{
 				// accounts are represented correctly, but the event owner which is no participant in AS
 				if ($type == 'u' && $id != $account) continue;
@@ -776,13 +776,13 @@ 
 		if (!$event['id'] || !$participants || !isset($participants[$account]))
 		{
 			$participants[$account] = calendar_so::combine_status($account == $GLOBALS['egw_info']['user']['account_id'] ?
-				'A' : 'U',1,!$chair_set ? 'CHAIR' : 'REQ-PARTICIPANT');
+				'A' : 'U', 1, !$chair_set ? 'CHAIR' : 'REQ-PARTICIPANT');
 		}
 		$event['participants'] = $participants;
 
 		if (isset($message->categories))
 		{
-			$event['category'] = implode(',', array_filter($this->calendar->find_or_add_categories($message->categories, $event),'strlen'));
+			$event['category'] = implode(',', array_filter($this->calendar->find_or_add_categories($message->categories, $event), 'strlen'));
 		}
 
 		// check if event is recurring and import recur information (incl. timezone)
@@ -792,8 +792,7 @@ 
 			{
 				$event['tzid'] = self::as2tz(self::_getTZFromSyncBlob(base64_decode($message->timezone)));
 			}
-			$event['recur_type'] = $message->recurrence->type == 6 ? calendar_rrule::YEARLY :
-				array_search($message->recurrence->type, self::$recur_type2as);
+			$event['recur_type'] = $message->recurrence->type == 6 ? calendar_rrule::YEARLY : array_search($message->recurrence->type, self::$recur_type2as);
 			$event['recur_interval'] = $message->recurrence->interval;
 
 			switch ($event['recur_type'])
@@ -802,7 +801,7 @@ 
 					// $message->recurrence->weekofmonth is not explicitly stored in egw, just taken from start date
 					// fall throught
 				case calendar_rrule::WEEKLY:
-					$event['recur_data'] = $message->recurrence->dayofweek;	// 1=Su, 2=Mo, 4=Tu, .., 64=Sa
+					$event['recur_data'] = $message->recurrence->dayofweek; // 1=Su, 2=Mo, 4=Tu, .., 64=Sa
 					break;
 				case calendar_rrule::MONTHLY_MDAY:
 					// $message->recurrence->dayofmonth is not explicitly stored in egw, just taken from start date
@@ -818,7 +817,7 @@ 
 			$event['recur_exceptions'] = array();
 			if ($message->exceptions)
 			{
-				foreach($message->exceptions as $exception)
+				foreach ($message->exceptions as $exception)
 				{
 					$event['recur_exception'][] = Api\DateTime::server2user($exception->exceptionstarttime);
 				}
@@ -828,7 +827,7 @@ 
 			{
 				// calculate enddate from occurences count, as we only support enddate
 				$count = $message->recurrence->occurrences;
-				foreach(calendar_rrule::event2rrule($event, true) as $rtime)	// true = timestamps are user time here, because of save!
+				foreach (calendar_rrule::event2rrule($event, true) as $rtime)	// true = timestamps are user time here, because of save!
 				{
 					if (--$count <= 0) break;
 				}
@@ -838,11 +837,11 @@ 
 		// only import alarms in own calendar
 		if ($message->reminder && $account == $GLOBALS['egw_info']['user']['account_id'])
 		{
-			foreach((array)$event['alarm'] as $alarm)
+			foreach ((array)$event['alarm'] as $alarm)
 			{
-				if (($alarm['all'] || $alarm['owner'] == $account) && $alarm['offset'] == 60*$message->reminder)
+				if (($alarm['all'] || $alarm['owner'] == $account) && $alarm['offset'] == 60 * $message->reminder)
 				{
-					$alarm = true;	// alarm already exists --> do nothing
+					$alarm = true; // alarm already exists --> do nothing
 					break;
 				}
 			}
@@ -851,16 +850,16 @@ 
 				// delete all earlier alarms of that user
 				// user get's per AS only the earliest alarm, as AS only supports one alarm
 				// --> if a later alarm is returned, user probably modifed an existing alarm
-				foreach((array)$event['alarm'] as $key => $alarm)
+				foreach ((array)$event['alarm'] as $key => $alarm)
 				{
-					if ($alarm['owner'] == $account && $alarm['offset'] > 60*$message->reminder)
+					if ($alarm['owner'] == $account && $alarm['offset'] > 60 * $message->reminder)
 					{
 						unset($event['alarm'][$key]);
 					}
 				}
 				$event['alarm'][] = $alarm = array(
 					'owner' => $account,
-					'offset' => 60*$message->reminder,
+					'offset' => 60 * $message->reminder,
 				);
 			}
 		}
@@ -934,7 +933,7 @@ 
 	 */
 	public function DeleteMessage($folderid, $id, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 
 		if (!isset($this->caledar)) $this->calendar = new calendar_boupdate();
 
@@ -962,7 +961,7 @@ 
 	 */
 	function SetReadFlag($folderid, $id, $flags, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', $id, ".array2string($flags)." NOT supported!");
 		return false;
@@ -1013,17 +1012,17 @@ 
 		}
 		else
 		{
-			list($id,$recur_date) = explode(':',$id);
-			if ($type != 'calendar' || !($event = $this->calendar->read($id,$recur_date,false,'server',$account)))
+			list($id, $recur_date) = explode(':', $id);
+			if ($type != 'calendar' || !($event = $this->calendar->read($id, $recur_date, false, 'server', $account)))
 			{
 				error_log(__METHOD__."('$folderid', $id, ...) read($id,null,false,'server',$account) returned false");
 				return false;
 			}
 		}
-		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid,$id,...) start=$event[start]=".date('Y-m-d H:i:s',$event['start']).", recurrence=$event[recurrence]=".date('Y-m-d H:i:s',$event['recurrence']));
-		foreach((array)$event['recur_exception'] as $ex)
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid,$id,...) start=$event[start]=".date('Y-m-d H:i:s', $event['start']).", recurrence=$event[recurrence]=".date('Y-m-d H:i:s', $event['recurrence']));
+		foreach ((array)$event['recur_exception'] as $ex)
 		{
-			ZLog::Write(LOGLEVEL_DEBUG, "exception=$ex=".date('Y-m-d H:i:s',$ex));
+			ZLog::Write(LOGLEVEL_DEBUG, "exception=$ex=".date('Y-m-d H:i:s', $ex));
 		}
 		$message = new SyncAppointment();
 
@@ -1032,13 +1031,13 @@ 
 			$as_tz = self::tz2as($event['tzid']);
 			$message->timezone = base64_encode(self::_getSyncBlobFromTZ($as_tz));
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			unset($e);
 			// ignore exception, simply set no timezone, as it is optional
 		}
 
 		// copying timestamps (they are already read in servertime, so non tz conversation)
-		foreach(array(
+		foreach (array(
 			'start' => 'starttime',
 			'end'   => 'endtime',
 			'created' => 'dtstamp',
@@ -1049,10 +1048,10 @@ 
 		}
 		if (($message->alldayevent = (int)calendar_bo::isWholeDay($event)))
 		{
-			++$message->endtime;	// EGw all-day-events are 1 sec shorter!
+			++$message->endtime; // EGw all-day-events are 1 sec shorter!
 		}
 		// copying strings
-		foreach(array(
+		foreach (array(
 			'title' => 'subject',
 			'uid'   => 'uid',
 			'location' => 'location',
@@ -1074,22 +1073,22 @@ 
 			{
 				ZLog::Write(LOGLEVEL_DEBUG, "airsyncbasebody!");
 				$message->asbody = new SyncBaseBody();
-				$message->nativebodytype=1;
+				$message->nativebodytype = 1;
 				$this->backend->note2messagenote($event['description'], $bodypreference, $message->asbody);
 			}
 		}
 		$message->md5body = md5($event['description']);
 
-		$message->organizername  = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_fullname');
-		$message->organizeremail = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
+		$message->organizername  = $GLOBALS['egw']->accounts->id2name($event['owner'], 'account_fullname');
+		$message->organizeremail = $GLOBALS['egw']->accounts->id2name($event['owner'], 'account_email');
 
-		$message->sensitivity = $event['public'] ? 0 : 2;	// 0=normal, 1=personal, 2=private, 3=confidential
+		$message->sensitivity = $event['public'] ? 0 : 2; // 0=normal, 1=personal, 2=private, 3=confidential
 
 		// busystatus=(0=free|1=tentative|2=busy|3=out-of-office), EGw has non_blocking=0|1
 		$message->busystatus = $event['non_blocking'] ? 0 : 2;
 
 		$message->attendees = array();
-		foreach($event['participants'] as $uid => $status)
+		foreach ($event['participants'] as $uid => $status)
 		{
 			// AS does NOT want calendar owner as participant
 			if ($uid == $account) continue;
@@ -1101,19 +1100,19 @@ 
 			$attendee->attendeetype = (int)self::$role2as[$role];
 			if (is_numeric($uid))
 			{
-				$attendee->name = $GLOBALS['egw']->accounts->id2name($uid,'account_fullname');
-				$attendee->email = $GLOBALS['egw']->accounts->id2name($uid,'account_email');
+				$attendee->name = $GLOBALS['egw']->accounts->id2name($uid, 'account_fullname');
+				$attendee->email = $GLOBALS['egw']->accounts->id2name($uid, 'account_email');
 			}
 			else
 			{
 				list($info) = $i = $this->calendar->resources[$uid[0]]['info'] ?
-					ExecMethod($this->calendar->resources[$uid[0]]['info'],substr($uid,1)) : array(false);
+					ExecMethod($this->calendar->resources[$uid[0]]['info'], substr($uid, 1)) : array(false);
 
 				if (!$info) continue;
 
 				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');
 				}
 				$attendee->name = empty($info['cn']) ? $info['name'] : $info['cn'];
 				$attendee->email = $info['email'];
@@ -1125,7 +1124,7 @@ 
 					$message->organizeremail = $attendee->email;
 					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid, $id, ...) external organizer detected (role=$role, uid=$uid), set as AS organizer: $message->organizername <$message->organizeremail>");
 				}
-				if ($uid[0] == 'r') $attendee->type = 3;	// 3 = resource
+				if ($uid[0] == 'r') $attendee->type = 3; // 3 = resource
 			}
 			// email must NOT be empty, but MAY be an arbitrary text
 			if (empty($attendee->email)) $attendee->email = 'noreply-'.$uid.'-uid@egroupware.org';
@@ -1133,7 +1132,7 @@ 
 			$message->attendees[] = $attendee;
 		}
 		$message->categories = array();
-		foreach($event['category'] ? explode(',',$event['category']) : array() as $cat_id)
+		foreach ($event['category'] ? explode(',', $event['category']) : array() as $cat_id)
 		{
 			$message->categories[] = Api\Categories::id2name($cat_id);
 		}
@@ -1142,25 +1141,25 @@ 
 		if ($event['recur_type'] != calendar_rrule::NONE && !$recur_date)
 		{
 			$message->recurrence = $recurrence = new SyncRecurrence();
-			$rrule = calendar_rrule::event2rrule($event,false);	// false = timestamps in $event are servertime
+			$rrule = calendar_rrule::event2rrule($event, false); // false = timestamps in $event are servertime
 			$recurrence->type = (int)self::$recur_type2as[$rrule->type];
 			$recurrence->interval = $rrule->interval;
 			switch ($rrule->type)
 			{
 				case calendar_rrule::MONTHLY_WDAY:
 					$recurrence->weekofmonth = $rrule->monthly_byday_num >= 1 ?
-						$rrule->monthly_byday_num : 5;	// 1..5=last week of month, not -1
+						$rrule->monthly_byday_num : 5; // 1..5=last week of month, not -1
 					// fall throught
 				case calendar_rrule::WEEKLY:
-					$recurrence->dayofweek = $rrule->weekdays;	// 1=Su, 2=Mo, 4=Tu, .., 64=Sa
+					$recurrence->dayofweek = $rrule->weekdays; // 1=Su, 2=Mo, 4=Tu, .., 64=Sa
 					break;
 				case calendar_rrule::MONTHLY_MDAY:
-					$recurrence->dayofmonth = $rrule->monthly_bymonthday >= 1 ?	// 1..31
-						$rrule->monthly_bymonthday : 31;	// not -1 for last day of month!
+					$recurrence->dayofmonth = $rrule->monthly_bymonthday >= 1 ? // 1..31
+						$rrule->monthly_bymonthday : 31; // not -1 for last day of month!
 					break;
 				case calendar_rrule::YEARLY:
-					$recurrence->dayofmonth = (int)$rrule->time->format('d');	// 1..31
-					$recurrence->monthofyear = (int)$rrule->time->format('m');	// 1..12
+					$recurrence->dayofmonth = (int)$rrule->time->format('d'); // 1..31
+					$recurrence->monthofyear = (int)$rrule->time->format('m'); // 1..12
 					break;
 			}
 			if ($rrule->enddate)	// enddate is only a date, but AS needs a time incl. correct starttime!
@@ -1176,9 +1175,9 @@ 
 				// search real / non-virtual exceptions
 				if (!empty($event['uid']))
 				{
-					$ex_events =& $this->calendar->search(array(
+					$ex_events = & $this->calendar->search(array(
 						'query' => array('cal_uid' => $event['uid']),
-						'filter' => 'owner',  // return all possible entries
+						'filter' => 'owner', // return all possible entries
 						'daywise' => false,
 						'date_format' => 'server',
 					));
@@ -1187,36 +1186,36 @@ 
 				{
 					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." Exceptions found but no UID given for Event:".$event['id'].' Exceptions:'.array2string($event['recur_exception']));
 				}
-				if (count($ex_events)>=1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." found ".count($ex_events)." exeptions for event with UID/ID:".$event['uid'].'/'.$event['id']);
+				if (count($ex_events) >= 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." found ".count($ex_events)." exeptions for event with UID/ID:".$event['uid'].'/'.$event['id']);
 
 				$message->exceptions = array();
-				foreach($ex_events as $ex_event)
+				foreach ($ex_events as $ex_event)
 				{
-					if ($ex_event['id'] == $event['id']) continue;	// ignore series master
+					if ($ex_event['id'] == $event['id']) continue; // ignore series master
 					$exception = $this->GetMessage($folderid, $ex_event, $contentparameters);
 					$exception->exceptionstarttime = $exception_time = $ex_event['recurrence'];
-					foreach(array('attendees','recurrence','uid','timezone','organizername','organizeremail') as $not_supported)
+					foreach (array('attendees', 'recurrence', 'uid', 'timezone', 'organizername', 'organizeremail') as $not_supported)
 					{
-						$exception->$not_supported = null;	// not allowed in exceptions :-(
+						$exception->$not_supported = null; // not allowed in exceptions :-(
 					}
 					$exception->deleted = 0;
-					if (($key = array_search($exception_time,$event['recur_exception'])) !== false)
+					if (($key = array_search($exception_time, $event['recur_exception'])) !== false)
 					{
 						unset($event['recur_exception'][$key]);
 					}
-					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() added exception ".date('Y-m-d H:i:s',$exception_time).' '.array2string($exception));
+					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() added exception ".date('Y-m-d H:i:s', $exception_time).' '.array2string($exception));
 					$message->exceptions[] = $exception;
 				}
 				// add rest of exceptions as deleted
-				foreach($event['recur_exception'] as $exception_time)
+				foreach ($event['recur_exception'] as $exception_time)
 				{
 					if (!empty($exception_time))
 					{
 						if (empty($event['uid'])) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." BEWARE no UID given for this event:".$event['id'].' but exception is set for '.$exception_time);
-						$exception = new SyncAppointmentException();	// exceptions seems to be full SyncAppointments, with only starttime required
+						$exception = new SyncAppointmentException(); // exceptions seems to be full SyncAppointments, with only starttime required
 						$exception->deleted = 1;
 						$exception->exceptionstarttime = $exception_time;
-						ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() added deleted exception ".date('Y-m-d H:i:s',$exception_time).' '.array2string($exception));
+						ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() added deleted exception ".date('Y-m-d H:i:s', $exception_time).' '.array2string($exception));
 						$message->exceptions[] = $exception;
 					}
 				}
@@ -1238,12 +1237,12 @@ 
 		// only return alarms if in own calendar
 		if ($account == $GLOBALS['egw_info']['user']['account_id'] && $event['alarm'])
 		{
-			foreach($event['alarm'] as $alarm)
+			foreach ($event['alarm'] as $alarm)
 			{
 				if ($alarm['all'] || $alarm['owner'] == $account)
 				{
-					$message->reminder = $alarm['offset']/60;	// is in minutes, not seconds as in EGw
-					break;	// AS supports only one alarm! (we use the next/earliest one)
+					$message->reminder = $alarm['offset'] / 60; // is in minutes, not seconds as in EGw
+					break; // AS supports only one alarm! (we use the next/earliest one)
 				}
 			}
 		}
@@ -1266,7 +1265,7 @@ 
 	 */
 	public function StatMessage($folderid, $id)
 	{
-		unset($folderid);	// not used ($id is unique), but required by function signature
+		unset($folderid); // not used ($id is unique), but required by function signature
 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
@@ -1277,7 +1276,7 @@ 
 			// error_log why access is denied (should never happen for everything returned by calendar_bo::search)
 			$backup = $this->calendar->debug;
 			//$this->calendar->debug = 2;
-			list($id) = explode(':',$id);
+			list($id) = explode(':', $id);
 			$this->calendar->check_perms(calendar_bo::ACL_FREEBUSY, $id, 0, 'server');
 			$this->calendar->debug = $backup;
 		}
@@ -1311,7 +1310,7 @@ 
 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 		//$ctag = $this->calendar->get_ctag($owner,'owner',true);	// true only consider recurrence master
-		$syncstate = $this->calendar->get_ctag($owner,false,true); // we only want to fetch the owners events, where he is a participant too
+		$syncstate = $this->calendar->get_ctag($owner, false, true); // we only want to fetch the owners events, where he is a participant too
 		// workaround for syncstate = 0 when calendar is empty causes synctate to not return 0 but array resulting in foldersync loop
 		if ($syncstate == 0) $syncstate = 1;
 
@@ -1384,8 +1383,8 @@ 
 			'dstendhour' => 0, 'dstendminute' => 0, 'dstendsecond' => 0, 'dstendmillis' => 0,
 		);
 
-		$name = $component = is_a($tz,'DateTimeZone') ? $tz->getName() : $tz;
-		if (strpos($component, 'VTIMEZONE') === false) $component = calendar_timezones::tz2id($name,'component');
+		$name = $component = is_a($tz, 'DateTimeZone') ? $tz->getName() : $tz;
+		if (strpos($component, 'VTIMEZONE') === false) $component = calendar_timezones::tz2id($name, 'component');
 		// parse ical timezone defintion
 		$ical = self::ical2array($component);
 		$standard = $ical['VTIMEZONE']['STANDARD'];
@@ -1394,11 +1393,11 @@ 
 		if (!isset($standard))
 		{
 			$matches = null;
-			if (preg_match('/^etc\/gmt([+-])([0-9]+)$/i',$name,$matches))
+			if (preg_match('/^etc\/gmt([+-])([0-9]+)$/i', $name, $matches))
 			{
 				$standard = array(
-					'TZOFFSETTO'   => sprintf('%s%02d00',$matches[1],$matches[2]),
-					'TZOFFSETFROM' => sprintf('%s%02d00',$matches[1],$matches[2]),
+					'TZOFFSETTO'   => sprintf('%s%02d00', $matches[1], $matches[2]),
+					'TZOFFSETFROM' => sprintf('%s%02d00', $matches[1], $matches[2]),
 				);
 				unset($daylight);
 			}
@@ -1409,15 +1408,15 @@ 
 		}
 		// get bias and dstbias from standard component, which is present in all tz's
 		// (dstbias is relative to bias and almost always 60 or 0)
-		$data['bias'] = -(60 * substr($standard['TZOFFSETTO'],0,-2) + substr($standard['TZOFFSETTO'],-2));
-		$data['dstbias'] = -(60 * substr($standard['TZOFFSETFROM'],0,-2) + substr($standard['TZOFFSETFROM'],-2) + $data['bias']);
+		$data['bias'] = -(60 * substr($standard['TZOFFSETTO'], 0, -2) + substr($standard['TZOFFSETTO'], -2));
+		$data['dstbias'] = -(60 * substr($standard['TZOFFSETFROM'], 0, -2) + substr($standard['TZOFFSETFROM'], -2) + $data['bias']);
 
 		// check if we have an additional DAYLIGHT component and both have a RRULE component --> tz uses daylight saving
 		if (isset($standard['RRULE']) && isset($daylight) && isset($daylight['RRULE']))
 		{
-			foreach(array('dststart' => $daylight,'dstend' => $standard) as $prefix => $comp)
+			foreach (array('dststart' => $daylight, 'dstend' => $standard) as $prefix => $comp)
 			{
-				if (preg_match('/FREQ=YEARLY;BYDAY=(.*);BYMONTH=(\d+)/',$comp['RRULE'],$matches))
+				if (preg_match('/FREQ=YEARLY;BYDAY=(.*);BYMONTH=(\d+)/', $comp['RRULE'], $matches))
 				{
 					$data[$prefix.'month'] = (int)$matches[2];
 					$data[$prefix.'week'] = (int)$matches[1];
@@ -1434,20 +1433,20 @@ 
 						$data[$prefix.'week'] = 5;
 						if ($prefix == 'dstend') $data[$prefix.'month'] -= 1;
 					}
-					static $day2int = array('SU'=>0,'MO'=>1,'TU'=>2,'WE'=>3,'TH'=>4,'FR'=>5,'SA'=>6);
-					$data[$prefix.'day'] = (int)$day2int[substr($matches[1],-2)];
+					static $day2int = array('SU'=>0, 'MO'=>1, 'TU'=>2, 'WE'=>3, 'TH'=>4, 'FR'=>5, 'SA'=>6);
+					$data[$prefix.'day'] = (int)$day2int[substr($matches[1], -2)];
 				}
-				if (preg_match('/^\d{8}T(\d{6})$/',$comp['DTSTART'],$matches))
+				if (preg_match('/^\d{8}T(\d{6})$/', $comp['DTSTART'], $matches))
 				{
-					$data[$prefix.'hour'] = (int)substr($matches[1],0,2)+($prefix=='dststart'?-1:1)*$data['dstbias']/60;
-					$data[$prefix.'minute'] = (int)substr($matches[1],2,2)+($prefix=='dststart'?-1:1)*$data['dstbias']%60;
-					$data[$prefix.'second'] = (int)substr($matches[1],4,2);
+					$data[$prefix.'hour'] = (int)substr($matches[1], 0, 2) + ($prefix == 'dststart' ?-1 : 1) * $data['dstbias'] / 60;
+					$data[$prefix.'minute'] = (int)substr($matches[1], 2, 2) + ($prefix == 'dststart' ?-1 : 1) * $data['dstbias'] % 60;
+					$data[$prefix.'second'] = (int)substr($matches[1], 4, 2);
 				}
 			}
 			// for southern hermisphere, were DST is in January, we have to swap start- and end-hour/-minute
 			if ($data['dststartmonth'] > $data['dstendmonth'])
 			{
-				$start = $data['dststarthour'];   $data['dststarthour'] = $data['dstendhour'];     $data['dstendhour'] = $start;
+				$start = $data['dststarthour']; $data['dststarthour'] = $data['dstendhour']; $data['dstendhour'] = $start;
 				$end = $data['dststartminute']; $data['dststartminute'] = $data['dstendminute']; $data['dstendminute'] = $end;
 			}
 		}
@@ -1505,20 +1504,20 @@ 
 	 * @param string|array $ical lines of ical file
 	 * @return array with parsed ical components
 	 */
-	static public function ical2array(&$ical,$section=null)
+	static public function ical2array(&$ical, $section = null)
 	{
 		$arr = array();
 		if (!is_array($ical)) $ical = preg_split("/[\r\n]+/m", $ical);
 		while (($line = array_shift($ical)))
 		{
-			list($name,$value) = explode(':',$line,2);
+			list($name, $value) = explode(':', $line, 2);
 			if ($name == 'BEGIN')
 			{
-				$arr[$value] = self::ical2array($ical,$value);
+				$arr[$value] = self::ical2array($ical, $value);
 			}
-			elseif($name == 'END')
+			elseif ($name == 'END')
 			{
-				if ($section && $section==$value) return $arr;
+				if ($section && $section == $value) return $arr;
 				break;
 			}
 			else
@@ -1541,13 +1540,13 @@ 
 	 */
 	public static function as2tz(array $data)
 	{
-		static $cache=null;	// some caching withing the request
+		static $cache = null; // some caching withing the request
 
-		unset($data['name']);	// not used, but can stall the match
+		unset($data['name']); // not used, but can stall the match
 
 		$key = serialize($data);
 
-		for($n = 0; !isset($cache[$key]); ++$n)
+		for ($n = 0; !isset($cache[$key]); ++$n)
 		{
 			if (!$n)	// check users timezone first
 			{
@@ -1566,7 +1565,7 @@ 
 					break;
 				}
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				unset($e);
 				// simpy ignore that, as it only means $tz can NOT be converted, because it has no VTIMEZONE component
 			}
@@ -1581,8 +1580,8 @@ 
 	 */
 	static public function _getTZFromSyncBlob($data)
 	{
-		$tz = unpack(	"lbias/a64name/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/" .
-						"lstdbias/a64name/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis/" .
+		$tz = unpack("lbias/a64name/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/".
+						"lstdbias/a64name/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis/".
 						"ldstbias", $data);
 
 		return $tz;
@@ -1595,7 +1594,7 @@ 
 	 */
 	static public function _getSyncBlobFromTZ($tz)
 	{
-		$packed = pack("la64vvvvvvvv" . "la64vvvvvvvv" . "l",
+		$packed = pack("la64vvvvvvvv"."la64vvvvvvvv"."l",
 				$tz["bias"], "", 0, $tz["dstendmonth"], $tz["dstendday"], $tz["dstendweek"], $tz["dstendhour"], $tz["dstendminute"], $tz["dstendsecond"], $tz["dstendmillis"],
 				$tz["stdbias"], "", 0, $tz["dststartmonth"], $tz["dststartday"], $tz["dststartweek"], $tz["dststarthour"], $tz["dststartminute"], $tz["dststartsecond"], $tz["dststartmillis"],
 				$tz["dstbias"]);
@@ -1619,7 +1618,7 @@ 
 				$account_id = $entry['grantor'];
 				$cals[$account_id] = $entry['name'];
 			}
-			if ($hook_data['account_id'] > 0) unset($cals[$hook_data['account_id']]);	// skip current user
+			if ($hook_data['account_id'] > 0) unset($cals[$hook_data['account_id']]); // skip current user
 		}
 		$cals['G'] = lang('Primary group');
 		$cals['A'] = lang('All');
@@ -1655,8 +1654,8 @@ 
 		)
 	);
 	require_once('../../header.inc.php');
-	ini_set('display_errors',1);
-	error_reporting(E_ALL & ~E_NOTICE);
+	ini_set('display_errors', 1);
+	error_reporting(E_ALL&~E_NOTICE);
 
 	echo "<html><head><title>Conversation of ActiveSync Timezone Blobs to TZID's</title></head>\n<body>\n";
 	echo "<h3>Conversation of ActiveSync Timezone Blobs to TZID's</h3>\n";
@@ -1670,7 +1669,7 @@ 
 	</script>\n";
 
 	// TZID => AS timezone blobs reported by various devices
-	foreach(array(
+	foreach (array(
 		'Europe/Berlin'    => 'xP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAFAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAFAAMAAAAAAAAAxP///w==',
 		'Europe/Helsinki'  => 'iP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAFAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAFAAQAAAAAAAAAxP///w==',
 		'Asia/Tokyo'       => '5P3//wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxP///w==',
@@ -1683,9 +1682,9 @@ 
 	) as $tz => $sync_blob)
 	{
 		// get as timezone data for a given timezone
-		$ical = calendar_timezones::tz2id($tz,'component');
+		$ical = calendar_timezones::tz2id($tz, 'component');
 		//echo "<pre>".print_r($ical,true)."</pre>\n";
-		$ical_arr = calendar_zpush::ical2array($ical_tz=$ical);
+		$ical_arr = calendar_zpush::ical2array($ical_tz = $ical);
 		//echo "<pre>".print_r($ical_arr,true)."</pre>\n";
 		$as_tz = calendar_zpush::tz2as($tz);
 		//echo "$tz=<pre>".print_r($as_tz,true)."</pre>\n";
@@ -1699,22 +1698,22 @@ 
 		//echo array2string($matched);
 
 		echo "<tr><td><b onclick='toggle_display(this.nextSibling);' style='cursor:pointer;'>$tz</b><pre style='margin:0; font-size: 90%; display:none;'>$ical</pre></td><td>$as_tz_org[bias]<br/>$as_tz[bias]</td><td>$as_tz_org[dstbias]<br/>$as_tz[dstbias]</td>\n";
-		foreach(array('dststart','dstend') as $prefix)
+		foreach (array('dststart', 'dstend') as $prefix)
 		{
 			echo "<td>\n";
-			foreach(array($as_tz_org,$as_tz) as $n => $arr)
+			foreach (array($as_tz_org, $as_tz) as $n => $arr)
 			{
 				$parts = array();
-				foreach(array('year','month','day','week','hour','minute','second') as $postfix)
+				foreach (array('year', 'month', 'day', 'week', 'hour', 'minute', 'second') as $postfix)
 				{
 					$failed = $n && $as_tz_org[$prefix.$postfix] !== $as_tz[$prefix.$postfix];
-					$parts[] = ($failed?'<font color="red">':'').$arr[$prefix.$postfix].($failed?'</font>':'');
+					$parts[] = ($failed ? '<font color="red">' : '').$arr[$prefix.$postfix].($failed ? '</font>' : '');
 				}
-				echo implode(' ', $parts).(!$n?'<br/>':'');
+				echo implode(' ', $parts).(!$n ? '<br/>' : '');
 			}
 			echo "</td>\n";
 		}
-		echo "<td>&nbsp;<br/>".($matched=='UTC'?'<font color="red">':'').$matched.($matched=='UTC'?'</font>':'')."</td></tr>\n";
+		echo "<td>&nbsp;<br/>".($matched == 'UTC' ? '<font color="red">' : '').$matched.($matched == 'UTC' ? '</font>' : '')."</td></tr>\n";
 	}
 	echo "</tbody></table>\n";
 	echo "</body></html>\n";

calendar/inc/class.calendar_egw_record.inc.php

Spacing +12 added lines, -12 removed lines

@@ -24,8 +24,8 @@ 
 
 	public static $types = array(
 		'select-cat'    => array('category'),
-		'select-account'=> array('owner','creator', 'modifier'),
-		'date-time'     => array('modified', 'created','start','end','recur_date'),
+		'select-account'=> array('owner', 'creator', 'modifier'),
+		'date-time'     => array('modified', 'created', 'start', 'end', 'recur_date'),
 		'date'			=> array('recur_enddate'),
 		'select-bool'	=> array('public', 'non_blocking'),
 		'select'	=> array('priority'),
@@ -37,12 +37,12 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ){
+	public function __construct($_identifier = '') {
 		$this->identifier = $_identifier;
-		if(!is_object($this->bo)) {
+		if (!is_object($this->bo)) {
 			$this->bo = new calendar_bo();
 		}
-		if($this->identifier) {
+		if ($this->identifier) {
 			$this->record = $this->bo->read($this->identifier);
 		}
 	}
@@ -96,7 +96,7 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record) {
 		$this->record = $_record;
 	}
 
@@ -124,7 +124,7 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save($_dst_identifier) {
 		// Not yet implemeted
 		$this->identifier = $_dst_identifier;
 	}
@@ -135,8 +135,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used
+	public function copy($_dst_identifier) {
+		unset($_dst_identifier); // not used
 	}
 
 	/**
@@ -146,15 +146,15 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used
+	public function move($_dst_identifier) {
+		unset($_dst_identifier); // not used
 	}
 
 	/**
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete() {
 
 	}
 

calendar/inc/class.calendar_uiviews.inc.php

Spacing +129 added lines, -130 removed lines

@@ -41,7 +41,7 @@ 
 	 *
 	 * @var mixed
 	 */
-	var $debug=false;
+	var $debug = false;
 
 	/**
 	 * extra rows above and below the workday
@@ -92,7 +92,7 @@ 
 	 *
 	 * @var boolean
 	 */
-	var $use_time_grid=true;
+	var $use_time_grid = true;
 
 	/**
 	 * Pref value of use_time_grid preference
@@ -105,14 +105,14 @@ 
 	 *
 	 * @var boolean
 	 */
-	var $scroll_to_wdstart=false;
+	var $scroll_to_wdstart = false;
 
 	/**
 	 * counter for the current whole day event of a single day
 	 *
 	 * @var int
 	 */
-	var $wholeDayPosCounter=1;
+	var $wholeDayPosCounter = 1;
 
 	/**
 	 * Switch to disable private data and possibility to view and edit events
@@ -135,25 +135,25 @@ 
 	 *
 	 * @param array $set_states = null to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
-	function __construct($set_states=null)
+	function __construct($set_states = null)
 	{
-		parent::__construct(false,$set_states);	// call the parent's constructor
+		parent::__construct(false, $set_states); // call the parent's constructor
 		$this->extraRowsOriginal = $this->extraRows; //save original extraRows value
 
 		$GLOBALS['egw_info']['flags']['nonavbar'] = False;
 
 		// Check for GET message (from merge)
-		if($_GET['msg'])
+		if ($_GET['msg'])
 		{
 			Framework::message($_GET['msg']);
 			unset($_GET['msg']);
 		}
 		// standard params for calling bocal::search for all views
-		$this->owner = str_replace('%2C',',',$this->owner);
+		$this->owner = str_replace('%2C', ',', $this->owner);
 		$this->search_params = array(
 			'start'   => $this->date,
-			'cat_id'  => $this->cat_id ? (is_array($this->cat_id)?$this->cat_id:explode(',',$this->cat_id)) : 0,
-			'users'   => explode(',',$this->owner),
+			'cat_id'  => $this->cat_id ? (is_array($this->cat_id) ? $this->cat_id : explode(',', $this->cat_id)) : 0,
+			'users'   => explode(',', $this->owner),
 			'filter'  => $this->filter,
 			'daywise' => True,
 			'use_so_events' => $this->test === 'true',
@@ -179,7 +179,7 @@ 
 	 */
 	public function week_number($time)
 	{
-		if (!is_a($time,'DateTime')) $time = new Api\DateTime($time);
+		if (!is_a($time, 'DateTime')) $time = new Api\DateTime($time);
 
 		// if week does not start Monday and $time is Sunday --> add one day
 		if ($this->cal_prefs['weekdaystarts'] != 'Monday' && !($wday = $time->format('w')))
@@ -197,19 +197,19 @@ 
 	/**
 	 * Load all views used by calendar, client side switches between them as needed
 	 */
-	function index($content=array())
+	function index($content = array())
 	{
-		if($content['merge'])
+		if ($content['merge'])
 		{
 			// View from sidebox is JSON encoded
-			$this->manage_states(array_merge($content,json_decode($content['view'],true)));
-			if($content['first'])
+			$this->manage_states(array_merge($content, json_decode($content['view'], true)));
+			if ($content['first'])
 			{
-				$this->first = Api\DateTime::to($content['first'],'ts');
+				$this->first = Api\DateTime::to($content['first'], 'ts');
 			}
-			if($content['last'])
+			if ($content['last'])
 			{
-				$this->last = Api\DateTime::to($content['last'],'ts');
+				$this->last = Api\DateTime::to($content['last'], 'ts');
 			}
 			$_GET['merge'] = $content['merge'];
 			$this->merge();
@@ -225,7 +225,7 @@ 
 		$GLOBALS['egw_info']['flags']['params']['manual'] = array('page' => 'ManualCalendar'.ucfirst($this->view));
 
 		// Sidebox & iframe for old views
-		if(in_array($this->view,array('year')) && $_GET['view'])
+		if (in_array($this->view, array('year')) && $_GET['view'])
 		{
 			$GLOBALS['egw_info']['flags']['nonavbar'] = true;
 			$this->manage_states($_GET);
@@ -237,24 +237,24 @@ 
 		$tmpl = new Etemplate('calendar.toolbar');
 		$tmpl->setElementAttribute('toolbar', 'actions', $this->getToolbarActions($content));
 		// Adjust toolbar for mobile
-		if(Api\Header\UserAgent::mobile()){
-			$tmpl->setElementAttribute('toolbar','class', 'et2_head_toolbar');
-			$tmpl->setElementAttribute('toolbar','view_range', '3');
+		if (Api\Header\UserAgent::mobile()) {
+			$tmpl->setElementAttribute('toolbar', 'class', 'et2_head_toolbar');
+			$tmpl->setElementAttribute('toolbar', 'view_range', '3');
 		}
-		$tmpl->exec('calendar_uiviews::index',array());
+		$tmpl->exec('calendar_uiviews::index', array());
 
 		// Load the different views once, we'll switch between them on the client side
 		$todo = new Etemplate('calendar.todo');
 		$label = '';
-		$todo->exec('calendar_uiviews::index',array('todos'=>$this->get_todos($label), 'label' => $label));
+		$todo->exec('calendar_uiviews::index', array('todos'=>$this->get_todos($label), 'label' => $label));
 
 		// Actually, this takes care of most of it...
 		$this->week();
 
 		$planner = new Etemplate('calendar.planner');
 		// Get the actions
-		$planner->setElementAttribute('planner','actions',$this->get_actions());
-		$planner->exec('calendar_uiviews::index',array());
+		$planner->setElementAttribute('planner', 'actions', $this->get_actions());
+		$planner->exec('calendar_uiviews::index', array());
 
 		// List view in a separate file
 		$list_ui = new calendar_uilist();
@@ -396,7 +396,7 @@ 
 		{
 			foreach (array_keys($actions) as $key)
 			{
-				if (!in_array($key, array('day_view','week_view','next', 'today','previous'))) {
+				if (!in_array($key, array('day_view', 'week_view', 'next', 'today', 'previous'))) {
 					$actions[$key]['toolbarDefault'] = false;
 				}
 				else {
@@ -414,7 +414,7 @@ 
 	 *
 	 * @param boolean|Etemplate $home = false if etemplate return content suitable for home-page
 	 */
-	function &planner($content = array(), $home=false)
+	function &planner($content = array(), $home = false)
 	{
 		if ($this->sortby == 'month')	// yearly planner with month rows
 		{
@@ -423,17 +423,17 @@ 
 			unset($this->first['raw']);
 			$this->last = $this->first;
 			$this->last['year']++;
-			$this->last = $this->bo->date2ts($this->last)-1;
+			$this->last = $this->bo->date2ts($this->last) - 1;
 		}
 		elseif (!$this->planner_view || $this->planner_view == 'month')	// planner monthview
 		{
 			if ($this->day < 15)	// show one complete month
 			{
-				$this->_week_align_month($this->first,$this->last);
+				$this->_week_align_month($this->first, $this->last);
 			}
 			else	// show 2 half month
 			{
-				$this->_week_align_month($this->first,$this->last,15);
+				$this->_week_align_month($this->first, $this->last, 15);
 			}
 		}
 		elseif ($this->planner_view == 'week' || $this->planner_view == 'weekN')	// weeekview
@@ -442,7 +442,7 @@ 
 			$start->setWeekstart();
 			$this->first = $start->format('ts');
 			$this->last = $this->bo->date2array($this->first);
-			$this->last['day'] += ($this->planner_view == 'week' ? 7 : 7 * $this->cal_prefs['multiple_weeks'])-1;
+			$this->last['day'] += ($this->planner_view == 'week' ? 7 : 7 * $this->cal_prefs['multiple_weeks']) - 1;
 			$this->last['hour'] = 23; $this->last['minute'] = $this->last['sec'] = 59;
 			unset($this->last['raw']);
 			$this->last = $this->bo->date2ts($this->last);
@@ -458,9 +458,9 @@ 
 		}
 
 		$merge = $this->merge();
-		if($merge)
+		if ($merge)
 		{
-			Egw::redirect_link('/index.php',array(
+			Egw::redirect_link('/index.php', array(
 				'menuaction' => 'calendar.calendar_uiviews.index',
 				'msg'        => $merge,
 			));
@@ -472,21 +472,21 @@ 
 		$search_params['end'] = $this->last;
 		$search_params['enum_groups'] = $this->sortby == 'user';
 		$content['planner'] = $this->bo->search($search_params);
-		foreach($content['planner'] as &$event)
+		foreach ($content['planner'] as &$event)
 		{
 			$this->to_client($event);
 		}
 
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::planner() date=%1: first=%2, last=%3',False,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::planner() date=%1: first=%2, last=%3', False, $this->date, $this->bo->date2string($this->first), $this->bo->date2string($this->last));
 
 		$tmpl = $home ? $home : new Etemplate('calendar.planner');
 
-		$tmpl->setElementAttribute('planner','start_date', Api\DateTime::to($this->first, Api\DateTime::ET2));
-		$tmpl->setElementAttribute('planner','end_date', Api\DateTime::to($this->last, Api\DateTime::ET2));
-		$tmpl->setElementAttribute('planner','owner', $search_params['users']);
-		$tmpl->setElementAttribute('planner','group_by', $this->sortby);
+		$tmpl->setElementAttribute('planner', 'start_date', Api\DateTime::to($this->first, Api\DateTime::ET2));
+		$tmpl->setElementAttribute('planner', 'end_date', Api\DateTime::to($this->last, Api\DateTime::ET2));
+		$tmpl->setElementAttribute('planner', 'owner', $search_params['users']);
+		$tmpl->setElementAttribute('planner', 'group_by', $this->sortby);
 		// Get the actions
-		$tmpl->setElementAttribute('planner','actions',$this->get_actions());
+		$tmpl->setElementAttribute('planner', 'actions', $this->get_actions());
 
 		$tmpl->exec(__METHOD__, $content);
 	}
@@ -499,30 +499,30 @@ 
 	 * @param int $weeks = 0 number of weeks to show, if 0 (default) all weeks of one month are shown
 	 * @param boolean|etemplate2 $home = false if not false return content suitable for home-page
 	 */
-	function &month($weeks=0,$home=false)
+	function &month($weeks = 0, $home = false)
 	{
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(weeks=%1) date=%2',True,$weeks,$this->date);
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(weeks=%1) date=%2', True, $weeks, $this->date);
 
 		if (!$home)
 		{
-			trigger_error(__METHOD__ .' only used by home app', E_USER_DEPRECATED);
+			trigger_error(__METHOD__.' only used by home app', E_USER_DEPRECATED);
 			return;
 		}
 
-		$this->use_time_grid = !$this->use_time_grid_pref || $this->use_time_grid_pref == 'all';	// all views
+		$this->use_time_grid = !$this->use_time_grid_pref || $this->use_time_grid_pref == 'all'; // all views
 		$granularity = 0;
-		if($weeks)
+		if ($weeks)
 		{
 			$granularity = ($this->cal_prefs['interval'] ? (int)$this->cal_prefs['interval'] : 30);
 
 			$list = $this->cal_prefs['use_time_grid'];
-			if(!is_array($list))
+			if (!is_array($list))
 			{
-				$list = explode(',',$list);
+				$list = explode(',', $list);
 			}
-			if(is_array($list))
+			if (is_array($list))
 			{
-				$granularity = in_array('weekN',$list) ? 0 : $granularity;
+				$granularity = in_array('weekN', $list) ? 0 : $granularity;
 			}
 		}
 		$content = array('view' => array());
@@ -532,23 +532,23 @@ 
 			$start = new Api\DateTime($this->date);
 			$start->setWeekstart();
 			$this->first = $start->format('ts');
-			$this->last = strtotime("+$weeks weeks",$this->first) - 1;
+			$this->last = strtotime("+$weeks weeks", $this->first) - 1;
 			$weekNavH = "$weeks weeks";
 			$navHeader = lang('Week').' '.$this->week_number($this->first).' - '.$this->week_number($this->last).': '.
-				$this->bo->long_date($this->first,$this->last);
+				$this->bo->long_date($this->first, $this->last);
 		}
 		else
 		{
-			$this->_week_align_month($this->first,$this->last);
+			$this->_week_align_month($this->first, $this->last);
 			$weekNavH = "1 month";
-			$navHeader = lang(adodb_date('F',$this->bo->date2ts($this->date))).' '.$this->year;
+			$navHeader = lang(adodb_date('F', $this->bo->date2ts($this->date))).' '.$this->year;
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(%1) date=%2: first=%3, last=%4',False,$weeks,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(%1) date=%2: first=%3, last=%4', False, $weeks, $this->date, $this->bo->date2string($this->first), $this->bo->date2string($this->last));
 
 		// Loop through, using Api\DateTime to handle DST
 		$week = 0;
 		$week_start = new EGroupware\Api\DateTime($this->first);
-		$week_start->setTime(0,0,0);
+		$week_start->setTime(0, 0, 0);
 		$week_end = new Api\DateTime($week_start);
 		$week_end->add(new DateInterval('P6DT23H59M59S'));
 		$last = new EGroupware\Api\DateTime($this->last);
@@ -562,14 +562,14 @@ 
 			array(
 				'id' => $week_start->format('Ymd')
 			);
-			$home->setElementAttribute("view[$week]",'onchange',false);
-			$home->setElementAttribute("view[$week]",'granularity',$granularity);
-			$home->setElementAttribute("view[$week]",'show_weekend', $this->search_params['weekend']);
+			$home->setElementAttribute("view[$week]", 'onchange', false);
+			$home->setElementAttribute("view[$week]", 'granularity', $granularity);
+			$home->setElementAttribute("view[$week]", 'show_weekend', $this->search_params['weekend']);
 			$week++;
 		}
 
 		// Get the actions
-		$home->setElementAttribute('view','actions',$this->get_actions());
+		$home->setElementAttribute('view', 'actions', $this->get_actions());
 
 		$home->exec(__METHOD__, $content);
 	}
@@ -581,13 +581,13 @@ 
 	 * @param int &$last timestamp 23:59:59 of last day of week containg the last day of the current month
 	 * @param int $day = 1 should the alignment be based on the 1. of the month or an other date, eg. the 15.
 	 */
-	function _week_align_month(&$first,&$last,$day=1)
+	function _week_align_month(&$first, &$last, $day = 1)
 	{
 		$start = new Api\DateTime($this->date);
-		$start->setDate($this->year,$this->month,$this->day=$day);
+		$start->setDate($this->year, $this->month, $this->day = $day);
 		$start->setWeekstart();
 		$first = $start->format('ts');
-		$start->setDate($this->year,$this->month+1,$day);
+		$start->setDate($this->year, $this->month + 1, $day);
 		if ($day == 1) $start->add('-1day');
 		$start->setWeekstart();
 		// now we need to calculate the end of the last day of that week
@@ -596,7 +596,7 @@ 
 		$arr['day'] += 6;
 		$arr['hour'] = 23;
 		$arr['min'] = $arr['sec'] = 59;
-		unset($arr['raw']);	// otherwise date2ts does not calc raw new, but uses it
+		unset($arr['raw']); // otherwise date2ts does not calc raw new, but uses it
 		$last = $this->bo->date2ts($arr);
 	}
 
@@ -606,7 +606,7 @@ 
 	 * @param int $days = 0 number of days to show, if 0 (default) the value from the URL or the prefs is used
 	 * @param boolean|etemplate2 $home = false if not false return content suitable for home-page
 	 */
-	function week($days=0,$home=false)
+	function week($days = 0, $home = false)
 	{
 		if (!$days)
 		{
@@ -614,17 +614,17 @@ 
 			if ($days != 5) $days = 7;
 			if ($days != $this->cal_prefs['days_in_weekview'])	// save the preference
 			{
-				$GLOBALS['egw']->preferences->add('calendar','days_in_weekview',$days);
+				$GLOBALS['egw']->preferences->add('calendar', 'days_in_weekview', $days);
 				$GLOBALS['egw']->preferences->save_repository();
 				$this->cal_prefs['days_in_weekview'] = $days;
 			}
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::week(days=%1) date=%2',True,$days,$this->date);
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::week(days=%1) date=%2', True, $days, $this->date);
 
 		if ($days <= 4)		// next 4 days view
 		{
 			$wd_start = $this->first = $this->bo->date2ts($this->date);
-			$this->last = strtotime("+$days days",$this->first) - 1;
+			$this->last = strtotime("+$days days", $this->first) - 1;
 			$view = $days == 1 ? 'day' : 'day4';
 		}
 		else
@@ -634,30 +634,30 @@ 
 			$wd_start = $this->first = $start->format('ts');
 			if ($days <= 5)		// no weekend-days
 			{
-				switch($this->cal_prefs['weekdaystarts'])
+				switch ($this->cal_prefs['weekdaystarts'])
 				{
 					case 'Saturday':
-						$this->first = strtotime("+2 days",$this->first);
+						$this->first = strtotime("+2 days", $this->first);
 						break;
 					case 'Sunday':
-						$this->first = strtotime("+1 day",$this->first);
+						$this->first = strtotime("+1 day", $this->first);
 						break;
 				}
 			}
-			$this->last = strtotime("+$days days",$this->first) - 1;
+			$this->last = strtotime("+$days days", $this->first) - 1;
 			$view = 'week';
 		}
 
 		$granularity = ($this->cal_prefs['interval'] ? (int)$this->cal_prefs['interval'] : 30);
 
 		$list = $this->cal_prefs['use_time_grid'];
-		if(!is_array($list))
+		if (!is_array($list))
 		{
-			$list = explode(',',$list);
+			$list = explode(',', $list);
 		}
-		if(is_array($list))
+		if (is_array($list))
 		{
-			$granularity = in_array($view,$list) ? 0 : $granularity;
+			$granularity = in_array($view, $list) ? 0 : $granularity;
 		}
 
 		$search_params = array(
@@ -670,15 +670,15 @@ 
 
 		$content = array('view' => array());
 
-		if(!$home)
+		if (!$home)
 		{
 			// Fill with the minimum needed 'weeks'
 			$min = max(
 				6, // Some months need 6 weeks for full display
-				$this->cal_prefs['multiple_weeks'],  // WeekN view
+				$this->cal_prefs['multiple_weeks'], // WeekN view
 				$this->cal_prefs['week_consolidate'] // We collapse after this many users
 			);
-			for($i = 0; $i < $min; $i++)
+			for ($i = 0; $i < $min; $i++)
 			{
 				$content['view'][] = array();
 			}
@@ -686,8 +686,8 @@ 
 		else
 		{
 			// Always do 7 days for a week so scrolling works properly
-			$this->last = ($days == 4 ? $this->last : $search_params['end'] = strtotime("+$days days",$this->first) - 1);
-			if (count($users) == 1 || count($users) >= $this->cal_prefs['week_consolidate']	||// for more then X users, show all in one row
+			$this->last = ($days == 4 ? $this->last : $search_params['end'] = strtotime("+$days days", $this->first) - 1);
+			if (count($users) == 1 || count($users) >= $this->cal_prefs['week_consolidate'] || // for more then X users, show all in one row
 				$days == 1 // Showing just 1 day
 			)
 			{
@@ -696,7 +696,7 @@ 
 			}
 			else
 			{
-				foreach(array_keys($this->_get_planner_users(false)) as $uid)
+				foreach (array_keys($this->_get_planner_users(false)) as $uid)
 				{
 					$search_params['users'] = $uid;
 					$content['view'][] = $this->tagWholeDayOnTop($this->bo->search($search_params))
@@ -704,15 +704,15 @@ 
 				}
 			}
 		}
-		$tmpl = $home ? $home :new Etemplate('calendar.view');
-		foreach(array_keys($content['view']) as $index)
+		$tmpl = $home ? $home : new Etemplate('calendar.view');
+		foreach (array_keys($content['view']) as $index)
 		{
-			$tmpl->setElementAttribute("view[$index]",'granularity',$granularity);
-			$tmpl->setElementAttribute("view[$index]",'show_weekend',$this->search_params['weekend']);
+			$tmpl->setElementAttribute("view[$index]", 'granularity', $granularity);
+			$tmpl->setElementAttribute("view[$index]", 'show_weekend', $this->search_params['weekend']);
 		}
 
 		// Get the actions
-		$tmpl->setElementAttribute('view','actions',$this->get_actions());
+		$tmpl->setElementAttribute('view', 'actions', $this->get_actions());
 
 		$tmpl->exec(__METHOD__, $content);
 	}
@@ -754,57 +754,56 @@ 
 			'owner'     => $this->owner	// num. id of the user, not necessary current user
 		));
 
-		if(is_array($todo_label))
+		if (is_array($todo_label))
 		{
-			list($label,$showall)=$todo_label;
+			list($label, $showall) = $todo_label;
 		}
 		else
 		{
-			$label=$todo_label;
-			$showall=true;
+			$label = $todo_label;
+			$showall = true;
 		}
 		$maxshow = (int)$GLOBALS['egw_info']['user']['preferences']['infolog']['mainscreen_maxshow'];
-		if($maxshow <= 0)
+		if ($maxshow <= 0)
 		{
-			$maxshow=10;
+			$maxshow = 10;
 		}
 		//print_debug("get_todos(): label=$label; showall=$showall; max=$maxshow");
 
 		$content = $todo_label = '';
 		if (is_array($todos_from_hook) && count($todos_from_hook))
 		{
-			foreach($todos_from_hook as $todos)
+			foreach ($todos_from_hook as $todos)
 			{
 				$i = 0;
 				if (is_array($todos))
 				{
 					$todo_label = !empty($label) ? $label : lang("open ToDo's:");
 
-					foreach($todos as &$todo)
+					foreach ($todos as &$todo)
 					{
-						if(!$showall && ($i++ > $maxshow))
+						if (!$showall && ($i++ > $maxshow))
 						{
 							break;
 						}
 						$icons = '';
-						foreach($todo['icons'] as $name => $alt)
+						foreach ($todo['icons'] as $name => $alt)
 						{
-							$icons .= ($icons?' ':'').Api\Html::image('infolog',$name,lang($alt),'border="0" width="15" height="15"');
+							$icons .= ($icons ? ' ' : '').Api\Html::image('infolog', $name, lang($alt), 'border="0" width="15" height="15"');
 						}
 						$todo['icons'] = $icons;
 						$class = $class == 'row_on' ? 'row_off' : 'row_on';
-						if($todo['edit']) {
+						if ($todo['edit']) {
 							$todo['edit_size'] = $todo['edit']['size'];
 							unset($todo['edit']['size']);
-							$edit_icon_href = Api\Html::a_href( $icons, $todo['edit'],'',' data-todo="app|750x590" ');
-							$edit_href = Api\Html::a_href( $todo['title'], $todo['edit'],'',' data-todo="app|750x590" ');
-							$todo['edit'] = Framework::link('/index.php',$todo['edit'],true);
+							$edit_icon_href = Api\Html::a_href($icons, $todo['edit'], '', ' data-todo="app|750x590" ');
+							$edit_href = Api\Html::a_href($todo['title'], $todo['edit'], '', ' data-todo="app|750x590" ');
+							$todo['edit'] = Framework::link('/index.php', $todo['edit'], true);
 						}
-						$icon_href = Api\Html::a_href($icons,$todo['view']);
+						$icon_href = Api\Html::a_href($icons, $todo['view']);
 						$content .= " <tr class=\"$class\">\n  <td valign=\"top\" width=\"15%\" nowrap>".
-							($this->bo->printer_friendly?$icons:($edit_icon_href ? $edit_icon_href : $icon_href)).
-							"</td>\n  <td>".($this->printer_friendly?$todo['title']:
-							$edit_href)."</td>\n </tr>\n";
+							($this->bo->printer_friendly ? $icons : ($edit_icon_href ? $edit_icon_href : $icon_href)).
+							"</td>\n  <td>".($this->printer_friendly ? $todo['title'] : $edit_href)."</td>\n </tr>\n";
 						/**
 						 * ToDo: add delete and closing action
 						 */
@@ -827,9 +826,9 @@ 
 	 * @param int|string $id
 	 * @return string
 	 */
-	public static function integration_get_popup($app,$id)
+	public static function integration_get_popup($app, $id)
 	{
-		$app_data = calendar_bo::integration_get_data($app,'edit_link');
+		$app_data = calendar_bo::integration_get_data($app, 'edit_link');
 
 		if (is_array($app_data) && isset($app_data['edit']))
 		{
@@ -839,7 +838,7 @@ 
 		}
 		else
 		{
-			$edit = Link::edit($app,$id,$popup_size);
+			$edit = Link::edit($app, $id, $popup_size);
 		}
 		if ($edit)
 		{
@@ -868,28 +867,28 @@ 
 	 * @param array $event
 	 * @return array
 	 */
-	static function integration_get_icons($app,$id,$event)
+	static function integration_get_icons($app, $id, $event)
 	{
 		$icons = array();
 		if ($event['icons'])
 		{
-			foreach(explode(',',$event['icons']) as $icon)
+			foreach (explode(',', $event['icons']) as $icon)
 			{
-				list($icon_app,$icon) = explode(':',$icon);
-				if (Api\Image::find($icon_app,$icon))
+				list($icon_app, $icon) = explode(':', $icon);
+				if (Api\Image::find($icon_app, $icon))
 				{
-					$icons[] = Api\Html::image($icon_app,$icon);
+					$icons[] = Api\Html::image($icon_app, $icon);
 				}
 			}
 		}
-		$app_data = calendar_bo::integration_get_data($app,'icons');
+		$app_data = calendar_bo::integration_get_data($app, 'icons');
 		if (is_null($app_data))
 		{
-			$icons[] = Api\Html::image($app,'navbar');	// use navbar icon
+			$icons[] = Api\Html::image($app, 'navbar'); // use navbar icon
 		}
 		elseif ($app_data)
 		{
-			$icons += (array)ExecMethod2($app_data,$id,$event);
+			$icons += (array)ExecMethod2($app_data, $id, $event);
 		}
 		return $icons;
 	}
@@ -912,20 +911,20 @@ 
 		unset($actions['select_all']);
 
 		// This disables the event actions for the grid rows (calendar weeks/owners)
-		foreach($actions as $id => &$action)
+		foreach ($actions as $id => &$action)
 		{
-			if($id=='add') continue;
-			if(!$action['enabled'])
+			if ($id == 'add') continue;
+			if (!$action['enabled'])
 			{
 				$action['enabled'] = 'javaScript:app.calendar.is_event';
 			}
 		}
 		$actions['add']['open'] = '{"app":"calendar","type":"add"}';
-		$actions['add']['onExecute'] =  'javaScript:app.calendar.action_open';
+		$actions['add']['onExecute'] = 'javaScript:app.calendar.action_open';
 		$actions['copy']['open'] = '{"app": "calendar", "type": "add", "extra": "cal_id=$id&action=copy"}';
 		$actions['copy']['onExecute'] = 'javaScript:app.calendar.action_open';
 
-		foreach($actions['status']['children'] as $id => &$status)
+		foreach ($actions['status']['children'] as $id => &$status)
 		{
 			$status = array(
 				'id' => $id,
@@ -936,7 +935,7 @@ 
 
 		if ($actions['filemanager'])
 		{
-			$actions['filemanager']['url'] = '/index.php?'. $actions['filemanager']['url'];
+			$actions['filemanager']['url'] = '/index.php?'.$actions['filemanager']['url'];
 			$actions['filemanager']['onExecute'] = 'javaScript:app.calendar.action_open';
 		}
 		if ($actions['infolog_app'])
@@ -981,26 +980,26 @@ 
 				{
 					$start = $this->bo->date2array($event['start']);
 					$end = $this->bo->date2array($event['end']);
-					if(!$start['hour'] && !$start['minute'] && $end['hour'] == 23 && $end['minute'] == 59)
+					if (!$start['hour'] && !$start['minute'] && $end['hour'] == 23 && $end['minute'] == 59)
 					{
-						if($event['non_blocking'])
+						if ($event['non_blocking'])
 						{
-							$dayEvents[$day][$num]['whole_day_on_top']=true;
-							$this->whole_day_positions[$num]=($this->rowHeight*($num+2));
+							$dayEvents[$day][$num]['whole_day_on_top'] = true;
+							$this->whole_day_positions[$num] = ($this->rowHeight * ($num + 2));
 							$extraRowsToAdd++;
 						}
 						else
 						{
-							$dayEvents[$day][$num]['whole_day']=true;
+							$dayEvents[$day][$num]['whole_day'] = true;
 						}
 					}
 					$this->to_client($dayEvents[$day][$num]);
 				}
 				// check after every day if we have to increase $this->extraRows
-				if(($this->extraRowsOriginal+$extraRowsToAdd) > $this->extraRows)
+				if (($this->extraRowsOriginal + $extraRowsToAdd) > $this->extraRows)
 				{
 					$this->remBotExtraRows = $extraRowsToAdd;
-					$this->extraRows = ($this->extraRowsOriginal+$extraRowsToAdd);
+					$this->extraRows = ($this->extraRowsOriginal + $extraRowsToAdd);
 				}
 			}
 		}

calendar/inc/class.calendar_ui.inc.php

Spacing +132 added lines, -132 removed lines

@@ -33,7 +33,7 @@ 
 	/**
 	 * @var $debug mixed integer level or string function-name
 	 */
-	var $debug=false;
+	var $debug = false;
 	/**
 	 * instance of the bocal or bocalupdate class
 	 *
@@ -127,7 +127,7 @@ 
 	/**
 	 * @var array $states_to_save all states that will be saved to the user prefs
 	 */
-	var $states_to_save = array('owner','status_filter','filter','cat_id','view','sortby','planner_view','weekend');
+	var $states_to_save = array('owner', 'status_filter', 'filter', 'cat_id', 'view', 'sortby', 'planner_view', 'weekend');
 
 	/**
 	 * Constructor
@@ -135,7 +135,7 @@ 
 	 * @param boolean $use_boupdate use bocalupdate as parenent instead of bocal
 	 * @param array $set_states to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
-	function __construct($use_boupdate=false,$set_states=NULL)
+	function __construct($use_boupdate = false, $set_states = NULL)
 	{
 		if ($use_boupdate)
 		{
@@ -146,27 +146,27 @@ 
 			$this->bo = new calendar_bo();
 		}
 
-		$this->categories = new Api\Categories($this->user,'calendar');
+		$this->categories = new Api\Categories($this->user, 'calendar');
 
-		$this->common_prefs	= &$GLOBALS['egw_info']['user']['preferences']['common'];
+		$this->common_prefs = &$GLOBALS['egw_info']['user']['preferences']['common'];
 		$this->cal_prefs	= &$GLOBALS['egw_info']['user']['preferences']['calendar'];
 		$this->bo->check_set_default_prefs();
 
-		$this->wd_start		= 60*$this->cal_prefs['workdaystarts'];
-		$this->wd_end		= 60*$this->cal_prefs['workdayends'];
-		$this->interval_m	= $this->cal_prefs['interval'];
+		$this->wd_start		= 60 * $this->cal_prefs['workdaystarts'];
+		$this->wd_end = 60 * $this->cal_prefs['workdayends'];
+		$this->interval_m = $this->cal_prefs['interval'];
 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		$this->manage_states($set_states);
 
-		$GLOBALS['uical'] = &$this;	// make us available for ExecMethod, else it creates a new instance
+		$GLOBALS['uical'] = &$this; // make us available for ExecMethod, else it creates a new instance
 
 		// calendar does not work with hidden sidebox atm.
 		unset($GLOBALS['egw_info']['user']['preferences']['common']['auto_hide_sidebox']);
 
 		// make sure the hook for export_limit is registered
-		if (!Api\Hooks::exists('export_limit','calendar')) Api\Hooks::read(true);
+		if (!Api\Hooks::exists('export_limit', 'calendar')) Api\Hooks::read(true);
 	}
 
 	/**
@@ -179,21 +179,21 @@ 
 	function check_owners_access($users = null, &$no_access = array())
 	{
 		$no_access = $no_access_group = array();
-		$owner_array = $users ? $users : explode(',',$this->owner);
-		foreach($owner_array as $idx => $owner)
+		$owner_array = $users ? $users : explode(',', $this->owner);
+		foreach ($owner_array as $idx => $owner)
 		{
 			$owner = trim($owner);
 			if (is_numeric($owner) && $GLOBALS['egw']->accounts->get_type($owner) == 'g')
 			{
-				foreach($GLOBALS['egw']->accounts->members($owner, true) as $member)
+				foreach ($GLOBALS['egw']->accounts->members($owner, true) as $member)
 				{
-					if (!$this->bo->check_perms(Acl::READ|calendar_bo::ACL_READ_FOR_PARTICIPANTS|calendar_bo::ACL_FREEBUSY,0,$member))
+					if (!$this->bo->check_perms(Acl::READ|calendar_bo::ACL_READ_FOR_PARTICIPANTS|calendar_bo::ACL_FREEBUSY, 0, $member))
 					{
 						$no_access_group[$member] = $this->bo->participant_name($member);
 					}
 				}
 			}
-			elseif (!$this->bo->check_perms(Acl::READ|calendar_bo::ACL_READ_FOR_PARTICIPANTS|calendar_bo::ACL_FREEBUSY,0,$owner))
+			elseif (!$this->bo->check_perms(Acl::READ|calendar_bo::ACL_READ_FOR_PARTICIPANTS|calendar_bo::ACL_FREEBUSY, 0, $owner))
 			{
 				$no_access[$owner] = $this->bo->participant_name($owner);
 				unset($owner_array[$idx]);
@@ -201,14 +201,14 @@ 
 		}
 		if (count($no_access))
 		{
-			$message = lang('Access denied to the calendar of %1 !!!',implode(', ',$no_access));
-			Framework::message($message,'error');
-			$this->owner = implode(',',$owner_array);
+			$message = lang('Access denied to the calendar of %1 !!!', implode(', ', $no_access));
+			Framework::message($message, 'error');
+			$this->owner = implode(',', $owner_array);
 			return $message;
 		}
 		if (count($no_access_group))
 		{
-			$this->bo->warnings['groupmembers'] = lang('Groupmember(s) %1 not included, because you have no access.',implode(', ',$no_access_group));
+			$this->bo->warnings['groupmembers'] = lang('Groupmember(s) %1 not included, because you have no access.', implode(', ', $no_access_group));
 		}
 		return false;
 	}
@@ -227,7 +227,7 @@ 
 	 *	- view: the actual view, where dialogs should return to or which they refresh
 	 * @param array $set_states array to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
-	function manage_states($set_states=NULL)
+	function manage_states($set_states = NULL)
 	{
 		// retrieve saved states from prefs
 		$states = is_array($this->bo->cal_prefs['saved_states']) ?
@@ -247,12 +247,12 @@ 
 				}
 				else
 				{
-					parse_str(substr($json_data['request']['parameters'][0], 10), $set_states);	// cut off "/index.php?"
+					parse_str(substr($json_data['request']['parameters'][0], 10), $set_states); // cut off "/index.php?"
 				}
 			}
 			else
 			{
-				$set_states = substr($_GET['menuaction'],0,9) == 'calendar.' ? $_REQUEST : array();
+				$set_states = substr($_GET['menuaction'], 0, 9) == 'calendar.' ? $_REQUEST : array();
 			}
 		}
 		if (!$states['date'] && $states['year'] && $states['month'] && $states['day'])
@@ -260,16 +260,16 @@ 
 			$states['date'] = $this->bo->date2string($states);
 		}
 
-		foreach(array(
+		foreach (array(
 			'date'       => $this->bo->date2string($this->bo->now_su),
 			'cat_id'     => 0,
 			'status_filter'     => 'default',
 			'owner'      => $this->user,
 			'save_owner' => 0,
 			'sortby'     => 'category',
-			'planner_view'=> 'month',	// full month
-			'view'       => ($this->bo->cal_prefs['defaultcalendar']?$this->bo->cal_prefs['defaultcalendar']:'day'), // use pref, if exists else use the dayview
-			'listview_days'=> '',	// no range
+			'planner_view'=> 'month', // full month
+			'view'       => ($this->bo->cal_prefs['defaultcalendar'] ? $this->bo->cal_prefs['defaultcalendar'] : 'day'), // use pref, if exists else use the dayview
+			'listview_days'=> '', // no range
 			'test'       => 'false',
 		) as $state => $default)
 		{
@@ -278,42 +278,42 @@ 
 				if ($state == 'owner')
 				{
 					// only change the owners of the same resource-type as given in set_state[owner]
-					$set_owners = is_array($set_states['owner']) ? $set_states['owner'] : explode(',',$set_states['owner']);
+					$set_owners = is_array($set_states['owner']) ? $set_states['owner'] : explode(',', $set_states['owner']);
 					if ((string)$set_owners[0] === '0')	// set exactly the specified owners (without the 0)
 					{
 						if ($set_states['owner'] === '0,r0')	// small fix for resources
 						{
-							$set_states['owner'] = $default;	// --> set default, instead of none
+							$set_states['owner'] = $default; // --> set default, instead of none
 						}
 						else
 						{
-							$set_states['owner'] = substr($set_states['owner'],2);
+							$set_states['owner'] = substr($set_states['owner'], 2);
 						}
 					}
 					else	// change only the owners of the given type
 					{
 						$res_type = is_numeric($set_owners[0]) ? false : $set_owners[0][0];
 						$owners = $states['owner'] ? $states['owner'] : $default;
-						if(!is_array($owners))
+						if (!is_array($owners))
 						{
-							$owners = explode(',',$owners);
+							$owners = explode(',', $owners);
 						}
-						foreach($owners as $key => $owner)
+						foreach ($owners as $key => $owner)
 						{
 							if (!$res_type && is_numeric($owner) || $res_type && $owner[0] == $res_type)
 							{
 								unset($owners[$key]);
 							}
 						}
-						if (!$res_type || !in_array($res_type.'0',$set_owners))
+						if (!$res_type || !in_array($res_type.'0', $set_owners))
 						{
-							$owners = array_merge($owners,$set_owners);
+							$owners = array_merge($owners, $set_owners);
 						}
-						$set_states['owner'] = implode(',',$owners);
+						$set_states['owner'] = implode(',', $owners);
 					}
 				}
 				// for the uiforms class (eg. edit), dont store the (new) owner, as it might change the view
-				if (substr($_GET['menuaction'],0,25) == 'calendar.calendar_uiforms')
+				if (substr($_GET['menuaction'], 0, 25) == 'calendar.calendar_uiforms')
 				{
 					$this->owner = $set_states[$state];
 					continue;
@@ -327,7 +327,7 @@ 
 			if ($state == 'date')
 			{
 				$date_arr = $this->bo->date2array($states['date']);
-				foreach(array('year','month','day') as $name)
+				foreach (array('year', 'month', 'day') as $name)
 				{
 					$this->$name = $states[$name] = $date_arr[$name];
 				}
@@ -335,16 +335,16 @@ 
 			$this->$state = $states[$state];
 		}
 		// remove a given calendar from the view
-		if (isset($_GET['close']) && ($k = array_search($_GET['close'], $owners=explode(',',$this->owner))) !== false)
+		if (isset($_GET['close']) && ($k = array_search($_GET['close'], $owners = explode(',', $this->owner))) !== false)
 		{
 			unset($owners[$k]);
-			$this->owner = $states['owner'] = implode(',',$owners);
+			$this->owner = $states['owner'] = implode(',', $owners);
 		}
-		if(is_array($this->owner))
+		if (is_array($this->owner))
 		{
-			$this->owner = implode(',',$this->owner);
+			$this->owner = implode(',', $this->owner);
 		}
-		if (substr($this->view,0,8) == 'planner_')
+		if (substr($this->view, 0, 8) == 'planner_')
 		{
 			$states['sortby'] = $this->sortby = $this->view == 'planner_cat' ? 'category' : 'user';
 			$states['view'] = $this->view = 'planner';
@@ -352,10 +352,10 @@ 
 		// set the actual view as return_to
 		if (isset($_GET['menuaction']))
 		{
-			list(,$class,$func) = explode('.',$_GET['menuaction']);
+			list(,$class, $func) = explode('.', $_GET['menuaction']);
 			if ($func == 'index')
 			{
-				$func = $this->view; $this->view = 'index';	// switch to the default view
+				$func = $this->view; $this->view = 'index'; // switch to the default view
 			}
 		}
 		else	// eg. calendar/index.php
@@ -369,18 +369,18 @@ 
 		}
 		$this->view_menuaction = $this->view == 'listview' ? 'calendar.calendar_uilist.listview' : 'calendar.calendar_uiviews.index';
 
-		if ($this->debug > 0 || $this->debug == 'manage_states') $this->bo->debug_message('uical::manage_states(%1), states now %3',True,$set_states,$states);
+		if ($this->debug > 0 || $this->debug == 'manage_states') $this->bo->debug_message('uical::manage_states(%1), states now %3', True, $set_states, $states);
 		// save the states in the session only when we are in calendar
-		if ($GLOBALS['egw_info']['flags']['currentapp']=='calendar')
+		if ($GLOBALS['egw_info']['flags']['currentapp'] == 'calendar')
 		{
 			// save defined states into the user-prefs
-			if(!empty($states) && is_array($states))
+			if (!empty($states) && is_array($states))
 			{
-				$saved_states = array_intersect_key($states,array_flip($this->states_to_save));
+				$saved_states = array_intersect_key($states, array_flip($this->states_to_save));
 				if ($saved_states != $this->cal_prefs['saved_states'])
 				{
-					$GLOBALS['egw']->preferences->add('calendar','saved_states',$saved_states);
-					$GLOBALS['egw']->preferences->save_repository(false,'user',true);
+					$GLOBALS['egw']->preferences->add('calendar', 'saved_states', $saved_states);
+					$GLOBALS['egw']->preferences->save_repository(false, 'user', true);
 				}
 			}
 		}
@@ -394,35 +394,35 @@ 
 	*/
 	function event_icons($event)
 	{
-		$is_private = !$event['public'] && !$this->bo->check_perms(Acl::READ,$event);
+		$is_private = !$event['public'] && !$this->bo->check_perms(Acl::READ, $event);
 
 		$icons = array();
 		if (!$is_private)
 		{
-			if($event['priority'] == 3)
+			if ($event['priority'] == 3)
 			{
-				$icons[] = Api\Html::image('calendar','high',lang('high priority'));
+				$icons[] = Api\Html::image('calendar', 'high', lang('high priority'));
 			}
-			if($event['recur_type'] != MCAL_RECUR_NONE)
+			if ($event['recur_type'] != MCAL_RECUR_NONE)
 			{
-				$icons[] = Api\Html::image('calendar','recur',lang('recurring event'));
+				$icons[] = Api\Html::image('calendar', 'recur', lang('recurring event'));
 			}
 			// icons for single user, multiple users or group(s) and resources
-			foreach(array_keys($event['participants']) as  $uid)
+			foreach (array_keys($event['participants']) as  $uid)
 			{
-				if(is_numeric($uid) || !isset($this->bo->resources[$uid[0]]['icon']))
+				if (is_numeric($uid) || !isset($this->bo->resources[$uid[0]]['icon']))
 				{
 					if (isset($icons['single']) || $GLOBALS['egw']->accounts->get_type($uid) == 'g')
 					{
 						unset($icons['single']);
-						$icons['multiple'] = Api\Html::image('calendar','users');
+						$icons['multiple'] = Api\Html::image('calendar', 'users');
 					}
 					elseif (!isset($icons['multiple']))
 					{
-						$icons['single'] = Api\Html::image('calendar','single');
+						$icons['single'] = Api\Html::image('calendar', 'single');
 					}
 				}
-				elseif(!isset($icons[$uid[0]]) && isset($this->bo->resources[$uid[0]]) && isset($this->bo->resources[$uid[0]]['icon']))
+				elseif (!isset($icons[$uid[0]]) && isset($this->bo->resources[$uid[0]]) && isset($this->bo->resources[$uid[0]]['icon']))
 				{
 				 	$icons[$uid[0]] = Api\Html::image($this->bo->resources[$uid[0]]['app'],
 				 		($this->bo->resources[$uid[0]]['icon'] ? $this->bo->resources[$uid[0]]['icon'] : 'navbar'),
@@ -431,21 +431,21 @@ 
 				}
 			}
 		}
-		if($event['non_blocking'])
+		if ($event['non_blocking'])
 		{
-			$icons[] = Api\Html::image('calendar','nonblocking',lang('non blocking'));
+			$icons[] = Api\Html::image('calendar', 'nonblocking', lang('non blocking'));
 		}
-		if($event['public'] == 0)
+		if ($event['public'] == 0)
 		{
-			$icons[] = Api\Html::image('calendar','private',lang('private'));
+			$icons[] = Api\Html::image('calendar', 'private', lang('private'));
 		}
-		if(isset($event['alarm']) && count($event['alarm']) >= 1 && !$is_private)
+		if (isset($event['alarm']) && count($event['alarm']) >= 1 && !$is_private)
 		{
-			$icons[] = Api\Html::image('calendar','alarm',lang('alarm'));
+			$icons[] = Api\Html::image('calendar', 'alarm', lang('alarm'));
 		}
-		if($event['participants'][$this->user][0] == 'U')
+		if ($event['participants'][$this->user][0] == 'U')
 		{
-			$icons[] = Api\Html::image('calendar','needs-action',lang('Needs action'));
+			$icons[] = Api\Html::image('calendar', 'needs-action', lang('Needs action'));
 		}
 		return $icons;
 	}
@@ -460,17 +460,17 @@ 
 	 * @param array $vars
 	 * @return string the link incl. content
 	 */
-	function add_link($content,$date=null,$hour=null,$minute=0,array $vars=null)
+	function add_link($content, $date = null, $hour = null, $minute = 0, array $vars = null)
 	{
 		$vars['menuaction'] = 'calendar.calendar_uiforms.edit';
-		$vars['date'] =  $date ? $date : $this->date;
+		$vars['date'] = $date ? $date : $this->date;
 
 		if (!is_null($hour))
 		{
 			$vars['hour'] = $hour;
 			$vars['minute'] = $minute;
 		}
-		return Api\Html::a_href($content,'',$vars,' data-date="' .$vars['date'].'|'.$vars['hour'].'|'.$vars['minute']
+		return Api\Html::a_href($content, '', $vars, ' data-date="'.$vars['date'].'|'.$vars['hour'].'|'.$vars['minute']
 				. '" title="'.Api\Html::htmlspecialchars(lang('Add')).'"');
 	}
 
@@ -482,7 +482,7 @@ 
 		// Magic etemplate2 favorites menu (from framework)
 		display_sidebox('calendar', lang('Favorites'), Framework\Favorites::list_favorites('calendar'));
 
-		$file = array('menuOpened' => true);	// menu open by default
+		$file = array('menuOpened' => true); // menu open by default
 
 		// Target for etemplate
 		$file[] = array(
@@ -495,34 +495,34 @@ 
 		// Merge print placeholders (selectbox in etemplate)
 		if ($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir'])
 		{
-			$file['Placeholders'] = Egw::link('/index.php','menuaction=calendar.calendar_merge.show_replacements');
+			$file['Placeholders'] = Egw::link('/index.php', 'menuaction=calendar.calendar_merge.show_replacements');
 		}
 		$appname = 'calendar';
 		$menu_title = lang('Calendar Menu');
-		display_sidebox($appname,$menu_title,$file);
+		display_sidebox($appname, $menu_title, $file);
 
 		$this->sidebox_etemplate();
 
 		// resources menu hooks
  		foreach ($this->bo->resources as $resource)
 		{
-			if(!is_array($resource['cal_sidebox'])) continue;
+			if (!is_array($resource['cal_sidebox'])) continue;
 			$menu_title = $resource['cal_sidebox']['menu_title'] ? $resource['cal_sidebox']['menu_title'] : lang($resource['app']);
-			$file = ExecMethod($resource['cal_sidebox']['file'],array(
+			$file = ExecMethod($resource['cal_sidebox']['file'], array(
 				'menuaction' => $this->view_menuaction,
 				'owner' => $this->owner,
 			));
-			display_sidebox($appname,$menu_title,$file);
+			display_sidebox($appname, $menu_title, $file);
 		}
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$file = Array(
-				'Configuration'=>Egw::link('/index.php','menuaction=admin.admin_config.index&appname=calendar&ajax=true'),
-				'Custom Fields'=>Egw::link('/index.php','menuaction=admin.customfields.index&appname=calendar'),
-				'Global Categories' =>Egw::link('/index.php','menuaction=admin.admin_categories.index&appname=calendar'),
+				'Configuration'=>Egw::link('/index.php', 'menuaction=admin.admin_config.index&appname=calendar&ajax=true'),
+				'Custom Fields'=>Egw::link('/index.php', 'menuaction=admin.customfields.index&appname=calendar'),
+				'Global Categories' =>Egw::link('/index.php', 'menuaction=admin.admin_categories.index&appname=calendar'),
 			);
-			$GLOBALS['egw']->framework->sidebox($appname,lang('Admin'),$file,'admin');
+			$GLOBALS['egw']->framework->sidebox($appname, lang('Admin'), $file, 'admin');
 		}
 	}
 
@@ -531,15 +531,15 @@ 
 	 */
 	function sidebox_etemplate($content = array())
 	{
-		if($content['merge'])
+		if ($content['merge'])
 		{
 			// View from sidebox is JSON encoded
-			$this->manage_states(array_merge($content,json_decode($content['view'],true)));
-			if($content['first'])
+			$this->manage_states(array_merge($content, json_decode($content['view'], true)));
+			if ($content['first'])
 			{
-				$this->first = Api\DateTime::to($content['first'],'ts');
+				$this->first = Api\DateTime::to($content['first'], 'ts');
 			}
-			if($content['last'])
+			if ($content['last'])
 			{
 				$this->last = new Api\DateTime($content['last']);
 				$this->last->setTime(23, 59, 59);
@@ -557,25 +557,25 @@ 
 		$cont['view'] = $this->view ? $this->view : 'week';
 		$cont['date'] = $this->date ? $this->date : Api\DateTime();
 
-		$cont['year'] = (int)Api\DateTime::to($cont['date'],'Y');
+		$cont['year'] = (int)Api\DateTime::to($cont['date'], 'Y');
 		$cont['holidays'] = $this->bo->read_holidays($cont['year']);
 
 		$readonlys = array();
 		$sel_options['status_filter'] = array(
-			array('value' => 'default',     'label' => lang('Not rejected'), 'title' => lang('Show all status, but rejected')),
-			array('value' => 'accepted',    'label' => lang('Accepted'), 'title' => lang('Show only accepted events')),
-			array('value' => 'unknown',     'label' => lang('Invitations'), 'title' => lang('Show only invitations, not yet accepted or rejected')),
-			array('value' => 'tentative',   'label' => lang('Tentative'), 'title' => lang('Show only tentative accepted events')),
-			array('value' => 'delegated',   'label' => lang('Delegated'), 'title' => lang('Show only delegated events')),
-			array('value' => 'rejected',    'label' => lang('Rejected'),'title' => lang('Show only rejected events')),
-			array('value' => 'owner',       'label' => lang('Owner too'),'title' => lang('Show also events just owned by selected user')),
-			array('value' => 'all',         'label' => lang('All incl. rejected'),'title' => lang('Show all status incl. rejected events')),
-			array('value' => 'hideprivate', 'label' => lang('Hide private infos'),'title' => lang('Show all events, as if they were private')),
-			array('value' => 'showonlypublic',  'label' => lang('Hide private events'),'title' => lang('Show only events flagged as public, (not checked as private)')),
-			array('value' => 'no-enum-groups', 'label' => lang('only group-events'),'title' => lang('Do not include events of group members')),
-			array('value' => 'not-unknown', 'label' => lang('No meeting requests'),'title' => lang('Show all status, but unknown')),
+			array('value' => 'default', 'label' => lang('Not rejected'), 'title' => lang('Show all status, but rejected')),
+			array('value' => 'accepted', 'label' => lang('Accepted'), 'title' => lang('Show only accepted events')),
+			array('value' => 'unknown', 'label' => lang('Invitations'), 'title' => lang('Show only invitations, not yet accepted or rejected')),
+			array('value' => 'tentative', 'label' => lang('Tentative'), 'title' => lang('Show only tentative accepted events')),
+			array('value' => 'delegated', 'label' => lang('Delegated'), 'title' => lang('Show only delegated events')),
+			array('value' => 'rejected', 'label' => lang('Rejected'), 'title' => lang('Show only rejected events')),
+			array('value' => 'owner', 'label' => lang('Owner too'), 'title' => lang('Show also events just owned by selected user')),
+			array('value' => 'all', 'label' => lang('All incl. rejected'), 'title' => lang('Show all status incl. rejected events')),
+			array('value' => 'hideprivate', 'label' => lang('Hide private infos'), 'title' => lang('Show all events, as if they were private')),
+			array('value' => 'showonlypublic', 'label' => lang('Hide private events'), 'title' => lang('Show only events flagged as public, (not checked as private)')),
+			array('value' => 'no-enum-groups', 'label' => lang('only group-events'), 'title' => lang('Do not include events of group members')),
+			array('value' => 'not-unknown', 'label' => lang('No meeting requests'), 'title' => lang('Show all status, but unknown')),
 		);
-		if($GLOBALS['egw_info']['server']['calendar_delete_history'])
+		if ($GLOBALS['egw_info']['server']['calendar_delete_history'])
 		{
 			$sel_options['status_filter'][] = array('value' => 'deleted', 'label' => lang('Deleted'), 'title' => lang('Show events that have been deleted'));
 		}
@@ -583,7 +583,7 @@ 
 		// Merge print
 		if ($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir'])
 		{
-			$sel_options['merge'] = calendar_merge::get_documents($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir'], '', null,'calendar');
+			$sel_options['merge'] = calendar_merge::get_documents($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir'], '', null, 'calendar');
 		}
 		else
 		{
@@ -609,27 +609,27 @@ 
 	 */
 	public function update_client($event_id, Api\DateTime $recurrence_date = null)
 	{
-		if(!$event_id) return;
+		if (!$event_id) return;
 
 		// Directly update stored data.
 		// Make sure we have the whole event
 		$event = $this->bo->read($event_id, $recurrence_date);
 		$response = Api\Json\Response::get();
 
-		if(!$event)
+		if (!$event)
 		{
 			// Sending null will trigger a removal
 			$response->generic('data', array('uid' => 'calendar::'.$event_id, 'data' => null));
 			return false;
 		}
 
-		if(!$event['recur_type'] || $recurrence_date)
+		if (!$event['recur_type'] || $recurrence_date)
 		{
 			$this->to_client($event);
 			$response->generic('data', array('uid' => 'calendar::'.$event['row_id'], 'data' => $event));
 		}
 		// If it's recurring, try to send the next month or so
-		else if($event['recur_type'] )
+		else if ($event['recur_type'])
 		{
 			$this_month = new Api\DateTime('next month');
 			$rrule = calendar_rrule::event2rrule($event, true);
@@ -642,7 +642,7 @@ 
 				$response->generic('data', array('uid' => 'calendar::'.$converted['row_id'], 'data' => $converted));
 				$rrule->next();
 			}
-			while ($rrule->valid() && $occurrence <= $this_month );
+			while ($rrule->valid() && $occurrence <= $this_month);
 		}
 	}
 
@@ -657,15 +657,15 @@ 
 	 */
 	public function to_client(&$event)
 	{
-		if(!$event || !is_array($event)) return false;
+		if (!$event || !is_array($event)) return false;
 
-		if (!$this->bo->check_perms(Acl::EDIT,$event))
+		if (!$this->bo->check_perms(Acl::EDIT, $event))
 		{
 			$event['class'] .= 'rowNoEdit ';
 		}
 
 		// Delete disabled for other applications
-		if (!$this->bo->check_perms(Acl::DELETE,$event) || !is_numeric($event['id']))
+		if (!$this->bo->check_perms(Acl::DELETE, $event) || !is_numeric($event['id']))
 		{
 			$event['class'] .= 'rowNoDelete ';
 		}
@@ -678,32 +678,32 @@ 
 
 		$event['recure'] = $this->bo->recure2string($event);
 
-		if (empty($event['description'])) $event['description'] = ' ';	// no description screws the titles horz. alignment
-		if (empty($event['location'])) $event['location'] = ' ';	// no location screws the owner horz. alignment
+		if (empty($event['description'])) $event['description'] = ' '; // no description screws the titles horz. alignment
+		if (empty($event['location'])) $event['location'] = ' '; // no location screws the owner horz. alignment
 
 		// respect category permissions
-		if(!empty($event['category']))
+		if (!empty($event['category']))
 		{
 			$event['category'] = $this->categories->check_list(Acl::READ, $event['category']);
 		}
 		$event['non_blocking'] = (bool)$event['non_blocking'];
 
 		$matches = null;
-		if(!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i',$event['id'],$matches))
+		if (!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i', $event['id'], $matches))
 		{
 			$app = $matches[1];
 			$app_id = $matches[2];
 			$icons = array();
-			if(!($is_private = calendar_bo::integration_get_private($app,$app_id,$event)))
+			if (!($is_private = calendar_bo::integration_get_private($app, $app_id, $event)))
 			{
-				$icons = calendar_uiviews::integration_get_icons($app,$app_id,$event);
+				$icons = calendar_uiviews::integration_get_icons($app, $app_id, $event);
 			}
 			$event['app'] = $app;
 			$event['app_id'] = $app_id;
 		}
 		else
 		{
-			$is_private = !$this->bo->check_perms(Acl::READ,$event);
+			$is_private = !$this->bo->check_perms(Acl::READ, $event);
 		}
 		if ($is_private)
 		{
@@ -711,29 +711,29 @@ 
 			$event['class'] .= 'rowNoView ';
 		}
 
-		if(!$event['app'])
+		if (!$event['app'])
 		{
 			$event['app'] = 'calendar';
 		}
-		if(!$event['app_id'])
+		if (!$event['app_id'])
 		{
 			$event['app_id'] = $event['id'];
 		}
 
 		if ($event['recur_type'] != MCAL_RECUR_NONE)
 		{
-			$event['app_id'] .= ':'.Api\DateTime::to($event['recur_date'] ? $event['recur_date'] : $event['start'],'ts');
+			$event['app_id'] .= ':'.Api\DateTime::to($event['recur_date'] ? $event['recur_date'] : $event['start'], 'ts');
 		}
 		// set id for grid
-		$event['row_id'] = $event['id'].($event['recur_type'] ? ':'.Api\DateTime::to($event['recur_date'] ? $event['recur_date'] : $event['start'],'ts') : '');
+		$event['row_id'] = $event['id'].($event['recur_type'] ? ':'.Api\DateTime::to($event['recur_date'] ? $event['recur_date'] : $event['start'], 'ts') : '');
 
-		$event['parts'] = implode(",\n",$this->bo->participants($event,false));
+		$event['parts'] = implode(",\n", $this->bo->participants($event, false));
 		$event['date'] = $this->bo->date2string($event['start']);
 
 		// Change dates
-		foreach(calendar_egw_record::$types['date-time'] as $field)
+		foreach (calendar_egw_record::$types['date-time'] as $field)
 		{
-			if(is_int($event[$field]))
+			if (is_int($event[$field]))
 			{
 				$event[$field] = Api\DateTime::to($event[$field], Api\DateTime::ET2);
 			}
@@ -751,13 +751,13 @@ 
 	public function merge($timespan = array())
 	{
 		// Merge print
-		if($_GET['merge'])
+		if ($_GET['merge'])
 		{
-			if(!$timespan)
+			if (!$timespan)
 			{
 				// Try to make time span into appropriate ranges to match
-				if(stripos($_GET['merge'],'month') !== false || stripos($_GET['merge'],lang('month')) !== false) $template = 'month';
-				if(stripos($_GET['merge'],'week') !== false || stripos($_GET['merge'],lang('week')) !== false) $template = 'week';
+				if (stripos($_GET['merge'], 'month') !== false || stripos($_GET['merge'], lang('month')) !== false) $template = 'month';
+				if (stripos($_GET['merge'], 'week') !== false || stripos($_GET['merge'], lang('week')) !== false) $template = 'week';
 				//error_log("Detected template $template");
 				switch ($template)
 				{
@@ -765,8 +765,8 @@ 
 						// Trim to _only_ the month, do not pad to week start / end
 						$time = new Api\DateTime($this->date);
 						$timespan = array(array(
-							'start' => Api\DateTime::to($time->format('Y-m-01 00:00:00'),'ts'),
-							'end'	=> Api\DateTime::to($time->format('Y-m-t 23:59:59'),'ts')
+							'start' => Api\DateTime::to($time->format('Y-m-01 00:00:00'), 'ts'),
+							'end'	=> Api\DateTime::to($time->format('Y-m-t 23:59:59'), 'ts')
 						));
 						break;
 					case 'week':
@@ -774,7 +774,7 @@ 
 						$start = new Api\DateTime($this->first);
 						$t = clone $start;
 						$t->modify('+1 week')->modify('-1 second');
-						if($t->format('ts') < Api\DateTime::to($this->last,'ts'))
+						if ($t->format('ts') < Api\DateTime::to($this->last, 'ts'))
 						{
 							do
 							{
@@ -784,7 +784,7 @@ 
 								);
 								$start->modify('+1 week');
 								$t->modify('+1 week');
-							} while( $start->format('ts') < $this->last);
+							} while ($start->format('ts') < $this->last);
 							break;
 						}
 						// Fall through
@@ -802,7 +802,7 @@ 
 			Framework::refresh_opener($error, 'calendar');
 		}
 		unset($_GET['merge']);
-		if($error)
+		if ($error)
 		{
 			// This doesn't give message either, but at least it doesn't give a blank screen
 			Framework::redirect_link('/index.php', array(

calendar/inc/class.calendar_owner_etemplate_widget.inc.php

Spacing +36 added lines, -36 removed lines

@@ -30,33 +30,33 @@ 
 	 * @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)
 	{
 
-		Framework::includeJS('.','et2_widget_owner','calendar');
-		Framework::includeCSS('calendar','calendar');
+		Framework::includeJS('.', 'et2_widget_owner', 'calendar');
+		Framework::includeCSS('calendar', 'calendar');
 
 		$bo = new calendar_bo();
 
 		$form_name = self::form_name($cname, $this->id, $expand);
 
-		$value =& self::get_array(self::$request->content, $form_name);
-		if(!is_array($value)) $value = array();
+		$value = & self::get_array(self::$request->content, $form_name);
+		if (!is_array($value)) $value = array();
 		if (!is_array(self::$request->sel_options[$form_name]))
 		{
 			self::$request->sel_options[$form_name] = array();
 		}
-		$sel_options =& self::$request->sel_options[$form_name];
+		$sel_options = & self::$request->sel_options[$form_name];
 
 		// Get user accounts, formatted nicely for grouping and matching
 		// the ajax call calendar_uiforms->ajax_owner() - users first
 		$accounts = array();
 		$list = array('accounts', 'owngroups');
-		foreach($list as $type)
+		foreach ($list as $type)
 		{
 			$account_options = array('account_type' => $type);
-			$accounts_type = Api\Accounts::link_query('',$account_options);
-			if($type == 'accounts')
+			$accounts_type = Api\Accounts::link_query('', $account_options);
+			if ($type == 'accounts')
 			{
 				$accounts_type = array_intersect_key($accounts_type, $GLOBALS['egw']->acl->get_grants('calendar'));
 			}
@@ -75,12 +75,12 @@ 
 
 
 		// Add external owners that a select account widget will not find
-		foreach($value as &$owner)
+		foreach ($value as &$owner)
 		{
 			$label = self::get_owner_label($owner);
-			if(!is_numeric($owner))
+			if (!is_numeric($owner))
 			{
-				$resource = $bo->resources[substr($owner, 0,1)];
+				$resource = $bo->resources[substr($owner, 0, 1)];
 			}
 			else if (!in_array($owner, array_keys($accounts)))
 			{
@@ -102,19 +102,19 @@ 
 	 * @param array $content
 	 * @param array &$validated=array() validated content
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
 		if (!$this->is_readonly($cname, $form_name))
 		{
-			$value = $value_in =& self::get_array($content, $form_name);
-			if(!is_array($value))
+			$value = $value_in = & self::get_array($content, $form_name);
+			if (!is_array($value))
 			{
 				$value = Array($value);
 			}
 
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 			if (true) $valid = $value;
 		}
 	}
@@ -126,7 +126,7 @@ 
 	public static function ajax_owner($id = null)
 	{
 		// Handle a request for a single ID
-		if($id)
+		if ($id)
 		{
 			$label = self::get_owner_label($id);
 			Api\Json\Response::get()->data($label);
@@ -137,35 +137,35 @@ 
 		$query = $_REQUEST['query'];
 		// Arbitrarily limited to 50 / resource
 		$options = array('start' => 0, 'num_rows' => 50) +
-			array_diff_key($_REQUEST, array_flip(array('menuaction','query')));
+			array_diff_key($_REQUEST, array_flip(array('menuaction', 'query')));
 		$results = array();
 
-		$resources = array_merge(array('' => $bo->resources['']),$bo->resources);
-		foreach($resources as $type => $data)
+		$resources = array_merge(array('' => $bo->resources['']), $bo->resources);
+		foreach ($resources as $type => $data)
 		{
 			$mapped = array();
 			$_results = array();
 
 			// Handle Api\Accounts seperately
-			if($type == '')
+			if ($type == '')
 			{
 				$list = array('accounts', 'owngroups');
-				foreach($list as $a_type)
+				foreach ($list as $a_type)
 				{
 					$account_options = $options + array('account_type' => $a_type);
-					$_results += Api\Accounts::link_query($query,$account_options);
+					$_results += Api\Accounts::link_query($query, $account_options);
 				}
 				$_results = array_intersect_key($_results, $GLOBALS['egw']->acl->get_grants('calendar'));
 			}
 			else if ($data['app'] && Link::get_registry($data['app'], 'query'))
 			{
-				$_results = Link::query($data['app'], $query,$options);
+				$_results = Link::query($data['app'], $query, $options);
 			}
-			if(!$_results) continue;
+			if (!$_results) continue;
 
-			foreach(array_unique($_results) as $id => $title)
+			foreach (array_unique($_results) as $id => $title)
 			{
-				if($id && $title)
+				if ($id && $title)
 				{
 					// Magicsuggest uses id, not value.
 					$value = array(
@@ -174,14 +174,14 @@ 
 						'label' => $title,
 						'app'	=> lang($data['app'])
 					);
-					if(is_array($value['label']))
+					if (is_array($value['label']))
 					{
 						$value = array_merge($value, $value['label']);
 					}
 					$mapped[] = $value;
 				}
 			}
-			if(count($mapped))
+			if (count($mapped))
 			{
 				$results = array_merge($results, $mapped);
 			}
@@ -202,24 +202,24 @@ 
 	public static function get_owner_label($id)
 	{
 		static $bo;
-		if(!$bo) $bo = new calendar_bo();
+		if (!$bo) $bo = new calendar_bo();
 
 		$id = ''.$id;
-		if(!is_numeric($id))
+		if (!is_numeric($id))
 		{
-			$resource = $bo->resources[substr($id, 0,1)];
-			$label = Link::title($resource['app'], substr($id,1));
+			$resource = $bo->resources[substr($id, 0, 1)];
+			$label = Link::title($resource['app'], substr($id, 1));
 			
 			// Could not get via link, try via resources info
-			if($label === false)
+			if ($label === false)
 			{
-				$info = ExecMethod($resource['info'], substr($id,1));
+				$info = ExecMethod($resource['info'], substr($id, 1));
 				$label = $info[0]['name'];
 			}
 		}
 		else
 		{
-			$label = Link::title('api-accounts',$id);
+			$label = Link::title('api-accounts', $id);
 		}
 		return $label;
 	}

calendar/inc/class.calendar_rrule.inc.php

Spacing +90 added lines, -90 removed lines

@@ -76,8 +76,8 @@ 
 	static private $recur_egw2ical_2_0 = array(
 		self::DAILY        => 'DAILY',
 		self::WEEKLY       => 'WEEKLY',
-		self::MONTHLY_WDAY => 'MONTHLY',	// BYDAY={1..7, -1}{MO..SO, last workday}
-		self::MONTHLY_MDAY => 'MONTHLY',	// BYMONHTDAY={1..31, -1 for last day of month}
+		self::MONTHLY_WDAY => 'MONTHLY', // BYDAY={1..7, -1}{MO..SO, last workday}
+		self::MONTHLY_MDAY => 'MONTHLY', // BYMONHTDAY={1..31, -1 for last day of month}
 		self::YEARLY       => 'YEARLY',
 	);
 
@@ -87,8 +87,8 @@ 
 	static private $recur_egw2ical_1_0 = array(
 		self::DAILY        => 'D',
 		self::WEEKLY       => 'W',
-		self::MONTHLY_WDAY => 'MP',	// BYDAY={1..7,-1}{MO..SO, last workday}
-		self::MONTHLY_MDAY => 'MD',	// BYMONHTDAY={1..31,-1}
+		self::MONTHLY_WDAY => 'MP', // BYDAY={1..7,-1}{MO..SO, last workday}
+		self::MONTHLY_MDAY => 'MD', // BYMONHTDAY={1..31,-1}
 		self::YEARLY       => 'YM',
 	);
 
@@ -144,7 +144,7 @@ 
 	const THURSDAY  = 16;
 	const FRIDAY    = 32;
 	const SATURDAY  = 64;
-	const WORKDAYS  = 62;	// Mo, ..., Fr
+	const WORKDAYS  = 62; // Mo, ..., Fr
 	const ALLDAYS   = 127;
 	/**
 	 * Translate weekday bitmasks to labels
@@ -172,14 +172,14 @@ 
 	 *
 	 * @var array
 	 */
-	public $exceptions=array();
+	public $exceptions = array();
 
 	/**
 	 * Array of exceptions as DateTime/egw_time objects
 	 *
 	 * @var array
 	 */
-	public $exceptions_objs=array();
+	public $exceptions_objs = array();
 
 	/**
 	 * Starttime of series
@@ -222,9 +222,9 @@ 
 	 * @param int $weekdays =0 self::SUNDAY=1|self::MONDAY=2|...|self::SATURDAY=64
 	 * @param array $exceptions =null DateTime objects with exceptions
 	 */
-	public function __construct(DateTime $time,$type,$interval=1,DateTime $enddate=null,$weekdays=0,array $exceptions=null)
+	public function __construct(DateTime $time, $type, $interval = 1, DateTime $enddate = null, $weekdays = 0, array $exceptions = null)
 	{
-		switch($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
+		switch ($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
 		{
 			case 'Sunday':
 				$this->lastdayofweek = self::SATURDAY;
@@ -238,7 +238,7 @@ 
 
 		$this->time = $time instanceof Api\DateTime ? $time : new Api\DateTime($time);
 
-		if (!in_array($type,array(self::NONE, self::DAILY, self::WEEKLY, self::MONTHLY_MDAY, self::MONTHLY_WDAY, self::YEARLY)))
+		if (!in_array($type, array(self::NONE, self::DAILY, self::WEEKLY, self::MONTHLY_MDAY, self::MONTHLY_WDAY, self::YEARLY)))
 		{
 			throw new Api\Exception\WrongParameter(__METHOD__."($time,$type,$interval,$enddate,$weekdays,...) type $type is NOT valid!");
 		}
@@ -248,16 +248,16 @@ 
 		if ($type == self::MONTHLY_WDAY)
 		{
 			// check for last week of month
-			if (($day = $this->time->format('d')) >= 21 && $day > self::daysInMonth($this->time)-7)
+			if (($day = $this->time->format('d')) >= 21 && $day > self::daysInMonth($this->time) - 7)
 			{
 				$this->monthly_byday_num = -1;
 			}
 			else
 			{
-				$this->monthly_byday_num = 1 + floor(($this->time->format('d')-1) / 7);
+				$this->monthly_byday_num = 1 + floor(($this->time->format('d') - 1) / 7);
 			}
 		}
-		elseif($type == self::MONTHLY_MDAY)
+		elseif ($type == self::MONTHLY_MDAY)
 		{
 			$this->monthly_bymonthday = (int)$this->time->format('d');
 			// check for last day of month
@@ -274,7 +274,7 @@ 
 
 		if ((int)$interval < 1)
 		{
-			$interval = 1;	// calendar stores no (extra) interval as null, so using default 1 here
+			$interval = 1; // calendar stores no (extra) interval as null, so using default 1 here
 		}
 		$this->interval = (int)$interval;
 
@@ -304,7 +304,7 @@ 
 		}
 		if ($exceptions)
 		{
-			foreach($exceptions as $exception)
+			foreach ($exceptions as $exception)
 			{
 				$exception->setTimezone($this->time->getTimezone());
 				$this->exceptions[] = $exception->format('Ymd');
@@ -320,22 +320,22 @@ 
 	 * @param int $interval =1
 	 * @return int
 	 */
-	public static function recurrence_interval($type, $interval=1)
+	public static function recurrence_interval($type, $interval = 1)
 	{
-		switch($type)
+		switch ($type)
 		{
 			case self::DAILY:
-				$duration = 24*3600;
+				$duration = 24 * 3600;
 				break;
 			case self::WEEKLY:
-				$duration = 7*24*3600;
+				$duration = 7 * 24 * 3600;
 				break;
 			case self::MONTHLY_MDAY:
 			case self::MONTHLY_WDAY:
-				$duration = 31*24*3600;
+				$duration = 31 * 24 * 3600;
 				break;
 			case self::YEARLY:
-				$duration = 366*24*3600;
+				$duration = 366 * 24 * 3600;
 				break;
 		}
 		if ($interval > 1) $duration *= $interval;
@@ -351,9 +351,9 @@ 
 	 */
 	private static function daysInMonth(DateTime $time)
 	{
-		list($year,$month) = explode('-',$time->format('Y-m'));
+		list($year, $month) = explode('-', $time->format('Y-m'));
 		$last_day = new Api\DateTime();
-		$last_day->setDate($year,$month+1,0);
+		$last_day->setDate($year, $month + 1, 0);
 
 		return (int)$last_day->format('d');
 	}
@@ -383,7 +383,7 @@ 
 	 */
 	public function next_no_exception()
 	{
-		switch($this->type)
+		switch ($this->type)
 		{
 			case self::NONE:	// need to add at least one day, to end "series", as enddate == current date
 			case self::DAILY:
@@ -398,28 +398,28 @@ 
 					// --> on the last day of the week we have to additionally advance interval-1 weeks
 					if ($this->interval > 1 && self::getWeekday($this->current) == $this->lastdayofweek)
 					{
-						$this->current->modify(($this->interval-1).' week');
+						$this->current->modify(($this->interval - 1).' week');
 					}
 					$this->current->modify('1 day');
 					//echo __METHOD__.'() '.$this->current->format('l').', '.$this->current.": $this->weekdays & ".self::getWeekday($this->current)."<br />\n";
 				}
-				while(!($this->weekdays & self::getWeekday($this->current)));
+				while (!($this->weekdays&self::getWeekday($this->current)));
 				break;
 
 			case self::MONTHLY_WDAY:	// iCal: BYDAY={1, ..., 5, -1}{MO..SO}
 				// advance to start of next month
-				list($year,$month) = explode('-',$this->current->format('Y-m'));
-				$month += $this->interval+($this->monthly_byday_num < 0 ? 1 : 0);
-				$this->current->setDate($year,$month,$this->monthly_byday_num < 0 ? 0 : 1);
+				list($year, $month) = explode('-', $this->current->format('Y-m'));
+				$month += $this->interval + ($this->monthly_byday_num < 0 ? 1 : 0);
+				$this->current->setDate($year, $month, $this->monthly_byday_num < 0 ? 0 : 1);
 				//echo __METHOD__."() $this->monthly_byday_num".substr(self::$days[$this->monthly_byday_wday],0,2).": setDate($year,$month,1): ".$this->current->format('l').', '.$this->current."<br />\n";
 				// now advance to n-th week
 				if ($this->monthly_byday_num > 1)
 				{
-					$this->current->modify(($this->monthly_byday_num-1).' week');
+					$this->current->modify(($this->monthly_byday_num - 1).' week');
 					//echo __METHOD__."() $this->monthly_byday_num".substr(self::$days[$this->monthly_byday_wday],0,2).': modify('.($this->monthly_byday_num-1).' week): '.$this->current->format('l').', '.$this->current."<br />\n";
 				}
 				// advance to given weekday
-				while(!($this->weekdays & self::getWeekday($this->current)))
+				while (!($this->weekdays&self::getWeekday($this->current)))
 				{
 					$this->current->modify(($this->monthly_byday_num < 0 ? -1 : 1).' day');
 					//echo __METHOD__."() $this->monthly_byday_num".substr(self::$days[$this->monthly_byday_wday],0,2).': modify(1 day): '.$this->current->format('l').', '.$this->current."<br />\n";
@@ -427,10 +427,10 @@ 
 				break;
 
 			case self::MONTHLY_MDAY:	// iCal: monthly_bymonthday={1, ..., 31, -1}
-				list($year,$month) = explode('-',$this->current->format('Y-m'));
-				$day = $this->monthly_bymonthday+($this->monthly_bymonthday < 0 ? 1 : 0);
-				$month += $this->interval+($this->monthly_bymonthday < 0 ? 1 : 0);
-				$this->current->setDate($year,$month,$day);
+				list($year, $month) = explode('-', $this->current->format('Y-m'));
+				$day = $this->monthly_bymonthday + ($this->monthly_bymonthday < 0 ? 1 : 0);
+				$month += $this->interval + ($this->monthly_bymonthday < 0 ? 1 : 0);
+				$this->current->setDate($year, $month, $day);
 				//echo __METHOD__."() setDate($year,$month,$day): ".$this->current->format('l').', '.$this->current."<br />\n";
 				break;
 
@@ -452,7 +452,7 @@ 
 		{
 			$this->next_no_exception();
 		}
-		while($this->exceptions && in_array($this->current->format('Ymd'),$this->exceptions));
+		while ($this->exceptions && in_array($this->current->format('Ymd'), $this->exceptions));
 	}
 
 	/**
@@ -484,7 +484,7 @@ 
 		if (isset($this->current)) $backup = $this->current;
 		$this->rewind();
 
-		while(--$count > 0)
+		while (--$count > 0)
 		{
 			$this->next_no_exception();
 		}
@@ -509,7 +509,7 @@ 
 		// if enddate is now before next acurrence, but not on same day, we use previous recurrence
 		// this can happen if client gives an enddate which is NOT a recurrence date
 		// eg. for a on Monday recurring weekly event a Tuesday as enddate
-		if ($this->enddate < $this->current  && $this->current->format('Ymd') != $this->enddate->format('Ymd'))
+		if ($this->enddate < $this->current && $this->current->format('Ymd') != $this->enddate->format('Ymd'))
 		{
 			$last = $previous;
 		}
@@ -528,7 +528,7 @@ 
 		$this->current = clone $this->time;
 		while ($this->valid() &&
 			$this->exceptions &&
-			in_array($this->current->format('Ymd'),$this->exceptions))
+			in_array($this->current->format('Ymd'), $this->exceptions))
 		{
 			$this->next_no_exception();
 		}
@@ -539,7 +539,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
 		return $this->current->format('Ymd') <= $this->enddate_ymd;
 	}
@@ -553,9 +553,9 @@ 
 	{
 		$str = '';
 		// Repeated Events
-		if($this->type != self::NONE)
+		if ($this->type != self::NONE)
 		{
-			list($str) = explode(' (',lang(self::$types[$this->type]));	// remove (by day/date) from Monthly
+			list($str) = explode(' (', lang(self::$types[$this->type])); // remove (by day/date) from Monthly
 
 			$str_extra = array();
 			switch ($this->type)
@@ -571,7 +571,7 @@ 
 					{
 						$repeat_days[] = $this->type == self::WEEKLY ? lang('all') : lang('day');
 					}
-					elseif($this->weekdays == self::WORKDAYS)
+					elseif ($this->weekdays == self::WORKDAYS)
 					{
 						$repeat_days[] = $this->type == self::WEEKLY ? lang('workdays') : lang('workday');
 					}
@@ -579,24 +579,24 @@ 
 					{
 						foreach (self::$days as $mask => $label)
 						{
-							if ($this->weekdays & $mask)
+							if ($this->weekdays&$mask)
 							{
 								$repeat_days[] = lang($label);
 							}
 						}
 					}
-					if($this->type == self::WEEKLY && count($repeat_days))
+					if ($this->type == self::WEEKLY && count($repeat_days))
 					{
-						$str_extra[] = lang('days repeated').': '.implode(', ',$repeat_days);
+						$str_extra[] = lang('days repeated').': '.implode(', ', $repeat_days);
 					}
-					elseif($this->type == self::MONTHLY_WDAY)
+					elseif ($this->type == self::MONTHLY_WDAY)
 					{
-						$str_extra[] = ($this->monthly_byday_num == -1 ? lang('last') : $this->monthly_byday_num.'.').' '.implode(', ',$repeat_days);
+						$str_extra[] = ($this->monthly_byday_num == -1 ? lang('last') : $this->monthly_byday_num.'.').' '.implode(', ', $repeat_days);
 					}
 					break;
 
 			}
-			if($this->interval > 1)
+			if ($this->interval > 1)
 			{
 				$str_extra[] = lang('Interval').': '.$this->interval;
 			}
@@ -612,9 +612,9 @@ 
 			{
 				$str_extra[] = $this->time->getTimezone()->getName();
 			}
-			if(count($str_extra))
+			if (count($str_extra))
 			{
-				$str .= ' ('.implode(', ',$str_extra).')';
+				$str .= ' ('.implode(', ', $str_extra).')';
 			}
 		}
 		return $str;
@@ -626,24 +626,24 @@ 
 	 *
 	 * $return array	vCalendar RRULE
 	 */
-	public function generate_rrule($version='2.0')
+	public function generate_rrule($version = '2.0')
 	{
 		$repeat_days = array();
 		$rrule = array();
 
-		if ($this->type == self::NONE) return false;	// no recuring event
+		if ($this->type == self::NONE) return false; // no recuring event
 
 		if ($version == '1.0')
 		{
-			$rrule['FREQ'] = self::$recur_egw2ical_1_0[$this->type] . $this->interval;
+			$rrule['FREQ'] = self::$recur_egw2ical_1_0[$this->type].$this->interval;
 			switch ($this->type)
 			{
 				case self::WEEKLY:
 					foreach (self::$days as $mask => $label)
 					{
-						if ($this->weekdays & $mask)
+						if ($this->weekdays&$mask)
 						{
-							$repeat_days[] = strtoupper(substr($label,0,2));
+							$repeat_days[] = strtoupper(substr($label, 0, 2));
 						}
 					}
 					$rrule['BYDAY'] = implode(' ', $repeat_days);
@@ -656,7 +656,7 @@ 
 				case self::MONTHLY_WDAY:	// weekday of the month: BDAY={1..5}+ {MO..SO}
 					$rrule['BYDAY'] = abs($this->monthly_byday_num);
 					$rrule['BYDAY'] .= ($this->monthly_byday_num < 0) ? '- ' : '+ ';
-					$rrule['BYDAY'] .= strtoupper(substr($this->time->format('l'),0,2));
+					$rrule['BYDAY'] .= strtoupper(substr($this->time->format('l'), 0, 2));
 					$rrule['FREQ'] = $rrule['FREQ'].' '.$rrule['BYDAY'];
 					break;
 			}
@@ -674,9 +674,9 @@ 
 				case self::WEEKLY:
 					foreach (self::$days as $mask => $label)
 					{
-						if ($this->weekdays & $mask)
+						if ($this->weekdays&$mask)
 						{
-							$repeat_days[] = strtoupper(substr($label,0,2));
+							$repeat_days[] = strtoupper(substr($label, 0, 2));
 						}
 					}
 					$rrule['BYDAY'] = implode(',', $repeat_days);
@@ -687,8 +687,8 @@ 
 					break;
 
 				case self::MONTHLY_WDAY:	// weekday of the month: BDAY={1..5}{MO..SO}
-					$rrule['BYDAY'] = $this->monthly_byday_num .
-						strtoupper(substr($this->time->format('l'),0,2));
+					$rrule['BYDAY'] = $this->monthly_byday_num.
+						strtoupper(substr($this->time->format('l'), 0, 2));
 					break;
 			}
 			if ($this->interval > 1)
@@ -723,12 +723,12 @@ 
 	 *
 	 * @return calendar_rrule		false on error
 	 */
-	public static function event2rrule(array $event,$usertime=true,$to_tz=null)
+	public static function event2rrule(array $event, $usertime = true, $to_tz = null)
 	{
-		if (!is_array($event)  || !isset($event['tzid'])) return false;
+		if (!is_array($event) || !isset($event['tzid'])) return false;
 		if (!$to_tz) $to_tz = $event['tzid'];
 		$timestamp_tz = $usertime ? Api\DateTime::$user_timezone : Api\DateTime::$server_timezone;
-		$time = is_a($event['start'],'DateTime') ? $event['start'] : new Api\DateTime($event['start'],$timestamp_tz);
+		$time = is_a($event['start'], 'DateTime') ? $event['start'] : new Api\DateTime($event['start'], $timestamp_tz);
 
 		if (!isset(self::$tz_cache[$to_tz]))
 		{
@@ -741,16 +741,16 @@ 
 
 		if ($event['recur_enddate'])
 		{
-			$enddate = is_a($event['recur_enddate'],'DateTime') ? $event['recur_enddate'] : new Api\DateTime($event['recur_enddate'],$timestamp_tz);
+			$enddate = is_a($event['recur_enddate'], 'DateTime') ? $event['recur_enddate'] : new Api\DateTime($event['recur_enddate'], $timestamp_tz);
 		}
 		if (is_array($event['recur_exception']))
 		{
-			foreach($event['recur_exception'] as $exception)
+			foreach ($event['recur_exception'] as $exception)
 			{
-				$exceptions[] = is_a($exception,'DateTime') ? $exception : new Api\DateTime($exception,$timestamp_tz);
+				$exceptions[] = is_a($exception, 'DateTime') ? $exception : new Api\DateTime($exception, $timestamp_tz);
 			}
 		}
-		return new calendar_rrule($time,$event['recur_type'],$event['recur_interval'],$enddate,$event['recur_data'],$exceptions);
+		return new calendar_rrule($time, $event['recur_type'], $event['recur_interval'], $enddate, $event['recur_data'], $exceptions);
 	}
 
 	/**
@@ -776,7 +776,7 @@ 
 	 * @param DateTime/string		starttime of the event (in servertime)
 	 * @param string $to_tz			new timezone
 	 */
-	public static function rrule2tz(array &$event,$starttime,$to_tz)
+	public static function rrule2tz(array &$event, $starttime, $to_tz)
 	{
 		// We assume that the difference between timezones can result
 		// in a maximum of one day
@@ -797,7 +797,7 @@ 
 			self::$tz_cache[$to_tz] = calendar_timezones::DateTimeZone($to_tz);
 		}
 
-		$time = is_a($starttime,'DateTime') ?
+		$time = is_a($starttime, 'DateTime') ?
 			$starttime : new Api\DateTime($starttime, Api\DateTime::$server_timezone);
 		$time->setTimezone(self::$tz_cache[$event['tzid']]);
 		$remote = clone $time;
@@ -815,11 +815,11 @@ 
 					if ($delta == 1 || $delta == -6)
 					{
 						$mask = $mask << 1;
-						if ($mask & 128) $mask = $mask - 127; // overflow
+						if ($mask&128) $mask = $mask - 127; // overflow
 					}
 					else
 					{
-						if ($mask & 1) $mask = $mask + 128; // underflow
+						if ($mask&1) $mask = $mask + 128; // underflow
 						$mask = $mask >> 1;
 					}
 					$event['recur_data'] = $mask;
@@ -830,15 +830,15 @@ 
 
 if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)	// some tests
 {
-	ini_set('display_errors',1);
-	error_reporting(E_ALL & ~E_NOTICE);
+	ini_set('display_errors', 1);
+	error_reporting(E_ALL&~E_NOTICE);
 	function lang($str) { return $str; }
 	$GLOBALS['egw_info']['user']['preferences']['common']['tz'] = $_REQUEST['user-tz'] ? $_REQUEST['user-tz'] : 'Europe/Berlin';
 	require_once('../../api/src/autoload.php');
 
 	if (!isset($_REQUEST['time']))
 	{
-		$now = new Api\DateTime('now',new DateTimeZone($_REQUEST['tz'] = 'UTC'));
+		$now = new Api\DateTime('now', new DateTimeZone($_REQUEST['tz'] = 'UTC'));
 		$_REQUEST['time'] = $now->format();
 		$_REQUEST['type'] = calendar_rrule::WEEKLY;
 		$_REQUEST['interval'] = 2;
@@ -847,29 +847,29 @@ 
 		$_REQUEST['user-tz'] = 'Europe/Berlin';
 	}
 	echo "<html>\n<head>\n\t<title>Test calendar_rrule class</title>\n</head>\n<body>\n<form method='GET'>\n";
-	echo "<p>Date+Time: ".Api\Html::input('time',$_REQUEST['time']).
-		Api\Html::select('tz',$_REQUEST['tz'],Api\DateTime::getTimezones())."</p>\n";
-	echo "<p>Type: ".Api\Html::select('type',$_REQUEST['type'],calendar_rrule::$types)."\n".
-		"Interval: ".Api\Html::input('interval',$_REQUEST['interval'])."</p>\n";
+	echo "<p>Date+Time: ".Api\Html::input('time', $_REQUEST['time']).
+		Api\Html::select('tz', $_REQUEST['tz'], Api\DateTime::getTimezones())."</p>\n";
+	echo "<p>Type: ".Api\Html::select('type', $_REQUEST['type'], calendar_rrule::$types)."\n".
+		"Interval: ".Api\Html::input('interval', $_REQUEST['interval'])."</p>\n";
 	echo "<table><tr><td>\n";
-	echo "Weekdays:<br />".Api\Html::checkbox_multiselect('weekdays',$_REQUEST['weekdays'],calendar_rrule::$days,false,'','7',false,'height: 150px;')."\n";
+	echo "Weekdays:<br />".Api\Html::checkbox_multiselect('weekdays', $_REQUEST['weekdays'], calendar_rrule::$days, false, '', '7', false, 'height: 150px;')."\n";
 	echo "</td><td>\n";
-	echo "<p>Exceptions:<br />".Api\Html::textarea('exceptions',$_REQUEST['exceptions'],'style="height: 150px;"')."\n";
+	echo "<p>Exceptions:<br />".Api\Html::textarea('exceptions', $_REQUEST['exceptions'], 'style="height: 150px;"')."\n";
 	echo "</td></tr></table>\n";
-	echo "<p>Enddate: ".Api\Html::input('enddate',$_REQUEST['enddate'])."</p>\n";
-	echo "<p>Display recurances in ".Api\Html::select('user-tz',$_REQUEST['user-tz'],Api\DateTime::getTimezones())."</p>\n";
-	echo "<p>".Api\Html::submit_button('calc','Calculate')."</p>\n";
+	echo "<p>Enddate: ".Api\Html::input('enddate', $_REQUEST['enddate'])."</p>\n";
+	echo "<p>Display recurances in ".Api\Html::select('user-tz', $_REQUEST['user-tz'], Api\DateTime::getTimezones())."</p>\n";
+	echo "<p>".Api\Html::submit_button('calc', 'Calculate')."</p>\n";
 	echo "</form>\n";
 
 	$tz = new DateTimeZone($_REQUEST['tz']);
-	$time = new Api\DateTime($_REQUEST['time'],$tz);
-	if ($_REQUEST['enddate']) $enddate = new Api\DateTime($_REQUEST['enddate'],$tz);
-	$weekdays = 0; foreach((array)$_REQUEST['weekdays'] as $mask) { $weekdays |= $mask; }
-	if ($_REQUEST['exceptions']) foreach(preg_split("/[,\r\n]+ ?/",$_REQUEST['exceptions']) as $exception) { $exceptions[] = new Api\DateTime($exception); }
+	$time = new Api\DateTime($_REQUEST['time'], $tz);
+	if ($_REQUEST['enddate']) $enddate = new Api\DateTime($_REQUEST['enddate'], $tz);
+	$weekdays = 0; foreach ((array)$_REQUEST['weekdays'] as $mask) { $weekdays |= $mask; }
+	if ($_REQUEST['exceptions']) foreach (preg_split("/[,\r\n]+ ?/", $_REQUEST['exceptions']) as $exception) { $exceptions[] = new Api\DateTime($exception); }
 
-	$rrule = new calendar_rrule($time,$_REQUEST['type'],$_REQUEST['interval'],$enddate,$weekdays,$exceptions);
+	$rrule = new calendar_rrule($time, $_REQUEST['type'], $_REQUEST['interval'], $enddate, $weekdays, $exceptions);
 	echo "<h3>".$time->format('l').', '.$time.' ('.$tz->getName().') '.$rrule."</h3>\n";
-	foreach($rrule as $rtime)
+	foreach ($rrule as $rtime)
 	{
 		$rtime->setTimezone(Api\DateTime::$user_timezone);
 		echo ++$n.': '.$rtime->format('l').', '.$rtime."<br />\n";

calendar/inc/class.calendar_datasource.inc.php

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
 	 */
 	function __construct()
 	{
-		if (false) parent::__construct();	// can not be called, but gives IDE warning
+		if (false) parent::__construct(); // can not be called, but gives IDE warning
 
 		$this->datasource('calendar');
 
@@ -48,14 +48,14 @@ 
 
 		if (!is_array($data_id))
 		{
-			if (!(int) $data_id || !($data = $cal->read((int) $data_id)))
+			if (!(int)$data_id || !($data = $cal->read((int)$data_id)))
 			{
 				return false;
 			}
 		}
 		else
 		{
-			$data =& $data_id;
+			$data = & $data_id;
 		}
 		$ds = array(
 			'pe_title' => $cal->link_title($data),
@@ -65,7 +65,7 @@ 
 			'pe_details'       => $data['description'] ? nl2br($data['description']) : '',
 		);
 		// return first global category, as PM only supports one
-		foreach($data['category'] ? explode(',', $data['category']) : array() as $cat_id)
+		foreach ($data['category'] ? explode(',', $data['category']) : array() as $cat_id)
 		{
 			if (Api\Categories::is_global($cat_id))
 			{
@@ -74,13 +74,13 @@ 
 			}
 		}
 		// calculation of the time
-		$ds['pe_planned_time'] = (int) (($ds['pe_planned_end'] - $ds['pe_planned_start'])/60);	// time is in minutes
+		$ds['pe_planned_time'] = (int)(($ds['pe_planned_end'] - $ds['pe_planned_start']) / 60); // time is in minutes
 
 		// if the event spans multiple days, we have to substract the nights (24h - daily working time specified in PM)
-		if (($ds['pe_planned_time']/ 60 > 24) && date('Y-m-d',$ds['pe_planned_end']) != date('Y-m-d',$ds['pe_planned_start']))
+		if (($ds['pe_planned_time'] / 60 > 24) && date('Y-m-d', $ds['pe_planned_end']) != date('Y-m-d', $ds['pe_planned_start']))
 		{
 			$start = $end = null;
-			foreach(array('start','end') as $name)
+			foreach (array('start', 'end') as $name)
 			{
 				$arr = $cal->date2array($ds['pe_planned_'.$name]);
 				$arr['hour'] = 12;
@@ -92,7 +92,7 @@ 
 
 			if (!is_array($this->pm_config))
 			{
-				$c =& CreateObject('phpgwapi.config','projectmanager');
+				$c = & CreateObject('phpgwapi.config', 'projectmanager');
 				$c->read_repository();
 				$this->pm_config = $c->config_data;
 				unset($c);
@@ -100,7 +100,7 @@ 
 			}
 			$ds['pe_planned_time'] -= $nights * 60 * (24 - $this->pm_config['hours_per_workday']);
 		}
-		foreach($data['participants'] as $uid => $status)
+		foreach ($data['participants'] as $uid => $status)
 		{
 			if ($status != 'R' && is_numeric($uid))	// only users for now
 			{