EGroupware / egroupware

filemanager/inc/class.filemanager_hooks.inc.php

Indentation +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
 		);
 		if ($location == 'admin')
 		{
-        	display_section(self::$appname,$file);
+			display_section(self::$appname,$file);
 		}
 		else
 		{
@@ -128,7 +128,7 @@ 
 			'yes' => lang('Yes')
 		);
 
-        $settings = array(
+		$settings = array(
 			'startfolder'	=> array(
 				'type'		=> 'input',
 				'name'		=> 'startfolder',

Braces +8 added lines, -2 removed lines

@@ -85,7 +85,10 @@ 
 			$file['Shared files'] = Egw::link('/index.php','menuaction=filemanager.filemanager_shares.index&ajax=true');
 			display_sidebox(self::$appname,$title,$file);
 		}
-		if ($GLOBALS['egw_info']['user']['apps']['admin']) self::admin(self::$appname);
+		if ($GLOBALS['egw_info']['user']['apps']['admin'])
+		{
+			self::admin(self::$appname);
+		}
 	}
 
 	/**
@@ -95,7 +98,10 @@ 
 	 */
 	static function admin($location = 'admin')
 	{
-		if (is_array($location)) $location = $location['location'];
+		if (is_array($location))
+		{
+			$location = $location['location'];
+		}
 
 		$file = Array(
 			//'Site Configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname='.self::$appname.'&ajax=true'),

filemanager/inc/class.filemanager_merge.inc.php

Indentation +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 		}
 		// Custom fields
 		if($content && strpos($content, '#') !== 0)
-                {
+				{
 			// Expand link-to custom fields
 			 $this->cf_link_to_expand($file, $content, $info);
 

Braces +21 added lines, -7 removed lines

@@ -123,7 +123,7 @@ 
 		}
 		// Custom fields
 		if($content && strpos($content, '#') !== 0)
-                {
+		{
 			// Expand link-to custom fields
 			 $this->cf_link_to_expand($file, $content, $info);
 
@@ -151,12 +151,14 @@ 
 			// Try this first - a normal path /apps/appname/id/file
 			list($app, $app_id) = explode('/', substr($file['path'], strpos($file['path'], 'apps/')+5));
 			// Symlink?
-			if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
+			if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps']))
+			{
 				// Try resolving just app + ID - /apps/App Name/Record Title/file
 				$resolved = Vfs::resolve_url_symlinks(implode('/',array_slice(explode('/',$file['dir']),0,4)));
 				list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
 
-				if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
+				if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps']))
+				{
 					// Get rid of any virtual folders (eg: All$) and symlinks
 					$resolved = Vfs::resolve_url_symlinks($file['path']);
 					list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
@@ -190,7 +192,10 @@ 
 		if(is_array($link))
 		{
 			// Directories have their internal protocol in path here
-			if($link['path'] && strpos($link['path'], '://') !== false) $link['path'] = $file['path'];
+			if($link['path'] && strpos($link['path'], '://') !== false)
+			{
+				$link['path'] = $file['path'];
+			}
 			$link = Api\Session::link('/index.php', $link);
 		}
 		else
@@ -211,7 +216,10 @@ 
 		// Add markers
 		foreach($file as $key => &$value)
 		{
-			if(!$value) $value = '';
+			if(!$value)
+			{
+				$value = '';
+			}
 			$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
 		}
 		if($app_placeholders)
@@ -252,9 +260,15 @@ 
 		);
 		foreach($fields as $name => $label)
 		{
-			if (!($n&1)) echo '<tr>';
+			if (!($n&1))
+			{
+				echo '<tr>';
+			}
 			echo '<td>{{'.$name.'}}</td><td>'.lang($label).'</td>';
-			if ($n&1) echo "</tr>\n";
+			if ($n&1)
+			{
+				echo "</tr>\n";
+			}
 			$n++;
 		}
 

calendar/setup/tables_update.inc.php

Indentation +1 added lines, -1 removed lines

@@ -1909,7 +1909,7 @@
 			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'],__LINE__,__FILE__);
 	}
 
-    $GLOBALS['egw_setup']->db->query('UPDATE egw_cal_repeats SET recur_interval=1
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal_repeats SET recur_interval=1
 			WHERE recur_interval=0',__LINE__,__FILE__);
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.007';

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/inc/class.calendar_ical.inc.php

Indentation +49 added lines, -49 removed lines

@@ -483,15 +483,15 @@ 
 									{
 										$user = $this->resource_info($this->user);
 										$attributes['ATTENDEE'][] = 'mailto:' . $user['email'];
-			    						$parameters['ATTENDEE'][] = array(
-			    							'CN'		=>	$user['name'],
-			    							'ROLE'		=> 'REQ-PARTICIPANT',
+										$parameters['ATTENDEE'][] = array(
+											'CN'		=>	$user['name'],
+											'ROLE'		=> 'REQ-PARTICIPANT',
 											'PARTSTAT'	=> 'NEEDS-ACTION',
 											'CUTYPE'	=> 'INDIVIDUAL',
 											'RSVP'		=> 'TRUE',
 											'X-EGROUPWARE-UID'	=> (string)$this->user,
-			    						);
-			    						$event['participants'][$this->user] = true;
+										);
+										$event['participants'][$this->user] = true;
 									}
 									break;
 								case 'r':
@@ -543,24 +543,24 @@ 
 						}
 						break;
 
-    				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');
-			    			if ($version == '1.0')
-			    			{
-		    					$organizerURL = trim($organizerCN . (empty($organizerURL) ? '' : ' <' . $organizerURL .'>'));
-			    			}
-			    			else
-			    			{
-		    					$organizerURL = empty($organizerEMail) ? '' : 'mailto:' . $organizerEMail;
-			    			}
-			    			$organizerUID = $event['owner'];
-		    				if (!isset($event['participants'][$event['owner']]))
-		    				{
-			    				$options = array(
+					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');
+							if ($version == '1.0')
+							{
+								$organizerURL = trim($organizerCN . (empty($organizerURL) ? '' : ' <' . $organizerURL .'>'));
+							}
+							else
+							{
+								$organizerURL = empty($organizerEMail) ? '' : 'mailto:' . $organizerEMail;
+							}
+							$organizerUID = $event['owner'];
+							if (!isset($event['participants'][$event['owner']]))
+							{
+								$options = array(
 									'ROLE'     => 'CHAIR',
 									'PARTSTAT' => 'DELEGATED',
 									'CUTYPE'   => 'INDIVIDUAL',
@@ -570,20 +570,20 @@ 
 								if (!empty($organizerEMail)) $options['EMAIL'] = $organizerEMail;
 								if (!empty($event['owner'])) $options['X-EGROUPWARE-UID'] = $event['owner'];
 								$attributes['ATTENDEE'][] = $organizerURL;
-			    				$parameters['ATTENDEE'][] = $options;
-		    				}
-	    				}
-    					// do NOT use ORGANIZER for events without further participants or a different organizer
-	    				if (count($event['participants']) > 1 || !isset($event['participants'][$event['owner']]))
-	    				{
-		    				$attributes['ORGANIZER'] = $organizerURL;
-		    				$parameters['ORGANIZER']['CN'] = $organizerCN;
-		    				if (!empty($organizerUID))
-		    				{
-			    				$parameters['ORGANIZER']['X-EGROUPWARE-UID'] = $organizerUID;
-		    				}
-	    				}
-	    				break;
+								$parameters['ATTENDEE'][] = $options;
+							}
+						}
+						// do NOT use ORGANIZER for events without further participants or a different organizer
+						if (count($event['participants']) > 1 || !isset($event['participants'][$event['owner']]))
+						{
+							$attributes['ORGANIZER'] = $organizerURL;
+							$parameters['ORGANIZER']['CN'] = $organizerCN;
+							if (!empty($organizerUID))
+							{
+								$parameters['ORGANIZER']['X-EGROUPWARE-UID'] = $organizerUID;
+							}
+						}
+						break;
 
 					case 'DTSTART':
 						if (empty($event['whole_day']))
@@ -992,12 +992,12 @@ 
 				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) ?
-                    		$parameters[$key][$valueID] : $parameters[$key],
-                            Api\Translation::charset(),$charset);
-                    $valuesData = (array) Api\Translation::convert($values[$key],
-                    		Api\Translation::charset(),$charset);
-                    $content = $valueData . implode(';', $valuesData);
+					$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);
 
 					if ($version == '1.0' && (preg_match('/[^\x20-\x7F]/', $content) ||
 						($paramData['CN'] && preg_match('/[^\x20-\x7F]/', $paramData['CN']))))
@@ -2233,7 +2233,7 @@ 
 	 * @param string|resource $_vcalData
 	 * @param string $principalURL ='' Used for CalDAV imports
 	 * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
+	 *                         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)
@@ -2784,10 +2784,10 @@ 
 					// fall throught
 				case 'ATTENDEE':
 					if (isset($attributes['params']['PARTSTAT']))
-				    {
-				    	$attributes['params']['STATUS'] = $attributes['params']['PARTSTAT'];
-				    }
-				    if (isset($attributes['params']['STATUS']))
+					{
+						$attributes['params']['STATUS'] = $attributes['params']['PARTSTAT'];
+					}
+					if (isset($attributes['params']['STATUS']))
 					{
 						$status = $this->status_ical2egw[strtoupper($attributes['params']['STATUS'])];
 						if (empty($status)) $status = 'X';
@@ -3178,7 +3178,7 @@ 
 				array2string($event)."\n",3,$this->logfile);
 		}
 		//Horde::logMessage("vevent2egw:\n" . print_r($event, true),
-        //    	__FILE__, __LINE__, PEAR_LOG_DEBUG);
+		//    	__FILE__, __LINE__, PEAR_LOG_DEBUG);
 		return $event;
 	}
 

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_import_csv.inc.php

Indentation +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
 	protected static $conditions = array('exists');
 
 	/**
-	* For figuring out if an entry has changed
-	*/
+	 * For figuring out if an entry has changed
+	 */
 	protected $tracking;
 
 	/**

Braces +75 added lines, -32 removed lines

@@ -17,7 +17,8 @@ 
 /**
  * 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
@@ -83,8 +84,10 @@ 
 		$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,
@@ -106,14 +109,16 @@ 
 		}
 
 		// Parse particpants
-		if ($record->participants && !is_array($record->participants)) {
+		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);
 			$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,9 +126,13 @@ 
 				$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)) {
+				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($contacts)
+					{
+						$id = $contacts[0]['account_id'] ? $contacts[0]['account_id'] : 'c'.$contacts[0]['contact_id'];
+					}
 				}
 				if(!$id)
 				{
@@ -131,7 +140,10 @@ 
 					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')
 						{
@@ -140,7 +152,8 @@ 
 								$this->resource_so = new resources_so();
 							}
 							$result = $this->resource_so->search($search,'res_id');
-							if(count($result) >= 1) {
+							if(count($result) >= 1)
+							{
 								$id = $resource['type'].$result[0]['res_id'];
 								break;
 							}
@@ -159,7 +172,8 @@ 
 						}
 					}
 				}
-				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,
@@ -188,27 +202,38 @@ 
 		}
 		$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 );
+								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() );
 							}
-						} else {
+						}
+						else
+						{
 							$action = $condition['false'];
 							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 						}
@@ -219,9 +244,14 @@ 
 						die('condition / action not supported!!!');
 						break;
 				}
-				if ($action['last']) break;
+				if ($action['last'])
+				{
+					break;
+				}
 			}
-		} else {
+		}
+		else
+		{
 			// unconditional insert
 			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 		}
@@ -240,12 +270,14 @@ 
 	 */
 	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;
@@ -261,7 +293,8 @@ 
 	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 )
 	{
 		$_data = $record->get_record_array();
-		switch ($_action) {
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'update' :
@@ -269,7 +302,8 @@ 
 				$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']);
 				}
@@ -277,23 +311,27 @@ 
 				// 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);
 					// User is interested in conflict checks, do so for dry run
 					// Otherwise, conflicts are just ignored and imported anyway
@@ -309,7 +347,9 @@ 
 					}
 					$this->results[$_action]++;
 					return true;
-				} else {
+				}
+				else
+				{
 					$messages = null;
 					$result = $this->bo->update( $_data, 
 						!$this->definition->plugin_options['skip_conflicts'],
@@ -360,7 +400,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Calendar CSV import');
 	}
 
@@ -369,7 +410,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports events into your Calendar from a CSV File. CSV means 'Comma Seperated Values'. However in the options Tab you can also choose other seperators.");
 	}
 
@@ -378,7 +420,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 

calendar/inc/class.calendar_zpush.inc.php

Indentation +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
 	 * @param int $cutoffdate =null
 	 * @param array $not_uids =null uids NOT to return for meeting requests
 	 * @return array
-  	 */
+	 */
 	function GetMessageList($id, $cutoffdate=NULL, array $not_uids=null)
 	{
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();

Braces +235 added lines, -57 removed lines

@@ -20,8 +20,12 @@ 
  */
 if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)
 {
-	interface activesync_plugin_write {}
-	interface activesync_plugin_meeting_requests {}
+	interface activesync_plugin_write
+	{
+}
+	interface activesync_plugin_meeting_requests
+	{
+}
 }
 
 /**
@@ -81,7 +85,10 @@ 
 	 */
 	public function GetFolderList()
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		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'
@@ -180,13 +187,20 @@ 
   	 */
 	function GetMessageList($id, $cutoffdate=NULL, array $not_uids=null)
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		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);
 
-		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,
@@ -212,7 +226,10 @@ 
 		{
 			foreach ($events as $event)
 			{
-				if ($not_uids && in_array($event['uid'], $not_uids)) continue;
+				if ($not_uids && in_array($event['uid'], $not_uids))
+				{
+					continue;
+				}
 				$messagelist[] = $this->StatMessage($id, $event);
 
 				// add virtual exceptions for recuring events too
@@ -227,7 +244,10 @@ 
 					}
 				}*/
 			}
-			if (count($events) < $num_rows) break;
+			if (count($events) < $num_rows)
+			{
+				break;
+			}
 		}
 		//error_log(__METHOD__."($id, $cutoffdate, ".array2string($not_uids).") type=$type, user=$user returning ".count($messagelist)." messages ".function_backtrace());
 		return $messagelist;
@@ -289,7 +309,10 @@ 
 	{
 		unset($truncsize, $optionbodypreference, $mimesupport);	// not used, but required by function signature
 
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		if (!($event = $this->calendar->read(abs($id), 0, false, 'server')))
 		{
@@ -367,7 +390,10 @@ 
 			'created' => 'dtstamp',
 		) as $key => $attr)
 		{
-			if (!empty($event[$key])) $message->$attr = $event[$key];
+			if (!empty($event[$key]))
+			{
+				$message->$attr = $event[$key];
+			}
 		}
 		if (($message->alldayevent = (int)calendar_bo::isWholeDay($event)))
 		{
@@ -379,7 +405,10 @@ 
 			'location' => 'location',
 		) as $key => $attr)
 		{
-			if (!empty($event[$key])) $message->$attr = $event[$key];
+			if (!empty($event[$key]))
+			{
+				$message->$attr = $event[$key];
+			}
 		}
 		$message->organizer = $event['organizer'];
 
@@ -414,7 +443,10 @@ 
 	 */
 	function MeetingResponse($folderid, $requestid, $response)
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		static $as2status = array(	// different from self::$status2as!
 			1 => 'A',
@@ -424,9 +456,12 @@ 
 		$status_in = isset($as2status[$response]) ? $as2status[$response] : 'U';
 		$uid = $GLOBALS['egw_info']['user']['account_id'];
 
-		if (!is_numeric($requestid))	// iCal from fmail
+		if (!is_numeric($requestid))
+		{
+			// iCal from fmail
 		{
 			$ical = new calendar_ical();
+		}
 			if (!($events = $ical->icaltoegw($requestid, '', 'utf-8')) || count($events) != 1)
 			{
 				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid, '$requestid') error parsing iCal!");
@@ -536,7 +571,10 @@ 
 	{
 		unset($contentParameters);	// unused, but required by function signature
 
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		$old_event = array();
 		$type = $account = null;
@@ -551,10 +589,13 @@ 
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid',$id,...) Folder wrong or event does not existing");
 			return false;
 		}
-		if ($recur_date)	// virtual exception
+		if ($recur_date)
+		{
+			// virtual exception
 		{
 			// @todo check if virtual exception needs to be saved as real exception, or only stati need to be changed
 			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))
@@ -564,7 +605,11 @@ 
 			//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);
 
@@ -593,7 +638,10 @@ 
 					unset($ex_event['etag']);
 					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;
 
@@ -646,7 +694,10 @@ 
 			'end' => 'endtime',
 		) as $key => $attr)
 		{
-			if (isset($message->$attr)) $event[$key] = Api\DateTime::server2user($message->$attr);
+			if (isset($message->$attr))
+			{
+				$event[$key] = Api\DateTime::server2user($message->$attr);
+			}
 		}
 		// copying strings
 		foreach(array(
@@ -655,7 +706,10 @@ 
 			'location' => 'location',
 		) as $key => $attr)
 		{
-			if (isset($message->$attr)) $event[$key] = $message->$attr;
+			if (isset($message->$attr))
+			{
+				$event[$key] = $message->$attr;
+			}
 		}
 
 		// only change description, if one given, as iOS5 skips description in ChangeMessage after MeetingResponse
@@ -674,14 +728,22 @@ 
 
 		if (($event['whole_day'] = $message->alldayevent))
 		{
-			if ($event['end'] == $event['start']) $event['end'] += 24*3600;	// some clients send equal start&end for 1day
+			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)
 		{
-			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))
@@ -696,7 +758,10 @@ 
 					//'n_fn' => $attendee->name,	// not sure if we want matches without email
 				);
 				// search addressbook for participant
-				if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+				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'),
 					'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC',
@@ -704,10 +769,13 @@ 
 				{
 					$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;
 				}
+				}
 				else	// store just the email
 				{
 					$uid = 'e'.$attendee->name.' <'.$attendee->email.'>';
@@ -736,7 +804,11 @@ 
 				$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)))
 			{
@@ -750,10 +822,13 @@ 
 			elseif (isset($attendee->attendeetype) &&
 				!($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
+				(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);
 		}
@@ -768,12 +843,19 @@ 
 		// $account is also preserved, as AS does not add him as participant!
 		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)
 			{
 				// accounts are represented correctly, but the event owner which is no participant in AS
-				if ($type == 'u' && $id != $account) continue;
+				if ($type == 'u' && $id != $account)
+				{
+					continue;
+				}
 
 				$uid = calendar_so::combine_user($type, $id);
 				if (!isset($participants[$uid]))
@@ -798,10 +880,13 @@ 
 		// check if event is recurring and import recur information (incl. timezone)
 		if ($message->recurrence)
 		{
-			if ($message->timezone && !$event['id'])	// dont care for timezone, if no new and recurring event
+			if ($message->timezone && !$event['id'])
+			{
+				// dont care for timezone, if no new and recurring event
 			{
 				$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_interval'] = $message->recurrence->interval;
@@ -838,10 +923,13 @@ 
 			{
 				// 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;
 				}
+				}
 				$event['recur_enddate'] = $rtime->format('ts');
 			}
 		}
@@ -856,7 +944,9 @@ 
 					break;
 				}
 			}
-			if ($alarm !== true)	// new alarm
+			if ($alarm !== true)
+			{
+				// new alarm
 			{
 				// delete all earlier alarms of that user
 				// user get's per AS only the earliest alarm, as AS only supports one alarm
@@ -866,6 +956,7 @@ 
 					if ($alarm['owner'] == $account && $alarm['offset'] > 60*$message->reminder)
 					{
 						unset($event['alarm'][$key]);
+			}
 					}
 				}
 				$event['alarm'][] = $alarm = array(
@@ -946,7 +1037,10 @@ 
 	{
 		unset($contentParameters);	// not used, but required by function signature
 
-		if (!isset($this->caledar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->caledar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		$ret = $this->calendar->delete($id);
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', $id) delete($id) returned ".array2string($ret));
@@ -1008,7 +1102,10 @@ 
 	 */
 	public function GetMessage($folderid, $id, $contentparameters, $class='SyncAppointment')
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 		//error_log(__METHOD__.__LINE__.array2string($contentparameters).function_backtrace());
 		$truncsize = Utils::GetTruncSize($contentparameters->GetTruncation());
 		$mimesupport = $contentparameters->GetMimeSupport();
@@ -1046,7 +1143,10 @@ 
 		catch(Exception $e) {
 			unset($e);
 			// z-push (2.3 at least) requires a timezone for recurring events
-			if ($event['recur_type']) $message->timezone = self::UTC_BLOB;
+			if ($event['recur_type'])
+			{
+				$message->timezone = self::UTC_BLOB;
+			}
 		}
 
 		// copying timestamps (they are already read in servertime, so non tz conversation)
@@ -1057,7 +1157,10 @@ 
 			'modified' => 'dtstamp',
 		) as $key => $attr)
 		{
-			if (!empty($event[$key])) $message->$attr = $event[$key];
+			if (!empty($event[$key]))
+			{
+				$message->$attr = $event[$key];
+			}
 		}
 		if (($message->alldayevent = (int)calendar_bo::isWholeDay($event)))
 		{
@@ -1070,7 +1173,10 @@ 
 			'location' => 'location',
 		) as $key => $attr)
 		{
-			if (!empty($event[$key])) $message->$attr = $event[$key];
+			if (!empty($event[$key]))
+			{
+				$message->$attr = $event[$key];
+			}
 		}
 
 		// appoint description
@@ -1103,7 +1209,10 @@ 
 		foreach($event['participants'] as $uid => $status)
 		{
 			// AS does NOT want calendar owner as participant
-			if ($uid == $account) continue;
+			if ($uid == $account)
+			{
+				continue;
+			}
 			$quantity = $role = null;
 			calendar_so::split_status($status, $quantity, $role);
 
@@ -1120,7 +1229,10 @@ 
 				list($info) = $i = $this->calendar->resources[$uid[0]]['info'] ?
 					ExecMethod($this->calendar->resources[$uid[0]]['info'],substr($uid,1)) : array(false);
 
-				if (!$info) continue;
+				if (!$info)
+				{
+					continue;
+				}
 
 				if (!$info['email'] && $info['responsible'])
 				{
@@ -1136,10 +1248,17 @@ 
 					$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';
+			if (empty($attendee->email))
+			{
+				$attendee->email = 'noreply-'.$uid.'-uid@egroupware.org';
+			}
 
 			$message->attendees[] = $attendee;
 		}
@@ -1174,9 +1293,12 @@ 
 					$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!
+			if ($rrule->enddate)
+			{
+				// enddate is only a date, but AS needs a time incl. correct starttime!
 			{
 				$enddate = clone $rrule->time;
+			}
 				$enddate->setDate($rrule->enddate->format('Y'), $rrule->enddate->format('m'),
 					$rrule->enddate->format('d'));
 				$recurrence->until = $enddate->format('server');
@@ -1198,12 +1320,19 @@ 
 				{
 					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)
 				{
-					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, 'SyncAppointmentException');
 					$exception->exceptionstarttime = $exception_time = $ex_event['recurrence'];
 					foreach(array('attendees','recurrence','uid','timezone','organizername','organizeremail') as $not_supported)
@@ -1223,7 +1352,10 @@ 
 				{
 					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);
+						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->deleted = 1;
 						$exception->exceptionstarttime = $exception_time;
@@ -1279,12 +1411,18 @@ 
 	{
 		unset($folderid);	// not used ($id is unique), but required by function signature
 
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		$nul = null;
-		if (!($etag = $this->calendar->get_etag($id, $nul, true, true)))	// last true: $only_master=true
+		if (!($etag = $this->calendar->get_etag($id, $nul, true, true)))
+		{
+			// last true: $only_master=true
 		{
 			$stat = false;
+		}
 			// error_log why access is denied (should never happen for everything returned by calendar_bo::search)
 			$backup = $this->calendar->debug;
 			//$this->calendar->debug = 2;
@@ -1318,13 +1456,22 @@ 
 		$type = $owner = null;
 		$this->backend->splitID($folderid, $type, $owner);
 
-		if ($type != 'calendar') return false;
+		if ($type != 'calendar')
+		{
+			return false;
+		}
 
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		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
 		// 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;
+		if ($syncstate == 0)
+		{
+			$syncstate = 1;
+		}
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', ...) type='$type', owner=$owner --> syncstate='$syncstate'");
 	}
@@ -1400,10 +1547,16 @@ 
 			'dstendhour' => 0, 'dstendminute' => 0, 'dstendsecond' => 0, 'dstendmillis' => 0,
 		);
 
-		if ($tz === 'UTC') return $data;
+		if ($tz === 'UTC')
+		{
+			return $data;
+		}
 
 		$name = $component = is_a($tz,'DateTimeZone') ? $tz->getName() : $tz;
-		if (strpos($component, 'VTIMEZONE') === false) $component = calendar_timezones::tz2id($name,'component');
+		if (strpos($component, 'VTIMEZONE') === false)
+		{
+			$component = calendar_timezones::tz2id($name,'component');
+		}
 		// parse ical timezone defintion
 		$ical = self::ical2array($component);
 		$standard = $ical['VTIMEZONE']['STANDARD'];
@@ -1446,11 +1599,17 @@ 
 						$data[$prefix.'week'] = 5;
 					}
 					// if both start and end use 1SU use week=5 and decrement month
-					if ($prefix == 'dststart') $start_byday = $matches[1];
+					if ($prefix == 'dststart')
+					{
+						$start_byday = $matches[1];
+					}
 					if ($prefix == 'dstend' && $matches[1] == '1SU' && $start_byday == '1SU')
 					{
 						$data[$prefix.'week'] = 5;
-						if ($prefix == 'dstend') $data[$prefix.'month'] -= 1;
+						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)];
@@ -1526,7 +1685,10 @@ 
 	static public function ical2array(&$ical,$section=null)
 	{
 		$arr = array();
-		if (!is_array($ical)) $ical = preg_split("/[\r\n]+/m", $ical);
+		if (!is_array($ical))
+		{
+			$ical = preg_split("/[\r\n]+/m", $ical);
+		}
 		while (($line = array_shift($ical)))
 		{
 			list($name,$value) = explode(':',$line,2);
@@ -1536,7 +1698,10 @@ 
 			}
 			elseif($name == 'END')
 			{
-				if ($section && $section==$value) return $arr;
+				if ($section && $section==$value)
+				{
+					return $arr;
+				}
 				break;
 			}
 			else
@@ -1567,13 +1732,19 @@ 
 
 		for($n = 0; !isset($cache[$key]); ++$n)
 		{
-			if (!$n)	// check users timezone first
+			if (!$n)
+			{
+				// check users timezone first
 			{
 				$tz = Api\DateTime::$user_timezone->getName();
 			}
-			elseif (!($tz = calendar_timezones::id2tz($n)))	// no further timezones to check
+			}
+			elseif (!($tz = calendar_timezones::id2tz($n)))
+			{
+				// no further timezones to check
 			{
 				$cache[$key] = 'UTC';
+			}
 				error_log(__METHOD__.'('.array2string($data).') NO matching timezone found --> using UTC now!');
 				break;
 			}
@@ -1637,7 +1808,11 @@ 
 				$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');
@@ -1665,13 +1840,16 @@ 
  *
  * You need to comment implements activesync_plugin_write
  */
-if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)	// some tests
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)
+{
+	// some tests
 {
 	$GLOBALS['egw_info'] = array(
 		'flags' => array(
 			'currentapp' => 'login'
 		)
 	);
+}
 	require_once('../../header.inc.php');
 	ini_set('display_errors',1);
 	error_reporting(E_ALL & ~E_NOTICE);

calendar/inc/class.calendar_ui.inc.php

Indentation +5 added lines, -5 removed lines

@@ -387,11 +387,11 @@
 	}
 
 	/**
-	* gets the icons displayed for a given event
-	*
-	* @param array $event
-	* @return array of 'img' / 'title' pairs
-	*/
+	 * gets the icons displayed for a given event
+	 *
+	 * @param array $event
+	 * @return array of 'img' / 'title' pairs
+	 */
 	function event_icons($event)
 	{
 		$is_private = !$event['public'] && !$this->bo->check_perms(Acl::READ,$event);

Braces +49 added lines, -13 removed lines

@@ -166,7 +166,10 @@ 
 		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);
+		}
 	}
 
 	/**
@@ -279,11 +282,15 @@ 
 				{
 					// 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']);
-					if ((string)$set_owners[0] === '0')	// set exactly the specified owners (without the 0)
+					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
 						{
@@ -369,7 +376,10 @@ 
 		}
 		$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')
 		{
@@ -505,8 +515,11 @@ 
 
 		// 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(
 				'menuaction' => $this->view_menuaction,
@@ -553,7 +566,10 @@ 
 		$sidebox = new Etemplate('calendar.sidebox');
 
 		$cont = $this->cal_prefs['saved_states'];
-		if (!is_array($cont)) $cont = array();
+		if (!is_array($cont))
+		{
+			$cont = array();
+		}
 		$cont['view'] = $this->view ? $this->view : 'week';
 		$cont['date'] = $this->date ? $this->date : Api\DateTime();
 
@@ -612,7 +628,10 @@ 
 	 */
 	public function update_client($event_id, Api\DateTime $recurrence_date = null)
 	{
-		if(!$event_id) return false;
+		if(!$event_id)
+		{
+			return false;
+		}
 
 		// Directly update stored data.
 		// Make sure we have the whole event
@@ -678,7 +697,10 @@ 
 	 */
 	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))
 		{
@@ -699,8 +721,16 @@ 
 
 		$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']))
@@ -777,8 +807,14 @@ 
 			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)
 				{

calendar/inc/class.calendar_uiforms.inc.php

Indentation +11 added lines, -11 removed lines

@@ -2415,14 +2415,14 @@ 
 	}
 
 	/**
-     * Export events as vCalendar version 2.0 files (iCal)
-     *
-     * @param int|array $content numeric cal_id or submitted content from etempalte::exec
-     * @param boolean $return_error should an error-msg be returned or a regular page with it generated (default)
-     * @return string error-msg if $return_error
-     */
-    function export($content=0,$return_error=false)
-    {
+	 * Export events as vCalendar version 2.0 files (iCal)
+	 *
+	 * @param int|array $content numeric cal_id or submitted content from etempalte::exec
+	 * @param boolean $return_error should an error-msg be returned or a regular page with it generated (default)
+	 * @return string error-msg if $return_error
+	 */
+	function export($content=0,$return_error=false)
+	{
 		$boical = new calendar_ical();
 		#error_log(__METHOD__.print_r($content,true));
 		if (is_numeric($cal_id = $content ? $content : $_REQUEST['cal_id']))
@@ -2476,7 +2476,7 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('iCal Export');
 		$etpl = new etemplate_new('calendar.export');
 		$etpl->exec('calendar.calendar_uiforms.export',$content);
-    }
+	}
 	
 	/**
 	 * Edit category ACL (admin only)
@@ -2548,8 +2548,8 @@ 
 	}
 
 	/**
-	* Set up the required fields to get the history tab
-	*/
+	 * Set up the required fields to get the history tab
+	 */
 	public function setup_history(&$content, &$sel_options)
 	{
 		$status = 'history_status';

Braces +286 added lines, -73 removed lines

@@ -110,11 +110,14 @@ 
 		if (!$owner || !is_numeric($owner) || $GLOBALS['egw']->accounts->get_type($owner) != 'u' ||
 			!$this->bo->check_perms(Acl::ADD,0,$owner))
 		{
-			if ($owner)	// make an owner who is no user or we have no add-rights a participant
+			if ($owner)
+			{
+				// make an owner who is no user or we have no add-rights a participant
 			{
 				if(!is_array($owner))
 				{
 					$owner = explode(',',$owner);
+			}
 				}
 				// if we come from ressources we don't need any users selected in calendar
 				if (!isset($_GET['participants']) || $_GET['participants'][0] != 'r')
@@ -146,9 +149,17 @@ 
 		$participant_types['u'] = $participant_types = $participants = array();
 		foreach($extra_participants as $uid)
 		{
-			if (isset($participants[$uid])) continue;	// already included
+			if (isset($participants[$uid]))
+			{
+				continue;
+			}
+			// already included
 
-			if (!$this->bo->check_acl_invite($uid)) continue;	// no right to invite --> ignored
+			if (!$this->bo->check_acl_invite($uid))
+			{
+				continue;
+			}
+			// no right to invite --> ignored
 
 			if (is_numeric($uid))
 			{
@@ -186,10 +197,13 @@ 
 				}
 			}
 		}
-		if (!$participants)	// if all participants got removed, include current user
+		if (!$participants)
+		{
+			// if all participants got removed, include current user
 		{
 			$participants[$this->user] = $participant_types['u'][$this->user] = calendar_so::combine_status('A',1,'CHAIR');
 		}
+		}
 		if(isset($_GET['cat_id']))
 		{
 			$cat_id = explode(',',$_GET['cat_id']);
@@ -239,10 +253,13 @@ 
 	 */
 	function process_edit($content)
 	{
-		if (!is_array($content))	// redirect from etemplate, if POST empty
+		if (!is_array($content))
+		{
+			// redirect from etemplate, if POST empty
 		{
 			return $this->edit(null,null,strip_tags($_GET['msg']));
 		}
+		}
 		// clear notification errors
 		notifications::errors(true);
 		$messages = null;
@@ -255,7 +272,11 @@ 
 		$update_type = $content['id'] ? ($content['recur_type'] == MCAL_RECUR_NONE ? 'update' : 'edit') : 'add';
 
 		list($button) = @each($content['button']);
-		if (!$button && $content['action']) $button = $content['action'];	// action selectbox
+		if (!$button && $content['action'])
+		{
+			$button = $content['action'];
+		}
+		// action selectbox
 		unset($content['button']); unset($content['action']);
 
 		$view = $content['view'];
@@ -268,7 +289,10 @@ 
 		{
 			list($date) = each($content['recur_exception']['delete_exception']);
 			// eT2 converts time to
-			if (!is_numeric($date)) $date = Api\DateTime::to (str_replace('Z','', $date), 'ts');
+			if (!is_numeric($date))
+			{
+				$date = Api\DateTime::to (str_replace('Z','', $date), 'ts');
+			}
 			unset($content['recur_exception']['delete_exception']);
 			if (($key = array_search($date,$content['recur_exception'])) !== false)
 			{
@@ -277,7 +301,10 @@ 
 				foreach ($recur_exceptions as $id)
 				{
 					if (!($exception = $this->bo->read($id)) ||
-							$exception['recurrence'] != $content['recur_exception'][$key]) continue;
+							$exception['recurrence'] != $content['recur_exception'][$key])
+					{
+						continue;
+					}
 					$exception['uid'] = Api\CalDAV::generate_uid('calendar', $id);
 					$exception['reference'] = $exception['recurrence'] = 0;
 					$this->bo->update($exception, true, true,false,true,$messages,$content['no_notifications']);
@@ -352,7 +379,10 @@ 
 				$event['end'] = $this->bo->date2ts($event['end']);
 			}
 			// some checks for recurrences, if you give a date, make it a weekly repeating event and visa versa
-			if ($event['recur_type'] == MCAL_RECUR_NONE && $event['recur_data']) $event['recur_type'] = MCAL_RECUR_WEEKLY;
+			if ($event['recur_type'] == MCAL_RECUR_NONE && $event['recur_data'])
+			{
+				$event['recur_type'] = MCAL_RECUR_WEEKLY;
+			}
 			if ($event['recur_type'] == MCAL_RECUR_WEEKLY && !$event['recur_data'])
 			{
 				$event['recur_data'] = 1 << (int)date('w',$event['start']);
@@ -475,7 +505,11 @@ 
 							break;
 
 						default:		// existing participant row
-							if (!is_array($data)) continue;	// widgets in participant tab, above participant list
+							if (!is_array($data))
+							{
+								continue;
+							}
+							// widgets in participant tab, above participant list
 							foreach(array('uid','status','quantity','role') as $name)
 							{
 								$$name = $data[$name];
@@ -607,7 +641,10 @@ 
 			{
 				foreach($participants as $id => &$p_response)
 				{
-					if($type == 'u' && $id == $event['owner']) continue;
+					if($type == 'u' && $id == $event['owner'])
+					{
+						continue;
+					}
 					calendar_so::split_status($p_response, $quantity, $role);
 					// if resource defines callback for status of new status (eg. Resources app acknowledges direct booking acl), call it
 					$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
@@ -689,17 +726,23 @@ 
 			{
 				foreach (array_keys($event['participants']) as $uid)
 				{
-					if ($uid[0] == 'r') //ressource detection
+					if ($uid[0] == 'r')
+					{
+						//ressource detection
 					{
 						$msg = lang('Error: ressources reservation in private events is not allowed!!!');
+					}
 						$button = '';
 						break 2; //break foreach and case
 					}
 				}
 			}
-			if ($content['edit_single'])	// we edited a single event from a series
+			if ($content['edit_single'])
+			{
+				// we edited a single event from a series
 			{
 				$event['reference'] = $event['id'];
+			}
 				$event['recurrence'] = $content['edit_single'];
 				unset($event['id']);
 				$conflicts = $this->bo->update($event,$ignore_conflicts,true,false,true,$messages,$content['no_notifications']);
@@ -795,7 +838,10 @@ 
 										case 'no':
 											break;
 										case 'startday':
-											if ($sameday) break;
+											if ($sameday)
+											{
+												break;
+											}
 										default:
 											$status_reset_to_unknown = true;
 											$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
@@ -957,7 +1003,10 @@ 
 				if ($event['recur_type'] != MCAL_RECUR_NONE && $content['reference'] == 0 && !$content['edit_single'])
 				{
 					$msg = lang('Series deleted');
-					if ($exceptions_kept) $msg .= lang(', exceptions preserved');
+					if ($exceptions_kept)
+					{
+						$msg .= lang(', exceptions preserved');
+					}
 				}
 				else
 				{
@@ -993,11 +1042,14 @@ 
 				{
 					$msg = lang("Can't add alarms in the past !!!");
 				}
-				elseif ($event['id'])	// save the alarm immediatly
+				elseif ($event['id'])
+				{
+					// save the alarm immediatly
 				{
 					if (($alarm_id = $this->bo->save_alarm($event['id'],$alarm)))
 					{
 						$alarm['id'] = $alarm_id;
+				}
 						$event['alarm'][$alarm_id] = $alarm;
 
 						$msg = lang('Alarm added');
@@ -1010,7 +1062,9 @@ 
 				}
 				else
 				{
-					for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++) {}	// get a temporary non-conflicting, numeric id
+					for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++)
+					{
+}	// get a temporary non-conflicting, numeric id
 					$event['alarm'][$alarm['id']] = $alarm;
 				}
 			}
@@ -1033,10 +1087,13 @@ 
 		}
 		if (in_array($button,array('cancel','save','delete','delete_exceptions','delete_keep_exceptions')) && $noerror)
 		{
-			if ($content['lock_token'])	// remove an existing lock
+			if ($content['lock_token'])
+			{
+				// remove an existing lock
 			{
 				Vfs::unlock(Vfs::app_entry_lock_path('calendar',$content['id']),$content['lock_token'],false);
 			}
+			}
 			if ($content['no_popup'])
 			{
 				Egw::redirect_link('/index.php',array(
@@ -1143,8 +1200,7 @@ 
 		if (Api\DateTime::to($old_event['start'],'Ymd') < Api\DateTime::to($as_of_date,'Ymd') ||
 			// Adjust for requested date in the past
 			Api\DateTime::to($as_of_date,'ts') < time()
-		)
-		{
+		) {
 
 			unset($orig_event);
 			// copy event by unsetting the id(s)
@@ -1232,32 +1288,50 @@ 
 		foreach($event['participants'] as $uid => $status)
 		{
 			//error_log(__METHOD__.__LINE__.' '.$uid.':'.array2string($status));
-			if (empty($status)) continue;
+			if (empty($status))
+			{
+				continue;
+			}
 			$toadd = '';
-			if ((isset($status['status']) && $status['status'] == 'R') || (isset($status['uid']) && $status['uid'] == $this->user)) continue;
+			if ((isset($status['status']) && $status['status'] == 'R') || (isset($status['uid']) && $status['uid'] == $this->user))
+			{
+				continue;
+			}
 
 			if (isset($status['uid']) && is_numeric($status['uid']) && $GLOBALS['egw']->accounts->get_type($status['uid']) == 'u')
 			{
-				if (!($email = $GLOBALS['egw']->accounts->id2name($status['uid'],'account_email'))) continue;
+				if (!($email = $GLOBALS['egw']->accounts->id2name($status['uid'],'account_email')))
+				{
+					continue;
+				}
 
 				$lid = $firstname = $lastname = null;
 				$GLOBALS['egw']->accounts->get_account_name($status['uid'],$lid,$firstname,$lastname);
 
 				$toadd = $firstname.' '.$lastname.' <'.$email.'>';
-				if (!in_array($toadd,$to)) $to[] = $toadd;
+				if (!in_array($toadd,$to))
+				{
+					$to[] = $toadd;
+				}
 				//error_log(__METHOD__.__LINE__.array2string($to));
 			}
 			elseif ($uid < 0)
 			{
 				foreach($GLOBALS['egw']->accounts->members($uid,true) as $uid)
 				{
-					if (!($email = $GLOBALS['egw']->accounts->id2name($uid,'account_email'))) continue;
+					if (!($email = $GLOBALS['egw']->accounts->id2name($uid,'account_email')))
+					{
+						continue;
+					}
 
 					$GLOBALS['egw']->accounts->get_account_name($uid,$lid,$firstname,$lastname);
 
 					$toadd = $firstname.' '.$lastname.' <'.$email.'>';
 					// dont add groupmembers if they already rejected the event, or are the current user
-					if (!in_array($toadd,$to) && ($event['participants'][$uid] !== 'R' && $uid != $this->user)) $to[] = $toadd;
+					if (!in_array($toadd,$to) && ($event['participants'][$uid] !== 'R' && $uid != $this->user))
+					{
+						$to[] = $toadd;
+					}
 					//error_log(__METHOD__.__LINE__.array2string($to));
 				}
 			}
@@ -1310,7 +1384,10 @@ 
 			'preset[type]'    => 'text/calendar'.($asrequest?'; method=REQUEST':''),
 			'preset[size]'    => filesize($ics_file),
 		);
-		if ($asrequest) $vars['preset[msg]'] = lang('You attempt to mail a meetingrequest to the recipients above. Depending on the client this mail is opened with, the recipient may or may not see the mailbody below, but only see the meeting request attached.');
+		if ($asrequest)
+		{
+			$vars['preset[msg]'] = lang('You attempt to mail a meetingrequest to the recipients above. Depending on the client this mail is opened with, the recipient may or may not see the mailbody below, but only see the meeting request attached.');
+		}
 		$response = Api\Json\Response::get();
 		$response->call('app.calendar.custom_mail', $vars);
 	}
@@ -1496,9 +1573,15 @@ 
 				}
 			}
 			// set new start and end if given by $_GET
-			if(isset($_GET['start'])) { $event['start'] = Api\DateTime::to($_GET['start'],'ts'); }
-			if(isset($_GET['end'])) { $event['end'] = Api\DateTime::to($_GET['end'],'ts'); }
-			if(isset($_GET['non_blocking'])) { $event['non_blocking'] = (bool)$_GET['non_blocking']; }
+			if(isset($_GET['start']))
+			{
+$event['start'] = Api\DateTime::to($_GET['start'],'ts'); }
+			if(isset($_GET['end']))
+			{
+$event['end'] = Api\DateTime::to($_GET['end'],'ts'); }
+			if(isset($_GET['non_blocking']))
+			{
+$event['non_blocking'] = (bool)$_GET['non_blocking']; }
 			// check if the event is the whole day
 			$start = $this->bo->date2array($event['start']);
 			$end = $this->bo->date2array($event['end']);
@@ -1511,10 +1594,13 @@ 
 				foreach(is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
 				{
 					$link_id = $link_ids[$n];
-					if(!preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))	// guard against XSS
+					if(!preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))
+					{
+						// guard against XSS
 					{
 						continue;
 					}
+					}
 					if(!$n)
 					{
 						$event['title'] = Link::title($link_app,$link_id);
@@ -1523,7 +1609,10 @@ 
 						{
 							foreach((array)$set['link_app'] as $i => $l_app)
 							{
-								if (($l_id=$set['link_id'][$i])) Link::link('calendar',$event['link_to']['to_id'],$l_app,$l_id);
+								if (($l_id=$set['link_id'][$i]))
+								{
+									Link::link('calendar',$event['link_to']['to_id'],$l_app,$l_id);
+								}
 							}
 							unset($set['link_app']);
 							unset($set['link_id']);
@@ -1549,10 +1638,13 @@ 
 			$lock_path = Vfs::app_entry_lock_path('calendar',$event['id']);
 			$lock_owner = 'mailto:'.$GLOBALS['egw_info']['user']['account_email'];
 
-			if (($preserv['lock_token'] = $event['lock_token']))		// already locked --> refresh the lock
+			if (($preserv['lock_token'] = $event['lock_token']))
+			{
+				// already locked --> refresh the lock
 			{
 				Vfs::lock($lock_path,$preserv['lock_token'],$locktime,$lock_owner,$scope='shared',$type='write',true,false);
 			}
+			}
 			if (($lock = Vfs::checkLock($lock_path)) && $lock['owner'] != $lock_owner)
 			{
 				$msg .= ' '.lang('This entry is currently opened by %1!',
@@ -1585,14 +1677,20 @@ 
 		));
 		Framework::message($msg, $msg_type);
 		$content['duration'] = $content['end'] - $content['start'];
-		if (isset($this->durations[$content['duration']])) $content['end'] = '';
+		if (isset($this->durations[$content['duration']]))
+		{
+			$content['end'] = '';
+		}
 
 		$row = 3;
 		$readonlys = $content['participants'] = $preserv['participants'] = array();
 		// preserve some ui elements, if set eg. under error-conditions
 		foreach(array('quantity','resource','role') as $n)
 		{
-			if (isset($event['participants'][$n])) $content['participants'][$n] = $event['participants'][$n];
+			if (isset($event['participants'][$n]))
+			{
+				$content['participants'][$n] = $event['participants'][$n];
+			}
 		}
 		foreach($event['participant_types'] as $type => $participants)
 		{
@@ -1634,9 +1732,13 @@ 
 				//echo "<p>$uid ($quantity): $role --> {$content['participants'][$row]['role']}</p>\n";
 
 				if (($no_status = !$this->bo->check_status_perms($uid,$event)) || $view)
-					$readonlys['participants'][$row]['status'] = $no_status;
+				{
+									$readonlys['participants'][$row]['status'] = $no_status;
+				}
 				if ($preserv['hide_delete'] || !$this->bo->check_perms(Acl::EDIT,$event))
-					$readonlys['participants']['delete'][$uid] = true;
+				{
+									$readonlys['participants']['delete'][$uid] = true;
+				}
 				// todo: make the participants available as links with email as title
 				$content['participants'][$row++]['title'] = $this->get_title($uid);
 				// enumerate group-invitations, so people can accept/reject them
@@ -1667,7 +1769,11 @@ 
 			$content['participants']['cal_resources'] = '';
 			foreach($this->bo->resources as $data)
 			{
-				if ($data['app'] == 'email') continue;	// make no sense, as we cant search for email
+				if ($data['app'] == 'email')
+				{
+					continue;
+				}
+				// make no sense, as we cant search for email
 				$content['participants']['cal_resources'] .= ','.$data['app'];
 			}
 		}
@@ -1695,9 +1801,18 @@ 
 				$hours = (int) (($alarm['offset'] % DAY_s) / HOUR_s);
 				$minutes = (int) (($alarm['offset'] % HOUR_s) / 60);
 				$label = array();
-				if ($days) $label[] = $days.' '.lang('days');
-				if ($hours) $label[] = $hours.' '.lang('hours');
-				if ($minutes) $label[] = $minutes.' '.lang('Minutes');
+				if ($days)
+				{
+					$label[] = $days.' '.lang('days');
+				}
+				if ($hours)
+				{
+					$label[] = $hours.' '.lang('hours');
+				}
+				if ($minutes)
+				{
+					$label[] = $minutes.' '.lang('Minutes');
+				}
 				$alarm['offset'] = implode(', ',$label) . ' ' . ($after ? lang('after') : lang('before'));
 				$content['alarm'][] = $alarm;
 
@@ -1760,25 +1875,34 @@ 
 			'participants' => $this->accountsel->account_selection == 'none',
 			'history' => !$event['id'],
 		);
-		if (!isset($GLOBALS['egw_info']['user']['apps']['mail']))	// no mail without mail-app
+		if (!isset($GLOBALS['egw_info']['user']['apps']['mail']))
+		{
+			// no mail without mail-app
 		{
 			unset($sel_options['action']['mail']);
+		}
 			unset($sel_options['action']['sendmeetingrequest']);
 		}
-		if (!$event['id'])	// no ical export for new (not saved) events
+		if (!$event['id'])
+		{
+			// no ical export for new (not saved) events
 		{
 			$readonlys['action'] = true;
 		}
+		}
 		if (!($readonlys['button[exception]'] = !$this->bo->check_perms(Acl::EDIT,$event) || $event['recur_type'] == MCAL_RECUR_NONE || ($event['recur_enddate'] &&$event['start'] > $event['recur_enddate'])))
 		{
 			$content['exception_label'] = $this->bo->long_date(max($preserved['actual_date'], $event['start']));
 		}
 		$readonlys['button[delete]'] = !$event['id'] || $preserved['hide_delete'] || !$this->bo->check_perms(Acl::DELETE,$event);
 
-		if (!$event['id'] || $this->bo->check_perms(Acl::EDIT,$event))	// new event or edit rights to the event ==> allow to add alarm for all users
+		if (!$event['id'] || $this->bo->check_perms(Acl::EDIT,$event))
+		{
+			// new event or edit rights to the event ==> allow to add alarm for all users
 		{
 			$sel_options['owner'][0] = lang('All participants');
 		}
+		}
 		if (isset($event['participant_types']['u'][$this->user]))
 		{
 			$sel_options['owner'][$this->user] = $this->bo->participant_name($this->user);
@@ -1820,7 +1944,10 @@ 
 
 		$content['cancel_needs_refresh'] = (bool)$_GET['cancel_needs_refresh'];
 
-		if (!empty($preserved['lock_token'])) $content['lock_token'] = $preserved['lock_token'];
+		if (!empty($preserved['lock_token']))
+		{
+			$content['lock_token'] = $preserved['lock_token'];
+		}
 
 		// non_interactive==true from $_GET calls immediate save action without displaying the edit form
 		if(isset($_GET['non_interactive']) && (bool)$_GET['non_interactive'] === true)
@@ -2022,7 +2149,10 @@ 
 					// set status and send notification / meeting response
 					if ($this->bo->set_status($event['id'], $user, $status))
 					{
-						if (!$msg) $msg = lang('Status changed');
+						if (!$msg)
+						{
+							$msg = lang('Status changed');
+						}
 					}
 					break;
 
@@ -2101,13 +2231,16 @@ 
 
 		foreach (array_keys($allConflicts) as $pId)
 		{
-			if(substr($pId,0,1) == 'r' && $resources_config ) // resources Allow ignore conflicts
+			if(substr($pId,0,1) == 'r' && $resources_config )
+			{
+				// resources Allow ignore conflicts
 			{
 
 				switch ($resources_config['ignoreconflicts'])
 				{
 					case 'no':
 						$readonlys['button[ignore]'] = true;
+			}
 						break;
 					case 'allusers':
 						$readonlys['button[ignore]'] = false;
@@ -2251,7 +2384,10 @@ 
 		}
 		else
 		{
-			if (!$content['duration']) $content['duration'] = $content['end'] - $content['start'];
+			if (!$content['duration'])
+			{
+				$content['duration'] = $content['end'] - $content['start'];
+			}
 			$weekds = 0;
 			foreach ($content['weekdays'] as &$wdays)
 			{
@@ -2273,7 +2409,10 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('freetime search');
 
 		$sel_options['duration'] = $this->durations;
-		if ($content['duration'] && isset($sel_options['duration'][$content['duration']])) $content['end'] = '';
+		if ($content['duration'] && isset($sel_options['duration'][$content['duration']]))
+		{
+			$content['end'] = '';
+		}
 
 		$etpl->exec('calendar.calendar_uiforms.freetimesearch',$content,$sel_options,NULL,array(
 				'participants'	=> $content['participants'],
@@ -2294,7 +2433,10 @@ 
 	 */
 	function freetime($participants,$start,$end,$duration=1,$cal_id=0)
 	{
-		if ($this->debug > 2) $this->bo->debug_message(__METHOD__.'(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5)',true,$participants,$start,$end,$duration,$cal_id);
+		if ($this->debug > 2)
+		{
+			$this->bo->debug_message(__METHOD__.'(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5)',true,$participants,$start,$end,$duration,$cal_id);
+		}
 
 		$busy = $this->bo->search(array(
 			'start' => $start,
@@ -2311,15 +2453,26 @@ 
 		$n = 0;
 		foreach($busy as $event)
 		{
-			if ((int)$cal_id && $event['id'] == (int)$cal_id) continue;	// ignore our own event
+			if ((int)$cal_id && $event['id'] == (int)$cal_id)
+			{
+				continue;
+			}
+			// ignore our own event
 
- 			if ($event['non_blocking']) continue; // ignore non_blocking events
+ 			if ($event['non_blocking'])
+ 			{
+ 				continue;
+ 			}
+ 			// ignore non_blocking events
 
 			// check if from all wanted participants at least one has a not rejected status in found event
 			$non_rejected_found = false;
 			foreach($participants as $uid)
 			{
-				if ($event['participants'][$uid] == 'R') continue;
+				if ($event['participants'][$uid] == 'R')
+				{
+					continue;
+				}
 
 				if (isset($event['participants'][$uid]) ||
 					$uid > 0 && array_intersect(array_keys((array)$event['participants']),
@@ -2329,7 +2482,10 @@ 
 					break;
 				}
 			}
-			if (!$non_rejected_found) continue;
+			if (!$non_rejected_found)
+			{
+				continue;
+			}
 
 			if ($this->debug)
 			{
@@ -2360,11 +2516,17 @@ 
 					'start'	=> $ft_start,
 					'end'	=> $ft_end,
 				);
-				if ($this->debug > 1) echo "<p>freetime: ".date('D d.m.Y H:i',$ft_start)." - ".date('D d.m.Y H:i',$ft_end)."</p>\n";
+				if ($this->debug > 1)
+				{
+					echo "<p>freetime: ".date('D d.m.Y H:i',$ft_start)." - ".date('D d.m.Y H:i',$ft_end)."</p>\n";
+				}
 			}
 			$ft_start = $event['end'];
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiforms::freetime(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5) freetime=%6',true,$participants,$start,$end,$duration,$cal_id,$freetime);
+		if ($this->debug > 0)
+		{
+			$this->bo->debug_message('uiforms::freetime(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5) freetime=%6',true,$participants,$start,$end,$duration,$cal_id,$freetime);
+		}
 
 		return $freetime;
 	}
@@ -2384,10 +2546,16 @@ 
 	 */
 	function split_freetime_daywise($freetime, $duration, $weekdays, $_start_time, $_end_time, &$sel_options)
 	{
-		if ($this->debug > 1) $this->bo->debug_message('uiforms::split_freetime_daywise(freetime=%1, duration=%2, start_time=%3, end_time=%4)',true,$freetime,$duration,$_start_time,$_end_time);
+		if ($this->debug > 1)
+		{
+			$this->bo->debug_message('uiforms::split_freetime_daywise(freetime=%1, duration=%2, start_time=%3, end_time=%4)',true,$freetime,$duration,$_start_time,$_end_time);
+		}
 
 		$freetime_daywise = array();
-		if (!is_array($sel_options)) $sel_options = array();
+		if (!is_array($sel_options))
+		{
+			$sel_options = array();
+		}
 		$time_format = $this->common_prefs['timeformat'] == 12 ? 'h:i a' : 'H:i';
 
 		$start_time = (int) $_start_time;	// ignore leading zeros
@@ -2397,7 +2565,10 @@ 
 		if (($end_time - $start_time)*HOUR_s < $duration)
 		{
 			$end_time = 0;
-			if ($this->debug > 1) $this->bo->debug_message('uiforms::split_freetime_daywise(, duration=%2, start_time=%3,..) end_time set to 0, it never fits durationn otherwise',true,$duration,$start_time);
+			if ($this->debug > 1)
+			{
+				$this->bo->debug_message('uiforms::split_freetime_daywise(, duration=%2, start_time=%3,..) end_time set to 0, it never fits durationn otherwise',true,$duration,$start_time);
+			}
 		}
 		$n = 0;
 		foreach($freetime as $ft)
@@ -2418,13 +2589,19 @@ 
 				}
 				$start = $t < $ft['start'] ? $ft['start'] : $t;
 
-				if ($start-$daybegin < $start_time*HOUR_s)	// start earlier then start_time
+				if ($start-$daybegin < $start_time*HOUR_s)
+				{
+					// start earlier then start_time
 				{
 					$start = $daybegin + $start_time*HOUR_s;
 				}
+				}
 				// if end_time given use it, else the original slot's end
 				$end = $end_time ? $daybegin + $end_time*HOUR_s : $ft['end'];
-				if ($end > $ft['end']) $end = $ft['end'];
+				if ($end > $ft['end'])
+				{
+					$end = $ft['end'];
+				}
 
 				// slot to small for duration
 				if ($end - $start < $duration)
@@ -2466,7 +2643,10 @@ 
 			{
 				$msg = lang('Permission denied');
 
-				if ($return_error) return $msg;
+				if ($return_error)
+				{
+					return $msg;
+				}
 			}
 			else
 			{
@@ -2528,27 +2708,42 @@ 
 		{
 			list($button) = each($_content['button']);
 			unset($_content['button']);
-			if ($button != 'cancel')	// store changed Acl
+			if ($button != 'cancel')
+			{
+				// store changed Acl
 			{
 				foreach($_content as $data)
 				{
 					if (!($cat_id = $data['cat_id'])) continue;
+			}
 					foreach(array_merge((array)$data['add'],(array)$data['status'],array_keys((array)$data['old'])) as $account_id)
 					{
 						$rights = 0;
-						if (in_array($account_id,(array)$data['add'])) $rights |= calendar_boupdate::CAT_ACL_ADD;
-						if (in_array($account_id,(array)$data['status'])) $rights |= calendar_boupdate::CAT_ACL_STATUS;
-						if ($account_id) $this->bo->set_cat_rights($cat_id,$account_id,$rights);
+						if (in_array($account_id,(array)$data['add']))
+						{
+							$rights |= calendar_boupdate::CAT_ACL_ADD;
+						}
+						if (in_array($account_id,(array)$data['status']))
+						{
+							$rights |= calendar_boupdate::CAT_ACL_STATUS;
+						}
+						if ($account_id)
+						{
+							$this->bo->set_cat_rights($cat_id,$account_id,$rights);
+						}
 					}
 				}
 			}
-			if ($button != 'apply')	// end dialog
+			if ($button != 'apply')
+			{
+				// end dialog
 			{
 				Egw::redirect_link('/index.php', array(
 					'menuaction' => 'admin.admin_ui.index',
 					'ajax' => 'true'
 				), 'admin');
 			}
+			}
 		}
 		$content= $preserv = array();
 		$n = 1;
@@ -2562,8 +2757,14 @@ 
 			);
 			foreach($data as $account_id => $rights)
 			{
-				if ($rights & calendar_boupdate::CAT_ACL_ADD) $row['add'][] = $account_id;
-				if ($rights & calendar_boupdate::CAT_ACL_STATUS) $row['status'][] = $account_id;
+				if ($rights & calendar_boupdate::CAT_ACL_ADD)
+				{
+					$row['add'][] = $account_id;
+				}
+				if ($rights & calendar_boupdate::CAT_ACL_STATUS)
+				{
+					$row['status'][] = $account_id;
+				}
 			}
 			$content[$n] = $row;
 			$preserv[$n] = array(
@@ -2691,7 +2892,10 @@ 
 					break;
 				}
 			}
-			if($return) return;
+			if($return)
+			{
+				return;
+			}
 		}
 		$old_event=$event=$this->bo->read($eventId);
 		if (!$durationT)
@@ -2784,7 +2988,10 @@ 
 			$this->bo->update($event,true, true, false, true, $message,true);
 
 			// Whole day non blocking with DAY_s would add a day
-			if($duration==DAY_s) $duration=0;
+			if($duration==DAY_s)
+			{
+				$duration=0;
+			}
 		}
 
 		$status_reset_to_unknown = false;
@@ -2802,7 +3009,10 @@ 
 					case 'no':
 						break;
 					case 'startday':
-						if ($sameday) break;
+						if ($sameday)
+						{
+							break;
+						}
 					default:
 						$status_reset_to_unknown = true;
 						$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
@@ -2840,7 +3050,10 @@ 
 		{
 			$response->call('egw.message',  implode('<br />', $message));
 		}
-		if($event['id'] != $eventId ) $this->update_client($_eventId);
+		if($event['id'] != $eventId )
+		{
+			$this->update_client($_eventId);
+		}
 		if ($status_reset_to_unknown)
 		{
 			foreach((array)$event['participants'] as $uid => $status)

calendar/inc/class.calendar_bo.inc.php

Indentation +20 added lines, -20 removed lines

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

Braces +206 added lines, -51 removed lines

@@ -15,10 +15,13 @@ 
 use EGroupware\Api\Link;
 use EGroupware\Api\Acl;
 
-if (!defined('ACL_TYPE_IDENTIFER'))	// used to mark ACL-values for the debug_message methode
+if (!defined('ACL_TYPE_IDENTIFER'))
+{
+	// used to mark ACL-values for the debug_message methode
 {
 	define('ACL_TYPE_IDENTIFER','***ACL***');
 }
+}
 
 define('HOUR_s',60*60);
 define('DAY_s',24*HOUR_s);
@@ -222,7 +225,10 @@ 
 	 */
 	function __construct()
 	{
-		if ($this->debug > 0) $this->debug_message('calendar_bo::bocal() started',True);
+		if ($this->debug > 0)
+		{
+			$this->debug_message('calendar_bo::bocal() started',True);
+		}
 
 		$this->so = new calendar_so();
 
@@ -308,7 +314,10 @@ 
 	 */
 	static function email_info($ids)
 	{
-		if (!$ids) return null;
+		if (!$ids)
+		{
+			return null;
+		}
 
 		$data = array();
 		foreach((array)$ids as $id)
@@ -391,10 +400,13 @@ 
 				$contact = 'c'.$contact['id'];
 				if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy?self::ACL_FREEBUSY:0),0,$contact))
 				{
-					if ($contact && !in_array($contact,$contact_list))	// already added?
+					if ($contact && !in_array($contact,$contact_list))
+					{
+						// already added?
 					{
 						$contact_list[] = $contact;
 					}
+					}
 				}
 			}
 		}
@@ -454,31 +466,43 @@ 
 			{
 				foreach($this->enum_mailing_list($user, $ignore_acl, $use_freebusy) as $contact)
 				{
-					if ($contact && !in_array($contact,$users))	// already added?
+					if ($contact && !in_array($contact,$users))
+					{
+						// already added?
 					{
 						$users[] = $contact;
 					}
+					}
 				}
 				continue;
 			}
 			if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy?self::ACL_FREEBUSY:0),0,$user))
 			{
-				if ($user && !in_array($user,$users))	// already added?
+				if ($user && !in_array($user,$users))
+				{
+					// already added?
 				{
 					$users[] = $user;
 				}
+				}
 			}
 			elseif ($GLOBALS['egw']->accounts->get_type($user) != 'g')
 			{
 				continue;	// for non-groups (eg. users), we stop here if we have no read-rights
 			}
 			// the further code is only for real users
-			if (!is_numeric($user)) continue;
+			if (!is_numeric($user))
+			{
+				continue;
+			}
 
 			// for groups we have to include the members
 			if ($GLOBALS['egw']->accounts->get_type($user) == 'g')
 			{
-				if ($no_enum_groups) continue;
+				if ($no_enum_groups)
+				{
+					continue;
+				}
 
 				$members = $GLOBALS['egw']->accounts->members($user, true);
 				if (is_array($members))
@@ -558,11 +582,14 @@ 
 		}
 
 		if (!isset($params['users']) || !$params['users'] ||
-			count($params['users']) == 1 && isset($params['users'][0]) && !$params['users'][0])	// null or '' casted to an array
+			count($params['users']) == 1 && isset($params['users'][0]) && !$params['users'][0])
+		{
+			// null or '' casted to an array
 		{
 			// for a search use all account you have read grants from
 			$params['users'] = $params['query'] ? array_keys($this->grants) : $this->user;
 		}
+		}
 		// resolve users to add memberships for users and members for groups
 		// for search, do NOT use freebusy rights, as it would allow to probe the content of event entries
 		$users = $this->resolve_users($params['users'], $params['filter'] == 'no-enum-groups', $params['ignore_acl'], empty($params['query']));
@@ -573,7 +600,10 @@ 
 			$params['private_grants'] = array();
 			foreach($this->grants as $user => $rights)
 			{
-				if ($rights & Acl::PRIVAT) $params['private_grants'][] = $user;
+				if ($rights & Acl::PRIVAT)
+				{
+					$params['private_grants'][] = $user;
+				}
 			}
 		}
 
@@ -588,7 +618,10 @@ 
 		{
 			return false;
 		}
-		if (isset($params['start'])) $start = $this->date2ts($params['start']);
+		if (isset($params['start']))
+		{
+			$start = $this->date2ts($params['start']);
+		}
 
 		if (isset($params['end']))
 		{
@@ -652,10 +685,13 @@ 
 				$this->debug_message('socalendar::search daywise sorting from %1 to %2 of %3',False,$start,$end,$events);
 			}
 			// create empty entries for each day in the reported time
-			for($ts = $start; $ts <= $end; $ts += DAY_s) // good enough for array creation, but see while loop below.
+			for($ts = $start; $ts <= $end; $ts += DAY_s)
+			{
+				// good enough for array creation, but see while loop below.
 			{
 				$daysEvents[$this->date2string($ts)] = array();
 			}
+			}
 			foreach($events as $k => $event)
 			{
 				$e_start = max($this->date2ts($event['start']),$start);
@@ -707,7 +743,10 @@ 
 			$integration_data = calendar_so::get_integration_data();
 		}
 
-		if (!isset($integration_data[$app])) return null;
+		if (!isset($integration_data[$app]))
+		{
+			return null;
+		}
 
 		return $part ? $integration_data[$app][$part] : $integration_data[$app];
 	}
@@ -754,8 +793,14 @@ 
 	 */
 	function clear_private_infos(&$event,$allowed_participants = array())
 	{
-		if ($event == false) return;
-		if (!is_array($event['participants'])) error_log(__METHOD__.'('.array2string($event).', '.array2string($allowed_participants).') NO PARTICIPANTS '.function_backtrace());
+		if ($event == false)
+		{
+			return;
+		}
+		if (!is_array($event['participants']))
+		{
+			error_log(__METHOD__.'('.array2string($event).', '.array2string($allowed_participants).') NO PARTICIPANTS '.function_backtrace());
+		}
 
 		$event = array(
 			'id'    => $event['id'],
@@ -800,19 +845,29 @@ 
 		}
 		$new_horizont = $this->date2ts($_new_horizont,true);	// now we are in server-time, where this function operates
 
-		if ($new_horizont <= $this->config['horizont'])	// no move necessary
+		if ($new_horizont <= $this->config['horizont'])
+		{
+			// no move necessary
 		{
 			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 is bigger ==> nothing to do',true,$new_horizont,(int)$this->config['horizont']);
+		}
 			return;
 		}
 		if (!empty($GLOBALS['egw_info']['server']['calendar_horizont']))
 		{
 			$maxdays = abs($GLOBALS['egw_info']['server']['calendar_horizont']);
 		}
-		if (empty($maxdays)) $maxdays = 1000; // old default
-		if ($new_horizont > time()+$maxdays*DAY_s)		// some user tries to "look" more then the maximum number of days in the future
+		if (empty($maxdays))
+		{
+			$maxdays = 1000;
+		}
+		// old default
+		if ($new_horizont > time()+$maxdays*DAY_s)
+		{
+			// some user tries to "look" more then the maximum number of days in the future
 		{
 			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 new horizont more then %3 days from now --> ignoring it',true,$new_horizont,(int)$this->config['horizont'],$maxdays);
+		}
 			$this->warnings['horizont'] = lang('Requested date %1 outside allowed range of %2 days: recurring events obmitted!', Api\DateTime::to($new_horizont,true), $maxdays);
 			return;
 		}
@@ -840,7 +895,10 @@ 
 		// update the horizont
 		Api\Config::save_value('horizont',$this->config['horizont'],'calendar');
 
-		if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) new horizont=%2, exiting',true,$new_horizont,(int)$this->config['horizont']);
+		if ($this->debug == 'check_move_horizont')
+		{
+			$this->debug_message('calendar_bo::check_move_horizont(%1) new horizont=%2, exiting',true,$new_horizont,(int)$this->config['horizont']);
+		}
 	}
 
 	/**
@@ -871,7 +929,10 @@ 
 				$event['end'] = $event_read['end'];
 			}
 		}
-		if (!$start) $start = $event['start'];
+		if (!$start)
+		{
+			$start = $event['start'];
+		}
 
 		$events = array();
 		$this->insert_all_recurrences($event,$start,$this->date2usertime($this->config['horizont']),$events);
@@ -911,7 +972,10 @@ 
 	 */
 	function db2data(&$events,$date_format='ts')
 	{
-		if (!is_array($events)) echo "<p>calendar_bo::db2data(\$events,$date_format) \$events is no array<br />\n".function_backtrace()."</p>\n";
+		if (!is_array($events))
+		{
+			echo "<p>calendar_bo::db2data(\$events,$date_format) \$events is no array<br />\n".function_backtrace()."</p>\n";
+		}
 		foreach ($events as &$event)
 		{
 			// convert timezone id of event to tzid (iCal id like 'Europe/Berlin')
@@ -995,7 +1059,10 @@ 
 	 */
 	function date2usertime($ts,$date_format='ts')
 	{
-		if (empty($ts) || $date_format == 'server') return $ts;
+		if (empty($ts) || $date_format == 'server')
+		{
+			return $ts;
+		}
 
 		return Api\DateTime::server2user($ts,$date_format);
 	}
@@ -1013,9 +1080,15 @@ 
 	 */
 	function read($ids,$date=null,$ignore_acl=False,$date_format='ts',$clear_private_infos_users=null)
 	{
-		if (!$ids) return false;
+		if (!$ids)
+		{
+			return false;
+		}
 
-		if ($date) $date = $this->date2ts($date);
+		if ($date)
+		{
+			$date = $this->date2ts($date);
+		}
 
 		$return = null;
 
@@ -1180,7 +1253,10 @@ 
 	{
 		static $res_info_cache = array();
 
-		if (!is_scalar($uid)) throw new Api\Exception\WrongParameter(__METHOD__.'('.array2string($uid).') parameter must be scalar');
+		if (!is_scalar($uid))
+		{
+			throw new Api\Exception\WrongParameter(__METHOD__.'('.array2string($uid).') parameter must be scalar');
+		}
 
 		if (!isset($res_info_cache[$uid]))
 		{
@@ -1235,7 +1311,10 @@ 
 	 */
 	function check_perms($needed,$event=0,$other=0,$date_format='ts',$date_to_read=null,$user=null)
 	{
-		if (!$user) $user = $this->user;
+		if (!$user)
+		{
+			$user = $this->user;
+		}
 		if ($user == $this->user)
 		{
 			$grants = $this->grants;
@@ -1274,7 +1353,10 @@ 
 		$grant = $grants[$owner];
 
 		// now any ACL rights (but invite rights!) implicate FREEBUSY rights (at least READ has to include FREEBUSY)
-		if ($grant & ~self::ACL_INVITE) $grant |= self::ACL_FREEBUSY;
+		if ($grant & ~self::ACL_INVITE)
+		{
+			$grant |= self::ACL_FREEBUSY;
+		}
 
 		if (is_array($event) && ($needed == Acl::READ || $needed == self::ACL_FREEBUSY))
 		{
@@ -1300,7 +1382,10 @@ 
 					elseif (!is_numeric($uid))
 					{
 						// if the owner only grants self::ACL_FREEBUSY we are not interested in the recources explicit rights
-						if ($grant == self::ACL_FREEBUSY) continue;
+						if ($grant == self::ACL_FREEBUSY)
+						{
+							continue;
+						}
 						// if we have a resource as participant
 						$resource = $this->resource_info($uid);
 						$grant |= $resource['rights'];
@@ -1451,14 +1536,20 @@ 
 						$param = $param ? 'True' : 'False';
 						break;
 					case 'integer':
-						if ($param >= mktime(0,0,0,1,1,2000)) $param = adodb_date('Y-m-d H:i:s',$param)." ($param)";
+						if ($param >= mktime(0,0,0,1,1,2000))
+						{
+							$param = adodb_date('Y-m-d H:i:s',$param)." ($param)";
+						}
 						break;
 				}
 			}
 			$msg = str_replace('%'.($i-1),$param,$msg);
 		}
 		error_log($msg);
-		if ($backtrace) error_log(function_backtrace(1));
+		if ($backtrace)
+		{
+			error_log(function_backtrace(1));
+		}
 	}
 
 	/**
@@ -1566,14 +1657,20 @@ 
 	function timespan($start_m,$end_m,$both=false)
 	{
 		$duration = $end_m - $start_m;
-		if ($end_m == 24*60-1) ++$duration;
+		if ($end_m == 24*60-1)
+		{
+			++$duration;
+		}
 		$duration = floor($duration/60).lang('h').($duration%60 ? $duration%60 : '');
 
 		$timespan = $t = Api\DateTime::to('20000101T'.sprintf('%02d',$start_m/60).sprintf('%02d',$start_m%60).'00', false);
 
-		if ($both)	// end-time too
+		if ($both)
+		{
+			// end-time too
 		{
 			$timespan .= ' - '.Api\DateTime::to('20000101T'.sprintf('%02d',$end_m/60).sprintf('%02d',$end_m%60).'00', false);
+		}
 			// dont double am/pm if they are the same in both times
 			if ($this->common_prefs['timeformat'] == 12 && substr($timespan,-2) == substr($t,-2))
 			{
@@ -1597,7 +1694,10 @@ 
 		static $id2lid = array();
 		static $id2email = array();
 
-		if ($use_type && $use_type != 'u') $id = $use_type.$id;
+		if ($use_type && $use_type != 'u')
+		{
+			$id = $use_type.$id;
+		}
 
 		if (!isset($id2lid[$id]))
 		{
@@ -1607,7 +1707,10 @@ 
 				if (($info = $this->resource_info($id)))
 				{
 					$id2lid[$id] = $info['name'] ? $info['name'] : $info['email'];
-					if ($info['name']) $id2email[$id] = $info['email'];
+					if ($info['name'])
+					{
+						$id2email[$id] = $info['email'];
+					}
 				}
 			}
 			else
@@ -1633,11 +1736,18 @@ 
 		$names = array();
 		foreach((array)$event['participants'] as $id => $status)
 		{
-			if (!is_string($status)) continue;
+			if (!is_string($status))
+			{
+				continue;
+			}
 			$quantity = $role = null;
 			calendar_so::split_status($status,$quantity,$role);
 
-			if ($status == 'G' && !$show_group_invitation) continue;	// dont show group-invitation
+			if ($status == 'G' && !$show_group_invitation)
+			{
+				continue;
+			}
+			// dont show group-invitation
 
 			$lang_status = lang($this->verbose_status[$status]);
 			if (!$long_status)
@@ -1710,7 +1820,10 @@ 
 
 		foreach(explode(',',$category) as $cat_id)
 		{
-			if (!$cat_id) continue;
+			if (!$cat_id)
+			{
+				continue;
+			}
 
 			if (!isset($id2cat[$cat_id]))
 			{
@@ -1776,7 +1889,10 @@ 
 	 */
 	public static function list_calendars($user, array $grants=null)
 	{
-		if (is_null($grants)) $grants = $GLOBALS['egw']->acl->get_grants('calendar', true, $user);
+		if (is_null($grants))
+		{
+			$grants = $GLOBALS['egw']->acl->get_grants('calendar', true, $user);
+		}
 
 		$users = $groups = array();
 		foreach(array_keys($grants) as $id)
@@ -1824,7 +1940,10 @@ 
 	 */
 	function recure2string($event)
 	{
-		if (!is_array($event)) return false;
+		if (!is_array($event))
+		{
+			return false;
+		}
 		return (string)calendar_rrule::event2rrule($event);
 	}
 
@@ -1843,12 +1962,18 @@ 
 	 */
 	function read_holidays($year=0)
 	{
-		if (!$year) $year = (int) date('Y',$this->now_su);
+		if (!$year)
+		{
+			$year = (int) date('Y',$this->now_su);
+		}
 
-		if (!$this->cached_holidays)	// try reading the holidays from the session
+		if (!$this->cached_holidays)
+		{
+			// try reading the holidays from the session
 		{
 			$this->cached_holidays = Api\Cache::getSession('calendar', 'holidays');
 		}
+		}
 		if (!isset($this->cached_holidays[$year]))
 		{
 			$this->cached_holidays[$year] = calendar_holidays::read(
@@ -1891,7 +2016,11 @@ 
 							continue;
 						}
 						list($y,$m,$d) = explode('-',$pers['bday']);
-						if ($y > $year) continue; 	// not yet born
+						if ($y > $year)
+						{
+							continue;
+						}
+						// not yet born
 						$this->cached_holidays[$year][sprintf('%04d%02d%02d',$year,$m,$d)][] = array(
 							'day'       => $d,
 							'month'     => $m,
@@ -1984,7 +2113,10 @@ 
 				}
 			}
 			$str_fields = implode(', ',$extra_fields);
-			if (is_array($extra_fields)) return $this->format_date($event['start']) . ': ' . $event['title'] . ($str_fields? ', ' . $str_fields:'');
+			if (is_array($extra_fields))
+			{
+				return $this->format_date($event['start']) . ': ' . $event['title'] . ($str_fields? ', ' . $str_fields:'');
+			}
 		}
 		return $this->format_date($event['start']) . ': ' . $event['title'];
 	}
@@ -2005,7 +2137,8 @@ 
 			'offset' =>	$options['start'],
 			'order' => 'cal_start DESC',
 		);
-		if($options['num_rows']) {
+		if($options['num_rows'])
+		{
 			$query['num_rows'] = $options['num_rows'];
 		}
 		foreach((array) $this->search($query) as $event)
@@ -2066,7 +2199,10 @@ 
 			if ((!isset($default_prefs[$var]) || (string)$default_prefs[$var] === '') && (!isset($forced_prefs[$var]) || (string)$forced_prefs[$var] === ''))
 			{
 				$GLOBALS['egw']->preferences->add('calendar',$var,$default,'default');	// always store default, even if we have a forced too
-				if ($type == 'forced') $GLOBALS['egw']->preferences->add('calendar',$var,$default,'forced');
+				if ($type == 'forced')
+				{
+					$GLOBALS['egw']->preferences->add('calendar',$var,$default,'forced');
+				}
 				$this->cal_prefs[$var] = $default;
 				$need_save = True;
 			}
@@ -2086,7 +2222,10 @@ 
 	 */
 	static function freebusy_url($user='',$pw=null)
 	{
-		if (is_numeric($user)) $user = $GLOBALS['egw']->accounts->id2name($user);
+		if (is_numeric($user))
+		{
+			$user = $GLOBALS['egw']->accounts->id2name($user);
+		}
 
 		$credentials = '';
 
@@ -2154,13 +2293,19 @@ 
 	 */
 	public function get_ctag($user, $filter='owner', $master_only=false)
 	{
-		if ($this->debug > 1) $startime = microtime(true);
+		if ($this->debug > 1)
+		{
+			$startime = microtime(true);
+		}
 
 		// resolve users to add memberships for users and members for groups
 		$users = $this->resolve_users($user);
 		$ctag = $users ? $this->so->get_ctag($users, $filter == 'owner', $master_only) : 0;	// no rights, return 0 as ctag (otherwise we get SQL error!)
 
-		if ($this->debug > 1) error_log(__METHOD__. "($user, '$filter', $master_only) = $ctag = ".date('Y-m-d H:i:s',$ctag)." took ".(microtime(true)-$startime)." secs");
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__. "($user, '$filter', $master_only) = $ctag = ".date('Y-m-d H:i:s',$ctag)." took ".(microtime(true)-$startime)." secs");
+		}
 		return $ctag;
 	}
 
@@ -2202,15 +2347,21 @@ 
 				$content['link_app'][] = $link['app'];
 				$content['link_id'][]  = $link['id'];
 			}
-			if ($link['app'] == 'addressbook')	// prefering contact as primary contact over calendar entry set above
+			if ($link['app'] == 'addressbook')
+			{
+				// prefering contact as primary contact over calendar entry set above
 			{
 				$content['info_contact'] = 'addressbook:'.$link['id'];
 			}
+			}
 		}
 		// Copy same custom fields
 		foreach(array_keys(Api\Storage\Customfields::get('infolog')) as $name)
 		{
-			if ($this->customfields[$name]) $content['#'.$name] = $calendar['#'.$name];
+			if ($this->customfields[$name])
+			{
+				$content['#'.$name] = $calendar['#'.$name];
+			}
 		}
 		//error_log(__METHOD__.'('.array2string($data).') calendar='.array2string($calendar).' returning '.array2string($content));
 		return $content;
@@ -2233,7 +2384,11 @@ 
 			$set['ts_title'] = $this->link_title($event);
 			$set['start_time'] = Api\DateTime::to($event['start'],'H:i');
 			$set['ts_description'] = $event['description'];
-			if ($this->isWholeDay($event)) $event['end']++;	// whole day events are 1sec short
+			if ($this->isWholeDay($event))
+			{
+				$event['end']++;
+			}
+			// whole day events are 1sec short
 			$set['ts_duration']	= ($event['end'] - $event['start']) / 60;
 			$set['ts_quantity'] = ($event['end'] - $event['start']) / 3600;
 			$set['end_time'] = null;	// unset end-time