EGroupware / egroupware

calendar/inc/class.calendar_uiforms.inc.php

Switch Indentation +276 added lines, -276 removed lines

@@ -538,268 +538,268 @@ 
 
 		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)$this->owner || !$this->bo->check_perms(EGW_ACL_ADD,0,$this->owner) ? $this->user : $this->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)$this->owner || !$this->bo->check_perms(EGW_ACL_ADD,0,$this->owner) ? $this->user : $this->owner;
+
+				// Clear participant stati
+				foreach($event['participant_types'] as $type => &$participants)
+				{
+					foreach($participants as $id => &$response)
+					{
+						if($type == 'u' && $id == $event['owner']) continue;
+						calendar_so::split_status($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';
+						$response = calendar_so::combine_status($status,$quantity,$role);
+					}
+				}
 
-			// Clear participant stati
-			foreach($event['participant_types'] as $type => &$participants)
-			{
-				foreach($participants as $id => &$response)
+				// Copy alarms
+				if (is_array($event['alarm']))
 				{
-					if($type == 'u' && $id == $event['owner']) continue;
-					calendar_so::split_status($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';
-					$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(egw_link::get_links('calendar', $content['id']) as $link)
 				{
-					unset($alarm['id']);
-					unset($alarm['cal_id']);
+					if ($link['app'] != egw_link::VFS_APPNAME)
+					{
+						egw_link::link('calendar', $content['link_to']['to_id'], $link['app'], $link['id'], $link['remark']);
+					}
+					elseif ($link['app'] == egw_link::VFS_APPNAME)
+					{
+						egw_link::link('calendar', $content['link_to']['to_id'], egw_link::VFS_APPNAME, array(
+							'tmp_name' => egw_link::vfs_path($link['app2'], $link['id2']).'/'.$link['id'],
+							'name' => $link['id'],
+						), $link['remark']);
+					}
 				}
-			}
+				unset($link);
+				$preserv['view'] = $preserv['edit_single'] = false;
+				$msg = lang('Event copied - the copy can now be edited');
+				$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(egw_link::get_links('calendar', $content['id']) as $link)
-			{
-				if ($link['app'] != egw_link::VFS_APPNAME)
+			case 'mail':
+			case 'sendrequest':
+			case 'save':
+			case 'print':
+			case 'apply':
+			case 'infolog':
+				if ($event['id'] && !$this->bo->check_perms(EGW_ACL_EDIT,$event))
 				{
-					egw_link::link('calendar', $content['link_to']['to_id'], $link['app'], $link['id'], $link['remark']);
+					$msg = lang('Permission denied');
+					$button = '';
+					break;
 				}
-				elseif ($link['app'] == egw_link::VFS_APPNAME)
+				if ($event['start'] > $event['end'])
 				{
-					egw_link::link('calendar', $content['link_to']['to_id'], egw_link::VFS_APPNAME, array(
-						'tmp_name' => egw_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('Event copied - the copy can now be edited');
-			$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(EGW_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'])
+				{
+					$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'])
 				{
-					if ($uid[0] == 'r') //ressource detection
+					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);
+						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
+					{
+						$event['id'] = $event['reference'];
+						$event['reference'] = $event['recurrence'] = 0;
+						$event['uid'] = $content['uid'];
 					}
-					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);
-					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
+				else	// we edited a non-reccuring event or the whole series
 				{
-					$event['id'] = $event['reference'];
-					$event['reference'] = $event['recurrence'] = 0;
-					$event['uid'] = $content['uid'];
-				}
-			}
-			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'])))
 					{
-						// we edit a existing series event
-						if ($event['start'] != $old_event['start'] ||
-							$event['whole_day'] != $old_event['whole_day'])
+						if ($event['recur_type'] != MCAL_RECUR_NONE)
 						{
-							if(!($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + 1, true)))
+							// we edit a existing series event
+							if ($event['start'] != $old_event['start'] ||
+								$event['whole_day'] != $old_event['whole_day'])
 							{
-								$msg = lang("Error: You can't shift a series from the past!");
-								$noerror = false;
-								break;
-							}
-							// splitting of series confirmed or first event clicked (no confirmation necessary)
-							$orig_event = $event;
+								if(!($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + 1, true)))
+								{
+									$msg = lang("Error: You can't shift a series from the past!");
+									$noerror = false;
+									break;
+								}
+								// splitting of series confirmed or first event clicked (no confirmation necessary)
+								$orig_event = $event;
 
-							// 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;
-							}
-							// base start-date of new series on actual / clicked date
-							$actual_date = $event['actual_date'];
-							$event['start'] = $actual_date + $offset;
-							if ($content['duration'])
-							{
-								$event['end'] = $event['start'] + $content['duration'];
-							}
-							elseif($event['end'] < $event['start'])
-							{
-								$event['end'] = $event['start'] + $event['end'] - $actual_date;
-							}
-							//echo "<p>".__LINE__.": event[start]=$event[start]=".egw_time::to($event['start']).", duration=$content[duration], event[end]=$event[end]=".egw_time::to($event['end']).", offset=$offset</p>\n";
-							$event['participants'] = $old_event['participants'];
-							foreach ($old_event['recur_exception'] as $key => $exdate)
-							{
-								if ($exdate > $actual_date)
+								// 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']))
 								{
-									unset($old_event['recur_exception'][$key]);
-									$event['recur_exception'][$key] += $offset;
+									$offset = $off2;
 								}
-								else
+								// base start-date of new series on actual / clicked date
+								$actual_date = $event['actual_date'];
+								$event['start'] = $actual_date + $offset;
+								if ($content['duration'])
 								{
-									unset($event['recur_exception'][$key]);
+									$event['end'] = $event['start'] + $content['duration'];
 								}
-							}
-							$old_alarms = $old_event['alarm'];
-							if ($old_event['start'] < $actual_date)
-							{
-								unset($orig_event);
-								// copy event by unsetting the id(s)
-								unset($event['id']);
-								unset($event['uid']);
-								unset($event['caldav_name']);
-
-								// set enddate of existing event
-								$rriter = calendar_rrule::event2rrule($old_event, true);
-								$rriter->rewind();
-								$last = $rriter->current();
-								do
+								elseif($event['end'] < $event['start'])
 								{
-									$rriter->next_no_exception();
-									$occurrence = $rriter->current();
+									$event['end'] = $event['start'] + $event['end'] - $actual_date;
 								}
-								while ($rriter->valid() &&
-										egw_time::to($occurrence, 'ts') < $actual_date &&
-										($last = $occurrence));
-								$last->setTime(0, 0, 0);
-								$old_event['recur_enddate'] = egw_time::to($last, 'ts');
-								if (!$this->bo->update($old_event,true,true,false,true,$dummy=null,$content['no_notifications']))
+								//echo "<p>".__LINE__.": event[start]=$event[start]=".egw_time::to($event['start']).", duration=$content[duration], event[end]=$event[end]=".egw_time::to($event['end']).", offset=$offset</p>\n";
+								$event['participants'] = $old_event['participants'];
+								foreach ($old_event['recur_exception'] as $key => $exdate)
 								{
-									$msg .= ($msg ? ', ' : '') .lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
-										lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.','<a href="'.
-											htmlspecialchars(egw::link('/index.php',array(
-												'menuaction' => 'calendar.calendar_uiforms.edit',
-												'cal_id'    => $content['id'],
-											))).'">','</a>');
-									$noerror = false;
-									$event = $orig_event;
-									break;
+									if ($exdate > $actual_date)
+									{
+										unset($old_event['recur_exception'][$key]);
+										$event['recur_exception'][$key] += $offset;
+									}
+									else
+									{
+										unset($event['recur_exception'][$key]);
+									}
+								}
+								$old_alarms = $old_event['alarm'];
+								if ($old_event['start'] < $actual_date)
+								{
+									unset($orig_event);
+									// copy event by unsetting the id(s)
+									unset($event['id']);
+									unset($event['uid']);
+									unset($event['caldav_name']);
+
+									// set enddate of existing event
+									$rriter = calendar_rrule::event2rrule($old_event, true);
+									$rriter->rewind();
+									$last = $rriter->current();
+									do
+									{
+										$rriter->next_no_exception();
+										$occurrence = $rriter->current();
+									}
+									while ($rriter->valid() &&
+											egw_time::to($occurrence, 'ts') < $actual_date &&
+											($last = $occurrence));
+									$last->setTime(0, 0, 0);
+									$old_event['recur_enddate'] = egw_time::to($last, 'ts');
+									if (!$this->bo->update($old_event,true,true,false,true,$dummy=null,$content['no_notifications']))
+									{
+										$msg .= ($msg ? ', ' : '') .lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
+											lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.','<a href="'.
+												htmlspecialchars(egw::link('/index.php',array(
+													'menuaction' => 'calendar.calendar_uiforms.edit',
+													'cal_id'    => $content['id'],
+												))).'">','</a>');
+										$noerror = false;
+										$event = $orig_event;
+										break;
+									}
+									$event['alarm'] = array();
 								}
-								$event['alarm'] = array();
 							}
 						}
-					}
-					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 = CreateObject('phpgwapi.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 = CreateObject('phpgwapi.preferences',$uid);
+										$part_prefs = $preferences->read_repository();
+										switch ($part_prefs['calendar']['reset_stati'])
+										{
 										case 'no':
 											break;
 										case 'startday':
@@ -808,7 +808,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
@@ -925,83 +925,83 @@ 
 			}
 			break;
 
-		case 'cancel':
-			if($content['cancel_needs_refresh'])
-			{
-				egw_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');
+					egw_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(EGW_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(EGW_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');
-						egw_framework::refresh_opener($msg,'calendar', $event['id'], 'update');
+							$msg = lang('Alarm added');
+							egw_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)))

phpgwapi/inc/idna_convert/idna_convert.class.php

Switch Indentation +92 added lines, -92 removed lines

@@ -129,41 +129,41 @@ 
         }
         foreach ($option as $k => $v) {
             switch ($k) {
-            case 'encoding':
-                switch ($v) {
-                case 'utf8':
-                case 'ucs4_string':
-                case 'ucs4_array':
-                    $this->_api_encoding = $v;
-                    break;
-                default:
-                    $this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
-                    return false;
-                }
-                break;
-            case 'overlong':
-                $this->_allow_overlong = ($v) ? true : false;
-                break;
-            case 'strict':
-                $this->_strict_mode = ($v) ? true : false;
+            	case 'encoding':
+                	switch ($v) {
+                		case 'utf8':
+                		case 'ucs4_string':
+                		case 'ucs4_array':
+                    		$this->_api_encoding = $v;
+                    		break;
+                		default:
+                    		$this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+                    		return false;
+                	}
                 break;
-            case 'idn_version':
-                if (in_array($v, array('2003', '2008'))) {
-                    $this->_idn_version = $v;
-                } else {
-                    $this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
-                }
-                break;
-            case 'encode_german_sz': // Deprecated
-                if (!$v) {
-                    self::$NP['replacemaps'][0xDF] = array(0x73, 0x73);
-                } else {
-                    unset(self::$NP['replacemaps'][0xDF]);
-                }
-                break;
-            default:
-                $this->_error('Set Parameter: Unknown option '.$k);
-                return false;
+            	case 'overlong':
+                	$this->_allow_overlong = ($v) ? true : false;
+                	break;
+            	case 'strict':
+                	$this->_strict_mode = ($v) ? true : false;
+                	break;
+            	case 'idn_version':
+                	if (in_array($v, array('2003', '2008'))) {
+                    	$this->_idn_version = $v;
+                	} else {
+                    	$this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+                	}
+                	break;
+            	case 'encode_german_sz': // Deprecated
+                	if (!$v) {
+                    	self::$NP['replacemaps'][0xDF] = array(0x73, 0x73);
+                	} else {
+                    	unset(self::$NP['replacemaps'][0xDF]);
+                	}
+                	break;
+            	default:
+                	$this->_error('Set Parameter: Unknown option '.$k);
+                	return false;
             }
         }
         return true;
@@ -180,13 +180,13 @@ 
         // Optionally set
         if ($one_time_encoding) {
             switch ($one_time_encoding) {
-            case 'utf8':
-            case 'ucs4_string':
-            case 'ucs4_array':
-                break;
-            default:
-                $this->_error('Unknown encoding '.$one_time_encoding);
-                return false;
+            	case 'utf8':
+            	case 'ucs4_string':
+            	case 'ucs4_array':
+                	break;
+            	default:
+                	$this->_error('Unknown encoding '.$one_time_encoding);
+                	return false;
             }
         }
         // Make sure to drop any newline characters around
@@ -255,18 +255,18 @@ 
         // The output is UTF-8 by default, other output formats need conversion here
         // If one time encoding is given, use this, else the objects property
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            return $return;
-            break;
-        case 'ucs4_string':
-           return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
-           break;
-        case 'ucs4_array':
-            return $this->_utf8_to_ucs4($return);
-            break;
-        default:
-            $this->_error('Unsupported output format');
-            return false;
+        	case 'utf8':
+            	return $return;
+            	break;
+        	case 'ucs4_string':
+           	return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
+           	break;
+        	case 'ucs4_array':
+            	return $this->_utf8_to_ucs4($return);
+            	break;
+        	default:
+            	$this->_error('Unsupported output format');
+            	return false;
         }
     }
 
@@ -281,16 +281,16 @@ 
         // Forcing conversion of input to UCS4 array
         // If one time encoding is given, use this, else the objects property
         switch ($one_time_encoding ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            $decoded = $this->_utf8_to_ucs4($decoded);
-            break;
-        case 'ucs4_string':
-           $decoded = $this->_ucs4_string_to_ucs4($decoded);
-        case 'ucs4_array':
-           break;
-        default:
-            $this->_error('Unsupported input format: '.($one_time_encoding ? $one_time_encoding : $this->_api_encoding));
-            return false;
+        	case 'utf8':
+            	$decoded = $this->_utf8_to_ucs4($decoded);
+            	break;
+        	case 'ucs4_string':
+           	$decoded = $this->_ucs4_string_to_ucs4($decoded);
+        	case 'ucs4_array':
+           	break;
+        	default:
+            	$this->_error('Unsupported input format: '.($one_time_encoding ? $one_time_encoding : $this->_api_encoding));
+            	return false;
         }
 
         // No input, no output, what else did you expect?
@@ -303,35 +303,35 @@ 
         foreach ($decoded as $k => $v) {
             // Make sure to use just the plain dot
             switch($v) {
-            case 0x3002:
-            case 0xFF0E:
-            case 0xFF61:
-                $decoded[$k] = 0x2E;
-                // Right, no break here, the above are converted to dots anyway
-            // Stumbling across an anchoring character
-            case 0x2E:
-            case 0x2F:
-            case 0x3A:
-            case 0x3F:
-            case 0x40:
-                // Neither email addresses nor URLs allowed in strict mode
-                if ($this->_strict_mode) {
-                   $this->_error('Neither email addresses nor URLs are allowed in strict mode.');
-                   return false;
-                } else {
-                    // Skip first char
-                    if ($k) {
-                        $encoded = '';
-                        $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
-                        if ($encoded) {
-                            $output .= $encoded;
-                        } else {
-                            $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
-                        }
-                        $output .= chr($decoded[$k]);
-                    }
-                    $last_begin = $k + 1;
-                }
+            	case 0x3002:
+            	case 0xFF0E:
+            	case 0xFF61:
+                	$decoded[$k] = 0x2E;
+                	// Right, no break here, the above are converted to dots anyway
+            	// Stumbling across an anchoring character
+            	case 0x2E:
+            	case 0x2F:
+            	case 0x3A:
+            	case 0x3F:
+            	case 0x40:
+                	// Neither email addresses nor URLs allowed in strict mode
+                	if ($this->_strict_mode) {
+                   	$this->_error('Neither email addresses nor URLs are allowed in strict mode.');
+                   	return false;
+                	} else {
+                    	// Skip first char
+                    	if ($k) {
+                        	$encoded = '';
+                        	$encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                        	if ($encoded) {
+                            	$output .= $encoded;
+                        	} else {
+                            	$output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                        	}
+                        	$output .= chr($decoded[$k]);
+                    	}
+                    	$last_begin = $k + 1;
+                	}
             }
         }
         // Catch the rest of the string

phpgwapi/inc/adodb/adodb-datadict.inc.php

Switch Indentation +101 added lines, -101 removed lines

@@ -65,92 +65,92 @@ 
 	while ($pos < $max) {
 		$ch = substr($args,$pos,1);
 		switch($ch) {
-		case ' ':
-		case "\t":
-		case "\n":
-		case "\r":
-			if (!$quoted) {
-				if ($intoken) {
-					$intoken = false;
-					$tokens[$stmtno][] = implode('',$tokarr);
+			case ' ':
+			case "\t":
+			case "\n":
+			case "\r":
+				if (!$quoted) {
+					if ($intoken) {
+						$intoken = false;
+						$tokens[$stmtno][] = implode('',$tokarr);
+					}
+					break;
 				}
+
+				$tokarr[] = $ch;
 				break;
-			}
 
-			$tokarr[] = $ch;
-			break;
+			case '`':
+				if ($intoken) $tokarr[] = $ch;
+			case '(':
+			case ')':
+			case '"':
+			case "'":
 
-		case '`':
-			if ($intoken) $tokarr[] = $ch;
-		case '(':
-		case ')':
-		case '"':
-		case "'":
+				if ($intoken) {
+					if (empty($endquote)) {
+						$tokens[$stmtno][] = implode('',$tokarr);
+						if ($ch == '(') $endquote = ')';
+						else $endquote = $ch;
+						$quoted = true;
+						$intoken = true;
+						$tokarr = array();
+					} else if ($endquote == $ch) {
+						$ch2 = substr($args,$pos+1,1);
+						if ($ch2 == $endquote) {
+							$pos += 1;
+							$tokarr[] = $ch2;
+						} else {
+							$quoted = false;
+							$intoken = false;
+							$tokens[$stmtno][] = implode('',$tokarr);
+							$endquote = '';
+						}
+					} else
+						$tokarr[] = $ch;
+
+				}else {
 
-			if ($intoken) {
-				if (empty($endquote)) {
-					$tokens[$stmtno][] = implode('',$tokarr);
 					if ($ch == '(') $endquote = ')';
 					else $endquote = $ch;
 					$quoted = true;
 					$intoken = true;
 					$tokarr = array();
-				} else if ($endquote == $ch) {
-					$ch2 = substr($args,$pos+1,1);
-					if ($ch2 == $endquote) {
-						$pos += 1;
-						$tokarr[] = $ch2;
-					} else {
-						$quoted = false;
-						$intoken = false;
-						$tokens[$stmtno][] = implode('',$tokarr);
-						$endquote = '';
-					}
-				} else
-					$tokarr[] = $ch;
+					if ($ch == '`') $tokarr[] = '`';
+				}
+				break;
 
-			}else {
+			default:
 
-				if ($ch == '(') $endquote = ')';
-				else $endquote = $ch;
-				$quoted = true;
-				$intoken = true;
-				$tokarr = array();
-				if ($ch == '`') $tokarr[] = '`';
-			}
-			break;
+				if (!$intoken) {
+					if ($ch == $endstmtchar) {
+						$stmtno += 1;
+						$tokens[$stmtno] = array();
+						break;
+					}
 
-		default:
+					$intoken = true;
+					$quoted = false;
+					$endquote = false;
+					$tokarr = array();
 
-			if (!$intoken) {
-				if ($ch == $endstmtchar) {
-					$stmtno += 1;
-					$tokens[$stmtno] = array();
-					break;
 				}
 
-				$intoken = true;
-				$quoted = false;
-				$endquote = false;
-				$tokarr = array();
-
-			}
-
-			if ($quoted) $tokarr[] = $ch;
-			else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false) $tokarr[] = $ch;
-			else {
-				if ($ch == $endstmtchar) {
+				if ($quoted) $tokarr[] = $ch;
+				else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false) $tokarr[] = $ch;
+				else {
+					if ($ch == $endstmtchar) {
+						$tokens[$stmtno][] = implode('',$tokarr);
+						$stmtno += 1;
+						$tokens[$stmtno] = array();
+						$intoken = false;
+						$tokarr = array();
+						break;
+					}
 					$tokens[$stmtno][] = implode('',$tokarr);
-					$stmtno += 1;
-					$tokens[$stmtno] = array();
+					$tokens[$stmtno][] = $ch;
 					$intoken = false;
-					$tokarr = array();
-					break;
 				}
-				$tokens[$stmtno][] = implode('',$tokarr);
-				$tokens[$stmtno][] = $ch;
-				$intoken = false;
-			}
 		}
 		$pos += 1;
 	}
@@ -469,15 +469,15 @@ 
 				$f1 = array();
 				foreach($f0 as $token) {
 					switch (strtoupper($token)) {
-					case 'CONSTRAINT':
-					case 'DEFAULT':
-						$hasparam = $token;
-						break;
-					default:
-						if ($hasparam) $f1[$hasparam] = $token;
-						else $f1[] = $token;
-						$hasparam = false;
-						break;
+						case 'CONSTRAINT':
+						case 'DEFAULT':
+							$hasparam = $token;
+							break;
+						default:
+							if ($hasparam) $f1[$hasparam] = $token;
+							else $f1[] = $token;
+							$hasparam = false;
+							break;
 					}
 				}
 				$flds[] = $f1;
@@ -511,31 +511,31 @@ 
 				else if (is_numeric($attr) && $attr > 1 && !is_numeric($v)) $attr = strtoupper($v);
 
 				switch($attr) {
-				case '0':
-				case 'NAME': 	$fname = $v; break;
-				case '1':
-				case 'TYPE': 	$ty = $v; $ftype = $this->ActualType(strtoupper($v)); break;
-
-				case 'SIZE':
-								$dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,',');
-								if ($dotat === false) $fsize = $v;
-								else {
-									$fsize = substr($v,0,$dotat);
-									$fprec = substr($v,$dotat+1);
-								}
-								break;
-				case 'UNSIGNED': $funsigned = true; break;
-				case 'AUTOINCREMENT':
-				case 'AUTO':	$fautoinc = true; $fnotnull = true; break;
-				case 'KEY':
-				case 'PRIMARY':	$fprimary = $v; $fnotnull = true; break;
-				case 'DEF':
-				case 'DEFAULT': $fdefault = $v; break;
-				case 'NOTNULL': $fnotnull = $v; break;
-				case 'NOQUOTE': $fnoquote = $v; break;
-				case 'DEFDATE': $fdefdate = $v; break;
-				case 'DEFTIMESTAMP': $fdefts = $v; break;
-				case 'CONSTRAINT': $fconstraint = $v; break;
+					case '0':
+					case 'NAME': 	$fname = $v; break;
+					case '1':
+					case 'TYPE': 	$ty = $v; $ftype = $this->ActualType(strtoupper($v)); break;
+
+					case 'SIZE':
+									$dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,',');
+									if ($dotat === false) $fsize = $v;
+									else {
+										$fsize = substr($v,0,$dotat);
+										$fprec = substr($v,$dotat+1);
+									}
+									break;
+					case 'UNSIGNED': $funsigned = true; break;
+					case 'AUTOINCREMENT':
+					case 'AUTO':	$fautoinc = true; $fnotnull = true; break;
+					case 'KEY':
+					case 'PRIMARY':	$fprimary = $v; $fnotnull = true; break;
+					case 'DEF':
+					case 'DEFAULT': $fdefault = $v; break;
+					case 'NOTNULL': $fnotnull = $v; break;
+					case 'NOQUOTE': $fnoquote = $v; break;
+					case 'DEFDATE': $fdefdate = $v; break;
+					case 'DEFTIMESTAMP': $fdefts = $v; break;
+					case 'CONSTRAINT': $fconstraint = $v; break;
 				} //switch
 			} // foreach $fld
 

phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php

Switch Indentation +77 added lines, -77 removed lines

@@ -344,67 +344,67 @@ 
 		for ($i=0; $i < $len; $i++) {
 			$ch = $fmt[$i];
 			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= '%Y';
-				break;
-			case 'Q':
-			case 'q':
-				$s .= "'),Quarter($col)";
-
-				if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
-				else $s .= ",('";
-				$concat = true;
-				break;
-			case 'M':
-				$s .= '%b';
-				break;
-
-			case 'm':
-				$s .= '%m';
-				break;
-			case 'D':
-			case 'd':
-				$s .= '%d';
-				break;
-
-			case 'H':
-				$s .= '%H';
-				break;
-
-			case 'h':
-				$s .= '%I';
-				break;
-
-			case 'i':
-				$s .= '%i';
-				break;
-
-			case 's':
-				$s .= '%s';
-				break;
-
-			case 'a':
-			case 'A':
-				$s .= '%p';
-				break;
-
-			case 'w':
-				$s .= '%w';
-				break;
-
-			case 'l':
-				$s .= '%W';
-				break;
-
-			default:
-
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $ch;
-				break;
+				case 'Y':
+				case 'y':
+					$s .= '%Y';
+					break;
+				case 'Q':
+				case 'q':
+					$s .= "'),Quarter($col)";
+
+					if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
+					else $s .= ",('";
+					$concat = true;
+					break;
+				case 'M':
+					$s .= '%b';
+					break;
+
+				case 'm':
+					$s .= '%m';
+					break;
+				case 'D':
+				case 'd':
+					$s .= '%d';
+					break;
+
+				case 'H':
+					$s .= '%H';
+					break;
+
+				case 'h':
+					$s .= '%I';
+					break;
+
+				case 'i':
+					$s .= '%i';
+					break;
+
+				case 's':
+					$s .= '%s';
+					break;
+
+				case 'a':
+				case 'A':
+					$s .= '%p';
+					break;
+
+				case 'w':
+					$s .= '%w';
+					break;
+
+				case 'l':
+					$s .= '%W';
+					break;
+
+				default:
+
+					if ($ch == '\\') {
+						$i++;
+						$ch = substr($fmt,$i,1);
+					}
+					$s .= $ch;
+					break;
 			}
 		}
 		$s.="')";
@@ -885,13 +885,13 @@ 
 
 		 $len = -1; // mysql max_length is not accurate
 		 switch (strtoupper($t)) {
-		 case 'STRING':
-		 case 'CHAR':
-		 case 'VARCHAR':
-		 case 'TINYBLOB':
-		 case 'TINYTEXT':
-		 case 'ENUM':
-		 case 'SET':
+		 	case 'STRING':
+		 	case 'CHAR':
+		 	case 'VARCHAR':
+		 	case 'TINYBLOB':
+		 	case 'TINYTEXT':
+		 	case 'ENUM':
+		 	case 'SET':
 
 		case MYSQLI_TYPE_TINY_BLOB :
 		case MYSQLI_TYPE_CHAR :
@@ -957,15 +957,15 @@ 
 
 		   // Added floating-point types
 		   // Maybe not necessery.
-		 case 'FLOAT':
-		 case 'DOUBLE':
-		   //		case 'DOUBLE PRECISION':
-		 case 'DECIMAL':
-		 case 'DEC':
-		 case 'FIXED':
-		 default:
-		 	//if (!is_numeric($t)) echo "<p>--- Error in type matching $t -----</p>";
-		 	return 'N';
+		 	case 'FLOAT':
+		 	case 'DOUBLE':
+		   	//		case 'DOUBLE PRECISION':
+		 	case 'DECIMAL':
+		 	case 'DEC':
+		 	case 'FIXED':
+		 	default:
+		 		//if (!is_numeric($t)) echo "<p>--- Error in type matching $t -----</p>";
+		 		return 'N';
 		}
 	} // function
 

phpgwapi/inc/adodb/drivers/adodb-postgres64.inc.php

Switch Indentation +63 added lines, -63 removed lines

@@ -287,64 +287,64 @@ 
 		for ($i=0; $i < $len; $i++) {
 			$ch = $fmt[$i];
 			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= 'YYYY';
-				break;
-			case 'Q':
-			case 'q':
-				$s .= 'Q';
-				break;
-
-			case 'M':
-				$s .= 'Mon';
-				break;
-
-			case 'm':
-				$s .= 'MM';
-				break;
-			case 'D':
-			case 'd':
-				$s .= 'DD';
-				break;
-
-			case 'H':
-				$s.= 'HH24';
-				break;
-
-			case 'h':
-				$s .= 'HH';
-				break;
-
-			case 'i':
-				$s .= 'MI';
-				break;
-
-			case 's':
-				$s .= 'SS';
-				break;
-
-			case 'a':
-			case 'A':
-				$s .= 'AM';
-				break;
-
-			case 'w':
-				$s .= 'D';
-				break;
-
-			case 'l':
-				$s .= 'DAY';
-				break;
-
-			default:
-			// handle escape characters...
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
-				else $s .= '"'.$ch.'"';
+				case 'Y':
+				case 'y':
+					$s .= 'YYYY';
+					break;
+				case 'Q':
+				case 'q':
+					$s .= 'Q';
+					break;
+
+				case 'M':
+					$s .= 'Mon';
+					break;
+
+				case 'm':
+					$s .= 'MM';
+					break;
+				case 'D':
+				case 'd':
+					$s .= 'DD';
+					break;
+
+				case 'H':
+					$s.= 'HH24';
+					break;
+
+				case 'h':
+					$s .= 'HH';
+					break;
+
+				case 'i':
+					$s .= 'MI';
+					break;
+
+				case 's':
+					$s .= 'SS';
+					break;
+
+				case 'a':
+				case 'A':
+					$s .= 'AM';
+					break;
+
+				case 'w':
+					$s .= 'D';
+					break;
+
+				case 'l':
+					$s .= 'DAY';
+					break;
+
+				default:
+				// handle escape characters...
+					if ($ch == '\\') {
+						$i++;
+						$ch = substr($fmt,$i,1);
+					}
+					if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
+					else $s .= '"'.$ch.'"';
 
 			}
 		}
@@ -859,12 +859,12 @@ 
 		}
 		switch ($mode)
 		{
-		case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
+			case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
+			case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
 
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default: $this->fetchMode = PGSQL_BOTH; break;
+			case ADODB_FETCH_DEFAULT:
+			case ADODB_FETCH_BOTH:
+			default: $this->fetchMode = PGSQL_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
 		$this->ADORecordSet($queryID);

phpgwapi/inc/adodb/drivers/adodb-odbc.inc.php

Switch Indentation +42 added lines, -42 removed lines

@@ -333,40 +333,40 @@ 
 	function ODBCTypes($t)
 	{
 		switch ((integer)$t) {
-		case 1:	
-		case 12:
-		case 0:
-		case -95:
-		case -96:
-			return 'C';
-		case -97:
-		case -1: //text
-			return 'X';
-		case -4: //image
-			return 'B';
+			case 1:	
+			case 12:
+			case 0:
+			case -95:
+			case -96:
+				return 'C';
+			case -97:
+			case -1: //text
+				return 'X';
+			case -4: //image
+				return 'B';
 				
-		case 9:	
-		case 91:
-			return 'D';
-		
-		case 10:
-		case 11:
-		case 92:
-		case 93:
-			return 'T';
+			case 9:	
+			case 91:
+				return 'D';
+		
+			case 10:
+			case 11:
+			case 92:
+			case 93:
+				return 'T';
 			
-		case 4:
-		case 5:
-		case -6:
-			return 'I';
+			case 4:
+			case 5:
+			case -6:
+				return 'I';
 			
-		case -11: // uniqidentifier
-			return 'R';
-		case -7: //bit
-			return 'L';
+			case -11: // uniqidentifier
+				return 'R';
+			case -7: //bit
+				return 'L';
 		
-		default:
-			return 'N';
+			default:
+				return 'N';
 		}
 	}
 	
@@ -404,21 +404,21 @@ 
 		} */
 		
 		switch ($this->databaseType) {
-		case 'access':
-		case 'vfp':
-			$qid = odbc_columns($this->_connectionID);#,'%','',strtoupper($table),'%');
-			break;
+			case 'access':
+			case 'vfp':
+				$qid = odbc_columns($this->_connectionID);#,'%','',strtoupper($table),'%');
+				break;
 		
 		
-		case 'db2':
-            $colname = "%";
-            $qid = odbc_columns($this->_connectionID, "", $schema, $table, $colname);
-            break;
+			case 'db2':
+            	$colname = "%";
+            	$qid = odbc_columns($this->_connectionID, "", $schema, $table, $colname);
+            	break;
 			
-		default:
-			$qid = @odbc_columns($this->_connectionID,'%','%',strtoupper($table),'%');
-			if (empty($qid)) $qid = odbc_columns($this->_connectionID);
-			break;
+			default:
+				$qid = @odbc_columns($this->_connectionID,'%','%',strtoupper($table),'%');
+				if (empty($qid)) $qid = odbc_columns($this->_connectionID);
+				break;
 		}
 		if (empty($qid)) return $false;
 		

phpgwapi/inc/adodb/drivers/adodb-ado5.inc.php

Switch Indentation +70 added lines, -70 removed lines

@@ -489,43 +489,43 @@ 
 		if (!is_numeric($t)) return $t;
 		
 		switch ($t) {
-		case 0:
-		case 12: // variant
-		case 8: // bstr
-		case 129: //char
-		case 130: //wc
-		case 200: // varc
-		case 202:// varWC
-		case 128: // bin
-		case 204: // varBin
-		case 72: // guid
-			if ($len <= $this->blobSize) return 'C';
-		
-		case 201:
-		case 203:
-			return 'X';
-		case 128:
-		case 204:
-		case 205:
-			 return 'B';
-		case 7:
-		case 133: return 'D';
-		
-		case 134:
-		case 135: return 'T';
-		
-		case 11: return 'L';
-		
-		case 16://	adTinyInt	= 16,
-		case 2://adSmallInt	= 2,
-		case 3://adInteger	= 3,
-		case 4://adBigInt	= 20,
-		case 17://adUnsignedTinyInt	= 17,
-		case 18://adUnsignedSmallInt	= 18,
-		case 19://adUnsignedInt	= 19,
-		case 20://adUnsignedBigInt	= 21,
-			return 'I';
-		default: return 'N';
+			case 0:
+			case 12: // variant
+			case 8: // bstr
+			case 129: //char
+			case 130: //wc
+			case 200: // varc
+			case 202:// varWC
+			case 128: // bin
+			case 204: // varBin
+			case 72: // guid
+				if ($len <= $this->blobSize) return 'C';
+		
+			case 201:
+			case 203:
+				return 'X';
+			case 128:
+			case 204:
+			case 205:
+			 	return 'B';
+			case 7:
+			case 133: return 'D';
+		
+			case 134:
+			case 135: return 'T';
+		
+			case 11: return 'L';
+		
+			case 16://	adTinyInt	= 16,
+			case 2://adSmallInt	= 2,
+			case 3://adInteger	= 3,
+			case 4://adBigInt	= 20,
+			case 17://adUnsignedTinyInt	= 17,
+			case 18://adUnsignedSmallInt	= 18,
+			case 19://adUnsignedInt	= 19,
+			case 20://adUnsignedBigInt	= 21,
+				return 'I';
+			default: return 'N';
 		}
 	}
 	
@@ -558,40 +558,40 @@ 
 		for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
 			//echo "<p>",$t,' ';var_dump($f->value); echo '</p>';
 			switch($t) {
-			case 135: // timestamp
-				if (!strlen((string)$f->value)) $this->fields[] = false;
-				else {
-					if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
-					else $val = $f->value;
-					$this->fields[] = adodb_date('Y-m-d H:i:s',$val);
-				}
-				break;			
-			case 133:// A date value (yyyymmdd) 
-				if ($val = $f->value) {
-					$this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
-				} else
-					$this->fields[] = false;
-				break;
-			case 7: // adDate
-				if (!strlen((string)$f->value)) $this->fields[] = false;
-				else {
-					if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
-					else $val = $f->value;
+				case 135: // timestamp
+					if (!strlen((string)$f->value)) $this->fields[] = false;
+					else {
+						if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
+						else $val = $f->value;
+						$this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+					}
+					break;			
+				case 133:// A date value (yyyymmdd) 
+					if ($val = $f->value) {
+						$this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
+					} else
+						$this->fields[] = false;
+					break;
+				case 7: // adDate
+					if (!strlen((string)$f->value)) $this->fields[] = false;
+					else {
+						if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
+						else $val = $f->value;
 					
-					if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
-					else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
-				}
-				break;
-			case 1: // null
-				$this->fields[] = false;
-				break;
-			case 6: // currency is not supported properly;
-				ADOConnection::outp( '<b>'.$f->Name.': currency type not supported by PHP</b>');
-				$this->fields[] = (float) $f->value;
-				break;
-			default:
-				$this->fields[] = $f->value; 
-				break;
+						if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
+						else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+					}
+					break;
+				case 1: // null
+					$this->fields[] = false;
+					break;
+				case 6: // currency is not supported properly;
+					ADOConnection::outp( '<b>'.$f->Name.': currency type not supported by PHP</b>');
+					$this->fields[] = (float) $f->value;
+					break;
+				default:
+					$this->fields[] = $f->value; 
+					break;
 			}
 			//print " $f->value $t, ";
 			$f = next($this->_flds);

phpgwapi/inc/adodb/drivers/adodb-borland_ibase.inc.php

Switch Indentation +5 added lines, -5 removed lines

@@ -38,11 +38,11 @@
 	{
 		$arr['dialect'] = $this->dialect;
 		switch($arr['dialect']) {
-		case '': 
-		case '1': $s = 'Interbase 6.5, Dialect 1'; break;
-		case '2': $s = 'Interbase 6.5, Dialect 2'; break;
-		default:
-		case '3': $s = 'Interbase 6.5, Dialect 3'; break;
+			case '': 
+			case '1': $s = 'Interbase 6.5, Dialect 1'; break;
+			case '2': $s = 'Interbase 6.5, Dialect 2'; break;
+			default:
+			case '3': $s = 'Interbase 6.5, Dialect 3'; break;
 		}
 		$arr['version'] = '6.5';
 		$arr['description'] = $s;

phpgwapi/inc/adodb/drivers/adodb-fbsql.inc.php

Switch Indentation +31 added lines, -31 removed lines

@@ -169,11 +169,11 @@ 
 			$mode = $ADODB_FETCH_MODE;
 		}
 		switch ($mode) {
-		case ADODB_FETCH_NUM: $this->fetchMode = FBSQL_NUM; break;
-		case ADODB_FETCH_ASSOC: $this->fetchMode = FBSQL_ASSOC; break;
-		case ADODB_FETCH_BOTH: 
-		default:
-		$this->fetchMode = FBSQL_BOTH; break;
+			case ADODB_FETCH_NUM: $this->fetchMode = FBSQL_NUM; break;
+			case ADODB_FETCH_ASSOC: $this->fetchMode = FBSQL_ASSOC; break;
+			case ADODB_FETCH_BOTH: 
+			default:
+			$this->fetchMode = FBSQL_BOTH; break;
 		}
 		return $this->ADORecordSet($queryID);
 	}
@@ -226,38 +226,38 @@ 
 		}
 		$len = -1; // fbsql max_length is not accurate
 		switch (strtoupper($t)) {
-		case 'CHARACTER':
-		case 'CHARACTER VARYING': 
-		case 'BLOB': 
-		case 'CLOB': 
-		case 'BIT': 
-		case 'BIT VARYING': 
-			if ($len <= $this->blobSize) return 'C';
+			case 'CHARACTER':
+			case 'CHARACTER VARYING': 
+			case 'BLOB': 
+			case 'CLOB': 
+			case 'BIT': 
+			case 'BIT VARYING': 
+				if ($len <= $this->blobSize) return 'C';
 			
-		// so we have to check whether binary...
-		case 'IMAGE':
-		case 'LONGBLOB': 
-		case 'BLOB':
-		case 'MEDIUMBLOB':
-			return !empty($fieldobj->binary) ? 'B' : 'X';
+			// so we have to check whether binary...
+			case 'IMAGE':
+			case 'LONGBLOB': 
+			case 'BLOB':
+			case 'MEDIUMBLOB':
+				return !empty($fieldobj->binary) ? 'B' : 'X';
 			
-		case 'DATE': return 'D';
+			case 'DATE': return 'D';
 		
-		case 'TIME':
-		case 'TIME WITH TIME ZONE':
-		case 'TIMESTAMP': 
-		case 'TIMESTAMP WITH TIME ZONE': return 'T';
+			case 'TIME':
+			case 'TIME WITH TIME ZONE':
+			case 'TIMESTAMP': 
+			case 'TIMESTAMP WITH TIME ZONE': return 'T';
 		
-		case 'PRIMARY_KEY':
-			return 'R';
-		case 'INTEGER':
-		case 'SMALLINT': 
-		case 'BOOLEAN':
+			case 'PRIMARY_KEY':
+				return 'R';
+			case 'INTEGER':
+			case 'SMALLINT': 
+			case 'BOOLEAN':
 			
-			if (!empty($fieldobj->primary_key)) return 'R';
-			else return 'I';
+				if (!empty($fieldobj->primary_key)) return 'R';
+				else return 'I';
 		
-		default: return 'N';
+			default: return 'N';
 		}
 	}