EGroupware / egroupware

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 +25 added lines, -8 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
@@ -200,7 +205,10 @@ 
 		}
 
 		// Prepend site, if missing
-		if ($link[0] == '/') $link = Api\Framework::getUrl($link);
+		if ($link[0] == '/')
+		{
+			$link = Api\Framework::getUrl($link);
+		}
 
 		$file['link'] = Api\Html::a_href(Api\Html::htmlspecialchars($file['name']), $link);
 		$file['webdav_url'] = Api\Session::link(Vfs::download_url($file['url']));
@@ -209,7 +217,10 @@ 
 		// Add markers
 		foreach($file as $key => &$value)
 		{
-			if(!$value) $value = '';
+			if(!$value)
+			{
+				$value = '';
+			}
 			$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
 		}
 		if($app_placeholders)
@@ -251,9 +262,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 +25 added lines, -7 removed lines

@@ -1428,13 +1428,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',
@@ -1443,6 +1448,7 @@ 
 					'order' => ($order += 10),
 				);
 			}
+			}
 		}
 		if (count($customfields))
 		{
@@ -2583,9 +2589,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'))),
 				__LINE__, __FILE__, 'calendar');
@@ -2735,8 +2744,12 @@ 
 function calendar_upgrade16_1_002()
 {
 	// Explicitly add months as showing list of events, no times
-	$change = function($attr, $old_value, $owner) {
-		if($owner == Api\Preferences::FORCED_ID) return;
+	$change = function($attr, $old_value, $owner)
+	{
+		if($owner == Api\Preferences::FORCED_ID)
+		{
+			return;
+		}
 		if(is_array($old_value) && !in_array('month', $old_value))
 		{
 			$old_value[] = 'month';
@@ -2759,8 +2772,13 @@ 
 function calendar_upgrade17_1()
 {
 	// Update birthdays as events preference from boolean
-	$change = function($attr, $old_value, $owner) {
-		if (!isset($old_value)) return null;	// do not set anything, if nothing was set before
+	$change = function($attr, $old_value, $owner)
+	{
+		if (!isset($old_value))
+		{
+			return null;
+		}
+		// do not set anything, if nothing was set before
 		unset($attr, $owner);
 		return $old_value ? 'birthday' : 'none';
 	};

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,7 +109,8 @@ 
 		}
 
 		// Parse particpants
-		if ($record->participants && !is_array($record->participants)) {
+		if ($record->participants && !is_array($record->participants))
+		{
 			$warning = '';
 			$record->participants = $this->parse_participants($record, $warning);
 			if($warning)
@@ -138,27 +142,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() ));
 						}
@@ -169,9 +184,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() );
 		}
@@ -197,7 +217,8 @@ 
 		$missing = array();
 
 		list($lines, $p, $names, $quantity, $status, $role) = $participants;
-		foreach($names as $key => $name) {
+		foreach($names as $key => $name)
+		{
 			//echo (__METHOD__ ." Name: $name Quantity: {$quantity[$key]} Status: {$status[$key]} Role: {$role[$key]}");
 
 			// Search for direct account name, then user in accounts first
@@ -205,9 +226,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)
 			{
@@ -215,7 +240,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')
 					{
@@ -224,7 +252,8 @@ 
 							$this->resource_so = new resources_so();
 						}
 						$result = $this->resource_so->search($search,'res_id');
-						if($result && count($result) >= 1) {
+						if($result && count($result) >= 1)
+						{
 							$id = $resource['type'].$result[0]['res_id'];
 							break;
 						}
@@ -243,7 +272,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,
@@ -274,12 +304,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;
@@ -295,7 +327,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' :
@@ -303,7 +336,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']);
 				}
@@ -313,24 +347,28 @@ 
 				{
 					$_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
@@ -346,7 +384,9 @@ 
 					}
 					$this->results[$_action]++;
 					return true;
-				} else {
+				}
+				else
+				{
 					$messages = null;
 					$result = $this->bo->update( $_data,
 						!$this->definition->plugin_options['skip_conflicts'],
@@ -398,7 +438,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Calendar CSV import');
 	}
 
@@ -407,7 +448,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 Separated Values'. However in the options Tab you can also choose other seperators.");
 	}
 
@@ -416,7 +458,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 

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 +51 added lines, -17 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,
@@ -560,7 +573,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 : new Api\DateTime();
 		$cont['owner'] = $this->owner ? (is_array($this->owner) ? $this->owner : explode(',',$this->owner) ) : $cont['owner'];
@@ -593,8 +609,7 @@ 
 			if (class_exists('EGroupware\\collabora\\Bo') &&
 					$GLOBALS['egw_info']['user']['apps']['collabora'] &&
 					$discovery = \EGroupware\collabora\Bo::discover()
-			)
-			{
+			) {
 				$cont['collabora_enabled'] = true;
 			}
 		}
@@ -635,7 +650,10 @@ 
 	 */
 	public function update_client($event_id, Api\DateTime $recurrence_date = null)
 	{
-		if(!$event_id) return false;
+		if(!$event_id)
+		{
+			return false;
+		}
 		if(is_string($event_id) && strpos($event_id,':') !== FALSE)
 		{
 			list($event_id, $date) = explode(':',$event_id);
@@ -706,7 +724,10 @@ 
 	 */
 	public function to_client(&$event)
 	{
-		if(!$event || !is_array($event)) return false;
+		if(!$event || !is_array($event))
+		{
+			return false;
+		}
 
 		static $sent_groups = array();
 
@@ -729,8 +750,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']))
@@ -828,8 +857,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)
 				{
@@ -910,8 +945,7 @@ 
 			if (class_exists('EGroupware\\collabora\\Bo') &&
 					$GLOBALS['egw_info']['user']['apps']['collabora'] &&
 					$discovery = \EGroupware\collabora\Bo::discover()
-			)
-			{
+			) {
 				$editable_mimes = $discovery;
 			}
 		}

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 +201 added lines, -50 removed lines

@@ -15,10 +15,13 @@ 
 use EGroupware\Api\Link;
 use EGroupware\Api\Acl;
 
-if (!defined('ACL_TYPE_IDENTIFER'))	// used to mark ACL-values for the debug_message methode
+if (!defined('ACL_TYPE_IDENTIFER'))
+{
+	// used to mark ACL-values for the debug_message methode
 {
 	define('ACL_TYPE_IDENTIFER','***ACL***');
 }
+}
 
 define('HOUR_s',60*60);
 define('DAY_s',24*HOUR_s);
@@ -219,7 +222,10 @@ 
 	 */
 	function __construct()
 	{
-		if ($this->debug > 0) $this->debug_message('calendar_bo::bocal() started',True);
+		if ($this->debug > 0)
+		{
+			$this->debug_message('calendar_bo::bocal() started',True);
+		}
 
 		$this->so = new calendar_so();
 
@@ -305,7 +311,10 @@ 
 	 */
 	static function email_info($ids)
 	{
-		if (!$ids) return null;
+		if (!$ids)
+		{
+			return null;
+		}
 
 		$data = array();
 		foreach((array)$ids as $id)
@@ -398,10 +407,13 @@ 
 				}
 				if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy?self::ACL_FREEBUSY:0),0,$contact))
 				{
-					if ($contact && !in_array($contact,$contact_list))	// already added?
+					if ($contact && !in_array($contact,$contact_list))
+					{
+						// already added?
 					{
 						$contact_list[] = $contact;
 					}
+					}
 				}
 			}
 		}
@@ -461,21 +473,27 @@ 
 			{
 				foreach($this->enum_mailing_list($user, $ignore_acl, $use_freebusy) as $contact)
 				{
-					if ($contact && !in_array($contact,$users))	// already added?
+					if ($contact && !in_array($contact,$users))
+					{
+						// already added?
 					{
 						$users[] = $contact;
 					}
+					}
 				}
 				continue;
 			}
 			if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy?self::ACL_FREEBUSY:0),0,$user))
 			{
-				if ($user && !in_array($user,$users))	// already added?
+				if ($user && !in_array($user,$users))
+				{
+					// already added?
 				{
 					// General expansion check
 					if (!is_numeric($user) && $this->resources[$user[0]]['info'])
 					{
 						$info = $this->resource_info($user);
+				}
 						if($info && $info['resources'])
 						{
 							foreach($info['resources'] as $_user)
@@ -496,12 +514,18 @@ 
 				continue;	// for non-groups (eg. users), we stop here if we have no read-rights
 			}
 			// the further code is only for real users
-			if (!is_numeric($user)) continue;
+			if (!is_numeric($user))
+			{
+				continue;
+			}
 
 			// for groups we have to include the members
 			if ($GLOBALS['egw']->accounts->get_type($user) == 'g')
 			{
-				if ($no_enum_groups) continue;
+				if ($no_enum_groups)
+				{
+					continue;
+				}
 
 				$members = $GLOBALS['egw']->accounts->members($user, true);
 				if (is_array($members))
@@ -583,11 +607,14 @@ 
 		}
 
 		if (empty($params['users']) ||
-			is_array($params['users']) && count($params['users']) == 1 && empty($params['users'][0]))	// null or '' casted to an array
+			is_array($params['users']) && count($params['users']) == 1 && empty($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']));
@@ -602,7 +629,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;
+				}
 			}
 		}
 
@@ -617,7 +647,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']))
 		{
@@ -681,10 +714,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);
@@ -736,7 +772,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];
 	}
@@ -783,8 +822,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'],
@@ -829,19 +874,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;
 		}
@@ -869,7 +924,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']);
+		}
 	}
 
 	/**
@@ -900,7 +958,10 @@ 
 				$event['end'] = $this->date2usertime($event_read['end']);
 			}
 		}
-		if (!$start) $start = $event['start'];
+		if (!$start)
+		{
+			$start = $event['start'];
+		}
 
 		$events = array();
 
@@ -944,7 +1005,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')
@@ -1028,7 +1092,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);
 	}
@@ -1047,9 +1114,15 @@ 
 	 */
 	function read($ids,$date=null, $ignore_acl=False, $date_format='ts', $clear_private_infos_users=null, $read_recurrence=false)
 	{
-		if (!$ids) return false;
+		if (!$ids)
+		{
+			return false;
+		}
 
-		if ($date) $date = $this->date2ts($date);
+		if ($date)
+		{
+			$date = $this->date2ts($date);
+		}
 
 		$return = null;
 
@@ -1224,7 +1297,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]))
 		{
@@ -1279,7 +1355,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;
@@ -1318,7 +1397,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))
 		{
@@ -1344,7 +1426,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'];
@@ -1495,14 +1580,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));
+		}
 	}
 
 	/**
@@ -1610,14 +1701,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))
 			{
@@ -1641,7 +1738,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]))
 		{
@@ -1651,7 +1751,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
@@ -1677,11 +1780,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)
@@ -1754,7 +1864,10 @@ 
 
 		foreach(explode(',',$category) as $cat_id)
 		{
-			if (!$cat_id) continue;
+			if (!$cat_id)
+			{
+				continue;
+			}
 
 			if (!isset($id2cat[$cat_id]))
 			{
@@ -1820,7 +1933,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)
@@ -1868,7 +1984,10 @@ 
 	 */
 	function recure2string($event)
 	{
-		if (!is_array($event)) return false;
+		if (!is_array($event))
+		{
+			return false;
+		}
 		return (string)calendar_rrule::event2rrule($event);
 	}
 
@@ -1887,7 +2006,10 @@ 
 	 */
 	function read_holidays($year=0)
 	{
-		if (!$year) $year = (int) date('Y',$this->now_su);
+		if (!$year)
+		{
+			$year = (int) date('Y',$this->now_su);
+		}
 
 		$holidays = calendar_holidays::read(
 				!empty($GLOBALS['egw_info']['server']['ical_holiday_url']) ?
@@ -1912,7 +2034,10 @@ 
 					foreach($bdays as $birthday)
 					{
 						// Skip if name / date are already there - duplicate contacts
-						if(in_array($birthday['name'], array_column($holidays[$date], 'name'))) continue;
+						if(in_array($birthday['name'], array_column($holidays[$date], 'name')))
+						{
+							continue;
+						}
 						$holidays[$date][] = $birthday;
 					}
 				}
@@ -1997,7 +2122,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'];
 	}
@@ -2018,7 +2146,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)
@@ -2079,7 +2208,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;
 			}
@@ -2099,7 +2231,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 = '';
 
@@ -2167,13 +2302,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;
 	}
 
@@ -2215,15 +2356,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;
@@ -2246,7 +2393,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

calendar/inc/class.calendar_boupdate.inc.php

Indentation +39 added lines, -39 removed lines

@@ -1504,22 +1504,22 @@ 
 		// check the old list against the new list
 		foreach ($old_event['participants'] as $userid => $status)
   		{
-            if (!isset($new_event['participants'][$userid])){
-            	// Attendee will be deleted this way
-            	$new_event['participants'][$userid] = 'G';
-            }
-            elseif ($new_event['participants'][$userid] == $status)
-            {
-            	// Same status -- nothing to do.
-            	unset($new_event['participants'][$userid]);
-            }
+			if (!isset($new_event['participants'][$userid])){
+				// Attendee will be deleted this way
+				$new_event['participants'][$userid] = 'G';
+			}
+			elseif ($new_event['participants'][$userid] == $status)
+			{
+				// Same status -- nothing to do.
+				unset($new_event['participants'][$userid]);
+			}
 		}
 		// write the changes
 		foreach ($new_event['participants'] as $userid => $status)
 		{
 			$this->set_status($old_event, $userid, $status, $recur_date, true, false,$skip_notification);
 		}
-    }
+	}
 
 	/**
 	 * deletes an event
@@ -2493,24 +2493,24 @@ 
 	/**
 	 * classifies an incoming event from the eGW point-of-view
 	 *
-     * exceptions: unlike other calendar apps eGW does not create an event exception
-     * if just the participant state changes - therefore we have to distinguish between
-     * real exceptions and status only exceptions
-     *
-     * @param array $event the event to check
-     *
-     * @return array
-     * 	type =>
-     * 		SINGLE a single event
-     * 		SERIES-MASTER the series master
-     * 		SERIES-EXCEPTION event is a real exception
-	  * 		SERIES-PSEUDO-EXCEPTION event is a status only exception
-	  * 		SERIES-EXCEPTION-PROPAGATE event was a status only exception in the past and is now a real exception
-	  * 	stored_event => if event already exists in the database array with event data or false
-	  * 	master_event => for event type SERIES-EXCEPTION, SERIES-PSEUDO-EXCEPTION or SERIES-EXCEPTION-PROPAGATE
-	  * 		the corresponding series master event array
-	  * 		NOTE: this param is false if event is of type SERIES-MASTER
-     */
+	 * exceptions: unlike other calendar apps eGW does not create an event exception
+	 * if just the participant state changes - therefore we have to distinguish between
+	 * real exceptions and status only exceptions
+	 *
+	 * @param array $event the event to check
+	 *
+	 * @return array
+	 * 	type =>
+	 * 		SINGLE a single event
+	 * 		SERIES-MASTER the series master
+	 * 		SERIES-EXCEPTION event is a real exception
+	 * 		SERIES-PSEUDO-EXCEPTION event is a status only exception
+	 * 		SERIES-EXCEPTION-PROPAGATE event was a status only exception in the past and is now a real exception
+	 * 	stored_event => if event already exists in the database array with event data or false
+	 * 	master_event => for event type SERIES-EXCEPTION, SERIES-PSEUDO-EXCEPTION or SERIES-EXCEPTION-PROPAGATE
+	 * 		the corresponding series master event array
+	 * 		NOTE: this param is false if event is of type SERIES-MASTER
+	 */
 	function get_event_info($event)
 	{
 		$type = 'SINGLE'; // default
@@ -2681,16 +2681,16 @@ 
 			'stored_event' => $stored_event,
 			'master_event' => $master_event,
 		);
-    }
-
-    /**
-     * Translates all timestamps for a given event from server-time to user-time.
-     * The update() and save() methods expect timestamps in user-time.
-     * @param &$event	the event we are working on
-     *
-     */
-    function server2usertime (&$event)
-    {
+	}
+
+	/**
+	 * Translates all timestamps for a given event from server-time to user-time.
+	 * The update() and save() methods expect timestamps in user-time.
+	 * @param &$event	the event we are working on
+	 *
+	 */
+	function server2usertime (&$event)
+	{
 		// we run all dates through date2usertime, to adjust to user-time
 		foreach(array('start','end','recur_enddate','recurrence') as $ts)
 		{
@@ -2713,7 +2713,7 @@ 
 				$event['alarm'][$id]['time'] = $this->date2usertime($alarm['time']);
 			}
 		}
-    }
+	}
 	/**
 	 * Delete events that are more than $age years old
 	 *

Braces +227 added lines, -58 removed lines

@@ -85,11 +85,17 @@ 
 	 */
 	function __construct()
 	{
-		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() started',True);
+		if ($this->debug > 0)
+		{
+			$this->debug_message('calendar_boupdate::__construct() started',True);
+		}
 
 		parent::__construct();	// calling the parent constructor
 
-		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() finished',True);
+		if ($this->debug > 0)
+		{
+			$this->debug_message('calendar_boupdate::__construct() finished',True);
+		}
 	}
 
 	/**
@@ -120,7 +126,10 @@ 
 	{
 		unset($updateTS);	// ignored, as updating timestamps is required for sync!
 		//error_log(__METHOD__."(".array2string($event).",$ignore_conflicts,$touch_modified,$ignore_acl)");
-		if (!is_array($messages)) $messages = $messages ? (array)$messages : array();
+		if (!is_array($messages))
+		{
+			$messages = $messages ? (array)$messages : array();
+		}
 
 		if ($this->debug > 1 || $this->debug == 'update')
 		{
@@ -140,10 +149,13 @@ 
 
 		$status_reset_to_unknown = false;
 
-		if (($new_event = !$event['id']))	// some defaults for new entries
+		if (($new_event = !$event['id']))
+		{
+			// some defaults for new entries
 		{
 			// if no owner given, set user to owner
 			if (!$event['owner']) $event['owner'] = $this->user;
+		}
 			// set owner as participant if none is given
 			if (!is_array($event['participants']) || !count($event['participants']))
 			{
@@ -183,7 +195,10 @@ 
 		// check category based ACL
 		if ($event['category'])
 		{
-			if (!is_array($event['category'])) $event['category'] = explode(',',$event['category']);
+			if (!is_array($event['category']))
+			{
+				$event['category'] = explode(',',$event['category']);
+			}
 			if (!$old_event || !isset($old_event['category']))
 			{
 				$old_event['category'] = array();
@@ -235,13 +250,16 @@ 
 		if (!$ignore_conflicts && !$event['non_blocking'] && isset($event['start']) && isset($event['end']) &&
 			(($conflicts = $this->conflicts($event, $checked_excluding)) || $checked_excluding))
 		{
-			if ($checked_excluding)	// warn user if not all recurrences have been checked
+			if ($checked_excluding)
+			{
+				// warn user if not all recurrences have been checked
 			{
 				$conflicts['warning'] = array(
 					'start' => $checked_excluding,
 					'title' => lang('Only recurrences until %1 (excluding) have been checked!', $checked_excluding->format(true)),
 				);
 			}
+			}
 			return $conflicts;
 		}
 
@@ -308,7 +326,10 @@ 
 		$types_with_quantity = array();
 		foreach($this->resources as $type => $data)
 		{
-			if ($data['max_quantity']) $types_with_quantity[] = $type;
+			if ($data['max_quantity'])
+			{
+				$types_with_quantity[] = $type;
+			}
 		}
 		// get all NOT rejected participants and evtl. their quantity
 		$quantity = $users = array();
@@ -316,12 +337,19 @@ 
 		{
 			$q = $role = null;
 			calendar_so::split_status($status, $q, $role);
-			if ($status == 'R' || $role == 'NON-PARTICIPANT') continue;	// ignore rejected or non-participants
+			if ($status == 'R' || $role == 'NON-PARTICIPANT')
+			{
+				continue;
+			}
+			// ignore rejected or non-participants
 
-			if ($uid < 0)	// group, check it's members too
+			if ($uid < 0)
+			{
+				// group, check it's members too
 			{
 				$users = array_unique(array_merge($users, (array)$GLOBALS['egw']->accounts->members($uid,true)));
 			}
+			}
 			$users[] = $uid;
 			if (in_array($uid[0],$types_with_quantity))
 			{
@@ -352,18 +380,24 @@ 
 			$startts = $date->format('ts');
 
 			// skip past events or recurrences
-			if ($startts+$duration < $this->now_su) continue;
+			if ($startts+$duration < $this->now_su)
+			{
+				continue;
+			}
 
 			// abort check if configured limits are exceeded
 			if ($event['recur_type'] &&
 				(++$checked > $max_checked && $max_checked > 0 || // maximum number of checked recurrences exceeded
 				microtime(true) > $start+$max_check_time ||	// max check time exceeded
-				$startts > $this->config['horizont']))	// we are behind horizon for which recurrences are rendered
+				$startts > $this->config['horizont']))
+			{
+				// we are behind horizon for which recurrences are rendered
 			{
 				if ($this->debug > 2 || $this->debug == 'conflicts')
 				{
 					$this->debug_message(__METHOD__.'() conflict check limited to %1 recurrences, %2 seconds, until (excluding) %3',
 						$checked, microtime(true)-$start, $date);
+			}
 				}
 				$checked_excluding = $date;
 				break;
@@ -387,10 +421,13 @@ 
 			{
 				if ($overlap['id'] == $event['id'] ||	// that's the event itself
 					$overlap['id'] == $event['reference'] ||	// event is an exception of overlap
-					$overlap['non_blocking'])			// that's a non_blocking event
+					$overlap['non_blocking'])
+				{
+					// that's a non_blocking event
 				{
 					continue;
 				}
+				}
 				if ($this->debug > 3 || $this->debug == 'conflicts')
 				{
 					$this->debug_message(__METHOD__.'() checking overlapping event %1',false,$overlap);
@@ -903,14 +940,20 @@ 
 		$startdate = new Api\DateTime($event['start']);
 		$enddate = new Api\DateTime($event['end']);
 		$modified = new Api\DateTime($event['modified']);
-		if ($old_event) $olddate = new Api\DateTime($old_event['start']);
+		if ($old_event)
+		{
+			$olddate = new Api\DateTime($old_event['start']);
+		}
 		//error_log(__METHOD__."() date_default_timezone_get()=".date_default_timezone_get().", user-timezone=".Api\DateTime::$user_timezone->getName().", startdate=".$startdate->format().", enddate=".$enddate->format().", updated=".$modified->format().", olddate=".($olddate ? $olddate->format() : ''));
 		$owner_prefs = $ics = null;
 		foreach($to_notify as $userid => $statusid)
 		{
 			$res_info = $quantity = $role = null;
 			calendar_so::split_status($statusid, $quantity, $role);
-			if ($this->debug > 0) error_log(__METHOD__." trying to notify $userid, with $statusid ($role)");
+			if ($this->debug > 0)
+			{
+				error_log(__METHOD__." trying to notify $userid, with $statusid ($role)");
+			}
 
 			if (!is_numeric($userid))
 			{
@@ -929,7 +972,11 @@ 
 
 				if (!isset($userid))
 				{
-					if (empty($res_info['email'])) continue;	// no way to notify
+					if (empty($res_info['email']))
+					{
+						continue;
+					}
+					// no way to notify
 					// check if event-owner wants non-EGroupware users notified
 					if (is_null($owner_prefs))
 					{
@@ -1003,7 +1050,10 @@ 
 				$details['to-lastname'] = isset($tln)? $tln: '';
 
 				// event is in user-time of current user, now we need to calculate the tz-difference to the notified user and take it into account
-				if (!isset($part_prefs['common']['tz'])) $part_prefs['common']['tz'] = $GLOBALS['egw_info']['server']['server_timezone'];
+				if (!isset($part_prefs['common']['tz']))
+				{
+					$part_prefs['common']['tz'] = $GLOBALS['egw_info']['server']['server_timezone'];
+				}
 				$timezone = new DateTimeZone($part_prefs['common']['tz']);
 				$timeformat = $part_prefs['common']['timeformat'];
 				switch($timeformat)
@@ -1038,9 +1088,12 @@ 
 				switch($msg_type == MSG_ALARM ? 'extended' : $part_prefs['calendar']['update_format'])
 				{
 					case 'ical':
-						if (is_null($ics) || $m_type != $msg_type)	// need different ical for organizer notification
+						if (is_null($ics) || $m_type != $msg_type)
+						{
+							// need different ical for organizer notification
 						{
 							$calendar_ical = new calendar_ical();
+						}
 							$calendar_ical->setSupportedFields('full');	// full iCal fields+event TZ
 							// we need to pass $event[id] so iCal class reads event again,
 							// as event is in user TZ, but iCal class expects server TZ!
@@ -1056,7 +1109,10 @@ 
 							'encoding' => '8bit',
 							'type' => 'text/calendar; method='.$method,
 						);
-						if ($m_type != $msg_type) unset($ics);
+						if ($m_type != $msg_type)
+						{
+							unset($ics);
+						}
 						$subject = isset($cleared_event) ? $cleared_event['title'] : $event['title'];
 						// fall through
 					case 'extended':
@@ -1116,11 +1172,16 @@ 
 								'app' => 'calendar'
 							));
 						}
-						if ($m_type === MSG_ALARM) $notification->set_popupdata('calendar', array('egw_pr_notify' => 1, 'type' => $m_type));
+						if ($m_type === MSG_ALARM)
+						{
+							$notification->set_popupdata('calendar', array('egw_pr_notify' => 1, 'type' => $m_type));
+						}
 						$notification->set_popupmessage($subject."\n\n".$notify_body."\n\n".$details['description']."\n\n".$details_body."\n\n");
 						$notification->set_popuplinks(array($details['link_arr']+array('app'=>'calendar')));
 
-						if(is_array($attachment)) { $notification->set_attachments(array($attachment)); }
+						if(is_array($attachment))
+						{
+$notification->set_attachments(array($attachment)); }
 						$notification->send();
 						foreach(notifications::errors(true) as $error)
 						{
@@ -1156,7 +1217,10 @@ 
 			Api\Translation::init();
 		}
 		// restore timezone, in case we had to reset it to server-timezone
-		if ($restore_tz) date_default_timezone_set($restore_tz);
+		if ($restore_tz)
+		{
+			date_default_timezone_set($restore_tz);
+		}
 
 		return true;
 	}
@@ -1191,10 +1255,13 @@ 
 		{
 			$to_notify = $event['participants'];
 		}
-		elseif ($this->check_perms(Acl::READ,$event))	// checks agains $this->owner set to $alarm[owner]
+		elseif ($this->check_perms(Acl::READ,$event))
+		{
+			// checks agains $this->owner set to $alarm[owner]
 		{
 			$to_notify[$alarm['owner']] = 'A';
 		}
+		}
 		else
 		{
 			return False;	// no rights
@@ -1244,14 +1311,20 @@ 
 		if ($event['id'])
 		{
 			// invalidate the read-cache if it contains the event we store now
-			if ($event['id'] == self::$cached_event['id']) self::$cached_event = array();
+			if ($event['id'] == self::$cached_event['id'])
+			{
+				self::$cached_event = array();
+			}
 			$old_event = $this->read($event['id'], $event['recurrence'], $ignore_acl, 'server');
 		}
 		else
 		{
 			$old_event = null;
 		}
-		if (!isset($event['whole_day'])) $event['whole_day'] = $this->isWholeDay($event);
+		if (!isset($event['whole_day']))
+		{
+			$event['whole_day'] = $this->isWholeDay($event);
+		}
 
 		// set recur-enddate/range-end to real end-date of last recurrence
 		if ($event['recur_type'] != MCAL_RECUR_NONE && $event['recur_enddate'] && $event['start'])
@@ -1328,7 +1401,10 @@ 
 		foreach($timestamps as $ts)
 		{
 			// we convert here from user-time to timestamps in server-time!
-			if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2ts($event[$ts],true) : 0;
+			if (isset($event[$ts]))
+			{
+				$event[$ts] = $event[$ts] ? $this->date2ts($event[$ts],true) : 0;
+			}
 		}
 		// convert tzid name to integer tz_id, of set user default
 		if (empty($event['tzid']) || !($event['tz_id'] = calendar_timezones::tz2id($event['tzid'])))
@@ -1364,7 +1440,10 @@ 
 				if ($alarm['owner'] && isset($expanded['participants']))
 				{
 					// Don't auto-delete alarm if for all users
-					if($alarm['all']) continue;
+					if($alarm['all'])
+					{
+						continue;
+					}
 
 					$status = $expanded['participants'][$alarm['owner']];
 					if (!isset($status) || calendar_so::split_status($status) === 'R')
@@ -1385,7 +1464,10 @@ 
 				if (!isset($event['alarm'][$id]))
 				{
 					$alarm['time'] = $event['start'] - $alarm['offset'];
-					if ($alarm['time'] < time()) calendar_so::shift_alarm($event, $alarm);
+					if ($alarm['time'] < time())
+					{
+						calendar_so::shift_alarm($event, $alarm);
+					}
 						// remove (not store) alarms belonging to not longer existing or rejected participants
 					$status = isset($event['participants']) ? $event['participants'][$alarm['owner']] :
 						$old_event['participants'][$alarm['owner']];
@@ -1441,7 +1523,10 @@ 
 
 		// Update history
 		$tracking = new calendar_tracking($this);
-		if (empty($event['id']) && !empty($cal_id)) $event['id']=$cal_id;
+		if (empty($event['id']) && !empty($cal_id))
+		{
+			$event['id']=$cal_id;
+		}
 		$tracking->track($save_event, $old_event);
 
 		return $cal_id;
@@ -1458,9 +1543,12 @@ 
 	 */
 	function check_status_perms($uid,$event)
 	{
-		if ($uid[0] == 'c' || $uid[0] == 'e')	// for contact we use the owner of the event
+		if ($uid[0] == 'c' || $uid[0] == 'e')
+		{
+			// for contact we use the owner of the event
 		{
 			if (!is_array($event) && !($event = $this->read($event))) return false;
+		}
 
 			return $this->check_perms(Acl::EDIT,0,$event['owner']);
 		}
@@ -1471,13 +1559,19 @@ 
 			return $access;
 		}
 		// no access or denied access because of category acl --> regular check
-		if (!is_numeric($uid))	// this is eg. for resources (r123)
+		if (!is_numeric($uid))
+		{
+			// this is eg. for resources (r123)
 		{
 			$resource = $this->resource_info($uid);
+		}
 
 			return Acl::EDIT & $resource['rights'];
 		}
-		if (!is_array($event) && !($event = $this->read($event))) return false;
+		if (!is_array($event) && !($event = $this->read($event)))
+		{
+			return false;
+		}
 
 		// regular user and groups (need to check memberships too)
 		if (!isset($event['participants'][$uid]))
@@ -1501,7 +1595,10 @@ 
 	 */
 	function check_cat_acl($right,$event)
 	{
-		if (!is_array($event)) $event = $this->read($event);
+		if (!is_array($event))
+		{
+			$event = $this->read($event);
+		}
 
 		$ret = null;
 		if ($event['category'])
@@ -1558,7 +1655,10 @@ 
 	public static function set_cat_rights($cat_id,$user,$rights)
 	{
 		//echo "<p>".__METHOD__."($cat_id,$user,$rights)</p>\n";
-		if (!isset(self::$cat_rights_cache)) self::get_cat_rights($cat_id);
+		if (!isset(self::$cat_rights_cache))
+		{
+			self::get_cat_rights($cat_id);
+		}
 
 		if ((int)$rights != (int)self::$cat_rights_cache['L'.$cat_id][$user])
 		{
@@ -1570,7 +1670,10 @@ 
 			else
 			{
 				unset(self::$cat_rights_cache['L'.$cat_id][$user]);
-				if (!self::$cat_rights_cache['L'.$cat_id]) unset(self::$cat_rights_cache['L'.$cat_id]);
+				if (!self::$cat_rights_cache['L'.$cat_id])
+				{
+					unset(self::$cat_rights_cache['L'.$cat_id]);
+				}
 				$GLOBALS['egw']->acl->delete_repository('calendar','L'.$cat_id,$user);
 			}
 			Api\Cache::setSession('calendar','cat_rights',self::$cat_rights_cache);
@@ -1603,7 +1706,10 @@ 
 				foreach($cat_rights as $uid => $value)
 				{
 					$all |= $value;
-					if (in_array($uid,$memberships)) $own |= $value;
+					if (in_array($uid,$memberships))
+					{
+						$own |= $value;
+					}
 				}
 			}
 			foreach(array(self::CAT_ACL_ADD,self::CAT_ACL_STATUS) as $mask)
@@ -1650,13 +1756,16 @@ 
 				is_numeric($uid)?$uid:substr($uid,1),$status,
 				$recur_date?$this->date2ts($recur_date,true):0,$role)))
 		{
-			if ($status == 'R')	// remove alarms belonging to rejected participants
+			if ($status == 'R')
+			{
+				// remove alarms belonging to rejected participants
 			{
 				foreach(is_array($event) && isset($event['alarm']) ? $event['alarm'] : $old_event['alarm'] as $id => $alarm)
 				{
 					if ((string)$alarm['owner'] === (string)$uid)
 					{
 						$this->so->delete_alarm($id);
+			}
 						//error_log(__LINE__.': '.__METHOD__."(".array2string($event).", '$uid', '$status', ...) deleting alarm=".array2string($alarm).", $status=".array2string($alarm));
 					}
 				}
@@ -1673,8 +1782,15 @@ 
 
 			if (isset($status2msg[$status]) && !$skip_notification)
 			{
-				if (!is_array($event)) $event = $this->read($cal_id);
-				if (isset($recur_date)) $event = $this->read($event['id'],$recur_date); //re-read the actually edited recurring event
+				if (!is_array($event))
+				{
+					$event = $this->read($cal_id);
+				}
+				if (isset($recur_date))
+				{
+					$event = $this->read($event['id'],$recur_date);
+				}
+				//re-read the actually edited recurring event
 				$user_id = is_numeric($uid) ? (int)$uid : $uid;
 				$this->send_update($status2msg[$status],$event['participants'],$event, null, $user_id);
 			}
@@ -1698,12 +1814,16 @@ 
 	 */
 	function update_status($new_event, $old_event , $recur_date=0, $skip_notification=false)
 	{
-		if (!isset($new_event['participants'])) return;
+		if (!isset($new_event['participants']))
+		{
+			return;
+		}
 
 		// check the old list against the new list
 		foreach ($old_event['participants'] as $userid => $status)
-  		{
-            if (!isset($new_event['participants'][$userid])){
+		{
+            if (!isset($new_event['participants'][$userid]))
+            {
             	// Attendee will be deleted this way
             	$new_event['participants'][$userid] = 'G';
             }
@@ -1786,7 +1906,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=null, true);
@@ -1857,7 +1980,10 @@ 
 		$event_arr = $this->event2array($event);
 		foreach($event_arr as $key => $val)
 		{
-			if ($key == 'recur_type') $key = 'repetition';
+			if ($key == 'recur_type')
+			{
+				$key = 'repetition';
+			}
 			$details[$key] = $val['data'];
 		}
 		$details['participants'] = $details['participants'] ? implode("\n",$details['participants']) : '';
@@ -1866,7 +1992,10 @@ 
 		$eventStart_arr = $this->date2array($event['start']); // give this as 'date' to the link to pick the right recurrence for the participants state
 		$link = $GLOBALS['egw_info']['server']['webserver_url'].'/index.php?menuaction=calendar.calendar_uiforms.edit&cal_id='.$event['id'].'&date='.$eventStart_arr['full'].'&no_popup=1&ajax=true';
 		// if url is only a path, try guessing the rest ;-)
-		if ($link[0] == '/') $link = Api\Framework::getUrl($link);
+		if ($link[0] == '/')
+		{
+			$link = Api\Framework::getUrl($link);
+		}
 		$event_arr['link']['data'] = $details['link'] = $link;
 
 		/* this is needed for notification-app
@@ -2039,7 +2168,10 @@ 
 	 */
 	function check_move_alarms(Array &$event, Array $old_event = null, $instance_date = null)
 	{
-		if ($old_event !== null && $event['start'] == $old_event['start']) return;
+		if ($old_event !== null && $event['start'] == $old_event['start'])
+		{
+			return;
+		}
 
 		$time = new Api\DateTime($event['start']);
 		if(!is_array($event['alarm']))
@@ -2122,7 +2254,10 @@ 
 		if (is_array($old_event) || $old_event > 0)
 		{
 			// preserve categories without users read access
-			if (!is_array($old_event)) $old_event = $this->read($old_event);
+			if (!is_array($old_event))
+			{
+				$old_event = $this->read($old_event);
+			}
 			$old_categories = explode(',',$old_event['category']);
 			$old_cats_preserve = array();
 			if (is_array($old_categories) && count($old_categories) > 0)
@@ -2213,7 +2348,10 @@ 
 				"($filter)[EVENT]:" . array2string($event)."\n",3,$this->logfile);
 		}
 
-		if (!isset($event['recurrence'])) $event['recurrence'] = 0;
+		if (!isset($event['recurrence']))
+		{
+			$event['recurrence'] = 0;
+		}
 
 		if ($filter == 'master')
 		{
@@ -2267,19 +2405,26 @@ 
 							$matchingEvents[] = $egwEvent['id'] . ':' . (int)$event['recurrence'];
 						}
 					}
-				} elseif ($filter != 'master' && ($filter == 'exact' ||
+				}
+				elseif ($filter != 'master' && ($filter == 'exact' ||
 							$event['recur_type'] == $egwEvent['recur_type'] &&
 							strpos($egwEvent['title'], $event['title']) === 0))
 				{
 					$matchingEvents[] = $egwEvent['id']; // we found the event
 				}
 			}
-			if (!empty($matchingEvents) || $filter == 'exact') return $matchingEvents;
+			if (!empty($matchingEvents) || $filter == 'exact')
+			{
+				return $matchingEvents;
+			}
 		}
 		unset($event['id']);
 
 		// No chance to find a master without [U]ID
-		if ($filter == 'master' && empty($event['uid'])) return $matchingEvents;
+		if ($filter == 'master' && empty($event['uid']))
+		{
+			return $matchingEvents;
+		}
 
 		// only query calendars of users, we have READ-grants from
 		$users = array();
@@ -2288,17 +2433,23 @@ 
 			$user = trim($user);
 			if ($this->check_perms(Acl::READ|self::ACL_READ_FOR_PARTICIPANTS|self::ACL_FREEBUSY,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')
@@ -2378,7 +2529,10 @@ 
 			}
 			foreach ($matchFields as $key)
 			{
-				if (isset($event[$key])) $query['cal_'.$key] = $event[$key];
+				if (isset($event[$key]))
+				{
+					$query['cal_'.$key] = $event[$key];
+				}
 			}
 		}
 
@@ -2418,7 +2572,10 @@ 
 					'[FOUND]: ' . array2string($egwEvent)."\n",3,$this->logfile);
 			}
 
-			if (in_array($egwEvent['id'], $matchingEvents)) continue;
+			if (in_array($egwEvent['id'], $matchingEvents))
+			{
+				continue;
+			}
 
 			// convert timezone id of event to tzid (iCal id like 'Europe/Berlin')
 			if (!$egwEvent['tz_id'] || !($egwEvent['tzid'] = calendar_timezones::id2tz($egwEvent['tz_id'])))
@@ -2585,13 +2742,16 @@ 
 					foreach ($event['participants'] as $attendee => $status)
 					{
 						if (!isset($egwEvent['participants'][$attendee]) &&
-								$attendee != $egwEvent['owner']) // ||
+								$attendee != $egwEvent['owner'])
+						{
+							// ||
 							//(!$relax && $egw_event['participants'][$attendee] != $status))
 						{
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 								"() additional event['participants']: $attendee\n",3,$this->logfile);
+						}
 							}
 							continue 2;
 						}
@@ -2913,7 +3073,10 @@ 
 		foreach(array('start','end','recur_enddate','recurrence') as $ts)
 		{
 			// we convert here from server-time to timestamps in user-time!
-			if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2usertime($event[$ts]) : 0;
+			if (isset($event[$ts]))
+			{
+				$event[$ts] = $event[$ts] ? $this->date2usertime($event[$ts]) : 0;
+			}
 		}
 		// same with the recur exceptions
 		if (isset($event['recur_exception']) && is_array($event['recur_exception']))
@@ -2941,10 +3104,13 @@ 
 	 */
 	function purge($age)
 	{
-		if (is_numeric($age) && $age > 0)	// just make sure bogus values dont delete everything
+		if (is_numeric($age) && $age > 0)
+		{
+			// just make sure bogus values dont delete everything
 		{
 			$this->so->purge(time() - 365*24*3600*(float)$age);
 		}
+		}
 	}
 
 	/**
@@ -2986,7 +3152,10 @@ 
 					case 'no':
 						break;
 					case 'startday':
-						if ($sameday) break;
+						if ($sameday)
+						{
+							break;
+						}
 					default:
 						$status_reset = true;
 						$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);

calendar/inc/class.calendar_timegrid_etemplate_widget.inc.php

Indentation +13 added lines, -13 removed lines

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

Braces +8 added lines, -2 removed lines

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

calendar/inc/class.calendar_tracking.inc.php

Indentation +8 added lines, -8 removed lines

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

calendar/inc/class.calendar_so.inc.php

Indentation +1 added lines, -1 removed lines

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

Braces +366 added lines, -96 removed lines

@@ -159,16 +159,32 @@ 
 	 */
 	protected function cal_range_view($start, $end, array $_where=null, $deleted=false)
 	{
-		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start)	// using view without start-date is slower!
+		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start)
 		{
-			return $this->cal_table;	// no need / use for a view
+			// using view without start-date is slower!
+		{
+			return $this->cal_table;
+		}
+		// no need / use for a view
 		}
 
 		$where = array();
-		if (isset($deleted)) $where[] = "cal_deleted IS ".($deleted ? '' : 'NOT').' NULL';
-		if ($end) $where[] = "range_start<".(int)$end;
-		if ($start) $where[] = "(range_end IS NULL OR range_end>".(int)$start.")";
-		if ($_where) $where = array_merge($where, $_where);
+		if (isset($deleted))
+		{
+			$where[] = "cal_deleted IS ".($deleted ? '' : 'NOT').' NULL';
+		}
+		if ($end)
+		{
+			$where[] = "range_start<".(int)$end;
+		}
+		if ($start)
+		{
+			$where[] = "(range_end IS NULL OR range_end>".(int)$start.")";
+		}
+		if ($_where)
+		{
+			$where = array_merge($where, $_where);
+		}
 
 		$sql = "(SELECT * FROM $this->cal_table WHERE ".$this->db->expression($this->cal_table, $where).") $this->cal_table";
 
@@ -189,16 +205,32 @@ 
 	 */
 	protected function dates_range_view($start, $end, array $_where=null, $deleted=false)
 	{
-		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start || !$end)	// using view without start- AND end-date is slower!
+		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start || !$end)
+		{
+			// using view without start- AND end-date is slower!
 		{
-			return $this->dates_table;	// no need / use for a view
+			return $this->dates_table;
+		}
+		// no need / use for a view
 		}
 
 		$where = array();
-		if (isset($deleted)) $where['recur_exception'] = $deleted;
-		if ($end) $where[] = "cal_start<".(int)$end;
-		if ($start) $where[] = "cal_end>".(int)$start;
-		if ($_where) $where = array_merge($where, $_where);
+		if (isset($deleted))
+		{
+			$where['recur_exception'] = $deleted;
+		}
+		if ($end)
+		{
+			$where[] = "cal_start<".(int)$end;
+		}
+		if ($start)
+		{
+			$where[] = "cal_end>".(int)$start;
+		}
+		if ($_where)
+		{
+			$where = array_merge($where, $_where);
+		}
 
 		// Api\Db::union uses Api\Db::select which check if join contains "WHERE"
 		// to support old join syntax like ", other_table WHERE ...",
@@ -248,7 +280,10 @@ 
 			throw new Api\Exception\AssertionFailed("Unsupported value for parameters!");
 		}
 		$where = is_array($params['query']) ? $params['query'] : array();
-		if ($cat_id) $where[] = $this->cat_filter($cat_id);
+		if ($cat_id)
+		{
+			$where[] = $this->cat_filter($cat_id);
+		}
 		$egw_cal = $this->cal_range_view($start, $end, $where, $filter == 'everything' ? null : $filter != 'deleted');
 
 		$status_filter = $this->status_filter($filter, $params['enum_recuring']);
@@ -269,7 +304,10 @@ 
 		if ($users)
 		{
 			// fix $users to also prefix system users and groups (with 'u')
-			if (!is_array($users)) $users = $users ? (array)$users : array();
+			if (!is_array($users))
+			{
+				$users = $users ? (array)$users : array();
+			}
 			foreach($users as &$uid)
 			{
 				$user_type = $user_id = null;
@@ -289,15 +327,22 @@ 
 			$sql .= " AND\n	".$params['sql_filter'];
 		}
 
-		if ($params['order'])	// only order if requested
+		if ($params['order'])
 		{
-			if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';		// gard against SQL injection
+			// only order if requested
+		{
+			if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';
+		}
+		// gard against SQL injection
 			$sql .= "\nORDER BY ".$params['order'];
 		}
 
-		if ($offset === false)	// return all rows --> Api\Db::query wants offset=0, num_rows=-1
+		if ($offset === false)
+		{
+			// return all rows --> Api\Db::query wants offset=0, num_rows=-1
 		{
 			$offset = 0;
+		}
 			$num_rows = -1;
 		}
 		$events =& $this->get_events($this->db->query($sql, __LINE__, __FILE__, $offset, $num_rows));
@@ -324,10 +369,13 @@ 
 		$join = "LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id";
 
 		$where = array();
-		if (is_scalar($ids) && !is_numeric($ids))	// a single uid
+		if (is_scalar($ids) && !is_numeric($ids))
+		{
+			// a single uid
 		{
 			// We want only the parents to match
 			$where['cal_uid'] = $ids;
+		}
 			if ($read_recurrence)
 			{
 				$where['cal_recurrence'] = $recur_date;
@@ -337,20 +385,26 @@ 
 				$where['cal_reference'] = 0;
 			}
 		}
-		elseif(is_array($ids) && isset($ids[count($ids)-1]) || is_scalar($ids))	// one or more cal_id's
+		elseif(is_array($ids) && isset($ids[count($ids)-1]) || is_scalar($ids))
+		{
+			// one or more cal_id's
 		{
 			$where['cal_id'] = $ids;
 		}
+		}
 		else	// array with column => value pairs
 		{
 			$where = $ids;
 			unset($ids);	// otherwise users get not read!
 		}
-		if (isset($where['cal_id']))	// prevent non-unique column-name cal_id
+		if (isset($where['cal_id']))
+		{
+			// prevent non-unique column-name cal_id
 		{
 			$where[] = $this->db->expression($this->cal_table, $this->cal_table.'.',array(
 				'cal_id' => $where['cal_id'],
 			));
+		}
 			unset($where['cal_id']);
 		}
 		if ((int) $recur_date && !$read_recurrence)
@@ -406,10 +460,16 @@ 
 			$row['recur_exception'] = $row['alarm'] = array();
 			$events[$row['cal_id']] = Api\Db::strip_array_keys($row,'cal_');
 		}
-		if (!$events) return $events;
+		if (!$events)
+		{
+			return $events;
+		}
 
 		$ids = array_keys($events);
-		if (count($ids) == 1) $ids = $ids[0];
+		if (count($ids) == 1)
+		{
+			$ids = $ids[0];
+		}
 
 		foreach ($events as &$event)
 		{
@@ -483,10 +543,13 @@ 
 			'cal_id'      => $ids,
 			'cal_recur_date' => $recur_date,
 			"cal_status NOT IN ('X','E')",
-		),__LINE__,__FILE__,false,'ORDER BY cal_user_type DESC,cal_recur_date ASC,'.self::STATUS_SORT,'calendar') as $row)	// DESC puts users before resources and contacts
+		),__LINE__,__FILE__,false,'ORDER BY cal_user_type DESC,cal_recur_date ASC,'.self::STATUS_SORT,'calendar') as $row)
+		{
+			// DESC puts users before resources and contacts
 		{
 			// combine all participant data in uid and status values
 			$uid    = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
+		}
 			$status = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
 
 			$events[$row['cal_id']]['participants'][$uid] = $status;
@@ -543,7 +606,10 @@ 
 			$last_request = time();
 		}
 		$signature = serialize(func_get_args());
-		if (isset($ctags[$signature])) return $ctags[$signature];
+		if (isset($ctags[$signature]))
+		{
+			return $ctags[$signature];
+		}
 
 		$types = array();
 		foreach((array)$users as $uid)
@@ -576,7 +642,10 @@ 
 			// owner can only by users, no groups or resources
 			foreach($users as $key => $user)
 			{
-				if (!($user > 0)) unset($users[$key]);
+				if (!($user > 0))
+				{
+					unset($users[$key]);
+				}
 			}
 			$where = $this->db->expression($this->user_table, '(', $where, ' OR ').
 				$this->db->expression($this->cal_table, array(
@@ -598,7 +667,10 @@ 
 	 */
 	function get_cal_data(array $query, $cols='cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified')
 	{
-		if (!is_array($cols)) $cols = explode(',', $cols);
+		if (!is_array($cols))
+		{
+			$cols = explode(',', $cols);
+		}
 
 		// special handling of cal_user_modified "pseudo" column
 		if (($key = array_search('cal_user_modified', $cols)) !== false)
@@ -627,7 +699,10 @@ 
 				unset($key);	// not used, but required by function signature
 				$val = (int) $val;
 			});
-			if (is_array($cat_id) && count($cat_id)==1) $cat_id = $cat_id[0];
+			if (is_array($cat_id) && count($cat_id)==1)
+			{
+				$cat_id = $cat_id[0];
+			}
 			$sql = '(cal_category'.(count($cats) > 1 ? " IN ('".implode("','",$cats)."')" : '='.$this->db->quote((int)$cat_id));
 			foreach($cats as $cat)
 			{
@@ -686,10 +761,13 @@ 
 				$where[] = "$this->user_table.cal_status NOT IN ('X','E')";
 				break;
 			default:
-				if ($enum_recuring)	// regular UI
+				if ($enum_recuring)
+				{
+					// regular UI
 				{
 					$where[] = "$this->user_table.cal_status NOT IN ('R','X','E')";
 				}
+				}
 				else	// CalDAV / eSync / iCal need to include 'E' = exceptions
 				{
 					$where[] = "$this->user_table.cal_status NOT IN ('R','X')";
@@ -831,7 +909,10 @@ 
 						$user_ids = array();
 						foreach($ids as $user_id)
 						{
-							if ($GLOBALS['egw']->accounts->get_type($user_id) === 'u') $user_ids[] = $user_id;
+							if ($GLOBALS['egw']->accounts->get_type($user_id) === 'u')
+							{
+								$user_ids[] = $user_id;
+							}
 						}
 						$owner_or = $this->db->expression($cal_table_def,array('cal_owner' => $user_ids));
 					}
@@ -851,7 +932,10 @@ 
 				}
 			}
 			// this is only used, when we cannot use UNIONS
-			if (!$useUnionQuery) $where[] = '('.implode(' OR ',$to_or).')';
+			if (!$useUnionQuery)
+			{
+				$where[] = '('.implode(' OR ',$to_or).')';
+			}
 
 			$where = $this->status_filter($filter, $params['enum_recuring'], $where);
 		}
@@ -870,7 +954,11 @@ 
 				$where[] = '('.((int)$start).' < range_end OR range_end IS NULL)';
 			}
 		}
-		if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';		// gard against SQL injection
+		if (!preg_match('/^[a-z_ ,c]+$/i',$params['order']))
+		{
+			$params['order'] = 'cal_start';
+		}
+		// gard against SQL injection
 
 		// if not enum recuring events, we have to use minimum start- AND end-dates, otherwise we get more then one event per cal_id!
 		if (!$params['enum_recuring'])
@@ -880,9 +968,15 @@ 
 			// in case cal_start is used in a query, eg. calendar_ical::find_event
 			$where = str_replace(array('cal_start','cal_end'), array('range_start','(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id)'), $where);
 			$params['order'] = str_replace('cal_start', 'range_start', $params['order']);
-			if ($end) $where[] = (int)$end.' > range_start';
+			if ($end)
+			{
+				$where[] = (int)$end.' > range_start';
+			}
   		}
-		elseif ($end) $where[] = (int)$end.' > cal_start';
+  		elseif ($end)
+		{
+			$where[] = (int)$end.' > cal_start';
+		}
 
 		if ($remove_rejected_by_user && $filter != 'everything')
 		{
@@ -896,7 +990,10 @@ 
 				'rejected_by_user.cal_status IS NULL',
 				"rejected_by_user.cal_status NOT IN ('R','X')",
 			);
-			if ($filter == 'owner') $or_required[] = 'cal_owner='.(int)$remove_rejected_by_user;
+			if ($filter == 'owner')
+			{
+				$or_required[] = 'cal_owner='.(int)$remove_rejected_by_user;
+			}
 			$where[] = '('.implode(' OR ',$or_required).')';
 		}
 		// using a time-range and deleted attribute limited view instead of full table
@@ -939,7 +1036,10 @@ 
 		if ($useUnionQuery)
 		{
 			// allow apps to supply participants and/or icons
-			if (!isset($params['cols'])) $cols .= ',NULL AS participants,NULL AS icons';
+			if (!isset($params['cols']))
+			{
+				$cols .= ',NULL AS participants,NULL AS icons';
+			}
 
 			// changed the original OR in the query into a union, to speed up the query execution under MySQL 5
 			// with time-range views benefit is now at best slim for huge tables or none at all!
@@ -994,9 +1094,12 @@ 
 					$selects[count($selects)-1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
 				}
 			}
-			if (is_numeric($offset) && !$params['no_total'])	// get the total too
+			if (is_numeric($offset) && !$params['no_total'])
+			{
+				// get the total too
 			{
 				$save_selects = $selects;
+			}
 				// we only select cal_table.cal_id (and not cal_table.*) to be able to use DISTINCT (eg. MsSQL does not allow it for text-columns)
 				foreach(array_keys($selects) as $key)
 				{
@@ -1007,14 +1110,20 @@ 
 							array('range_start AS cal_start','range_end AS cal_end'), $selects[$key]['cols']);
 					}
 				}
-				if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+				if (!isset($params['cols']) && !$params['no_integration'])
+				{
+					self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+				}
 
 				$this->total = $this->db->union($selects,__LINE__,__FILE__)->NumRows();
 
 				// restore original cols / selects
 				$selects = $save_selects; unset($save_selects);
 			}
-			if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+			if (!isset($params['cols']) && !$params['no_integration'])
+			{
+				self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+			}
 
 			$rs = $this->db->union($selects,__LINE__,__FILE__,$params['order'],$offset,$num_rows);
 		}
@@ -1032,9 +1141,12 @@ 
 				'table_def' => $cal_table_def,
 			));
 
-			if (is_numeric($offset) && !$params['no_total'])	// get the total too
+			if (is_numeric($offset) && !$params['no_total'])
+			{
+				// get the total too
 			{
 				$save_selects = $selects;
+			}
 				// we only select cal_table.cal_id (and not cal_table.*) to be able to use DISTINCT (eg. MsSQL does not allow it for text-columns)
 				$selects[0]['cols'] = "$this->cal_table.cal_id,cal_start";
 				if (!isset($params['cols']) && !$params['no_integration'] && $this->db->capabilities['union'])
@@ -1062,7 +1174,10 @@ 
 		foreach($rs as $row)
 		{
 			$id = $row['cal_id'];
-			if (is_numeric($id)) $ids[] = $id;
+			if (is_numeric($id))
+			{
+				$ids[] = $id;
+			}
 
 			if ($row['cal_recur_date'])
 			{
@@ -1082,7 +1197,10 @@ 
 			$row['recur_exception'] = $row['alarm'] = array();
 
 			// compile a list of recurrences per cal_id
-			if (!in_array($id,(array)$recur_ids[$row['cal_id']])) $recur_ids[$row['cal_id']][] = $id;
+			if (!in_array($id,(array)$recur_ids[$row['cal_id']]))
+			{
+				$recur_ids[$row['cal_id']][] = $id;
+			}
 
 			$events[$id] = Api\Db::strip_array_keys($row,'cal_');
 		}
@@ -1101,10 +1219,16 @@ 
 					//'cal_id' => array_unique($ids),
 					'cal_recur_date' => $recur_dates,
 				),__LINE__,__FILE__,false,'ORDER BY cal_id,cal_user_type DESC,'.self::STATUS_SORT,'calendar',-1,$join='',
-				$this->db->get_table_definitions('calendar',$this->user_table)) as $row)	// DESC puts users before resources and contacts
+				$this->db->get_table_definitions('calendar',$this->user_table)) as $row)
+			{
+				// DESC puts users before resources and contacts
 			{
 				$id = $row['cal_id'];
-				if ($row['cal_recur_date']) $id .= '-'.$row['cal_recur_date'];
+			}
+				if ($row['cal_recur_date'])
+				{
+					$id .= '-'.$row['cal_recur_date'];
+				}
 
 				// combine all participant data in uid and status values
 				$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
@@ -1123,7 +1247,10 @@ 
 				}
 
 				// set data, if recurrence is requested
-				if (isset($events[$id])) $events[$id]['participants'][$uid] = $status;
+				if (isset($events[$id]))
+				{
+					$events[$id]['participants'][$uid] = $status;
+				}
 			}
 			// query recurrance exceptions, if needed: enum_recuring && !daywise is used in calendar_groupdav::get_series($uid,...)
 			if (!$params['enum_recuring'] || !$params['daywise'])
@@ -1139,7 +1266,10 @@ 
 					{
 						foreach($events as $id => $event)
 						{
-							if ($event['id'] == $row['cal_id']) break;
+							if ($event['id'] == $row['cal_id'])
+							{
+								break;
+							}
 						}
 					}
 					$events[$id]['recur_exception'][] = $row['cal_start'];
@@ -1149,7 +1279,10 @@ 
 			if (!is_null($params['cfs']))
 			{
 				$where = array('cal_id' => $ids);
-				if ($params['cfs']) $where['cal_extra_name'] = $params['cfs'];
+				if ($params['cfs'])
+				{
+					$where['cal_extra_name'] = $params['cfs'];
+				}
 				foreach($this->db->select($this->extra_table,'*',$where,
 					__LINE__,__FILE__,false,'','calendar') as $row)
 				{
@@ -1169,14 +1302,20 @@ 
 				{
 					$event_start = $alarm['time'] + $alarm['offset'];
 
-					if (isset($events[$cal_id]))	// none recuring event
+					if (isset($events[$cal_id]))
+					{
+						// none recuring event
 					{
 						$events[$cal_id]['alarm'][$id] = $alarm;
 					}
-					elseif (isset($events[$cal_id.'-'.$event_start]))	// recuring event
+					}
+					elseif (isset($events[$cal_id.'-'.$event_start]))
+					{
+						// recuring event
 					{
 						$events[$cal_id.'-'.$event_start]['alarm'][$id] = $alarm;
 					}
+					}
 				}
 			}
 		}
@@ -1276,10 +1415,13 @@ 
 			}
 			foreach((array)$cols as $col)
 			{
-				if (substr($col,0,7) == 'egw_cal')	// remove table name
+				if (substr($col,0,7) == 'egw_cal')
+				{
+					// remove table name
 				{
 					$col = preg_replace('/^egw_cal[a-z_]*\./','',$col);
 				}
+				}
 				if (isset($app_cols[$col]))
 				{
 					$return_cols[] = $app_cols[$col];
@@ -1373,7 +1515,11 @@ 
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
 		{
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
-			if (empty($minimum_uid_length) || $minimum_uid_length<=1) $minimum_uid_length = 8; // we just do not accept no uid, or uid way to short!
+			if (empty($minimum_uid_length) || $minimum_uid_length<=1)
+			{
+				$minimum_uid_length = 8;
+			}
+			// we just do not accept no uid, or uid way to short!
 		}
 		else
 		{
@@ -1404,7 +1550,10 @@ 
 			}
 		}
 		// set range_start/_end, but only if we have cal_start/_end, as otherwise we destroy present values!
-		if (isset($event['cal_start'])) $event['range_start'] = $event['cal_start'];
+		if (isset($event['cal_start']))
+		{
+			$event['range_start'] = $event['cal_start'];
+		}
 		if (isset($event['cal_end']))
 		{
 			$event['range_end'] = $event['recur_type'] == MCAL_RECUR_NONE ? $event['cal_end'] :
@@ -1425,7 +1574,10 @@ 
 		$event['cal_category'] = implode(',',$categories);
 
 		// make sure recurring events never reference to an other recurrent event
-		if ($event['recur_type'] != MCAL_RECUR_NONE) $event['cal_reference'] = 0;
+		if ($event['recur_type'] != MCAL_RECUR_NONE)
+		{
+			$event['cal_reference'] = 0;
+		}
 
 		if ($cal_id)
 		{
@@ -1442,7 +1594,10 @@ 
 			{
 				$old_tz_id = $this->db->select($this->cal_table,'tz_id',$where,__LINE__,__FILE__,'calendar')->fetchColumn();
 			}
-			if (!is_null($etag)) $where['cal_etag'] = $etag;
+			if (!is_null($etag))
+			{
+				$where['cal_etag'] = $etag;
+			}
 
 			unset($event['cal_etag']);
 			$event[] = 'cal_etag=COALESCE(cal_etag,0)+1';	// always update the etag, even if none given to check
@@ -1453,14 +1608,24 @@ 
 			{
 				return 0;	// wrong etag, someone else updated the entry
 			}
-			if (!is_null($etag)) ++$etag;
+			if (!is_null($etag))
+			{
+				++$etag;
+			}
 		}
 		else
 		{
 			// new event
-			if (!$event['cal_owner']) $event['cal_owner'] = $GLOBALS['egw_info']['user']['account_id'];
+			if (!$event['cal_owner'])
+			{
+				$event['cal_owner'] = $GLOBALS['egw_info']['user']['account_id'];
+			}
 
-			if (!$event['cal_id'] && !isset($event['cal_uid'])) $event['cal_uid'] = '';	// uid is NOT NULL!
+			if (!$event['cal_id'] && !isset($event['cal_uid']))
+			{
+				$event['cal_uid'] = '';
+			}
+			// uid is NOT NULL!
 
 			$event['cal_etag'] = $etag = 0;
 			$this->db->insert($this->cal_table,$event,false,__LINE__,__FILE__,'calendar');
@@ -1612,8 +1777,7 @@ 
 					// recurrences need to be truncated
 					if((int)$event['recur_enddate'] > 0 &&
 						((int)$old_repeats['recur_enddate'] == 0 || (int)$old_repeats['recur_enddate'] > (int)$event['recur_enddate'])
-					)
-					{
+					) {
 						$this->db->delete($this->user_table,array('cal_id' => $cal_id,'cal_recur_date >= '.($event['recur_enddate'] + 1*DAY_s)),__LINE__,__FILE__,'calendar');
 						$this->db->delete($this->dates_table,array('cal_id' => $cal_id,'cal_start >= '.($event['recur_enddate'] + 1*DAY_s)),__LINE__,__FILE__,'calendar');
 					}
@@ -1621,8 +1785,7 @@ 
 					// recurrences need to be expanded
 					if(((int)$event['recur_enddate'] == 0 && (int)$old_repeats['recur_enddate'] > 0)
 						|| ((int)$event['recur_enddate'] > 0 && (int)$old_repeats['recur_enddate'] > 0 && (int)$old_repeats['recur_enddate'] < (int)$event['recur_enddate'])
-					)
-					{
+					) {
 						$set_recurrences = true;
 						$set_recurrences_start = ($old_repeats['recur_enddate'] + 1*DAY_s);
 					}
@@ -1771,12 +1934,18 @@ 
 	{
 		//echo "<p>socal::move($cal_id,$start,$end,$change_since,$old_start,$old_end)</p>\n";
 
-		if (!(int) $cal_id) return false;
+		if (!(int) $cal_id)
+		{
+			return false;
+		}
 
 		if (!$old_start)
 		{
-			if ($change_since !== false) $row = $this->db->select($this->dates_table,'MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
+			if ($change_since !== false)
+			{
+				$row = $this->db->select($this->dates_table,'MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
 				array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetch();
+			}
 			// if no recurrence found, create one with the new dates
 			if ($change_since === false || !$row || !$row['cal_start'] || !$row['cal_end'])
 			{
@@ -1878,7 +2047,10 @@ 
 			$user_type = $uid[0];
 			$email = substr($uid, 1);
 			$matches = null;
-			if (preg_match('/<([^<>]+)>$/', $email, $matches)) $email = $matches[1];
+			if (preg_match('/<([^<>]+)>$/', $email, $matches))
+			{
+				$email = $matches[1];
+			}
 			$user_id = md5(trim(strtolower($email)));
 		}
 		else
@@ -1898,8 +2070,14 @@ 
 	 */
 	static function combine_status($status,$quantity=1,$role='REQ-PARTICIPANT')
 	{
-		if ((int)$quantity > 1) $status .= (int)$quantity;
-		if ($role != 'REQ-PARTICIPANT') $status .= $role;
+		if ((int)$quantity > 1)
+		{
+			$status .= (int)$quantity;
+		}
+		if ($role != 'REQ-PARTICIPANT')
+		{
+			$status .= $role;
+		}
 
 		return $status;
 	}
@@ -1920,8 +2098,14 @@ 
 		$matches = null;
 		if (is_string($status) && strlen($status) > 1 && preg_match('/^.([0-9]*)(.*)$/',$status,$matches))
 		{
-			if ((int)$matches[1] > 0) $quantity = (int)$matches[1];
-			if ($matches[2]) $role = $matches[2];
+			if ((int)$matches[1] > 0)
+			{
+				$quantity = (int)$matches[1];
+			}
+			if ($matches[2])
+			{
+				$role = $matches[2];
+			}
 			$status = $status[0];
 		}
 		elseif ($status === true)
@@ -2032,9 +2216,13 @@ 
 			}
 		}
 
-		if (count($participants))	// participants which need to be added
+		if (count($participants))
+		{
+			// participants which need to be added
 		{
-			if (!count($recurrences)) $recurrences[] = 0;   // insert the default recurrence
+			if (!count($recurrences)) $recurrences[] = 0;
+		}
+		// insert the default recurrence
 
 			$delete_deleted = array();
 
@@ -2106,7 +2294,10 @@ 
 			return false;
 		}
 
-		if (is_numeric($status)) $status = $status_code_short[$status];
+		if (is_numeric($status))
+		{
+			$status = $status_code_short[$status];
+		}
 
 		$uid = self::combine_user($user_type, $user_id);
 		$user_id_md5 = null;
@@ -2126,16 +2317,25 @@ 
 			$where[] = '(cal_recur_date=0 OR cal_recur_date >= '.time().')';
 		}
 
-		if ($status == 'G')		// remove group invitations, as we dont store them in the db
+		if ($status == 'G')
+		{
+			// remove group invitations, as we dont store them in the db
 		{
 			$this->db->delete($this->user_table,$where,__LINE__,__FILE__,'calendar');
+		}
 			$ret = $this->db->affected_rows();
 		}
 		else
 		{
 			$set = array('cal_status' => $status);
-			if ($user_type == 'e' || $attendee) $set['cal_user_attendee'] = $attendee ? $attendee : $user_id;
-			if (!is_null($role) && $role != 'REQ-PARTICIPANT') $set['cal_role'] = $role;
+			if ($user_type == 'e' || $attendee)
+			{
+				$set['cal_user_attendee'] = $attendee ? $attendee : $user_id;
+			}
+			if (!is_null($role) && $role != 'REQ-PARTICIPANT')
+			{
+				$set['cal_role'] = $role;
+			}
 			$this->db->insert($this->user_table,$set,$where,__LINE__,__FILE__,'calendar');
 			// for new or changed group-invitations, remove previously deleted members, so they show up again
 			if (($ret = $this->db->affected_rows()) && $user_type == 'u' && $user_id < 0)
@@ -2168,7 +2368,10 @@ 
 	{
 		//error_log(__METHOD__."($cal_id, $start, $end, ".array2string($participants).", ".array2string($exception));
 		$update = array('cal_end' => $end);
-		if (isset($exception)) $update['recur_exception'] = $exception;
+		if (isset($exception))
+		{
+			$update['recur_exception'] = $exception;
+		}
 
 		$this->db->insert($this->dates_table, $update, array(
 			'cal_id' => $cal_id,
@@ -2183,7 +2386,11 @@ 
 		{
 			foreach($participants as $uid => $status)
 			{
-				if ($status == 'G') continue;	// dont save group-invitations
+				if ($status == 'G')
+				{
+					continue;
+				}
+				// dont save group-invitations
 
 				$type = '';
 				$id = null;
@@ -2412,7 +2619,10 @@ 
 			$alarm['time'] = $alarm['keep_time'] = time()+self::ALARM_KEEP_TIME;
 		}
 		// add an alarm uid, if none is given
-		if (empty($alarm['uid']) && class_exists('Horde_Support_Uuid')) $alarm['uid'] = (string)new Horde_Support_Uuid;
+		if (empty($alarm['uid']) && class_exists('Horde_Support_Uuid'))
+		{
+			$alarm['uid'] = (string)new Horde_Support_Uuid;
+		}
 		//error_log(__METHOD__.__LINE__.' Save Alarm for CalID:'.$cal_id.'->'.array2string($alarm).'-->'.$id.'#'.function_backtrace());
 		// allways store job with the alarm owner as job-owner to get eg. the correct from address
 		if (!$this->async->set_timer($alarm['time'], $id, 'calendar.calendar_boupdate.send_alarm', $alarm, $alarm['owner'], false, true))
@@ -2421,10 +2631,16 @@ 
 		}
 
 		// update the modification information of the related event
-		if ($update_modified) $this->updateModified($cal_id, true);
+		if ($update_modified)
+		{
+			$this->updateModified($cal_id, true);
+		}
 
 		// update cache, if used
-		if (isset(self::$alarm_cache)) $this->read_alarms($cal_id, true);
+		if (isset(self::$alarm_cache))
+		{
+			$this->read_alarms($cal_id, true);
+		}
 
 		return $id;
 	}
@@ -2447,7 +2663,10 @@ 
 				$this->async->cancel_timer($id);
 			}
 			// update cache, if used
-			if (isset(self::$alarm_cache)) $this->read_alarms($cal_id, false);
+			if (isset(self::$alarm_cache))
+			{
+				$this->read_alarms($cal_id, false);
+			}
 		}
 		return count($alarms);
 	}
@@ -2470,7 +2689,10 @@ 
 		$ret = $this->async->cancel_timer($id);
 
 		// update cache, if used
-		if (isset(self::$alarm_cache)) $this->read_alarms($cal_id, true);
+		if (isset(self::$alarm_cache))
+		{
+			$this->read_alarms($cal_id, true);
+		}
 
 		return $ret;
 	}
@@ -2494,11 +2716,14 @@ 
 			$user_id = null;
 			self::split_user($old_user,$user_type,$user_id);
 
-			if ($user_type == 'u')	// only accounts can be owners of events
+			if ($user_type == 'u')
+			{
+				// only accounts can be owners of events
 			{
 				foreach($this->db->select($this->cal_table,'cal_id',array('cal_owner' => $old_user),__LINE__,__FILE__,false,'','calendar') as $row)
 				{
 					$this->delete($row['cal_id']);
+			}
 				}
 			}
 			$this->db->delete($this->user_table,array(
@@ -2526,11 +2751,14 @@ 
 			{
 				$ids[] = $row['cal_id'];
 			}
-			if ($ids) $this->db->delete($this->user_table,array(
+			if ($ids)
+			{
+				$this->db->delete($this->user_table,array(
 				'cal_user_type' => 'u',
 				'cal_user_id' => $old_user,
 				'cal_id' => $ids,
 			),__LINE__,__FILE__,'calendar');
+			}
 			// now change participant in the rest to contain new user instead of old user
 			$this->db->update($this->user_table,array(
 				'cal_user_id' => $new_user,
@@ -2555,8 +2783,14 @@ 
 	{
 		$participant_status = array();
 		$where = array('cal_id' => $cal_id);
-		if ($start != 0 && $end == 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
-		if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		if ($start != 0 && $end == 0)
+		{
+			$where[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
+		}
+		if ($start == 0 && $end != 0)
+		{
+			$where[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		}
 		if ($start != 0 && $end != 0)
 		{
 			$where[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start .
@@ -2567,7 +2801,10 @@ 
 			// inititalize the array
 			$participant_status[$row['cal_recur_date']] = null;
 		}
-		if (is_null($uid)) return $participant_status;
+		if (is_null($uid))
+		{
+			return $participant_status;
+		}
 		$user_type = $user_id = null;
 		self::split_user($uid, $user_type, $user_id, true);
 
@@ -2576,8 +2813,14 @@ 
 			'cal_user_type'	=> $user_type ? $user_type : 'u',
 			'cal_user_id'   => $user_id,
 		);
-		if ($start != 0 && $end == 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
-		if ($start == 0 && $end != 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		if ($start != 0 && $end == 0)
+		{
+			$where2[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
+		}
+		if ($start == 0 && $end != 0)
+		{
+			$where2[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		}
 		if ($start != 0 && $end != 0)
 		{
 			$where2[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start .
@@ -2667,17 +2910,26 @@ 
 	 */
 	function get_recurrence_exceptions($event, $tz_id=null, $start=0, $end=0, $filter='all')
 	{
-		if (!is_array($event)) return false;
+		if (!is_array($event))
+		{
+			return false;
+		}
 		$cal_id = (int) $event['id'];
 		//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 		//		"($cal_id, $tz_id, $filter): " . $event['tzid']);
-		if (!$cal_id || $event['recur_type'] == MCAL_RECUR_NONE) return false;
+		if (!$cal_id || $event['recur_type'] == MCAL_RECUR_NONE)
+		{
+			return false;
+		}
 
 		$days = array();
 
 		$expand_all = (!$this->isWholeDay($event) && $tz_id && $tz_id != $event['tzid']);
 
-		if ($filter == 'tz_only' && !$expand_all) return $days;
+		if ($filter == 'tz_only' && !$expand_all)
+		{
+			return $days;
+		}
 
 		$remote = in_array($filter, array('tz_rrule', 'rrule'));
 
@@ -2720,7 +2972,10 @@ 
 					$remote_rrule->next_no_exception();
 				}
 				$egw_rrule->next_no_exception();
-				if (!$egw_rrule->valid()) return $days;
+				if (!$egw_rrule->valid())
+				{
+					return $days;
+				}
 			}
 			$day = $egw_rrule->current();
 			$locts = (int)Api\DateTime::to($day,'server');
@@ -2874,7 +3129,11 @@ 
 			}
 		}
 
-		if (empty($participants)) return false; // occurrence does not exist at all yet
+		if (empty($participants))
+		{
+			return false;
+		}
+		// occurrence does not exist at all yet
 
 		foreach ($recurrence_zero as $uid => $status)
 		{
@@ -2931,7 +3190,9 @@ 
 			}
 			if (!isset($participants[$uid])
 				|| $participants[$uid] != $status)
-				return true;
+			{
+							return true;
+			}
 			unset($participants[$uid]);
 		}
 		return (!empty($participants));
@@ -2945,7 +3206,10 @@ 
 	 */
 	function isWholeDay($event)
 	{
-		if (!isset($event['start']) || !isset($event['end'])) return false;
+		if (!isset($event['start']) || !isset($event['end']))
+		{
+			return false;
+		}
 
 		if (empty($event['tzid']))
 		{
@@ -3007,8 +3271,14 @@ 
 	 */
 	function updateModified($id, $update_master=false, $time=null, $modifier=null)
 	{
-		if (is_null($time) || !$time) $time = time();
-		if (is_null($modifier)) $modifier = $GLOBALS['egw_info']['user']['account_id'];
+		if (is_null($time) || !$time)
+		{
+			$time = time();
+		}
+		if (is_null($modifier))
+		{
+			$modifier = $GLOBALS['egw_info']['user']['account_id'];
+		}
 
 		$this->db->update($this->cal_table,
 			array('cal_modified' => $time, 'cal_modifier' => $modifier),