fisharebest / webtrees

app/GedcomRecord.php

Switch Indentation +47 added lines, -47 removed lines

@@ -198,27 +198,27 @@ 
 		}
 
 		switch ($type) {
-		case 'INDI':
-			$record = new Individual($xref, $gedcom, $pending, $tree);
-			break;
-		case 'FAM':
-			$record = new Family($xref, $gedcom, $pending, $tree);
-			break;
-		case 'SOUR':
-			$record = new Source($xref, $gedcom, $pending, $tree);
-			break;
-		case 'OBJE':
-			$record = new Media($xref, $gedcom, $pending, $tree);
-			break;
-		case 'REPO':
-			$record = new Repository($xref, $gedcom, $pending, $tree);
-			break;
-		case 'NOTE':
-			$record = new Note($xref, $gedcom, $pending, $tree);
-			break;
-		default:
-			$record = new self($xref, $gedcom, $pending, $tree);
-			break;
+			case 'INDI':
+				$record = new Individual($xref, $gedcom, $pending, $tree);
+				break;
+			case 'FAM':
+				$record = new Family($xref, $gedcom, $pending, $tree);
+				break;
+			case 'SOUR':
+				$record = new Source($xref, $gedcom, $pending, $tree);
+				break;
+			case 'OBJE':
+				$record = new Media($xref, $gedcom, $pending, $tree);
+				break;
+			case 'REPO':
+				$record = new Repository($xref, $gedcom, $pending, $tree);
+				break;
+			case 'NOTE':
+				$record = new Note($xref, $gedcom, $pending, $tree);
+				break;
+			default:
+				$record = new self($xref, $gedcom, $pending, $tree);
+				break;
 		}
 
 		// Store it in the cache
@@ -437,31 +437,31 @@ 
 // CACHING: this function can take three different parameters,
 		// and therefore needs three different caches for the result.
 		switch ($access_level) {
-		case Auth::PRIV_PRIVATE: // visitor
-			if ($this->disp_public === null) {
-				$this->disp_public = $this->canShowRecord(Auth::PRIV_PRIVATE);
-			}
+			case Auth::PRIV_PRIVATE: // visitor
+				if ($this->disp_public === null) {
+					$this->disp_public = $this->canShowRecord(Auth::PRIV_PRIVATE);
+				}
 
-			return $this->disp_public;
-		case Auth::PRIV_USER: // member
-			if ($this->disp_user === null) {
-				$this->disp_user = $this->canShowRecord(Auth::PRIV_USER);
-			}
+				return $this->disp_public;
+			case Auth::PRIV_USER: // member
+				if ($this->disp_user === null) {
+					$this->disp_user = $this->canShowRecord(Auth::PRIV_USER);
+				}
 
-			return $this->disp_user;
-		case Auth::PRIV_NONE: // admin
-			if ($this->disp_none === null) {
-				$this->disp_none = $this->canShowRecord(Auth::PRIV_NONE);
-			}
+				return $this->disp_user;
+			case Auth::PRIV_NONE: // admin
+				if ($this->disp_none === null) {
+					$this->disp_none = $this->canShowRecord(Auth::PRIV_NONE);
+				}
 
-			return $this->disp_none;
-		case Auth::PRIV_HIDE: // hidden from admins
-			// We use this value to bypass privacy checks. For example,
-			// when downloading data or when calculating privacy itself.
-			return true;
-		default:
-			// Should never get here.
-			return false;
+				return $this->disp_none;
+			case Auth::PRIV_HIDE: // hidden from admins
+				// We use this value to bypass privacy checks. For example,
+				// when downloading data or when calculating privacy itself.
+				return true;
+			default:
+				// Should never get here.
+				return false;
 		}
 	}
 
@@ -816,10 +816,10 @@ 
 			}
 			if ($event->getDate()->isOK() || !$event->getPlace()->isEmpty()) {
 				switch ($style) {
-				case 1:
-					return '<br><em>' . $event->getLabel() . ' ' . FunctionsPrint::formatFactDate($event, $this, false, false) . $joiner . FunctionsPrint::formatFactPlace($event) . '</em>';
-				case 2:
-					return '<dl><dt class="label">' . $event->getLabel() . '</dt><dd class="field">' . FunctionsPrint::formatFactDate($event, $this, false, false) . $joiner . FunctionsPrint::formatFactPlace($event) . '</dd></dl>';
+					case 1:
+						return '<br><em>' . $event->getLabel() . ' ' . FunctionsPrint::formatFactDate($event, $this, false, false) . $joiner . FunctionsPrint::formatFactPlace($event) . '</em>';
+					case 2:
+						return '<dl><dt class="label">' . $event->getLabel() . '</dt><dd class="field">' . FunctionsPrint::formatFactDate($event, $this, false, false) . $joiner . FunctionsPrint::formatFactPlace($event) . '</dd></dl>';
 				}
 			}
 		}

edit_changes.php

Switch Indentation +85 added lines, -85 removed lines

@@ -49,72 +49,72 @@ 
 echo '<div id="pending"><h2>', I18N::translate('Pending changes'), '</h2>';
 
 switch ($action) {
-case 'undo':
-	$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
-	$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
-	// Undo a change, and subsequent changes to the same record
-	Database::prepare(
-		"UPDATE `##change`" .
-		" SET   status     = 'rejected'" .
-		" WHERE status     = 'pending'" .
-		" AND   gedcom_id  = ?" .
-		" AND   xref       = ?" .
-		" AND   change_id >= ?"
-	)->execute(array($gedcom_id, $xref, $change_id));
-	break;
-case 'accept':
-	$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
-	$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
-	// Accept a change, and all previous changes to the same record
-	$changes = Database::prepare(
-		"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
-		" FROM  `##change` c" .
-		" JOIN  `##gedcom` g USING (gedcom_id)" .
-		" WHERE c.status   = 'pending'" .
-		" AND   gedcom_id  = ?" .
-		" AND   xref       = ?" .
-		" AND   change_id <= ?" .
-		" ORDER BY change_id"
-	)->execute(array($gedcom_id, $xref, $change_id))->fetchAll();
-	foreach ($changes as $change) {
-		if (empty($change->new_gedcom)) {
-			// delete
-			FunctionsImport::updateRecord($change->old_gedcom, $gedcom_id, true);
-		} else {
-			// add/update
-			FunctionsImport::updateRecord($change->new_gedcom, $gedcom_id, false);
+	case 'undo':
+		$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
+		$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
+		// Undo a change, and subsequent changes to the same record
+		Database::prepare(
+			"UPDATE `##change`" .
+			" SET   status     = 'rejected'" .
+			" WHERE status     = 'pending'" .
+			" AND   gedcom_id  = ?" .
+			" AND   xref       = ?" .
+			" AND   change_id >= ?"
+		)->execute(array($gedcom_id, $xref, $change_id));
+		break;
+	case 'accept':
+		$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
+		$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
+		// Accept a change, and all previous changes to the same record
+		$changes = Database::prepare(
+			"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
+			" FROM  `##change` c" .
+			" JOIN  `##gedcom` g USING (gedcom_id)" .
+			" WHERE c.status   = 'pending'" .
+			" AND   gedcom_id  = ?" .
+			" AND   xref       = ?" .
+			" AND   change_id <= ?" .
+			" ORDER BY change_id"
+		)->execute(array($gedcom_id, $xref, $change_id))->fetchAll();
+		foreach ($changes as $change) {
+			if (empty($change->new_gedcom)) {
+				// delete
+				FunctionsImport::updateRecord($change->old_gedcom, $gedcom_id, true);
+			} else {
+				// add/update
+				FunctionsImport::updateRecord($change->new_gedcom, $gedcom_id, false);
+			}
+			Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
+			Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
 		}
-		Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
-		Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
-	}
-	break;
-case 'undoall':
-	Database::prepare(
-		"UPDATE `##change`" .
-		" SET status='rejected'" .
-		" WHERE status='pending' AND gedcom_id=?"
-	)->execute(array($WT_TREE->getTreeId()));
-	break;
-case 'acceptall':
-	$changes = Database::prepare(
-		"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
-		" FROM `##change` c" .
-		" JOIN `##gedcom` g USING (gedcom_id)" .
-		" WHERE c.status='pending' AND gedcom_id=?" .
-		" ORDER BY change_id"
-	)->execute(array($WT_TREE->getTreeId()))->fetchAll();
-	foreach ($changes as $change) {
-		if (empty($change->new_gedcom)) {
-			// delete
-			FunctionsImport::updateRecord($change->old_gedcom, $change->gedcom_id, true);
-		} else {
-			// add/update
-			FunctionsImport::updateRecord($change->new_gedcom, $change->gedcom_id, false);
+		break;
+	case 'undoall':
+		Database::prepare(
+			"UPDATE `##change`" .
+			" SET status='rejected'" .
+			" WHERE status='pending' AND gedcom_id=?"
+		)->execute(array($WT_TREE->getTreeId()));
+		break;
+	case 'acceptall':
+		$changes = Database::prepare(
+			"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
+			" FROM `##change` c" .
+			" JOIN `##gedcom` g USING (gedcom_id)" .
+			" WHERE c.status='pending' AND gedcom_id=?" .
+			" ORDER BY change_id"
+		)->execute(array($WT_TREE->getTreeId()))->fetchAll();
+		foreach ($changes as $change) {
+			if (empty($change->new_gedcom)) {
+				// delete
+				FunctionsImport::updateRecord($change->old_gedcom, $change->gedcom_id, true);
+			} else {
+				// add/update
+				FunctionsImport::updateRecord($change->new_gedcom, $change->gedcom_id, false);
+			}
+			Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
+			Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
 		}
-		Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
-		Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
-	}
-	break;
+		break;
 }
 
 $changed_gedcoms = Database::prepare(
@@ -146,27 +146,27 @@ 
 
 
 		switch ($match[1]) {
-		case 'INDI':
-			$record = new Individual($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'FAM':
-			$record = new Family($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'SOUR':
-			$record = new Source($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'REPO':
-			$record = new Repository($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'OBJE':
-			$record = new Media($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'NOTE':
-			$record = new Note($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		default:
-			$record = new GedcomRecord($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
+			case 'INDI':
+				$record = new Individual($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
+			case 'FAM':
+				$record = new Family($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
+			case 'SOUR':
+				$record = new Source($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
+			case 'REPO':
+				$record = new Repository($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
+			case 'OBJE':
+				$record = new Media($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
+			case 'NOTE':
+				$record = new Note($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
+			default:
+				$record = new GedcomRecord($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
 		}
 		if ($change->xref != $prev_xref || $change->gedcom_id != $prev_gedcom_id) {
 			if ($prev_xref) {

message.php

Switch Indentation +14 added lines, -14 removed lines

@@ -65,20 +65,20 @@
 // Ensure the user always visits this page twice - once to compose it and again to send it.
 // This makes it harder for spammers.
 switch ($action) {
-case 'compose':
-	Session::put('good_to_send', true);
-	break;
-case 'send':
-	// Only send messages if we've come straight from the compose page.
-	if (!Session::get('good_to_send')) {
-		Log::addAuthenticationLog('Attempt to send a message without visiting the compose page. Spam attack?');
-		$action = 'compose';
-	}
-	if (!Filter::checkCsrf()) {
-		$action = 'compose';
-	}
-	Session::forget('good_to_send');
-	break;
+	case 'compose':
+		Session::put('good_to_send', true);
+		break;
+	case 'send':
+		// Only send messages if we've come straight from the compose page.
+		if (!Session::get('good_to_send')) {
+			Log::addAuthenticationLog('Attempt to send a message without visiting the compose page. Spam attack?');
+			$action = 'compose';
+		}
+		if (!Filter::checkCsrf()) {
+			$action = 'compose';
+		}
+		Session::forget('good_to_send');
+		break;
 }
 
 switch ($action) {

app/Theme/MinimalTheme.php

Switch Indentation +4 added lines, -4 removed lines

@@ -41,10 +41,10 @@
 	protected function flashMessageContainer(\stdClass $message) {
 		// This theme uses jQueryUI markup.
 		switch ($message->status) {
-		case 'danger':
-			return '<p class="ui-state-error">' . $message->text . '</p>';
-		default:
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
+			case 'danger':
+				return '<p class="ui-state-error">' . $message->text . '</p>';
+			default:
+				return '<p class="ui-state-highlight">' . $message->text . '</p>';
 		}
 	}
 

app/Theme/FabTheme.php

Switch Indentation +4 added lines, -4 removed lines

@@ -41,10 +41,10 @@
 	protected function flashMessageContainer(\stdClass $message) {
 		// This theme uses jQueryUI markup.
 		switch ($message->status) {
-		case 'danger':
-			return '<p class="ui-state-error">' . $message->text . '</p>';
-		default:
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
+			case 'danger':
+				return '<p class="ui-state-error">' . $message->text . '</p>';
+			default:
+				return '<p class="ui-state-highlight">' . $message->text . '</p>';
 		}
 	}
 

app/Theme/XeneaTheme.php

Switch Indentation +4 added lines, -4 removed lines

@@ -41,10 +41,10 @@
 	protected function flashMessageContainer(\stdClass $message) {
 		// This theme uses jQueryUI markup.
 		switch ($message->status) {
-		case 'danger':
-			return '<p class="ui-state-error">' . $message->text . '</p>';
-		default:
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
+			case 'danger':
+				return '<p class="ui-state-error">' . $message->text . '</p>';
+			default:
+				return '<p class="ui-state-highlight">' . $message->text . '</p>';
 		}
 	}
 

app/Theme/CloudsTheme.php

Switch Indentation +4 added lines, -4 removed lines

@@ -41,10 +41,10 @@
 	protected function flashMessageContainer(\stdClass $message) {
 		// This theme uses jQueryUI markup.
 		switch ($message->status) {
-		case 'danger':
-			return '<p class="ui-state-error">' . $message->text . '</p>';
-		default:
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
+			case 'danger':
+				return '<p class="ui-state-error">' . $message->text . '</p>';
+			default:
+				return '<p class="ui-state-highlight">' . $message->text . '</p>';
 		}
 	}
 

app/Module/ClippingsCartModule.php

Switch Indentation +130 added lines, -130 removed lines

@@ -75,37 +75,37 @@ 
 		}
 
 		switch ($mod_action) {
-		case 'ajax':
-			$html = $this->getSidebarAjaxContent();
-			header('Content-Type: text/html; charset=UTF-8');
-			echo $html;
-			break;
-		case 'index':
-			global $controller, $WT_TREE;
-
-			$MAX_PEDIGREE_GENERATIONS = $WT_TREE->getPreference('MAX_PEDIGREE_GENERATIONS');
-
-			$clip_ctrl = new ClippingsCartController;
-			$cart      = Session::get('cart');
-
-			$controller = new PageController;
-			$controller
-				->setPageTitle($this->getTitle())
-				->pageHeader()
-				->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-				->addInlineJavascript('autocomplete();');
-
-			echo '<script>';
-			echo 'function radAncestors(elementid) {var radFamilies=document.getElementById(elementid);radFamilies.checked=true;}';
-			echo '</script>';
-
-			if (!$cart[$WT_TREE->getTreeId()]) {
-				echo '<h2>', I18N::translate('Family tree clippings cart'), '</h2>';
-			}
+			case 'ajax':
+				$html = $this->getSidebarAjaxContent();
+				header('Content-Type: text/html; charset=UTF-8');
+				echo $html;
+				break;
+			case 'index':
+				global $controller, $WT_TREE;
+
+				$MAX_PEDIGREE_GENERATIONS = $WT_TREE->getPreference('MAX_PEDIGREE_GENERATIONS');
+
+				$clip_ctrl = new ClippingsCartController;
+				$cart      = Session::get('cart');
+
+				$controller = new PageController;
+				$controller
+					->setPageTitle($this->getTitle())
+					->pageHeader()
+					->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+					->addInlineJavascript('autocomplete();');
+
+				echo '<script>';
+				echo 'function radAncestors(elementid) {var radFamilies=document.getElementById(elementid);radFamilies.checked=true;}';
+				echo '</script>';
+
+				if (!$cart[$WT_TREE->getTreeId()]) {
+					echo '<h2>', I18N::translate('Family tree clippings cart'), '</h2>';
+				}
 
-			if ($clip_ctrl->action == 'add') {
-				$record = GedcomRecord::getInstance($clip_ctrl->id, $WT_TREE);
-				if ($clip_ctrl->type === 'FAM') { ?>
+				if ($clip_ctrl->action == 'add') {
+					$record = GedcomRecord::getInstance($clip_ctrl->id, $WT_TREE);
+					if ($clip_ctrl->type === 'FAM') { ?>
 					<form action="module.php" method="get">
 						<input type="hidden" name="mod" value="clippings">
 						<input type="hidden" name="mod_action" value="index">
@@ -131,14 +131,14 @@ 
 									<td class="optionbox">
 										<input type="radio" name="others" value="members" checked>
 										<?php echo /* I18N: %s is a family (husband + wife) */
-										I18N::translate('%s and their children', $record->getFullName()); ?>
+											I18N::translate('%s and their children', $record->getFullName()); ?>
 									</td>
 								</tr>
 								<tr>
 									<td class="optionbox">
 										<input type="radio" name="others" value="descendants">
 										<?php echo /* I18N: %s is a family (husband + wife) */
-										I18N::translate('%s and their descendants', $record->getFullName()); ?>
+											I18N::translate('%s and their descendants', $record->getFullName()); ?>
 									</td>
 								</tr>
 							</tbody>
@@ -179,14 +179,14 @@ 
 										<label>
 											<input type="radio" name="others" value="parents">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her parents and siblings', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his parents and siblings', $record->getFullName());
-											}
-											?>
+												if ($record->getSex() === 'F') {
+													echo /* I18N: %s is a woman's name */
+													I18N::translate('%s, her parents and siblings', $record->getFullName());
+												} else {
+													echo /* I18N: %s is a man's name */
+													I18N::translate('%s, his parents and siblings', $record->getFullName());
+												}
+												?>
 										</label>
 									</td>
 								</tr>
@@ -195,14 +195,14 @@ 
 										<label>
 											<input type="radio" name="others" value="members">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her spouses and children', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his spouses and children', $record->getFullName());
-											}
-											?>
+												if ($record->getSex() === 'F') {
+													echo /* I18N: %s is a woman's name */
+													I18N::translate('%s, her spouses and children', $record->getFullName());
+												} else {
+													echo /* I18N: %s is a man's name */
+													I18N::translate('%s, his spouses and children', $record->getFullName());
+												}
+												?>
 										</label>
 									</td>
 								</tr>
@@ -211,18 +211,18 @@ 
 										<label>
 											<input type="radio" name="others" value="ancestors" id="ancestors">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s and her ancestors', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s and his ancestors', $record->getFullName());
-											}
-											?>
+												if ($record->getSex() === 'F') {
+													echo /* I18N: %s is a woman's name */
+													I18N::translate('%s and her ancestors', $record->getFullName());
+												} else {
+													echo /* I18N: %s is a man's name */
+													I18N::translate('%s and his ancestors', $record->getFullName());
+												}
+												?>
 										</label>
 										<br>
 										<?php echo I18N::translate('Number of generations'); ?>
-										<input type="text" size="5" name="level1" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestors');">
+											<input type="text" size="5" name="level1" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestors');">
 									</td>
 								</tr>
 								<tr>
@@ -230,18 +230,18 @@ 
 										<label>
 											<input type="radio" name="others" value="ancestorsfamilies" id="ancestorsfamilies">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her ancestors and their families', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his ancestors and their families', $record->getFullName());
-											}
-											?>
+												if ($record->getSex() === 'F') {
+													echo /* I18N: %s is a woman's name */
+													I18N::translate('%s, her ancestors and their families', $record->getFullName());
+												} else {
+													echo /* I18N: %s is a man's name */
+													I18N::translate('%s, his ancestors and their families', $record->getFullName());
+												}
+												?>
 										</label>
 										<br>
 										<?php echo I18N::translate('Number of generations'); ?>
-										<input type="text" size="5" name="level2" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestorsfamilies');">
+											<input type="text" size="5" name="level2" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestorsfamilies');">
 									</td>
 								</tr>
 								<tr>
@@ -249,18 +249,18 @@ 
 										<label>
 											<input type="radio" name="others" value="descendants" id="descendants">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her spouses and descendants', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his spouses and descendants', $record->getFullName());
-											}
-											?>
+												if ($record->getSex() === 'F') {
+													echo /* I18N: %s is a woman's name */
+													I18N::translate('%s, her spouses and descendants', $record->getFullName());
+												} else {
+													echo /* I18N: %s is a man's name */
+													I18N::translate('%s, his spouses and descendants', $record->getFullName());
+												}
+												?>
 										</label>
 										<br>
 										<?php echo I18N::translate('Number of generations'); ?>
-										<input type="text" size="5" name="level3" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('descendants');">
+											<input type="text" size="5" name="level3" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('descendants');">
 									</td>
 								</tr>
 							</tbody>
@@ -302,7 +302,7 @@ 
 										<label>
 											<input type="radio" name="others" value="linked">
 											<?php echo /* I18N: %s is the name of a source */
-											I18N::translate('%s and the individuals that reference it.', $record->getFullName()); ?>
+												I18N::translate('%s and the individuals that reference it.', $record->getFullName()); ?>
 										</label>
 									</td>
 								</tr>
@@ -317,12 +317,12 @@ 
 						</table>
 					</form>
 				<?php }
-			}
+				}
 
-			if (!$cart[$WT_TREE->getTreeId()]) {
-				if ($clip_ctrl->action != 'add') {
-					echo I18N::translate('The clippings cart allows you to take extracts from this family tree and download them as a GEDCOM file.');
-					?>
+				if (!$cart[$WT_TREE->getTreeId()]) {
+					if ($clip_ctrl->action != 'add') {
+						echo I18N::translate('The clippings cart allows you to take extracts from this family tree and download them as a GEDCOM file.');
+						?>
 					<form method="get" name="addin" action="module.php">
 						<input type="hidden" name="mod" value="clippings">
 						<input type="hidden" name="mod_action" value="index">
@@ -342,25 +342,25 @@ 
 									</td>
 									<td class="optionbox">
 										<?php echo FunctionsPrint::printFindIndividualLink('cart_item_id'); ?>
-										<?php echo FunctionsPrint::printFindFamilyLink('cart_item_id'); ?>
-										<?php echo FunctionsPrint::printFindSourceLink('cart_item_id', ''); ?>
-										<input type="submit" value="<?php echo /* I18N: A button label. */ I18N::translate('add'); ?>">
+											<?php echo FunctionsPrint::printFindFamilyLink('cart_item_id'); ?>
+											<?php echo FunctionsPrint::printFindSourceLink('cart_item_id', ''); ?>
+											<input type="submit" value="<?php echo /* I18N: A button label. */ I18N::translate('add'); ?>">
 									</td>
 								</tr>
 							</tbody>
 						</table>
 					</form>
 					<?php
-				}
+					}
 
-				// -- end new lines
-				echo I18N::translate('Your clippings cart is empty.');
-			} else {
-				// Keep track of the INDI from the parent page, otherwise it will
-				// get lost after ajax updates
-				$pid = Filter::get('pid', WT_REGEX_XREF);
+					// -- end new lines
+					echo I18N::translate('Your clippings cart is empty.');
+				} else {
+					// Keep track of the INDI from the parent page, otherwise it will
+					// get lost after ajax updates
+					$pid = Filter::get('pid', WT_REGEX_XREF);
 
-				if ($clip_ctrl->action !== 'download' && $clip_ctrl->action !== 'add') { ?>
+					if ($clip_ctrl->action !== 'download' && $clip_ctrl->action !== 'add') { ?>
 					<form method="get" action="module.php">
 						<input type="hidden" name="mod" value="clippings">
 						<input type="hidden" name="mod_action" value="index">
@@ -468,9 +468,9 @@ 
 									</td>
 									<td class="optionbox">
 										<?php echo FunctionsPrint::printFindIndividualLink('cart_item_id'); ?>
-										<?php echo FunctionsPrint::printFindFamilyLink('cart_item_id'); ?>
-										<?php echo FunctionsPrint::printFindSourceLink('cart_item_id'); ?>
-										<input type="submit" value="<?php echo /* I18N: A button label. */ I18N::translate('add'); ?>">
+											<?php echo FunctionsPrint::printFindFamilyLink('cart_item_id'); ?>
+											<?php echo FunctionsPrint::printFindSourceLink('cart_item_id'); ?>
+											<input type="submit" value="<?php echo /* I18N: A button label. */ I18N::translate('add'); ?>">
 									</td>
 								</tr>
 							</tbody>
@@ -500,32 +500,32 @@ 
 					</thead>
 					<tbody>
 						<?php
-						foreach (array_keys($cart[$WT_TREE->getTreeId()]) as $xref) {
-							$record = GedcomRecord::getInstance($xref, $WT_TREE);
-							if ($record) {
-								switch ($record::RECORD_TYPE) {
-								case 'INDI':
-									$icon = 'icon-indis';
-									break;
-								case 'FAM':
-									$icon = 'icon-sfamily';
-									break;
-								case 'SOUR':
-									$icon = 'icon-source';
-									break;
-								case 'REPO':
-									$icon = 'icon-repository';
-									break;
-								case 'NOTE':
-									$icon = 'icon-note';
-									break;
-								case 'OBJE':
-									$icon = 'icon-media';
-									break;
-								default:
-									$icon = 'icon-clippings';
-									break;
-								}
+							foreach (array_keys($cart[$WT_TREE->getTreeId()]) as $xref) {
+								$record = GedcomRecord::getInstance($xref, $WT_TREE);
+								if ($record) {
+									switch ($record::RECORD_TYPE) {
+										case 'INDI':
+											$icon = 'icon-indis';
+											break;
+										case 'FAM':
+											$icon = 'icon-sfamily';
+											break;
+										case 'SOUR':
+											$icon = 'icon-source';
+											break;
+										case 'REPO':
+											$icon = 'icon-repository';
+											break;
+										case 'NOTE':
+											$icon = 'icon-note';
+											break;
+										case 'OBJE':
+											$icon = 'icon-media';
+											break;
+										default:
+											$icon = 'icon-clippings';
+											break;
+									}
 								?>
 								<tr>
 									<td class="list_value">
@@ -544,9 +544,9 @@ 
 				<?php
 			}
 			break;
-		default:
-			http_response_code(404);
-			break;
+			default:
+				http_response_code(404);
+				break;
 		}
 	}
 
@@ -695,12 +695,12 @@ 
 				$record = GedcomRecord::getInstance($xref, $WT_TREE);
 				if ($record instanceof Individual || $record instanceof Family) {
 					switch ($record::RECORD_TYPE) {
-					case 'INDI':
-						$icon = 'icon-indis';
-						break;
-					case 'FAM':
-						$icon = 'icon-sfamily';
-						break;
+						case 'INDI':
+							$icon = 'icon-indis';
+							break;
+						case 'FAM':
+							$icon = 'icon-sfamily';
+							break;
 					}
 					$out .= '<li>';
 					if (!empty($icon)) {

app/Date.php

Switch Indentation +101 added lines, -101 removed lines

@@ -169,22 +169,22 @@ 
 		}
 		// Now construct an object of the correct type
 		switch ($cal) {
-		case '@#DGREGORIAN@':
-			return new GregorianDate(array($y, $m, $d));
-		case '@#DJULIAN@':
-			return new JulianDate(array($y, $m, $d));
-		case '@#DHEBREW@':
-			return new JewishDate(array($y, $m, $d));
-		case '@#DHIJRI@':
-			return new HijriDate(array($y, $m, $d));
-		case '@#DFRENCH R@':
-			return new FrenchDate(array($y, $m, $d));
-		case '@#DJALALI@':
-			return new JalaliDate(array($y, $m, $d));
-		case '@#DROMAN@':
-			return new RomanDate(array($y, $m, $d));
-		default:
-			throw new \DomainException('Invalid calendar');
+			case '@#DGREGORIAN@':
+				return new GregorianDate(array($y, $m, $d));
+			case '@#DJULIAN@':
+				return new JulianDate(array($y, $m, $d));
+			case '@#DHEBREW@':
+				return new JewishDate(array($y, $m, $d));
+			case '@#DHIJRI@':
+				return new HijriDate(array($y, $m, $d));
+			case '@#DFRENCH R@':
+				return new FrenchDate(array($y, $m, $d));
+			case '@#DJALALI@':
+				return new JalaliDate(array($y, $m, $d));
+			case '@#DROMAN@':
+				return new RomanDate(array($y, $m, $d));
+			default:
+				throw new \DomainException('Invalid calendar');
 		}
 	}
 
@@ -291,42 +291,42 @@ 
 
 		// Localise the date
 		switch ($q1 . $q2) {
-		case '':
-			$tmp = $d1 . $conv1;
-			break;
-		case 'ABT':
-			$tmp = /* I18N: Gedcom ABT dates */ I18N::translate('about %s', $d1 . $conv1);
-			break;
-		case 'CAL':
-			$tmp = /* I18N: Gedcom CAL dates */ I18N::translate('calculated %s', $d1 . $conv1);
-			break;
-		case 'EST':
-			$tmp = /* I18N: Gedcom EST dates */ I18N::translate('estimated %s', $d1 . $conv1);
-			break;
-		case 'INT':
-			$tmp = /* I18N: Gedcom INT dates */ I18N::translate('interpreted %s (%s)', $d1 . $conv1, Filter::escapeHtml($this->text));
-			break;
-		case 'BEF':
-			$tmp = /* I18N: Gedcom BEF dates */ I18N::translate('before %s', $d1 . $conv1);
-			break;
-		case 'AFT':
-			$tmp = /* I18N: Gedcom AFT dates */ I18N::translate('after %s', $d1 . $conv1);
-			break;
-		case 'FROM':
-			$tmp = /* I18N: Gedcom FROM dates */ I18N::translate('from %s', $d1 . $conv1);
-			break;
-		case 'TO':
-			$tmp = /* I18N: Gedcom TO dates */ I18N::translate('to %s', $d1 . $conv1);
-			break;
-		case 'BETAND':
-			$tmp = /* I18N: Gedcom BET-AND dates */ I18N::translate('between %s and %s', $d1 . $conv1, $d2 . $conv2);
-			break;
-		case 'FROMTO':
-			$tmp = /* I18N: Gedcom FROM-TO dates */ I18N::translate('from %s to %s', $d1 . $conv1, $d2 . $conv2);
-			break;
-		default:
-			$tmp = I18N::translate('Invalid date');
-			break; // e.g. BET without AND
+			case '':
+				$tmp = $d1 . $conv1;
+				break;
+			case 'ABT':
+				$tmp = /* I18N: Gedcom ABT dates */ I18N::translate('about %s', $d1 . $conv1);
+				break;
+			case 'CAL':
+				$tmp = /* I18N: Gedcom CAL dates */ I18N::translate('calculated %s', $d1 . $conv1);
+				break;
+			case 'EST':
+				$tmp = /* I18N: Gedcom EST dates */ I18N::translate('estimated %s', $d1 . $conv1);
+				break;
+			case 'INT':
+				$tmp = /* I18N: Gedcom INT dates */ I18N::translate('interpreted %s (%s)', $d1 . $conv1, Filter::escapeHtml($this->text));
+				break;
+			case 'BEF':
+				$tmp = /* I18N: Gedcom BEF dates */ I18N::translate('before %s', $d1 . $conv1);
+				break;
+			case 'AFT':
+				$tmp = /* I18N: Gedcom AFT dates */ I18N::translate('after %s', $d1 . $conv1);
+				break;
+			case 'FROM':
+				$tmp = /* I18N: Gedcom FROM dates */ I18N::translate('from %s', $d1 . $conv1);
+				break;
+			case 'TO':
+				$tmp = /* I18N: Gedcom TO dates */ I18N::translate('to %s', $d1 . $conv1);
+				break;
+			case 'BETAND':
+				$tmp = /* I18N: Gedcom BET-AND dates */ I18N::translate('between %s and %s', $d1 . $conv1, $d2 . $conv2);
+				break;
+			case 'FROMTO':
+				$tmp = /* I18N: Gedcom FROM-TO dates */ I18N::translate('from %s to %s', $d1 . $conv1, $d2 . $conv2);
+				break;
+			default:
+				$tmp = I18N::translate('Invalid date');
+				break; // e.g. BET without AND
 		}
 		if ($this->text && !$q1) {
 			$tmp = I18N::translate('%1$s (%2$s)', $tmp, $this->text);
@@ -445,33 +445,33 @@ 
 		}
 
 		switch ($format) {
-		case 0:
-			// Years - integer only (for statistics, rather than for display)
-			if ($jd && $d1->minimumJulianDay() && $d1->minimumJulianDay() <= $jd) {
-				return $d1->minimumDate()->getAge(false, $jd, false);
-			} else {
-				return -1;
-			}
-		case 1:
-			// Days - integer only (for sorting, rather than for display)
-			if ($jd && $d1->minimumJulianDay()) {
-				return $jd - $d1->minimumJulianDay();
-			} else {
-				return -1;
-			}
-		case 2:
-			// Just years, in local digits, with warning for negative/
-			if ($jd && $d1->minimumJulianDay()) {
-				if ($d1->minimumJulianDay() > $jd) {
-					return '<i class="icon-warning"></i>';
+			case 0:
+				// Years - integer only (for statistics, rather than for display)
+				if ($jd && $d1->minimumJulianDay() && $d1->minimumJulianDay() <= $jd) {
+					return $d1->minimumDate()->getAge(false, $jd, false);
 				} else {
-					return I18N::number($d1->minimumDate()->getAge(false, $jd));
+					return -1;
 				}
-			} else {
-				return '';
-			}
-		default:
-			throw new \InvalidArgumentException('format: ' . $format);
+			case 1:
+				// Days - integer only (for sorting, rather than for display)
+				if ($jd && $d1->minimumJulianDay()) {
+					return $jd - $d1->minimumJulianDay();
+				} else {
+					return -1;
+				}
+			case 2:
+				// Just years, in local digits, with warning for negative/
+				if ($jd && $d1->minimumJulianDay()) {
+					if ($d1->minimumJulianDay() > $jd) {
+						return '<i class="icon-warning"></i>';
+					} else {
+						return I18N::number($d1->minimumDate()->getAge(false, $jd));
+					}
+				} else {
+					return '';
+				}
+			default:
+				throw new \InvalidArgumentException('format: ' . $format);
 		}
 	}
 
@@ -515,32 +515,32 @@ 
 	public static function compare(Date $a, Date $b) {
 		// Get min/max JD for each date.
 		switch ($a->qual1) {
-		case 'BEF':
-			$amin = $a->minimumJulianDay() - 1;
-			$amax = $amin;
-			break;
-		case 'AFT':
-			$amax = $a->maximumJulianDay() + 1;
-			$amin = $amax;
-			break;
-		default:
-			$amin = $a->minimumJulianDay();
-			$amax = $a->maximumJulianDay();
-			break;
+			case 'BEF':
+				$amin = $a->minimumJulianDay() - 1;
+				$amax = $amin;
+				break;
+			case 'AFT':
+				$amax = $a->maximumJulianDay() + 1;
+				$amin = $amax;
+				break;
+			default:
+				$amin = $a->minimumJulianDay();
+				$amax = $a->maximumJulianDay();
+				break;
 		}
 		switch ($b->qual1) {
-		case 'BEF':
-			$bmin = $b->minimumJulianDay() - 1;
-			$bmax = $bmin;
-			break;
-		case 'AFT':
-			$bmax = $b->maximumJulianDay() + 1;
-			$bmin = $bmax;
-			break;
-		default:
-			$bmin = $b->minimumJulianDay();
-			$bmax = $b->maximumJulianDay();
-			break;
+			case 'BEF':
+				$bmin = $b->minimumJulianDay() - 1;
+				$bmax = $bmin;
+				break;
+			case 'AFT':
+				$bmax = $b->maximumJulianDay() + 1;
+				$bmin = $bmax;
+				break;
+			default:
+				$bmin = $b->minimumJulianDay();
+				$bmax = $b->maximumJulianDay();
+				break;
 		}
 		if ($amax < $bmin) {
 			return -1;