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);
 

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';

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;
 
 	/**

calendar/inc/class.calendar_zpush.inc.php

Indentation +1 added lines, -1 removed lines

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

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);

calendar/inc/class.calendar_uiforms.inc.php

Indentation +11 added lines, -11 removed lines

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

Switch Indentation +234 added lines, -234 removed lines

@@ -598,220 +598,220 @@ 
 
 		switch((string)$button)
 		{
-		case 'exception':	// create an exception in a recuring event
-			$msg = $this->_create_exception($event,$preserv);
-			break;
+			case 'exception':	// create an exception in a recuring event
+				$msg = $this->_create_exception($event,$preserv);
+				break;
 
-		case 'copy':	// create new event with copied content, some content need to be unset to make a "new" event
-			unset($event['id']);
-			unset($event['uid']);
-			unset($event['reference']);
-			unset($preserv['reference']);
-			unset($event['recurrence']);
-			unset($preserv['recurrence']);
-			unset($event['recur_exception']);
-			unset($event['edit_single']);	// in case it has been set
-			unset($event['modified']);
-			unset($event['modifier']);
-			unset($event['caldav_name']);
-			$event['owner'] = !(int)$event['owner'] || !$this->bo->check_perms(Acl::ADD,0,$event['owner']) ? $this->user : $event['owner'];
+			case 'copy':	// create new event with copied content, some content need to be unset to make a "new" event
+				unset($event['id']);
+				unset($event['uid']);
+				unset($event['reference']);
+				unset($preserv['reference']);
+				unset($event['recurrence']);
+				unset($preserv['recurrence']);
+				unset($event['recur_exception']);
+				unset($event['edit_single']);	// in case it has been set
+				unset($event['modified']);
+				unset($event['modifier']);
+				unset($event['caldav_name']);
+				$event['owner'] = !(int)$event['owner'] || !$this->bo->check_perms(Acl::ADD,0,$event['owner']) ? $this->user : $event['owner'];
+
+				// Clear participant stati
+				foreach($event['participant_types'] as $type => &$participants)
+				{
+					foreach($participants as $id => &$p_response)
+					{
+						if($type == 'u' && $id == $event['owner']) continue;
+						calendar_so::split_status($p_response, $quantity, $role);
+						// if resource defines callback for status of new status (eg. Resources app acknowledges direct booking acl), call it
+						$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
+						$p_response = calendar_so::combine_status($status,$quantity,$role);
+					}
+				}
 
-			// Clear participant stati
-			foreach($event['participant_types'] as $type => &$participants)
-			{
-				foreach($participants as $id => &$p_response)
+				// Copy alarms
+				if (is_array($event['alarm']))
 				{
-					if($type == 'u' && $id == $event['owner']) continue;
-					calendar_so::split_status($p_response, $quantity, $role);
-					// if resource defines callback for status of new status (eg. Resources app acknowledges direct booking acl), call it
-					$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
-					$p_response = calendar_so::combine_status($status,$quantity,$role);
+					foreach($event['alarm'] as $n => &$alarm)
+					{
+						unset($alarm['id']);
+						unset($alarm['cal_id']);
+					}
 				}
-			}
 
-			// Copy alarms
-			if (is_array($event['alarm']))
-			{
-				foreach($event['alarm'] as $n => &$alarm)
+				// Get links to be copied
+				// With no ID, $content['link_to']['to_id'] is used
+				$content['link_to']['to_id'] = array('to_app' => 'calendar', 'to_id' => 0);
+				foreach(Link::get_links('calendar', $content['id']) as $link)
 				{
-					unset($alarm['id']);
-					unset($alarm['cal_id']);
+					if ($link['app'] != Link::VFS_APPNAME)
+					{
+						Link::link('calendar', $content['link_to']['to_id'], $link['app'], $link['id'], $link['remark']);
+					}
+					elseif ($link['app'] == Link::VFS_APPNAME)
+					{
+						Link::link('calendar', $content['link_to']['to_id'], Link::VFS_APPNAME, array(
+							'tmp_name' => Link::vfs_path($link['app2'], $link['id2']).'/'.$link['id'],
+							'name' => $link['id'],
+						), $link['remark']);
+					}
 				}
-			}
+				unset($link);
+				$preserv['view'] = $preserv['edit_single'] = false;
+				$msg = lang('%1 copied - the copy can now be edited', lang(Link::get_registry('calendar','entry')));
+				$event['title'] = lang('Copy of:').' '.$event['title'];
+				break;
 
-			// Get links to be copied
-			// With no ID, $content['link_to']['to_id'] is used
-			$content['link_to']['to_id'] = array('to_app' => 'calendar', 'to_id' => 0);
-			foreach(Link::get_links('calendar', $content['id']) as $link)
-			{
-				if ($link['app'] != Link::VFS_APPNAME)
+			case 'mail':
+			case 'sendrequest':
+			case 'save':
+			case 'print':
+			case 'apply':
+			case 'infolog':
+				if ($event['id'] && !$this->bo->check_perms(Acl::EDIT,$event))
 				{
-					Link::link('calendar', $content['link_to']['to_id'], $link['app'], $link['id'], $link['remark']);
+					$msg = lang('Permission denied');
+					$button = '';
+					break;
 				}
-				elseif ($link['app'] == Link::VFS_APPNAME)
+				if ($event['start'] > $event['end'])
 				{
-					Link::link('calendar', $content['link_to']['to_id'], Link::VFS_APPNAME, array(
-						'tmp_name' => Link::vfs_path($link['app2'], $link['id2']).'/'.$link['id'],
-						'name' => $link['id'],
-					), $link['remark']);
+					$msg = lang('Error: Starttime has to be before the endtime !!!');
+					$button = '';
+					break;
 				}
-			}
-			unset($link);
-			$preserv['view'] = $preserv['edit_single'] = false;
-			$msg = lang('%1 copied - the copy can now be edited', lang(Link::get_registry('calendar','entry')));
-			$event['title'] = lang('Copy of:').' '.$event['title'];
-			break;
-
-		case 'mail':
-		case 'sendrequest':
-		case 'save':
-		case 'print':
-		case 'apply':
-		case 'infolog':
-			if ($event['id'] && !$this->bo->check_perms(Acl::EDIT,$event))
-			{
-				$msg = lang('Permission denied');
-				$button = '';
-				break;
-			}
-			if ($event['start'] > $event['end'])
-			{
-				$msg = lang('Error: Starttime has to be before the endtime !!!');
-				$button = '';
-				break;
-			}
-			if ($event['recur_type'] != MCAL_RECUR_NONE && $event['recur_enddate'] && $event['start'] > $event['recur_enddate'])
-			{
-				$msg = lang('repetition').': '.lang('Error: Starttime has to be before the endtime !!!');
-				$button = '';
-				break;
-			}
-			if ($event['recur_type'] != MCAL_RECUR_NONE && $event['end']-$event['start'] > calendar_rrule::recurrence_interval($event['recur_type'], $event['recur_interval']))
-			{
-				$msg = lang('Error: Duration of event longer then recurrence interval!');
-				$button = '';
-				break;
-			}
-			if (!$event['participants'])
-			{
-				$msg = lang('Error: no participants selected !!!');
-				$button = '';
-				break;
-			}
-			// if private event with ressource reservation is forbidden
-			if (!$event['public'] && $GLOBALS['egw_info']['server']['no_ressources_private'])
-			{
-				foreach (array_keys($event['participants']) as $uid)
+				if ($event['recur_type'] != MCAL_RECUR_NONE && $event['recur_enddate'] && $event['start'] > $event['recur_enddate'])
+				{
+					$msg = lang('repetition').': '.lang('Error: Starttime has to be before the endtime !!!');
+					$button = '';
+					break;
+				}
+				if ($event['recur_type'] != MCAL_RECUR_NONE && $event['end']-$event['start'] > calendar_rrule::recurrence_interval($event['recur_type'], $event['recur_interval']))
+				{
+					$msg = lang('Error: Duration of event longer then recurrence interval!');
+					$button = '';
+					break;
+				}
+				if (!$event['participants'])
 				{
-					if ($uid[0] == 'r') //ressource detection
+					$msg = lang('Error: no participants selected !!!');
+					$button = '';
+					break;
+				}
+				// if private event with ressource reservation is forbidden
+				if (!$event['public'] && $GLOBALS['egw_info']['server']['no_ressources_private'])
+				{
+					foreach (array_keys($event['participants']) as $uid)
 					{
-						$msg = lang('Error: ressources reservation in private events is not allowed!!!');
-						$button = '';
-						break 2; //break foreach and case
+						if ($uid[0] == 'r') //ressource detection
+						{
+							$msg = lang('Error: ressources reservation in private events is not allowed!!!');
+							$button = '';
+							break 2; //break foreach and case
+						}
 					}
 				}
-			}
-			if ($content['edit_single'])	// we edited a single event from a series
-			{
-				$event['reference'] = $event['id'];
-				$event['recurrence'] = $content['edit_single'];
-				unset($event['id']);
-				$conflicts = $this->bo->update($event,$ignore_conflicts,true,false,true,$messages,$content['no_notifications']);
-				if (!is_array($conflicts) && $conflicts)
+				if ($content['edit_single'])	// we edited a single event from a series
 				{
-					// now we need to add the original start as recur-execption to the series
-					$recur_event = $this->bo->read($event['reference']);
-					$recur_event['recur_exception'][] = $content['edit_single'];
-					// check if we need to move the alarms, because they are next on that exception
-					foreach($recur_event['alarm'] as $id => $alarm)
+					$event['reference'] = $event['id'];
+					$event['recurrence'] = $content['edit_single'];
+					unset($event['id']);
+					$conflicts = $this->bo->update($event,$ignore_conflicts,true,false,true,$messages,$content['no_notifications']);
+					if (!is_array($conflicts) && $conflicts)
 					{
-						if ($alarm['time'] == $content['edit_single'] - $alarm['offset'])
+						// now we need to add the original start as recur-execption to the series
+						$recur_event = $this->bo->read($event['reference']);
+						$recur_event['recur_exception'][] = $content['edit_single'];
+						// check if we need to move the alarms, because they are next on that exception
+						foreach($recur_event['alarm'] as $id => $alarm)
 						{
-							$rrule = calendar_rrule::event2rrule($recur_event, true);
-							foreach ($rrule as $time)
+							if ($alarm['time'] == $content['edit_single'] - $alarm['offset'])
 							{
-								if ($content['edit_single'] < $time->format('ts'))
+								$rrule = calendar_rrule::event2rrule($recur_event, true);
+								foreach ($rrule as $time)
 								{
-									$alarm['time'] = $time->format('ts') - $alarm['offset'];
-									$this->bo->save_alarm($event['reference'], $alarm);
-									break;
+									if ($content['edit_single'] < $time->format('ts'))
+									{
+										$alarm['time'] = $time->format('ts') - $alarm['offset'];
+										$this->bo->save_alarm($event['reference'], $alarm);
+										break;
+									}
 								}
 							}
 						}
-					}
-					unset($recur_event['start']); unset($recur_event['end']);	// no update necessary
-					unset($recur_event['alarm']);	// unsetting alarms too, as they cant be updated without start!
-					$this->bo->update($recur_event,true);	// no conflict check here
+						unset($recur_event['start']); unset($recur_event['end']);	// no update necessary
+						unset($recur_event['alarm']);	// unsetting alarms too, as they cant be updated without start!
+						$this->bo->update($recur_event,true);	// no conflict check here
 
-					// Save links
-					if($content['links'])
-					{
-						Link::link('calendar', $event['id'], $content['links']['to_id']);
-					}
+						// Save links
+						if($content['links'])
+						{
+							Link::link('calendar', $event['id'], $content['links']['to_id']);
+						}
 
-					if(Api\Json\Response::isJSONResponse())
+						if(Api\Json\Response::isJSONResponse())
+						{
+							// Sending null will trigger a removal of the original
+							// for that date
+							Api\Json\Response::get()->generic('data', array('uid' => 'calendar::'.$content['reference'].':'.$content['actual_date'], 'data' => null));
+						}
+
+						unset($recur_event);
+						unset($event['edit_single']);			// if we further edit it, it's just a single event
+						unset($preserv['edit_single']);
+					}
+					else	// conflict or error, we need to reset everything to the state befor we tried to save it
 					{
-						// Sending null will trigger a removal of the original
-						// for that date
-						Api\Json\Response::get()->generic('data', array('uid' => 'calendar::'.$content['reference'].':'.$content['actual_date'], 'data' => null));
+						$event['id'] = $event['reference'];
+						$event['reference'] = $event['recurrence'] = 0;
+						$event['uid'] = $content['uid'];
 					}
-
-					unset($recur_event);
-					unset($event['edit_single']);			// if we further edit it, it's just a single event
-					unset($preserv['edit_single']);
+					$update_type = 'edit';
 				}
-				else	// conflict or error, we need to reset everything to the state befor we tried to save it
+				else	// we edited a non-reccuring event or the whole series
 				{
-					$event['id'] = $event['reference'];
-					$event['reference'] = $event['recurrence'] = 0;
-					$event['uid'] = $content['uid'];
-				}
-				$update_type = 'edit';
-			}
-			else	// we edited a non-reccuring event or the whole series
-			{
-				if (($old_event = $this->bo->read($event['id'])))
-				{
-					if ($event['recur_type'] != MCAL_RECUR_NONE)
+					if (($old_event = $this->bo->read($event['id'])))
 					{
-						$update_type = 'edit';
-
-						// we edit a existing series event
-						if ($event['start'] != $old_event['start'] ||
-							$event['whole_day'] != $old_event['whole_day'] ||
-							$event['end'] != $old_event['end'])
+						if ($event['recur_type'] != MCAL_RECUR_NONE)
 						{
-							// calculate offset against old series start or clicked recurrance,
-							// depending on which is smaller
-							$offset = $event['start'] - $old_event['start'];
-							if (abs($offset) > abs($off2 = $event['start'] - $event['actual_date']))
-							{
-								$offset = $off2;
-							}
-							$msg = $this->_break_recurring($event, $old_event, $event['actual_date'] + $offset,$content['no_notifications']);
-							if($msg)
+							$update_type = 'edit';
+
+							// we edit a existing series event
+							if ($event['start'] != $old_event['start'] ||
+								$event['whole_day'] != $old_event['whole_day'] ||
+								$event['end'] != $old_event['end'])
 							{
-								$noerror = false;
+								// calculate offset against old series start or clicked recurrance,
+								// depending on which is smaller
+								$offset = $event['start'] - $old_event['start'];
+								if (abs($offset) > abs($off2 = $event['start'] - $event['actual_date']))
+								{
+									$offset = $off2;
+								}
+								$msg = $this->_break_recurring($event, $old_event, $event['actual_date'] + $offset,$content['no_notifications']);
+								if($msg)
+								{
+									$noerror = false;
+								}
 							}
 						}
-					}
-					else
-					{
-						if ($old_event['start'] != $event['start'] ||
-							$old_event['end'] != $event['end'] ||
-							$event['whole_day'] != $old_event['whole_day'])
+						else
 						{
-							$sameday = (date('Ymd', $old_event['start']) == date('Ymd', $event['start']));
-							foreach((array)$event['participants'] as $uid => $status)
+							if ($old_event['start'] != $event['start'] ||
+								$old_event['end'] != $event['end'] ||
+								$event['whole_day'] != $old_event['whole_day'])
 							{
-								$q = $r = null;
-								calendar_so::split_status($status,$q,$r);
-								if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user && $status != 'U')
+								$sameday = (date('Ymd', $old_event['start']) == date('Ymd', $event['start']));
+								foreach((array)$event['participants'] as $uid => $status)
 								{
-									$preferences = new Api\Preferences($uid);
-									$part_prefs = $preferences->read_repository();
-									switch ($part_prefs['calendar']['reset_stati'])
+									$q = $r = null;
+									calendar_so::split_status($status,$q,$r);
+									if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user && $status != 'U')
 									{
+										$preferences = new Api\Preferences($uid);
+										$part_prefs = $preferences->read_repository();
+										switch ($part_prefs['calendar']['reset_stati'])
+										{
 										case 'no':
 											break;
 										case 'startday':
@@ -820,7 +820,7 @@ 
 											$status_reset_to_unknown = true;
 											$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
 											// todo: report reset status to user
-									}
+										}
 								}
 							}
 							// check if we need to move the alarms, because they are relative
@@ -962,83 +962,83 @@ 
 			}
 			break;
 
-		case 'cancel':
-			if($content['cancel_needs_refresh'])
-			{
-				Framework::refresh_opener($msg, 'calendar');
-			}
-			break;
-
-		case 'delete':					// delete of event (regular or series)
-			$exceptions_kept = null;
-			if ($this->bo->delete($event['id'], (int)$content['edit_single'], false, $event['no_notifications'],
-				$content['delete_exceptions'] == 'true', $exceptions_kept))
-			{
-				if ($event['recur_type'] != MCAL_RECUR_NONE && $content['reference'] == 0 && !$content['edit_single'])
+			case 'cancel':
+				if($content['cancel_needs_refresh'])
 				{
-					$msg = lang('Series deleted');
-					if ($exceptions_kept) $msg .= lang(', exceptions preserved');
+					Framework::refresh_opener($msg, 'calendar');
 				}
-				else
+				break;
+
+			case 'delete':					// delete of event (regular or series)
+				$exceptions_kept = null;
+				if ($this->bo->delete($event['id'], (int)$content['edit_single'], false, $event['no_notifications'],
+					$content['delete_exceptions'] == 'true', $exceptions_kept))
 				{
-					$msg = lang('Event deleted');
-				}
+					if ($event['recur_type'] != MCAL_RECUR_NONE && $content['reference'] == 0 && !$content['edit_single'])
+					{
+						$msg = lang('Series deleted');
+						if ($exceptions_kept) $msg .= lang(', exceptions preserved');
+					}
+					else
+					{
+						$msg = lang('Event deleted');
+					}
 
-			}
-			break;
+				}
+				break;
 
-		case 'freetime':
-			// the "click" has to be in onload, to make sure the button is already created
-			$event['button_was'] = $button;
-			break;
+			case 'freetime':
+				// the "click" has to be in onload, to make sure the button is already created
+				$event['button_was'] = $button;
+				break;
 
-		case 'add_alarm':
-			$time = $content['start'];
-			$offset = $time - $content['new_alarm']['date'];
-			if ($event['recur_type'] != MCAL_RECUR_NONE &&
-				($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + $offset, true)) &&
-				$time < $next_occurrence['start'])
-			{
-				$content['new_alarm']['date'] = $next_occurrence['start'] - $offset;
-			}
-			if ($this->bo->check_perms(Acl::EDIT,!$content['new_alarm']['owner'] ? $event : 0,$content['new_alarm']['owner']))
-			{
-				$alarm = array(
-					'offset' => $offset,
-					'time'   => $content['new_alarm']['date'],
-					'all'    => !$content['new_alarm']['owner'],
-					'owner'  => $content['new_alarm']['owner'] ? $content['new_alarm']['owner'] : $this->user,
-				);
-				if ($alarm['time'] < $this->bo->now_su)
+			case 'add_alarm':
+				$time = $content['start'];
+				$offset = $time - $content['new_alarm']['date'];
+				if ($event['recur_type'] != MCAL_RECUR_NONE &&
+					($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + $offset, true)) &&
+					$time < $next_occurrence['start'])
 				{
-					$msg = lang("Can't add alarms in the past !!!");
+					$content['new_alarm']['date'] = $next_occurrence['start'] - $offset;
 				}
-				elseif ($event['id'])	// save the alarm immediatly
+				if ($this->bo->check_perms(Acl::EDIT,!$content['new_alarm']['owner'] ? $event : 0,$content['new_alarm']['owner']))
 				{
-					if (($alarm_id = $this->bo->save_alarm($event['id'],$alarm)))
+					$alarm = array(
+						'offset' => $offset,
+						'time'   => $content['new_alarm']['date'],
+						'all'    => !$content['new_alarm']['owner'],
+						'owner'  => $content['new_alarm']['owner'] ? $content['new_alarm']['owner'] : $this->user,
+					);
+					if ($alarm['time'] < $this->bo->now_su)
+					{
+						$msg = lang("Can't add alarms in the past !!!");
+					}
+					elseif ($event['id'])	// save the alarm immediatly
 					{
-						$alarm['id'] = $alarm_id;
-						$event['alarm'][$alarm_id] = $alarm;
+						if (($alarm_id = $this->bo->save_alarm($event['id'],$alarm)))
+						{
+							$alarm['id'] = $alarm_id;
+							$event['alarm'][$alarm_id] = $alarm;
 
-						$msg = lang('Alarm added');
-						Framework::refresh_opener($msg,'calendar', $event['id'], 'update');
+							$msg = lang('Alarm added');
+							Framework::refresh_opener($msg,'calendar', $event['id'], 'update');
+						}
+						else
+						{
+							$msg = lang('Error adding the alarm');
+						}
 					}
 					else
 					{
-						$msg = lang('Error adding the alarm');
+						for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++) {}	// get a temporary non-conflicting, numeric id
+						$event['alarm'][$alarm['id']] = $alarm;
 					}
 				}
 				else
 				{
-					for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++) {}	// get a temporary non-conflicting, numeric id
-					$event['alarm'][$alarm['id']] = $alarm;
+					$msg = lang('Permission denied');
 				}
-			}
-			else
-			{
-				$msg = lang('Permission denied');
-			}
-			break;
+				break;
 		}
 		// add notification-errors, if we have some
 		if (($notification_errors = notifications::errors(true)))

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();

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
 	 *

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);