EGroupware / egroupware

calendar/sitemgr/class.module_calendar_list.inc.php

Braces +16 added lines, -5 removed lines

@@ -165,7 +165,8 @@ 
 			$cat_ids[$category['id']] = $GLOBALS['egw']->strip_html($category['name']);
 		}
 		$this->arguments['category']['options'] = $cat_ids;
-		if (count($cat_ids) > 5) {
+		if (count($cat_ids) > 5)
+		{
 			$this->arguments['category']['multiple'] = 5;
 		}
 
@@ -310,8 +311,16 @@ 
 		foreach((array) $this->bo->search($search_params) as $event)
 		{
 			$event['date'] = $this->bo->date2string($event['start']);
-			if (empty($event['description'])) $event['description'] = ' ';	// no description screws the titles horz. alignment
-			if (empty($event['location'])) $event['location'] = ' ';	// no location screws the owner horz. alignment
+			if (empty($event['description']))
+			{
+				$event['description'] = ' ';
+			}
+			// no description screws the titles horz. alignment
+			if (empty($event['location']))
+			{
+				$event['location'] = ' ';
+			}
+			// no location screws the owner horz. alignment
 			$rows[] = $event;
 		}
 		if (($arguments['showWeeks']) && ((int)$arguments['offset'] == 0))
@@ -337,7 +346,8 @@ 
 				}
 				$last_week = adodb_date('W-Y',$event['start']);
 				$html .= "  <!-- Event -->\n";
-				if ($event_count % 2 == 0) {
+				if ($event_count % 2 == 0)
+				{
 					$html .= '  <div class="cal_list_event cal_event_even">'."\n";
 				}
 				else
@@ -353,7 +363,8 @@ 
 				$html .= '<span class="cal_list_weekday">'.lang(adodb_date('D',$event['end'])).".".($this->bo->common_prefs['dateformat'][0] != 'd' ? ' ' : ', ')."</span>";
 				$html .= $this->bo->format_date($event['end'])."</span></div>\n";
 				$descr = trim($event['description']);
-				if (! empty($descr)) {
+				if (! empty($descr))
+				{
 					$html .= "    <div class=\"cal_list_descr\">\n".preg_replace('/\\n/',"<br>\n",$event['description'])."</div>\n";
 				}
 				$html .= "  </div><!-- cal_list_event -->\n";

calendar/setup/tables_update.inc.php

Braces +12 added lines, -3 removed lines

@@ -1429,13 +1429,18 @@ 
 function calendar_upgrade1_0_1_008()
 {
 	$config_data = Api\Config::read('calendar');
-	if (isset($config_data['fields']))	// old custom fields
+	if (isset($config_data['fields']))
+	{
+		// old custom fields
 	{
 		$customfields = array();
+	}
 		$order = 0;
 		foreach($config_data['fields'] as $name => $data)
 		{
-			if ($name{0} == '#' && !$data['disabled'])	// real not-disabled custom field
+			if ($name{0} == '#' && !$data['disabled'])
+			{
+				// real not-disabled custom field
 			{
 				$customfields[substr($name,1)] = array(
 					'type'  => 'text',
@@ -1444,6 +1449,7 @@ 
 					'order' => ($order += 10),
 				);
 			}
+			}
 		}
 		if (count($customfields))
 		{
@@ -2589,9 +2595,12 @@ 
 			'cal_recur_date' => $row['cal_recur_date'],
 			'cal_user_type' => 'e',
 			$email.'='.$GLOBALS['egw_setup']->db->quote($row['email']),
-		), __LINE__, __FILE__, false, 'ORDER BY cal_status', 'calendar') as $user)	// order A, T, U, X
+		), __LINE__, __FILE__, false, 'ORDER BY cal_status', 'calendar') as $user)
+		{
+			// order A, T, U, X
 		{
 			if (strpos($user['email'], '@') !== false && !$n++) continue;
+		}
 			$GLOBALS['egw_setup']->db->delete('egw_cal_user', array_intersect_key($user, array_flip(array('cal_id','cal_recur_date','cal_user_type','cal_user_id','cal_status'))));
 		}
 	}

calendar/freebusy.php

Braces +12 added lines, -4 removed lines

@@ -44,15 +44,23 @@
 if (strpos($_SERVER['QUERY_STRING'],'=3D') !== false && substr($_GET['user'],0,2) == '3D')
 {
 	$_GET['user'] = substr($_GET['user'],2);
-	if (isset($_GET['password'])) $_GET['password'] = substr($_GET['password'],2);
-	if (isset($_GET['cred'])) $_GET['cred'] = substr($_GET['cred'],2);
-}
+	if (isset($_GET['password']))
+	{
+		$_GET['password'] = substr($_GET['password'],2);
+	}
+	if (isset($_GET['cred']))
+	{
+		$_GET['cred'] = substr($_GET['cred'],2);
+	}
+	}
 if (!is_numeric($user = $_GET['user']))
 {
 	// check if user contains the current domain --> remove it
 	list(,$domain) = explode('@',$user);
 	if ($domain === $GLOBALS['egw_info']['user']['domain'])
-	list($user) = explode('@',$user);
+	{
+		list($user) = explode('@',$user);
+	}
 	$user = $GLOBALS['egw']->accounts->name2id($user,'account_lid','u');
 }
 if ($user === false || !($username = $GLOBALS['egw']->accounts->id2name($user)))

calendar/inc/class.calendar_ical.inc.php

Braces +317 added lines, -81 removed lines

@@ -177,7 +177,10 @@ 
 	function __construct(&$_clientProperties = array())
 	{
 		parent::__construct();
-		if ($this->log) $this->logfile = $GLOBALS['egw_info']['server']['temp_dir']."/log-vcal";
+		if ($this->log)
+		{
+			$this->logfile = $GLOBALS['egw_info']['server']['temp_dir']."/log-vcal";
+		}
 		$this->clientProperties = $_clientProperties;
 		$this->vCalendar = new Horde_Icalendar;
 		$this->addressbook = new Api\Contacts;
@@ -226,10 +229,14 @@ 
 			'ATTACH'        => 'attachments',
 		);
 
-		if (!is_array($this->supportedFields)) $this->setSupportedFields();
+		if (!is_array($this->supportedFields))
+		{
+			$this->setSupportedFields();
+		}
 
 		if ($this->productManufacturer == '' )
-		{	// syncevolution is broken
+		{
+// syncevolution is broken
 			$version = '2.0';
 		}
 
@@ -237,10 +244,16 @@ 
 		$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);
+		if ($method)
+		{
+			$vcal->setAttribute('METHOD', $method);
+		}
 		$events_exported = false;
 
-		if (!is_array($events)) $events = array($events);
+		if (!is_array($events))
+		{
+			$events = array($events);
+		}
 
 		$vtimezones_added = array();
 		foreach ($events as $event)
@@ -306,7 +319,10 @@ 
 				self::$tz_cache[$event['tzid']] = calendar_timezones::DateTimeZone($event['tzid']);
 			}
 
-			if ($this->so->isWholeDay($event)) $event['whole_day'] = true;
+			if ($this->so->isWholeDay($event))
+			{
+				$event['whole_day'] = true;
+			}
 
 			if ($this->log)
 			{
@@ -317,7 +333,10 @@ 
 
 			if ($recurrence)
 			{
-				if (!($master = $this->read($event['id'], 0, true, 'server'))) continue;
+				if (!($master = $this->read($event['id'], 0, true, 'server')))
+				{
+					continue;
+				}
 
 				if (!isset($this->supportedFields['participants']))
 				{
@@ -374,7 +393,8 @@ 
 			if ($this->productManufacturer != 'file' && $this->uidExtension)
 			{
 				// Append UID to DESCRIPTION
-				if (!preg_match('/\[UID:.+\]/m', $event['description'])) {
+				if (!preg_match('/\[UID:.+\]/m', $event['description']))
+				{
 					$event['description'] .= "\n[UID:" . $event['uid'] . "]";
 				}
 			}
@@ -434,11 +454,21 @@ 
 							$quantity = $role = null;
 							calendar_so::split_status($status, $quantity, $role);
 							// do not include event owner/ORGANIZER as participant in his own calendar, if he is only participant
-							if (count($event['participants']) == 1 && $event['owner'] == $uid) continue;
+							if (count($event['participants']) == 1 && $event['owner'] == $uid)
+							{
+								continue;
+							}
 
-							if (!($info = $this->resource_info($uid))) continue;
+							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)
 							{
@@ -517,24 +547,49 @@ 
 							}
 							// ROLE={CHAIR|REQ-PARTICIPANT|OPT-PARTICIPANT|NON-PARTICIPANT|X-*}
 							$options = array();
-							if (!empty($participantCN)) $options['CN'] = $participantCN;
-							if (!empty($role)) $options['ROLE'] = $role;
-							if (!empty($status)) $options['PARTSTAT'] = $status;
-							if (!empty($cutype)) $options['CUTYPE'] = $cutype;
-							if (!empty($rsvp)) $options['RSVP'] = $rsvp;
+							if (!empty($participantCN))
+							{
+								$options['CN'] = $participantCN;
+							}
+							if (!empty($role))
+							{
+								$options['ROLE'] = $role;
+							}
+							if (!empty($status))
+							{
+								$options['PARTSTAT'] = $status;
+							}
+							if (!empty($cutype))
+							{
+								$options['CUTYPE'] = $cutype;
+							}
+							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
 							}
-							if ($info['type'] != 'e') $options['X-EGROUPWARE-UID'] = (string)$uid;
-							if ($quantity > 1) $options['X-EGROUPWARE-QUANTITY'] = (string)$quantity;
+							if ($info['type'] != 'e')
+							{
+								$options['X-EGROUPWARE-UID'] = (string)$uid;
+							}
+							if ($quantity > 1)
+							{
+								$options['X-EGROUPWARE-QUANTITY'] = (string)$quantity;
+							}
 							$attributes['ATTENDEE'][] = $participantURL;
 							$parameters['ATTENDEE'][] = $options;
 						}
 						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')
@@ -566,9 +621,18 @@ 
 									'CUTYPE'   => 'INDIVIDUAL',
 									//'RSVP'     => 'FALSE',
 									);
-								if (!empty($organizerCN)) $options['CN'] = $organizerCN;
-								if (!empty($organizerEMail)) $options['EMAIL'] = $organizerEMail;
-								if (!empty($event['owner'])) $options['X-EGROUPWARE-UID'] = $event['owner'];
+								if (!empty($organizerCN))
+								{
+									$options['CN'] = $organizerCN;
+								}
+								if (!empty($organizerEMail))
+								{
+									$options['EMAIL'] = $organizerEMail;
+								}
+								if (!empty($event['owner']))
+								{
+									$options['X-EGROUPWARE-UID'] = $event['owner'];
+								}
 								$attributes['ATTENDEE'][] = $organizerURL;
 			    				$parameters['ATTENDEE'][] = $options;
 		    				}
@@ -597,9 +661,12 @@ 
 						{
 							// Hack for CalDAVTester to export duration instead of endtime
 							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['duration'] = $event['end'] - $event['start'];
+							}
+							else {
+														$attributes['DTEND'] = self::getDateTime($event['end'],$tzid,$parameters['DTEND']);
+							}
 						}
 						else
 						{
@@ -619,7 +686,11 @@ 
 						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'])
@@ -653,7 +724,10 @@ 
 						break;
 
 					case 'EXDATE':
-						if ($event['recur_type'] == MCAL_RECUR_NONE) break;
+						if ($event['recur_type'] == MCAL_RECUR_NONE)
+						{
+							break;
+						}
 						if (!empty($event['recur_exception']))
 						{
 							if (empty($event['whole_day']))
@@ -680,14 +754,21 @@ 
 									);
 								}
 								$event['recur_exception'] = $days;
-								if ($version != '1.0') $parameters['EXDATE']['VALUE'] = 'DATE';
+								if ($version != '1.0')
+								{
+									$parameters['EXDATE']['VALUE'] = 'DATE';
+								}
 							}
 							$vevent->setAttribute('EXDATE', $event['recur_exception'], $parameters['EXDATE']);
 						}
 						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))
@@ -701,7 +782,11 @@ 
 						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);
@@ -758,7 +843,11 @@ 
 						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']))
 							{
@@ -884,7 +973,10 @@ 
 			foreach ((array)$event['alarm'] as $alarmData)
 			{
 				// skip over alarms that don't have the minimum required info
-				if (!isset($alarmData['offset']) && !isset($alarmData['time'])) continue;
+				if (!isset($alarmData['offset']) && !isset($alarmData['time']))
+				{
+					continue;
+				}
 
 				// skip alarms not being set for all users and alarms owned by other users
 				if ($alarmData['all'] != true && $alarmData['owner'] != $this->user)
@@ -901,7 +993,10 @@ 
 
 				if ($version == '1.0')
 				{
-					if ($event['title']) $description = $event['title'];
+					if ($event['title'])
+					{
+						$description = $event['title'];
+					}
 					if ($description)
 					{
 						$values['DALARM']['snooze_time'] = '';
@@ -921,7 +1016,10 @@ 
 					// VCalendar 2.0 / RFC 2445
 
 					// RFC requires DESCRIPTION for DISPLAY
-					if (!$event['title'] && !$description) $description = 'Alarm';
+					if (!$event['title'] && !$description)
+					{
+						$description = 'Alarm';
+					}
 
 					/* Disabling for now
 					// Lightning infinitly pops up alarms for recuring events, if the only use an offset
@@ -1112,13 +1210,20 @@ 
 		$this->events_imported = 0;
 		$replace = $delete_exceptions= false;
 
-		if (!is_array($this->supportedFields)) $this->setSupportedFields();
+		if (!is_array($this->supportedFields))
+		{
+			$this->setSupportedFields();
+		}
 
 		if (!($events = $this->icaltoegw($_vcalData, $principalURL, $charset)))
 		{
 			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,8 +1231,14 @@ 
 			{
 				$replace = $recur_date == 0;
 				$events[0]['id'] = $cal_id;
-				if (!is_null($etag)) $events[0]['etag'] = (int) $etag;
-				if ($recur_date) $events[0]['recurrence'] = $recur_date;
+				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')) &&
 					($eventId = array_shift($foundEvent)) &&
@@ -1135,7 +1246,10 @@ 
 			{
 				foreach ($events as $k => $event)
 				{
-					if (!isset($event['uid'])) $events[$k]['uid'] = $egwEvent['uid'];
+					if (!isset($event['uid']))
+					{
+						$events[$k]['uid'] = $egwEvent['uid'];
+					}
 				}
 			}
 		}
@@ -1165,10 +1279,17 @@ 
 		$msg = null;
 		foreach ($events as $event)
 		{
-			if (!is_array($event)) continue; // the iterator may return false
+			if (!is_array($event))
+			{
+				continue;
+			}
+			// the iterator may return false
 			++$this->events_imported;
 
-			if ($this->so->isWholeDay($event)) $event['whole_day'] = true;
+			if ($this->so->isWholeDay($event))
+			{
+				$event['whole_day'] = true;
+			}
 			if (is_array($event['category']))
 			{
 				$event['category'] = $this->find_or_add_categories($event['category'],
@@ -1205,7 +1326,10 @@ 
 						}
 						else
 						{
-							if (!($exception = $this->read($id))) continue;
+							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);
@@ -1294,7 +1418,10 @@ 
 								break;
 
 							default:
-								if (!empty($value)) $event[$key] = $value;
+								if (!empty($value))
+								{
+									$event[$key] = $value;
+								}
 						}
 					}
 				}
@@ -1392,7 +1519,10 @@ 
 			else // common adjustments for new events
 			{
 				unset($event['id']);
-				if ($caldav_name) $event['caldav_name'] = $caldav_name;
+				if ($caldav_name)
+				{
+					$event['caldav_name'] = $caldav_name;
+				}
 				// set non blocking all day depending on the user setting
 				if (!empty($event['whole_day']) && $this->nonBlockingAllday)
 				{
@@ -1440,7 +1570,10 @@ 
 					|| !isset($event['participants'][$event['owner']]))
 				{
 					$status = calendar_so::combine_status($event['owner'] == $this->user ? 'A' : 'U', 1, 'CHAIR');
-					if (!is_array($event['participants'])) $event['participants'] = array();
+					if (!is_array($event['participants']))
+					{
+						$event['participants'] = array();
+					}
 					$event['participants'][$event['owner']] = $status;
 				}
 				else
@@ -1593,7 +1726,10 @@ 
 								$occurence = $exception = false;
 								foreach ($event_info['master_event']['recur_exception'] as $exception)
 								{
-									if ($exception > $event['start']) break;
+									if ($exception > $event['start'])
+									{
+										break;
+									}
 									$occurence = $exception;
 								}
 								if (!$occurence)
@@ -1683,12 +1819,15 @@ 
 					case 'SERIES-MASTER':
 					case 'SERIES-EXCEPTION':
 					case 'SERIES-EXCEPTION-PROPAGATE':
-						if (is_array($event_info['stored_event'])) // status update requires a stored event
+						if (is_array($event_info['stored_event']))
+						{
+							// status update requires a stored event
 						{
 							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);
+						}
 							}
 							elseif (isset($event['participants'][$this->user]) || isset($event_info['stored_event']['participants'][$this->user]))
 							{
@@ -1700,9 +1839,12 @@ 
 						break;
 
 					case 'SERIES-PSEUDO-EXCEPTION':
-						if (is_array($event_info['master_event'])) // status update requires a stored master event
+						if (is_array($event_info['master_event']))
+						{
+							// status update requires a stored master event
 						{
 							$recurrence = $this->date2usertime($event['recurrence']);
+						}
 							if ($event_info['acl_edit'])
 							{
 								// update all participants if we have the right to do that
@@ -1775,7 +1917,10 @@ 
 	 */
 	public function sync_alarms(array &$event, array $old_alarms, $user)
 	{
-		if ($this->debug) error_log(__METHOD__."(".array2string($event).', old_alarms='.array2string($old_alarms).", $user,)");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."(".array2string($event).', old_alarms='.array2string($old_alarms).", $user,)");
+		}
 		$modified = 0;
 		foreach($event['alarm'] as &$alarm)
 		{
@@ -1799,19 +1944,40 @@ 
 			if ($alarm['offset'] != $old_alarm['offset'] || $old_alarm['owner'] != $user && !$alarm['all'])
 			{
 				$alarm['owner'] = $user;
-				if (!isset($alarm['time'])) $alarm['time'] = $event['start'] - $alarm['offset'];
-				if ($alarm['time'] < time()) calendar_so::shift_alarm($event, $alarm);
-				if ($this->debug) error_log(__METHOD__."() adding new alarm from client ".array2string($alarm));
-				if ($event['id']) $alarm['id'] = $this->save_alarm($event['id'], $alarm);
+				if (!isset($alarm['time']))
+				{
+					$alarm['time'] = $event['start'] - $alarm['offset'];
+				}
+				if ($alarm['time'] < time())
+				{
+					calendar_so::shift_alarm($event, $alarm);
+				}
+				if ($this->debug)
+				{
+					error_log(__METHOD__."() adding new alarm from client ".array2string($alarm));
+				}
+				if ($event['id'])
+				{
+					$alarm['id'] = $this->save_alarm($event['id'], $alarm);
+				}
 				++$modified;
 			}
 			// existing alarm --> update it
 			elseif ($alarm['offset'] == $old_alarm['offset'] && ($old_alarm['owner'] == $user || $old_alarm['all']))
 			{
-				if (!isset($alarm['time'])) $alarm['time'] = $event['start'] - $alarm['offset'];
-				if ($alarm['time'] < time()) calendar_so::shift_alarm($event, $alarm);
+				if (!isset($alarm['time']))
+				{
+					$alarm['time'] = $event['start'] - $alarm['offset'];
+				}
+				if ($alarm['time'] < time())
+				{
+					calendar_so::shift_alarm($event, $alarm);
+				}
 				$alarm = array_merge($old_alarm, $alarm);
-				if ($this->debug) error_log(__METHOD__."() updating existing alarm from client ".array2string($alarm));
+				if ($this->debug)
+				{
+					error_log(__METHOD__."() updating existing alarm from client ".array2string($alarm));
+				}
 				$alarm['id'] = $this->save_alarm($event['id'], $alarm);
 				++$modified;
 			}
@@ -1825,7 +1991,10 @@ 
 				unset($old_alarm[$id]);
 				continue;
 			}
-			if ($this->debug) error_log(__METHOD__."() deleting alarm '$id' deleted on client ".array2string($old_alarm));
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() deleting alarm '$id' deleted on client ".array2string($old_alarm));
+			}
 			$this->delete_alarm($id);
 			++$modified;
 		}
@@ -2244,7 +2413,10 @@ 
 				array2string($_vcalData)."\n",3,$this->logfile);
 		}
 
-		if (!is_array($this->supportedFields)) $this->setSupportedFields();
+		if (!is_array($this->supportedFields))
+		{
+			$this->setSupportedFields();
+		}
 
 		// we use Api\CalDAV\IcalIterator only on resources, as calling importVCal() accesses single events like an array (eg. $events[0])
 		if (is_resource($_vcalData))
@@ -2589,19 +2761,27 @@ 
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime(trim($recurenceMatches[2]));
 							}
-							else break;
+							else {
+								break;
+							}
 							// fall-through
 						case 'DAILY':	// 2.0
 							$vcardData['recur_type'] = MCAL_RECUR_DAILY;
-							if (stripos($recurence, 'BYDAY') === false) break;
+							if (stripos($recurence, 'BYDAY') === false)
+							{
+								break;
+							}
 							// hack to handle TYPE=DAILY;BYDAY= as WEEKLY, which is true as long as there's no interval
 							// fall-through
 						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));
@@ -2614,7 +2794,10 @@ 
 								$repeatMatches = null;
 								if (preg_match('/#(\d+)/',$recurenceMatches[4],$repeatMatches))
 								{
-									if ($repeatMatches[1]) $vcardData['recur_count'] = $repeatMatches[1];
+									if ($repeatMatches[1])
+									{
+										$vcardData['recur_count'] = $repeatMatches[1];
+									}
 								}
 								else
 								{
@@ -2623,9 +2806,12 @@ 
 
 								$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]);
+							}
 								$recur_days = $this->recur_days;
 							}
 							else	// no day given, use the day of dtstart
@@ -2684,7 +2870,10 @@ 
 							{
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
-							} else break;
+							}
+							else {
+								break;
+							}
 							// fall-through
 						case 'YEARLY':	// 2.0
 							if (strpos($recurence, 'BYDAY') === false)
@@ -2704,7 +2893,10 @@ 
 					}
 					break;
 				case 'EXDATE':
-					if (!$attributes['value']) break;
+					if (!$attributes['value'])
+					{
+						break;
+					}
 					if ((isset($attributes['params']['VALUE'])
 							&& $attributes['params']['VALUE'] == 'DATE') ||
 						(!isset($attributes['params']['VALUE']) && $isDate))
@@ -2784,13 +2976,16 @@ 
 					// fall throught
 				case 'ATTENDEE':
 					if (isset($attributes['params']['PARTSTAT']))
-				    {
+					{
 				    	$attributes['params']['STATUS'] = $attributes['params']['PARTSTAT'];
 				    }
 				    if (isset($attributes['params']['STATUS']))
-					{
+				    {
 						$status = $this->status_ical2egw[strtoupper($attributes['params']['STATUS'])];
-						if (empty($status)) $status = 'X';
+						if (empty($status))
+						{
+							$status = 'X';
+						}
 					}
 					else
 					{
@@ -2850,7 +3045,10 @@ 
 							$uid = $this->user;
 					}
 					// check principal url from CalDAV here after X-EGROUPWARE-UID and to get optional X-EGROUPWARE-QUANTITY
-					if (!$uid) $uid = Api\CalDAV\Principals::url2uid($attributes['value'], null, $cn);
+					if (!$uid)
+					{
+						$uid = Api\CalDAV\Principals::url2uid($attributes['value'], null, $cn);
+					}
 
 					// try to find an email address
 					if (!$uid && $email && ($uid = $GLOBALS['egw']->accounts->name2id($email, 'account_email')))
@@ -2918,7 +3116,10 @@ 
 								}
 								$status = 'U'; // keep the group
 							}
-							else continue; // can't find this group
+							else {
+								continue;
+							}
+							// can't find this group
 						}
 						elseif (empty($searcharray))
 						{
@@ -2977,7 +3178,9 @@ 
 
 								try {
 									if (!$this->calendarOwner && is_numeric($uid) && $role == 'CHAIR')
-										$component->getAttribute('ORGANIZER');
+									{
+																			$component->getAttribute('ORGANIZER');
+									}
 								}
 								catch(Horde_Icalendar_Exception $e)
 								{
@@ -3014,7 +3217,10 @@ 
 					}
 					break;
 				case 'CREATED':		// will be written direct to the event
-					if ($event['modified']) break;
+					if ($event['modified'])
+					{
+						break;
+					}
 					// fall through
 				case 'LAST-MODIFIED':	// will be written direct to the event
 					$event['modified'] = $attributes['value'];
@@ -3035,7 +3241,11 @@ 
 					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));
@@ -3166,7 +3376,10 @@ 
 			$event['end'] = $event['start'] + 60 * $this->cal_prefs['defaultlength'];
 		}
 
-		if ($this->calendarOwner) $event['owner'] = $this->calendarOwner;
+		if ($this->calendarOwner)
+		{
+			$event['owner'] = $this->calendarOwner;
+		}
 
 		// parsing ATTACH attributes for managed attachments
 		$event['attach-delete-by-put'] = $component->getAttributeDefault('X-EGROUPWARE-ATTACH-INCLUDED', null) === 'TRUE';
@@ -3192,7 +3405,10 @@ 
 				$filter = $relax ? 'relax' : 'check';
 				$event = array_shift($events);
 				$eventId = -1;
-				if ($this->so->isWholeDay($event)) $event['whole_day'] = true;
+				if ($this->so->isWholeDay($event))
+				{
+					$event['whole_day'] = true;
+				}
 				if ($contentID)
 				{
 					$parts = preg_split('/:/', $contentID);
@@ -3224,8 +3440,16 @@ 
 	 */
 	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'].'//'.
@@ -3247,10 +3471,13 @@ 
 				$attributes[$attr] = date('Ymd\THis', $value);
 			}
 		}
-		if (is_null($extra)) $extra = array(
+		if (is_null($extra))
+		{
+			$extra = array(
 			'URL' => $this->freebusy_url($user),
 			'ORGANIZER' => 'mailto:'.$GLOBALS['egw']->accounts->id2name($user,'account_email'),
 		);
+		}
 		foreach($attributes+$extra as $attr => $value)
 		{
 			$vfreebusy->setAttribute($attr, $value);
@@ -3266,9 +3493,18 @@ 
 		{
 			foreach ($fbdata as $event)
 			{
-				if ($event['non_blocking']) continue;
-				if ($event['uid'] === $extra['X-CALENDARSERVER-MASK-UID']) continue;
-				if ($event['participants'][$user] == 'R') continue;
+				if ($event['non_blocking'])
+				{
+					continue;
+				}
+				if ($event['uid'] === $extra['X-CALENDARSERVER-MASK-UID'])
+				{
+					continue;
+				}
+				if ($event['participants'][$user] == 'R')
+				{
+					continue;
+				}
 
 				$fbtype = $event['participants'][$user] == 'T' ? 'BUSY-TENTATIVE' : 'BUSY';
 

calendar/inc/class.calendar_uilist.inc.php

Braces +48 added lines, -13 removed lines

@@ -77,8 +77,14 @@ 
 	 */
 	function listview($_content=null,$msg='',$home=false)
 	{
-		if ($_GET['msg']) $msg .= $_GET['msg'];
-		if ($this->group_warning) $msg .= $this->group_warning;
+		if ($_GET['msg'])
+		{
+			$msg .= $_GET['msg'];
+		}
+		if ($this->group_warning)
+		{
+			$msg .= $this->group_warning;
+		}
 
 		$etpl = new Etemplate('calendar.list');
 
@@ -106,7 +112,8 @@ 
 			{
 				// Allow merge using the date range filter
 				if(strpos($_content['nm']['action'],'document') !== false &&
-					!count($_content['nm']['selected']) && !$_content['nm']['select_all']) {
+					!count($_content['nm']['selected']) && !$_content['nm']['select_all'])
+				{
 					$_content['nm']['selected'][] = $this->get_merge_range($_content['nm']);
 				}
 				if (!count($_content['nm']['selected']) && !$_content['nm']['select_all'])
@@ -165,15 +172,21 @@ 
 		{
 			$params = null;
 			parse_str(substr($json_data['request']['parameters'][0], 10), $params);	// cut off "/index.php?"
-			if (isset($params['keywords']))	// new search => set filters so every match is shown
+			if (isset($params['keywords']))
+			{
+				// new search => set filters so every match is shown
 			{
 				$this->adjust_for_search($params['keywords'], $content['nm']);
 			}
+			}
 		}
-		if (isset($_REQUEST['keywords']))	// new search => set filters so every match is shown
+		if (isset($_REQUEST['keywords']))
+		{
+			// new search => set filters so every match is shown
 		{
 			$this->adjust_for_search($_REQUEST['keywords'],$content['nm']);
 		}
+		}
 		$sel_options['filter'] = &$this->date_filters;
 
 		// Send categories for row styling - calendar uses no_cat, so they don't go automatically
@@ -264,9 +277,12 @@ 
 		$old_params = Api\Cache::getSession('calendar', 'calendar_list');
 		if (is_array($old_params))
 		{
-			if ($old_params['filter'] && $old_params['filter'] != $params['filter'])	// filter changed => order accordingly
+			if ($old_params['filter'] && $old_params['filter'] != $params['filter'])
+			{
+				// filter changed => order accordingly
 			{
 				$params['order'] = 'cal_start';
+			}
 				$params['sort'] = $params['filter'] == 'before' ? 'DESC' : 'ASC';
 			}
 			if ($old_params['search'] != $params['search'])
@@ -274,7 +290,10 @@ 
 				$this->adjust_for_search($params['search'],$params);
 			}
 		}
-		if (!$params['csv_export']) Api\Cache::setSession('calendar', 'calendar_list', $params);
+		if (!$params['csv_export'])
+		{
+			Api\Cache::setSession('calendar', 'calendar_list', $params);
+		}
 
 		// do we need to query custom fields and which
 		// Check stored preference if selectcols isn't available (ie: first call)
@@ -288,7 +307,10 @@ 
 			$cfs = array();
 			foreach($select_cols as $col)
 			{
-				if ($col[0] == '#') $cfs[] = substr($col,1);
+				if ($col[0] == '#')
+				{
+					$cfs[] = substr($col,1);
+				}
 			}
 		}
 		$search_params = array(
@@ -521,7 +543,10 @@ 
 		{
 			$rows['format'] = '64';
 		}
-		if ($this->cat_id) $rows['no_cat_id'] = true;
+		if ($this->cat_id)
+		{
+			$rows['no_cat_id'] = true;
+		}
 		if (!$GLOBALS['egw_info']['user']['apps']['projectmanager'])
 		{
 			$params['options-selectcols']['pm_id'] = false;
@@ -587,7 +612,10 @@ 
 			$this->get_rows($query,$events,$readonlys);
 			foreach($events as $key => $event)
 			{
-				if (!in_array($event['id'],$checked) && !in_array($event['id'].':'.$event['recur_date'], $checked)) unset($events[$key]);
+				if (!in_array($event['id'],$checked) && !in_array($event['id'].':'.$event['recur_date'], $checked))
+				{
+					unset($events[$key]);
+				}
 			}
 			$checked = array_values($events); // Clear keys
 		}
@@ -601,7 +629,10 @@ 
 				$ids = array();
 				foreach($checked as $id)
 				{
-					if (is_array($id)) $id = $id['id'];
+					if (is_array($id))
+					{
+						$id = $id['id'];
+					}
 					// get rid of recurrences, doublicate series and calendar-integration events
 					if (($id = (int)$id))
 					{
@@ -615,7 +646,10 @@ 
 				exit();
 
 			case 'document':
-				if (!$settings) $settings = $GLOBALS['egw_info']['user']['preferences']['calendar']['default_document'];
+				if (!$settings)
+				{
+					$settings = $GLOBALS['egw_info']['user']['preferences']['calendar']['default_document'];
+				}
 				$document_merge = new calendar_merge();
 				$msg = $document_merge->download($settings, $checked, '', $GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir']);
 				$failed = count($checked);
@@ -802,7 +836,8 @@ 
 						$success++;
 
 						// Can't link to just one of a recurring series of events
-						if(!$recur_date || $app) {
+						if(!$recur_date || $app)
+						{
 							// Create link
 							$link_id = $app ? $app_id : $id;
 							Link::link($app ? $app : 'calendar', $link_id, 'timesheet', $timesheet_bo->data['ts_id']);

calendar/inc/class.calendar_uiviews.inc.php

Braces +69 added lines, -21 removed lines

@@ -179,7 +179,10 @@ 
 	 */
 	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')))
@@ -237,7 +240,8 @@ 
 		$tmpl = new Etemplate('calendar.toolbar');
 		$tmpl->setElementAttribute('toolbar', 'actions', $this->getToolbarActions($content));
 		// Adjust toolbar for mobile
-		if(Api\Header\UserAgent::mobile()){
+		if(Api\Header\UserAgent::mobile())
+		{
 			$tmpl->setElementAttribute('toolbar','class', 'et2_head_toolbar');
 			$tmpl->setElementAttribute('toolbar','view_range', '3');
 		}
@@ -396,10 +400,12 @@ 
 		{
 			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 {
+				else
+				{
 					$actions[$key]['toolbarDefault'] = true;
 				}
 			}
@@ -416,29 +422,38 @@ 
 	 */
 	function &planner($content = array(), $home=false)
 	{
-		if ($this->sortby == 'month')	// yearly planner with month rows
+		if ($this->sortby == 'month')
+		{
+			// yearly planner with month rows
 		{
 			$this->first = $this->bo->date2array($this->date);
+		}
 			$this->first['day'] = 1;
 			unset($this->first['raw']);
 			$this->last = $this->first;
 			$this->last['year']++;
 			$this->last = $this->bo->date2ts($this->last)-1;
 		}
-		elseif (!$this->planner_view || $this->planner_view == 'month')	// planner monthview
+		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);
+		}
 			}
 			else	// show 2 half month
 			{
 				$this->_week_align_month($this->first,$this->last,15);
 			}
 		}
-		elseif ($this->planner_view == 'week' || $this->planner_view == 'weekN')	// weeekview
+		elseif ($this->planner_view == 'week' || $this->planner_view == 'weekN')
+		{
+			// weeekview
 		{
 			$start = new Api\DateTime($this->date);
+		}
 			$start->setWeekstart();
 			$this->first = $start->format('ts');
 			$this->last = $this->bo->date2array($this->first);
@@ -477,7 +492,10 @@ 
 			$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');
 
@@ -501,7 +519,10 @@ 
 	 */
 	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)
 		{
@@ -543,7 +564,10 @@ 
 			$weekNavH = "1 month";
 			$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;
@@ -588,7 +612,10 @@ 
 		$start->setWeekstart();
 		$first = $start->format('ts');
 		$start->setDate($this->year,$this->month+1,$day);
-		if ($day == 1) $start->add('-1day');
+		if ($day == 1)
+		{
+			$start->add('-1day');
+		}
 		$start->setWeekstart();
 		// now we need to calculate the end of the last day of that week
 		// as simple $last += WEEK_s - 1; does NOT work, if daylight saving changes in that week!!!
@@ -611,19 +638,31 @@ 
 		if (!$days)
 		{
 			$days = isset($_GET['days']) ? $_GET['days'] : $this->cal_prefs['days_in_weekview'];
-			if ($days != 5) $days = 7;
-			if ($days != $this->cal_prefs['days_in_weekview'])	// save the preference
+			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->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
+		if ($days <= 4)
+		{
+			// next 4 days view
 		{
 			$wd_start = $this->first = $this->bo->date2ts($this->date);
+		}
 			$this->last = strtotime("+$days days",$this->first) - 1;
 			$view = $days == 1 ? 'day' : 'day4';
 		}
@@ -632,12 +671,15 @@ 
 			$start = new Api\DateTime($this->date);
 			$start->setWeekstart();
 			$wd_start = $this->first = $start->format('ts');
-			if ($days <= 5)		// no weekend-days
+			if ($days <= 5)
+			{
+				// no weekend-days
 			{
 				switch($this->cal_prefs['weekdaystarts'])
 				{
 					case 'Saturday':
 						$this->first = strtotime("+2 days",$this->first);
+			}
 						break;
 					case 'Sunday':
 						$this->first = strtotime("+1 day",$this->first);
@@ -666,7 +708,10 @@ 
 			) + $this->search_params;
 
 		$users = $this->search_params['users'];
-		if (!is_array($users)) $users = array($users);
+		if (!is_array($users))
+		{
+			$users = array($users);
+		}
 
 		$content = array('view' => array());
 
@@ -689,8 +734,7 @@ 
 			$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
-			)
-			{
+			) {
 				$content['view'][] = (array)$this->tagWholeDayOnTop($this->bo->search($search_params)) +
 					array('owner' => $users);
 			}
@@ -793,7 +837,8 @@ 
 						}
 						$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" ');
@@ -914,7 +959,10 @@ 
 		// This disables the event actions for the grid rows (calendar weeks/owners)
 		foreach($actions as $id => &$action)
 		{
-			if($id=='add') continue;
+			if($id=='add')
+			{
+				continue;
+			}
 			if(!$action['enabled'])
 			{
 				$action['enabled'] = 'javaScript:app.calendar.is_event';

calendar/inc/class.calendar_groupdav.inc.php

Braces +225 added lines, -56 removed lines

@@ -120,7 +120,10 @@ 
 		}
 		else
 		{
-			if (!is_array($event)) $event = $this->bo->read($event);
+			if (!is_array($event))
+			{
+				$event = $this->bo->read($event);
+			}
 			$name = $event[self::$path_attr];
 		}
 		$name .= self::$path_extension;
@@ -181,10 +184,13 @@ 
 			}
 			$filter[$name] = $this->bo->now + 24*3600*($name == 'start' ? -1 : 1)*abs($value);
 		}
-		if ($this->client_shared_uid_exceptions)	// do NOT return (non-virtual) exceptions
+		if ($this->client_shared_uid_exceptions)
+		{
+			// do NOT return (non-virtual) exceptions
 		{
 			$filter['query'] = array('cal_reference' => 0);
 		}
+		}
 
 		if ($path == '/calendar/')
 		{
@@ -214,7 +220,11 @@ 
 			// when trying to request not supported components, eg. VTODO on a calendar collection
 			return true;
 		}
-		if ($id) $path = dirname($path).'/';	// caldav_name get's added anyway in the callback
+		if ($id)
+		{
+			$path = dirname($path).'/';
+		}
+		// caldav_name get's added anyway in the callback
 
 		if ($this->debug > 1)
 		{
@@ -276,7 +286,11 @@ 
 		$n = 0;
 		foreach($files as $file)
 		{
-			if (!$n++) continue;	// first entry is collection itself
+			if (!$n++)
+			{
+				continue;
+			}
+			// first entry is collection itself
 
 			$icalendar = $file['props']['calendar-data']['val'];
 			if (($start = strpos($icalendar, 'BEGIN:VEVENT')) !== false &&
@@ -320,10 +334,17 @@ 
 	 */
 	function propfind_callback($path,array $filter,$start=false)
 	{
-		if ($this->debug) $starttime = microtime(true);
+		if ($this->debug)
+		{
+			$starttime = microtime(true);
+		}
 
 		$calendar_data = $this->caldav->prop_requested('calendar-data', Api\CalDAV::CALDAV, true);
-		if (!is_array($calendar_data)) $calendar_data = false;	// not in allprop or autoindex
+		if (!is_array($calendar_data))
+		{
+			$calendar_data = false;
+		}
+		// not in allprop or autoindex
 
 		$files = array();
 
@@ -481,7 +502,10 @@ 
 				switch($filter['name'])
 				{
 					case 'comp-filter':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
+						}
 
 						switch($filter['attrs']['name'])
 						{
@@ -496,14 +520,23 @@ 
 						}
 						break;
 					case 'prop-filter':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) prop-filter='{$filter['attrs']['name']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) prop-filter='{$filter['attrs']['name']}'");
+						}
 						$prop_filter = $filter['attrs']['name'];
 						break;
 					case 'text-match':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) text-match: $prop_filter='{$filter['data']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) text-match: $prop_filter='{$filter['data']}'");
+						}
 						if (!isset($this->filter_prop2cal[strtoupper($prop_filter)]))
 						{
-							if ($this->debug) error_log(__METHOD__."($options[path],".array2string($options).",...) unknown property '$prop_filter' --> ignored");
+							if ($this->debug)
+							{
+								error_log(__METHOD__."($options[path],".array2string($options).",...) unknown property '$prop_filter' --> ignored");
+							}
 						}
 						else
 						{
@@ -512,10 +545,16 @@ 
 						unset($prop_filter);
 						break;
 					case 'param-filter':
-						if ($this->debug) error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
+						if ($this->debug)
+						{
+							error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
+						}
 						break;
 					case 'time-range':
-				 		if ($this->debug > 1) error_log(__FILE__ . __METHOD__."($options[path],...) time-range={$filter['attrs']['start']}-{$filter['attrs']['end']}");
+				 		if ($this->debug > 1)
+				 		{
+				 			error_log(__FILE__ . __METHOD__."($options[path],...) time-range={$filter['attrs']['start']}-{$filter['attrs']['end']}");
+				 		}
 				 		if (!empty($filter['attrs']['start']))
 				 		{
 					 		$cal_filters['start'] = $this->vCalendar->_parseDateTime($filter['attrs']['start']);
@@ -526,13 +565,19 @@ 
 				 		}
 						break;
 					default:
-						if ($this->debug) error_log(__METHOD__."($options[path],".array2string($options).",...) unknown filter --> ignored");
+						if ($this->debug)
+						{
+							error_log(__METHOD__."($options[path],".array2string($options).",...) unknown filter --> ignored");
+						}
 						break;
 				}
 			}
-			if (count($cal_filters) == $num_filters)	// no filters set --> restore default start and end time
+			if (count($cal_filters) == $num_filters)
+			{
+				// no filters set --> restore default start and end time
 			{
 				$cal_filters['start'] = $cal_start;
+			}
 				$cal_filters['end']   = $cal_end;
 			}
 		}
@@ -609,7 +654,10 @@ 
 				}
 			}
 
-			if ($this->debug > 1) error_log(__FILE__ . __METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids).', cal_filters='.array2string($cal_filters));
+			if ($this->debug > 1)
+			{
+				error_log(__FILE__ . __METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids).', cal_filters='.array2string($cal_filters));
+			}
 		}
 		return true;
 	}
@@ -655,9 +703,15 @@ 
 	private function iCal(array $event,$user=null, $method=null, $expand=false)
 	{
 		static $handler = null;
-		if (is_null($handler)) $handler = $this->_get_handler();
+		if (is_null($handler))
+		{
+			$handler = $this->_get_handler();
+		}
 
-		if (!$user) $user = $GLOBALS['egw_info']['user']['account_id'];
+		if (!$user)
+		{
+			$user = $GLOBALS['egw_info']['user']['account_id'];
+		}
 
 		// only return alarms in own calendar, not other users calendars
 		if ($user != $GLOBALS['egw_info']['user']['account_id'])
@@ -673,8 +727,14 @@ 
 		{
 			if (is_array($expand))
 			{
-				if (isset($expand['start'])) $expand['start'] = $this->vCalendar->_parseDateTime($expand['start']);
-				if (isset($expand['end'])) $expand['end'] = $this->vCalendar->_parseDateTime($expand['end']);
+				if (isset($expand['start']))
+				{
+					$expand['start'] = $this->vCalendar->_parseDateTime($expand['start']);
+				}
+				if (isset($expand['end']))
+				{
+					$expand['end'] = $this->vCalendar->_parseDateTime($expand['end']);
+				}
 			}
 			$events =& self::get_series($event['uid'], $this->bo, $expand, $user);
 		}
@@ -698,7 +758,10 @@ 
 	 */
 	private static function &get_series($uid,calendar_bo $bo=null, $expand=false, $user=null)
 	{
-		if (is_null($bo)) $bo = new calendar_bopdate();
+		if (is_null($bo))
+		{
+			$bo = new calendar_bopdate();
+		}
 
 		$params = array(
 			'query' => array('cal_uid' => $uid),
@@ -707,7 +770,10 @@ 
 			'date_format' => 'server',
 			'cfs' => array(),	// read cfs as we use them to store X- attributes
 		);
-		if (is_array($expand)) $params += $expand;
+		if (is_array($expand))
+		{
+			$params += $expand;
+		}
 
 		if (!($events =& $bo->search($params)))
 		{
@@ -728,12 +794,17 @@ 
 			}
 		}
 		// if recurring event starts in future behind horizont, nothing will be returned by bo::search()
-		if (!isset($master)) $master = $bo->read($uid);
+		if (!isset($master))
+		{
+			$master = $bo->read($uid);
+		}
 
 		foreach($events as $k => &$recurrence)
 		{
 			//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($uid)[$k]:" . array2string($recurrence));
-			if (!$master || $recurrence['id'] != $master['id'])	// real exception
+			if (!$master || $recurrence['id'] != $master['id'])
+			{
+				// real exception
 			{
 				// user is NOT participating in this exception
 				if ($user && !self::isParticipant($recurrence, $user))
@@ -742,6 +813,7 @@ 
 					if (!$master || !self::isParticipant($master, $user))
 					{
 						unset($events[$k]);
+			}
 						continue;
 					}
 					// otherwise mark him in this exception as rejected
@@ -777,7 +849,10 @@ 
 			// this is a virtual exception now (no extra event/cal_id in DB)
 			//error_log('virtual exception: '.array2string($recurrence));
 			$recurrence['recurrence'] = $recurrence['start'];
-			if ($master) $recurrence['reference'] = $master['id'];
+			if ($master)
+			{
+				$recurrence['reference'] = $master['id'];
+			}
 			$recurrence['recur_type'] = MCAL_RECUR_NONE;	// is set, as this is a copy of the master
 			// not for included exceptions (Lightning): $master['recur_exception'][] = $recurrence['start'];
 		}
@@ -814,9 +889,16 @@ 
 	 */
 	function put(&$options,$id,$user=null,$prefix=null)
 	{
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($id, $user)".print_r($options,true));
+		}
 
-		if (!$prefix) $user = null;	// /infolog/ does not imply setting the current user (for new entries it's done anyway)
+		if (!$prefix)
+		{
+			$user = null;
+		}
+		// /infolog/ does not imply setting the current user (for new entries it's done anyway)
 
 		// fix for iCal4OL using WinHTTP only supporting a certain header length
 		if (isset($_SERVER['HTTP_IF_SCHEDULE']) && !isset($_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH']))
@@ -828,7 +910,10 @@ 
 			isset($_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH']));	// dont fail with 412 Precondition Failed in that case
 		if (!is_null($oldEvent) && !is_array($oldEvent))
 		{
-			if ($this->debug) error_log(__METHOD__.': '.print_r($oldEvent,true).function_backtrace());
+			if ($this->debug)
+			{
+				error_log(__METHOD__.': '.print_r($oldEvent,true).function_backtrace());
+			}
 			return $oldEvent;
 		}
 
@@ -839,7 +924,10 @@ 
 		{
 			// we have no add permission on this user's calendar
 			// ToDo: create event in current users calendar and invite only $user
-			if ($this->debug) error_log(__METHOD__."(,,$user) we have not enough rights on this calendar");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(,,$user) we have not enough rights on this calendar");
+			}
 			return '403 Forbidden';
 		}
 
@@ -887,13 +975,19 @@ 
 			if ($this->use_schedule_tag && isset($_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH']))
 			{
 				$schedule_tag_match = $_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH'];
-				if ($schedule_tag_match[0] == '"') $schedule_tag_match = substr($schedule_tag_match, 1, -1);
+				if ($schedule_tag_match[0] == '"')
+				{
+					$schedule_tag_match = substr($schedule_tag_match, 1, -1);
+				}
 				$schedule_tag = null;
 				$this->get_etag($oldEvent, $schedule_tag);
 
 				if ($schedule_tag_match !== $schedule_tag)
 				{
-					if ($this->debug) error_log(__METHOD__."(,,$user) schedule_tag missmatch: given '$schedule_tag_match' != '$schedule_tag'");
+					if ($this->debug)
+					{
+						error_log(__METHOD__."(,,$user) schedule_tag missmatch: given '$schedule_tag_match' != '$schedule_tag'");
+					}
 					// honor Prefer: return=representation for 412 too (no need for client to explicitly reload)
 					$this->check_return_representation($options, $id, $user);
 					return '412 Precondition Failed';
@@ -908,7 +1002,10 @@ 
 					// above can be true, if current user is not in master but just a recurrence
 					(!$oldEvent['recur_type'] || !($series = self::get_series($oldEvent['uid'], $this->bo))))
 				{
-					if ($this->debug) error_log(__METHOD__."(,,$user) user $user is NOT an attendee!");
+					if ($this->debug)
+					{
+						error_log(__METHOD__."(,,$user) user $user is NOT an attendee!");
+					}
 					return '403 Forbidden';
 				}
 				// update only participant status and alarms of current user
@@ -928,7 +1025,10 @@ 
 							}
 							foreach($series as $oldEvent)
 							{
-								if ($oldEvent['recurrence'] == $event['recurrence']) break;
+								if ($oldEvent['recurrence'] == $event['recurrence'])
+								{
+									break;
+								}
 							}
 							// if no exception found, check if it might be just a recurrence (no exception)
 							if ($event['recurrence'] && $oldEvent['recurrence'] != $event['recurrence'])
@@ -943,7 +1043,10 @@ 
 								}
 							}
 						}
-						if ($this->debug) error_log(__METHOD__."(, $id, $user, '$prefix') eventId=$eventId ($oldEvent[id]), user=$user, old-status='{$oldEvent['participants'][$user]}', new-status='{$event['participants'][$user]}', recurrence=$event[recurrence]=".Api\DateTime::to($event['recurrence']).", event=".array2string($event));
+						if ($this->debug)
+						{
+							error_log(__METHOD__."(, $id, $user, '$prefix') eventId=$eventId ($oldEvent[id]), user=$user, old-status='{$oldEvent['participants'][$user]}', new-status='{$event['participants'][$user]}', recurrence=$event[recurrence]=".Api\DateTime::to($event['recurrence']).", event=".array2string($event));
+						}
 						if (isset($event['participants']) && isset($event['participants'][$user]) &&
 							$event['participants'][$user] !== $oldEvent['participants'][$user])
 						{
@@ -951,13 +1054,19 @@ 
 								// real (not virtual) exceptions use recurrence 0 in egw_cal_user.cal_recurrence!
 								$recurrence = $eventId == $oldEvent['id'] ? $event['recurrence'] : 0))
 							{
-								if ($this->debug) error_log(__METHOD__."(,,$user) failed to set_status($oldEvent[id], $user, '{$event['participants'][$user]}', $recurrence=".Api\DateTime::to($recurrence).')');
+								if ($this->debug)
+								{
+									error_log(__METHOD__."(,,$user) failed to set_status($oldEvent[id], $user, '{$event['participants'][$user]}', $recurrence=".Api\DateTime::to($recurrence).')');
+								}
 								return '403 Forbidden';
 							}
 							else
 							{
 								++$modified;
-								if ($this->debug) error_log(__METHOD__."() set_status($oldEvent[id], $user, {$event['participants'][$user]} , $recurrence=".Api\DateTime::to($recurrence).')');
+								if ($this->debug)
+								{
+									error_log(__METHOD__."() set_status($oldEvent[id], $user, {$event['participants'][$user]} , $recurrence=".Api\DateTime::to($recurrence).')');
+								}
 							}
 						}
 						// import alarms, if given and changed
@@ -967,15 +1076,21 @@ 
 							$modified += $handler->sync_alarms($event, (array)$oldEvent['alarm'], $user);
 						}
 					}
-					if (!$modified)	// NO modififictions, or none we understood --> log it and return Ok: "204 No Content"
+					if (!$modified)
+					{
+						// NO modififictions, or none we understood --> log it and return Ok: "204 No Content"
 					{
 						$this->caldav->log(__METHOD__."(,,$user) NO changes for current user events=".array2string($events).', old-event='.array2string($oldEvent));
 					}
+					}
 					$this->put_response_headers($eventId, $options['path'], '204 No Content', self::$path_attr == 'caldav_name');
 
 					return '204 No Content';
 				}
-				if ($this->debug && !isset($events)) error_log(__METHOD__."(,,$user) only schedule-tag given for event without participants (only calendar owner) --> handle as regular PUT");
+				if ($this->debug && !isset($events))
+				{
+					error_log(__METHOD__."(,,$user) only schedule-tag given for event without participants (only calendar owner) --> handle as regular PUT");
+				}
 			}
 			if ($return_no_access)
 			{
@@ -1007,17 +1122,23 @@ 
 		if (!($cal_id = $handler->importVCal($vCalendar, $eventId,
 			self::etag2value($this->http_if_match), false, 0, $this->caldav->current_user_principal, $user, $charset, $id)))
 		{
-			if ($this->debug) error_log(__METHOD__."(,$id) eventId=$eventId: importVCal('$options[content]') returned ".array2string($cal_id));
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(,$id) eventId=$eventId: importVCal('$options[content]') returned ".array2string($cal_id));
+			}
 			if ($eventId && $cal_id === false)
 			{
 				// ignore import failures
 				$cal_id = $eventId;
 				$retval = true;
 			}
-			elseif ($cal_id === 0)	// etag failure
+			elseif ($cal_id === 0)
+			{
+				// etag failure
 			{
 				// honor Prefer: return=representation for 412 too (no need for client to explicitly reload)
 				$this->check_return_representation($options, $id, $user);
+			}
 				return '412 Precondition Failed';
 			}
 			else
@@ -1042,7 +1163,10 @@ 
 	 */
 	function post(&$options,$id,$user=null)
 	{
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($id, $user)".print_r($options,true));
+		}
 
 		$vCalendar = htmlspecialchars_decode($options['content']);
 		$charset = null;
@@ -1097,7 +1221,10 @@ 
 				if (!($cal_id = $handler->importVCal($vCalendar, $eventId, null,
 					false, 0, $this->caldav->current_user_principal, $user, $charset)))
 				{
-					if ($this->debug) error_log(__METHOD__."() importVCal($eventId) returned false");
+					if ($this->debug)
+					{
+						error_log(__METHOD__."() importVCal($eventId) returned false");
+					}
 				}
 				header('ETag: "'.$this->get_etag($eventId).'"');
 			}
@@ -1265,7 +1392,10 @@ 
 		$org_recurrences = $exceptions = array();
 		foreach(self::get_series($events[0]['uid'],$bo) as $k => $event)
 		{
-			if (!$k) $master = $event;
+			if (!$k)
+			{
+				$master = $event;
+			}
 			if ($event['recurrence'])
 			{
 				$org_recurrences[$event['recurrence']] = $event;
@@ -1285,10 +1415,13 @@ 
 
 			// from now on we deal with exceptions
 			$org_recurrence = $org_recurrences[$recurrence['recurrence']];
-			if (isset($org_recurrence))	// already existing recurrence
+			if (isset($org_recurrence))
+			{
+				// already existing recurrence
 			{
 				//error_log(__METHOD__.'() setting id #'.$org_recurrence['id']).' for '.$recurrence['recurrence'].' = '.date('Y-m-d H:i:s',$recurrence['recurrence']);
 				$recurrence['id'] = $org_recurrence['id'];
+			}
 
 				// re-add (non-virtual) exceptions to master's recur_exception
 				if ($recurrence['id'] != $master['id'])
@@ -1305,10 +1438,14 @@ 
 		// delete not longer existing recurrences
 		foreach($org_recurrences as $org_recurrence)
 		{
-			if ($org_recurrence['id'] != $master['id'])	// non-virtual recurrence
+			if ($org_recurrence['id'] != $master['id'])
+			{
+				// non-virtual recurrence
 			{
 				//error_log(__METHOD__.'() deleting #'.$org_recurrence['id']);
-				$bo->delete($org_recurrence['id']);	// might fail because of permissions
+				$bo->delete($org_recurrence['id']);
+			}
+			// might fail because of permissions
 			}
 			else	// virtual recurrence
 			{
@@ -1339,7 +1476,7 @@ 
 		if (!is_array($event = $this->_common_get_put_delete('DELETE',$options,$id,$return_no_access)) || !$return_no_access)
 		{
  			if (!$return_no_access)
-			{
+ 			{
 				// check if user is a participant or one of the groups he is a member of --> reject the meeting request
 				$ret = '403 Forbidden';
 				$memberships = $GLOBALS['egw']->accounts->memberships($this->bo->user, true);
@@ -1362,7 +1499,10 @@ 
 		{
 			$ret = $this->bo->delete($event['id']);
 		}
-		if ($this->debug) error_log(__METHOD__."(,$id) return_no_access=$return_no_access, event[participants]=".array2string(is_array($event)?$event['participants']:null).", user={$this->bo->user} --> return ".array2string($ret));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."(,$id) return_no_access=$return_no_access, event[participants]=".array2string(is_array($event)?$event['participants']:null).", user={$this->bo->user} --> return ".array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -1377,16 +1517,26 @@ 
 	 */
 	function read($id)
 	{
-		if (strpos($column=self::$path_attr,'_') === false) $column = 'cal_'.$column;
+		if (strpos($column=self::$path_attr,'_') === false)
+		{
+			$column = 'cal_'.$column;
+		}
 
 		$event = $this->bo->read(array($column => $id, 'cal_deleted IS NULL', 'cal_reference=0'), null, true, 'server');
-		if ($event) $event = array_shift($event);	// read with array as 1. param, returns an array of events!
+		if ($event)
+		{
+			$event = array_shift($event);
+		}
+		// read with array as 1. param, returns an array of events!
 
 		if (!($retval = $this->bo->check_perms(calendar_bo::ACL_FREEBUSY,$event, 0, 'server')) &&
 			// above can be true, if current user is not in master but just a recurrence
 			(!$event['recur_type'] || !($events = self::get_series($event['uid'], $this->bo))))
 		{
-			if ($this->debug > 0) error_log(__METHOD__."($id) no READ or FREEBUSY rights returning ".array2string($retval));
+			if ($this->debug > 0)
+			{
+				error_log(__METHOD__."($id) no READ or FREEBUSY rights returning ".array2string($retval));
+			}
 			return $retval;
 		}
 		if (!$this->bo->check_perms(Acl::READ, $event, 0, 'server'))
@@ -1394,9 +1544,15 @@ 
 			$this->bo->clear_private_infos($event, array($this->bo->user, $event['owner']));
 		}
 		// handle deleted events, as not existing
-		if ($event['deleted']) $event = null;
+		if ($event['deleted'])
+		{
+			$event = null;
+		}
 
-		if ($this->debug > 1) error_log(__METHOD__."($id) returning ".array2string($event));
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__."($id) returning ".array2string($event));
+		}
 
 		return $event;
 	}
@@ -1408,7 +1564,10 @@ 
 	 */
 	public function update_tags($entry)
 	{
-		if (!is_array($entry)) $entry = $this->read($entry);
+		if (!is_array($entry))
+		{
+			$entry = $this->read($entry);
+		}
 
 		$this->bo->update($entry, true);
 	}
@@ -1422,7 +1581,10 @@ 
 	{
 		$ctag = $this->bo->get_ctag($user,$path == '/calendar/' ? 'owner' : 'default'); // default = not rejected
 
-		if ($this->debug > 1) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user] = $ctag");
+		if ($this->debug > 1)
+		{
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user] = $ctag");
+		}
 
 		return $ctag;
 	}
@@ -1553,7 +1715,10 @@ 
 		$handler = new calendar_ical();
 		$handler->setSupportedFields('GroupDAV',$this->agent);
 		$handler->supportedFields['attachments'] = true;	// enabling attachments
-		if ($this->debug > 1) error_log("ical Handler called: " . $this->agent);
+		if ($this->debug > 1)
+		{
+			error_log("ical Handler called: " . $this->agent);
+		}
 		return $handler;
 	}
 
@@ -1624,7 +1789,11 @@ 
 			{
 				$calendars[$entry['grantor']] = $entry['name'];
 			}
-			if ($user > 0) unset($calendars[$user]);	// skip current user
+			if ($user > 0)
+			{
+				unset($calendars[$user]);
+			}
+			// skip current user
 		}
 
 		$settings = array();

calendar/inc/class.calendar_rrule.inc.php

Braces +58 added lines, -14 removed lines

@@ -338,7 +338,10 @@ 
 				$duration = 366*24*3600;
 				break;
 		}
-		if ($interval > 1) $duration *= $interval;
+		if ($interval > 1)
+		{
+			$duration *= $interval;
+		}
 
 		return $duration;
 	}
@@ -481,7 +484,10 @@ 
 		{
 			return clone $this->time;
 		}
-		if (isset($this->current)) $backup = $this->current;
+		if (isset($this->current))
+		{
+			$backup = $this->current;
+		}
 		$this->rewind();
 
 		while(--$count > 0)
@@ -489,7 +495,10 @@ 
 			$this->next_no_exception();
 		}
 		$ret = clone $this->current;
-		if ($backup) $this->current = $backup;
+		if ($backup)
+		{
+			$this->current = $backup;
+		}
 		return $ret;
 	}
 
@@ -631,7 +640,11 @@ 
 		$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')
 		{
@@ -725,8 +738,14 @@ 
 	 */
 	public static function event2rrule(array $event,$usertime=true,$to_tz=null)
 	{
-		if (!is_array($event)  || !isset($event['tzid'])) return false;
-		if (!$to_tz) $to_tz = $event['tzid'];
+		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);
 
@@ -786,7 +805,10 @@ 
 			$event['recur_type'] == self::NONE ||
 			empty($event['recur_data']) || $event['recur_data'] == ALLDAYS ||
 			empty($event['tzid']) || empty($to_tz) ||
-			$event['tzid'] == $to_tz) return;
+			$event['tzid'] == $to_tz)
+		{
+			return;
+		}
 
 		if (!isset(self::$tz_cache[$event['tzid']]))
 		{
@@ -815,11 +837,19 @@ 
 					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;
@@ -828,11 +858,16 @@ 
 	}
 }
 
-if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)	// some tests
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)
+{
+	// some tests
 {
 	ini_set('display_errors',1);
+}
 	error_reporting(E_ALL & ~E_NOTICE);
-	function lang($str) { return $str; }
+	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');
 
@@ -863,9 +898,18 @@ 
 
 	$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); }
+	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);
 	echo "<h3>".$time->format('l').', '.$time.' ('.$tz->getName().') '.$rrule."</h3>\n";

calendar/inc/class.calendar_datasource.inc.php

Braces +13 added lines, -3 removed lines

@@ -24,7 +24,11 @@ 
 	 */
 	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');
 
@@ -96,16 +100,22 @@ 
 				$c->read_repository();
 				$this->pm_config = $c->config_data;
 				unset($c);
-				if (!$this->pm_config['hours_per_workday']) $this->pm_config['hours_per_workday'] = 8;
+				if (!$this->pm_config['hours_per_workday'])
+				{
+					$this->pm_config['hours_per_workday'] = 8;
+				}
 			}
 			$ds['pe_planned_time'] -= $nights * 60 * (24 - $this->pm_config['hours_per_workday']);
 		}
 		foreach($data['participants'] as $uid => $status)
 		{
-			if ($status != 'R' && is_numeric($uid))	// only users for now
+			if ($status != 'R' && is_numeric($uid))
+			{
+				// only users for now
 			{
 				$ds['pe_resources'][] = $uid;
 			}
+			}
 		}
 		// if we have multiple participants we have to multiply the time by the number of participants to get the total time
 		$ds['pe_planned_time'] *= count($ds['pe_resources']);