fisharebest / webtrees

app/Http/Controllers/BranchesController.php

Indentation +13 added lines, -13 removed lines

@@ -111,24 +111,24 @@
 	 * @return Individual[]
 	 */
 	protected function allAncestors(Individual $individual): array {
-	    /** @var Individual[] $ancestors */
-        $ancestors = [
-            1 => $individual,
-        ];
+			/** @var Individual[] $ancestors */
+				$ancestors = [
+						1 => $individual,
+				];
 
-        do {
-            $sosa = key($ancestors);
+				do {
+						$sosa = key($ancestors);
 
 			$family = $ancestors[$sosa]->getPrimaryChildFamily();
 
 			if ($family !== null) {
-                if ($family->getHusband() !== null) {
-                    $ancestors[$sosa * 2] = $family->getHusband();
-                }
-                if ($family->getWife() !== null) {
-                    $ancestors[$sosa * 2 + 1] = $family->getWife();
-                }
-            }
+								if ($family->getHusband() !== null) {
+										$ancestors[$sosa * 2] = $family->getHusband();
+								}
+								if ($family->getWife() !== null) {
+										$ancestors[$sosa * 2 + 1] = $family->getWife();
+								}
+						}
 		} while (next($ancestors));
 
 		return $ancestors;

resources/views/modules/openstreetmap/admin-config.php

Indentation +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
 <?= view('admin/breadcrumbs', [
 		'links' => [route('admin-control-panel') => I18N::translate('Control panel'),
-		            route('admin-modules') => I18N::translate('Module administration'),
+								route('admin-modules') => I18N::translate('Module administration'),
 					$title
 		]]) ?>
 

resources/views/places-page.php

Indentation +4 added lines, -4 removed lines

@@ -21,13 +21,13 @@
         <div class="center">
             <?php if ($showeventslink): ?>
                     <a class="formField" href= <?= e(route('place-hierarchy',
-                            ['ged' => $tree->getName(), 'parent' => $parent, 'action' => 'hierarchy-e']
-                        )
-                    ) ?>><?= I18N::translate('View table of events occurring in %s', $place) ?></a>
+														['ged' => $tree->getName(), 'parent' => $parent, 'action' => 'hierarchy-e']
+												)
+										) ?>><?= I18N::translate('View table of events occurring in %s', $place) ?></a>
                 |
             <?php endif ?>
             <a href="<?= e(route('place-hierarchy', ['ged' => $tree->getName(), 'action' => key($nextaction)]))
-                ?>"><?= current($nextaction) ?></a>
+								?>"><?= current($nextaction) ?></a>
         </div>
 	</div>
 </div>

resources/views/modules/openstreetmap/admin-import-form.php

Indentation +4 added lines, -4 removed lines

@@ -6,10 +6,10 @@
 
 <h3><?= $title ?></h3>
 <form id="upload_form" method="post" enctype="multipart/form-data" action="<?=
-    e(route('admin-module',[
-        'module' => $module,
-        'action' => 'AdminImport',
-    ])) ?>">
+		e(route('admin-module',[
+				'module' => $module,
+				'action' => 'AdminImport',
+		])) ?>">
 	<?= csrf_field() ?>
 	<input type="hidden" name="parent_id" value="<?= $parent_id ?>">
 	<input type="hidden" name="inactive" value="<?= $inactive ?>">

resources/views/modules/openstreetmap/admin-places.php

Indentation +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
 </div>
 <form method="POST"
 	  action="<?=e(route('admin-module',
-		  ['module' => $module, 'action' => 'AdminPlaces', 'parent_id' => $parent_id])) ?>">
+			['module' => $module, 'action' => 'AdminPlaces', 'parent_id' => $parent_id])) ?>">
 
 	<?= csrf_field() ?>
 	<?= Bootstrap4::checkbox(
@@ -54,12 +54,12 @@ 
 		<tr>
             <td>
                 <a href="<?= e(route('admin-module',
-					   ['module' => $module,
-					    'action' => 'AdminPlaces',
-					    'parent_id' => $place->pl_id,
-					    'inactive' => $inactive]
-				   )
-				   ) ?>">
+						 ['module' => $module,
+							'action' => 'AdminPlaces',
+							'parent_id' => $place->pl_id,
+							'inactive' => $inactive]
+					 )
+					 ) ?>">
 					<?= e($place->pl_place) ?>
                     <span class="badge badge-pill badge-<?= $place->badge ?>">
 				        <?= I18N::number($place->child_count) ?>
@@ -68,11 +68,11 @@ 
             </td>
 			<td>
 				<?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') :
-                    strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
+										strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
 			</td>
 			<td>
 				<?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') :
-                    strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
+										strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
 			</td>
 			<td>
 				<?= $place->pl_long === null ? FontAwesome::decorativeIcon('warning') : $place->pl_zoom ?>

app/Module/OpenStreetMapModule.php

Indentation +7 added lines, -7 removed lines

@@ -529,8 +529,8 @@ 
 			case 'BaseData':
 				$varName = (self::$map_selections['style'] === '') ? '' : self::$map_providers[self::$map_selections['provider']]['styles'][self::$map_selections['style']];
 				$payload = ['selectedProvIndex' => self::$map_selections['provider'],
-				            'selectedProvName'  => self::$map_providers[self::$map_selections['provider']]['name'],
-				            'selectedStyleName' => $varName,
+										'selectedProvName'  => self::$map_providers[self::$map_selections['provider']]['name'],
+										'selectedStyleName' => $varName,
 				];
 				break;
 			case 'ProviderStyles':
@@ -543,9 +543,9 @@ 
 					$providers[$key] = $provider['name'];
 				}
 				$payload = ['providers'     => $providers,
-				            'selectedProv'  => self::$map_selections['provider'],
-				            'styles'        => self::$map_providers[self::$map_selections['provider']]['styles'],
-				            'selectedStyle' => self::$map_selections['style'],
+										'selectedProv'  => self::$map_selections['provider'],
+										'styles'        => self::$map_providers[self::$map_selections['provider']]['styles'],
+										'selectedStyle' => self::$map_selections['style'],
 				];
 				break;
 			default:
@@ -1105,8 +1105,8 @@ 
 					$row    = explode($delimiter, $input_array[0]);
 					$fields = count($row);
 					if ($fields >= 6 &&
-					    (bool)preg_match("/[SN][0-9]*\.?[0-9]*/", $row[$fields - 3]) &&
-					    (bool)preg_match("/[EW][0-9]*\.?[0-9]*/", $row[$fields - 4])) {
+							(bool)preg_match("/[SN][0-9]*\.?[0-9]*/", $row[$fields - 3]) &&
+							(bool)preg_match("/[EW][0-9]*\.?[0-9]*/", $row[$fields - 4])) {
 						$filetype = 'csv';
 					}
 				}

edit_interface.php

Switch Indentation +747 added lines, -747 removed lines

@@ -30,48 +30,48 @@ 
 $controller = new PageController;
 
 switch ($action) {
-case 'edit':
-	//////////////////////////////////////////////////////////////////////////////
-	// Edit a fact
-	//////////////////////////////////////////////////////////////////////////////
-	$tree    = $controller->tree();
-	$xref    = Filter::get('xref', WT_REGEX_XREF);
-	$fact_id = Filter::get('fact_id');
-
-	$record = GedcomRecord::getInstance($xref, $tree);
-	check_record_access($record);
-
-	// Find the fact to edit
-	$edit_fact = null;
-	foreach ($record->getFacts() as $fact) {
-		if ($fact->getFactId() === $fact_id && $fact->canEdit()) {
-			$edit_fact = $fact;
+	case 'edit':
+		//////////////////////////////////////////////////////////////////////////////
+		// Edit a fact
+		//////////////////////////////////////////////////////////////////////////////
+		$tree    = $controller->tree();
+		$xref    = Filter::get('xref', WT_REGEX_XREF);
+		$fact_id = Filter::get('fact_id');
+
+		$record = GedcomRecord::getInstance($xref, $tree);
+		check_record_access($record);
+
+		// Find the fact to edit
+		$edit_fact = null;
+		foreach ($record->getFacts() as $fact) {
+			if ($fact->getFactId() === $fact_id && $fact->canEdit()) {
+				$edit_fact = $fact;
+				break;
+			}
+		}
+		if (!$edit_fact) {
+			header('Location: ' . $record->url());
 			break;
 		}
-	}
-	if (!$edit_fact) {
-		header('Location: ' . $record->url());
-		break;
-	}
 
-	$controller
-		->setPageTitle($record->getFullName() . ' - ' . GedcomTag::getLabel($edit_fact->getTag()))
-		->pageHeader();
-
-	echo '<h2>', $controller->getPageTitle(), '</h2>';
-	FunctionsPrint::initializeCalendarPopup();
-	echo '<form name="editform" method="post" enctype="multipart/form-data">';
-	echo '<input type="hidden" name="ged" value="', e($tree->getName()), '">';
-	echo '<input type="hidden" name="action" value="update">';
-	echo '<input type="hidden" name="fact_id" value="', $fact_id, '">';
-	echo '<input type="hidden" name="xref" value="', $xref, '">';
-	echo '<input type="hidden" name="prev_action" value="edit">';
-	echo Filter::getCsrf();
-	FunctionsEdit::createEditForm($edit_fact);
-	echo keep_chan($record);
-
-	$level1type = $edit_fact->getTag();
-	switch ($record::RECORD_TYPE) {
+		$controller
+			->setPageTitle($record->getFullName() . ' - ' . GedcomTag::getLabel($edit_fact->getTag()))
+			->pageHeader();
+
+		echo '<h2>', $controller->getPageTitle(), '</h2>';
+		FunctionsPrint::initializeCalendarPopup();
+		echo '<form name="editform" method="post" enctype="multipart/form-data">';
+		echo '<input type="hidden" name="ged" value="', e($tree->getName()), '">';
+		echo '<input type="hidden" name="action" value="update">';
+		echo '<input type="hidden" name="fact_id" value="', $fact_id, '">';
+		echo '<input type="hidden" name="xref" value="', $xref, '">';
+		echo '<input type="hidden" name="prev_action" value="edit">';
+		echo Filter::getCsrf();
+		FunctionsEdit::createEditForm($edit_fact);
+		echo keep_chan($record);
+
+		$level1type = $edit_fact->getTag();
+		switch ($record::RECORD_TYPE) {
 		case 'REPO':
 			// REPO:NAME facts may take a NOTE (but the REPO record may not).
 			if ($level1type === 'NAME') {
@@ -128,7 +128,7 @@ 
 		default:
 			// Other types of record do not have these lower-level records
 			break;
-	}
+		}
 
 	?>
 	<div class="row form-group">
@@ -157,527 +157,527 @@ 
 	echo view('modals/ajax');
 	break;
 
-case 'add':
-	//////////////////////////////////////////////////////////////////////////////
-	// Add a new fact
-	//////////////////////////////////////////////////////////////////////////////
-	$tree = $controller->tree();
-	$xref = Filter::get('xref', WT_REGEX_XREF);
-	$fact = Filter::get('fact', WT_REGEX_TAG);
-
-	$record = GedcomRecord::getInstance($xref, $tree);
-	check_record_access($record);
-
-	$controller
-		->setPageTitle($record->getFullName() . ' - ' . GedcomTag::getLabel($fact, $record))
-		->pageHeader();
-
-	$level0type = $record::RECORD_TYPE;
-
-	echo '<h2>', $controller->getPageTitle(), '</h2>';
-
-	FunctionsPrint::initializeCalendarPopup();
-	echo '<form name="addform" method="post" enctype="multipart/form-data">';
-	echo '<input type="hidden" name="ged" value="', e($tree->getName()), '">';
-	echo '<input type="hidden" name="action" value="update">';
-	echo '<input type="hidden" name="xref" value="', $xref, '">';
-	echo '<input type="hidden" name="prev_action" value="add">';
-	echo '<input type="hidden" name="fact_type" value="' . $fact . '">';
-	echo Filter::getCsrf();
-	FunctionsEdit::createAddForm($tree, $fact);
-	echo keep_chan($record);
-
-	// Genealogical facts (e.g. for INDI and FAM records) can have 2 SOUR/NOTE/OBJE/ASSO/RESN ...
-	if ($level0type === 'INDI' || $level0type === 'FAM') {
-		// ... but not facts which are simply links to other records
-		if ($fact !== 'OBJE' && $fact !== 'NOTE' && $fact !== 'SHARED_NOTE' && $fact !== 'REPO' && $fact !== 'SOUR' && $fact !== 'SUBM' && $fact !== 'ASSO' && $fact !== 'ALIA' && $fact !== 'SEX') {
-			echo view('cards/add-source-citation', [
-				'level'          => 2,
-				'full_citations' => $tree->getPreference('FULL_SOURCES'),
-			]);
-			if ($tree->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($tree)) {
-				echo view('cards/add-media-object', [
-					'level' => 2,
-				]);
-			}
-			// Don’t add notes to notes!
-			if ($fact !== 'NOTE') {
-				echo view('cards/add-note', [
-					'level' => 2,
+	case 'add':
+		//////////////////////////////////////////////////////////////////////////////
+		// Add a new fact
+		//////////////////////////////////////////////////////////////////////////////
+		$tree = $controller->tree();
+		$xref = Filter::get('xref', WT_REGEX_XREF);
+		$fact = Filter::get('fact', WT_REGEX_TAG);
+
+		$record = GedcomRecord::getInstance($xref, $tree);
+		check_record_access($record);
+
+		$controller
+			->setPageTitle($record->getFullName() . ' - ' . GedcomTag::getLabel($fact, $record))
+			->pageHeader();
+
+		$level0type = $record::RECORD_TYPE;
+
+		echo '<h2>', $controller->getPageTitle(), '</h2>';
+
+		FunctionsPrint::initializeCalendarPopup();
+		echo '<form name="addform" method="post" enctype="multipart/form-data">';
+		echo '<input type="hidden" name="ged" value="', e($tree->getName()), '">';
+		echo '<input type="hidden" name="action" value="update">';
+		echo '<input type="hidden" name="xref" value="', $xref, '">';
+		echo '<input type="hidden" name="prev_action" value="add">';
+		echo '<input type="hidden" name="fact_type" value="' . $fact . '">';
+		echo Filter::getCsrf();
+		FunctionsEdit::createAddForm($tree, $fact);
+		echo keep_chan($record);
+
+		// Genealogical facts (e.g. for INDI and FAM records) can have 2 SOUR/NOTE/OBJE/ASSO/RESN ...
+		if ($level0type === 'INDI' || $level0type === 'FAM') {
+			// ... but not facts which are simply links to other records
+			if ($fact !== 'OBJE' && $fact !== 'NOTE' && $fact !== 'SHARED_NOTE' && $fact !== 'REPO' && $fact !== 'SOUR' && $fact !== 'SUBM' && $fact !== 'ASSO' && $fact !== 'ALIA' && $fact !== 'SEX') {
+				echo view('cards/add-source-citation', [
+					'level'          => 2,
+					'full_citations' => $tree->getPreference('FULL_SOURCES'),
 				]);
-				echo view('cards/add-shared-note', [
-					'level' => 2,
-				]);
-			}
-			echo view('cards/add-associate', [
-				'id'    => Uuid::uuid4()->toString(),
-				'level' => 2,
-			]);
-			// allow to add godfather and godmother for CHR fact or best man and bridesmaid  for MARR fact in one window
-			if (in_array($fact, Config::twoAssociates())) {
+				if ($tree->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($tree)) {
+					echo view('cards/add-media-object', [
+						'level' => 2,
+					]);
+				}
+				// Don’t add notes to notes!
+				if ($fact !== 'NOTE') {
+					echo view('cards/add-note', [
+						'level' => 2,
+					]);
+					echo view('cards/add-shared-note', [
+						'level' => 2,
+					]);
+				}
 				echo view('cards/add-associate', [
 					'id'    => Uuid::uuid4()->toString(),
 					'level' => 2,
 				]);
+				// allow to add godfather and godmother for CHR fact or best man and bridesmaid  for MARR fact in one window
+				if (in_array($fact, Config::twoAssociates())) {
+					echo view('cards/add-associate', [
+						'id'    => Uuid::uuid4()->toString(),
+						'level' => 2,
+					]);
+				}
+				echo view('cards/add-restriction', [
+					'level' => 2,
+				]);
 			}
-			echo view('cards/add-restriction', [
-				'level' => 2,
-			]);
 		}
-	}
-	?>
+		?>
 	<div class="row form-group">
 		<div class="col-sm-9 offset-sm-3">
 			<button class="btn btn-primary" type="submit">
 				<?= FontAwesome::decorativeIcon('save') ?>
-				<?= /* I18N: A button label. */
-				I18N::translate('save') ?>
+					<?= /* I18N: A button label. */
+					I18N::translate('save') ?>
 			</button>
 			<a class="btn btn-secondary" href="<?= e($record->url()) ?>">
 				<?= FontAwesome::decorativeIcon('cancel') ?>
-				<?= /* I18N: A button label. */
-				I18N::translate('cancel') ?>
+					<?= /* I18N: A button label. */
+					I18N::translate('cancel') ?>
 			</a>
 		</div>
 	</div>
 	</form>
 	<?php
-	echo view('modals/on-screen-keyboard');
-	echo view('modals/ajax');
+		echo view('modals/on-screen-keyboard');
+		echo view('modals/ajax');
 
-	break;
+		break;
 
-case 'update':
-	//////////////////////////////////////////////////////////////////////////////
-	// Save a new/updated fact
-	//////////////////////////////////////////////////////////////////////////////
-	$tree      = $controller->tree();
-	$xref      = Filter::post('xref', WT_REGEX_XREF);
-	$fact_id   = Filter::post('fact_id');
-	$keep_chan = Filter::postBool('keep_chan');
-
-	$record = GedcomRecord::getInstance($xref, $tree);
-	check_record_access($record);
-
-	// Arrays for each GEDCOM line
-	$glevels = Filter::postArray('glevels', '[0-9]');
-	$tag     = Filter::postArray('tag', WT_REGEX_TAG);
-	$text    = Filter::postArray('text');
-	$islink  = Filter::postArray('islink', '[01]');
-
-	// If the fact has a DATE or PLAC, then delete any value of Y
-	if ($text[0] === 'Y') {
-		foreach ($tag as $n => $value) {
-			if ($glevels[$n] == 2 && ($value === 'DATE' || $value === 'PLAC') && $text[$n] !== '') {
-				$text[0] = '';
-				break;
+	case 'update':
+		//////////////////////////////////////////////////////////////////////////////
+		// Save a new/updated fact
+		//////////////////////////////////////////////////////////////////////////////
+		$tree      = $controller->tree();
+		$xref      = Filter::post('xref', WT_REGEX_XREF);
+		$fact_id   = Filter::post('fact_id');
+		$keep_chan = Filter::postBool('keep_chan');
+
+		$record = GedcomRecord::getInstance($xref, $tree);
+		check_record_access($record);
+
+		// Arrays for each GEDCOM line
+		$glevels = Filter::postArray('glevels', '[0-9]');
+		$tag     = Filter::postArray('tag', WT_REGEX_TAG);
+		$text    = Filter::postArray('text');
+		$islink  = Filter::postArray('islink', '[01]');
+
+		// If the fact has a DATE or PLAC, then delete any value of Y
+		if ($text[0] === 'Y') {
+			foreach ($tag as $n => $value) {
+				if ($glevels[$n] == 2 && ($value === 'DATE' || $value === 'PLAC') && $text[$n] !== '') {
+					$text[0] = '';
+					break;
+				}
 			}
 		}
-	}
 
-	$newged = '';
-	if (!empty($_POST['NAME'])) {
-		$newged .= "\n1 NAME " . $_POST['NAME'];
-		$name_facts = ['TYPE', 'NPFX', 'GIVN', 'NICK', 'SPFX', 'SURN', 'NSFX'];
-		foreach ($name_facts as $name_fact) {
-			if (!empty($_POST[$name_fact])) {
-				$newged .= "\n2 " . $name_fact . ' ' . $_POST[$name_fact];
+		$newged = '';
+		if (!empty($_POST['NAME'])) {
+			$newged .= "\n1 NAME " . $_POST['NAME'];
+			$name_facts = ['TYPE', 'NPFX', 'GIVN', 'NICK', 'SPFX', 'SURN', 'NSFX'];
+			foreach ($name_facts as $name_fact) {
+				if (!empty($_POST[$name_fact])) {
+					$newged .= "\n2 " . $name_fact . ' ' . $_POST[$name_fact];
+				}
 			}
 		}
-	}
 
-	if (isset($_POST['NOTE'])) {
-		$NOTE = $_POST['NOTE'];
-	}
-	if (!empty($NOTE)) {
-		$tempnote = preg_split('/\r?\n/', trim($NOTE) . "\n"); // make sure only one line ending on the end
-		$title[]  = '0 @' . $xref . '@ NOTE ' . array_shift($tempnote);
-		foreach ($tempnote as &$line) {
-			$line = trim('1 CONT ' . $line, ' ');
+		if (isset($_POST['NOTE'])) {
+			$NOTE = $_POST['NOTE'];
+		}
+		if (!empty($NOTE)) {
+			$tempnote = preg_split('/\r?\n/', trim($NOTE) . "\n"); // make sure only one line ending on the end
+			$title[]  = '0 @' . $xref . '@ NOTE ' . array_shift($tempnote);
+			foreach ($tempnote as &$line) {
+				$line = trim('1 CONT ' . $line, ' ');
+			}
 		}
-	}
 
-	$newged = FunctionsEdit::handleUpdates($newged);
+		$newged = FunctionsEdit::handleUpdates($newged);
 
-	// Add new names after existing names
-	if (!empty($_POST['NAME'])) {
-		preg_match_all('/[_0-9A-Z]+/', $tree->getPreference('ADVANCED_NAME_FACTS'), $match);
-		$name_facts = array_unique(array_merge(['_MARNM'], $match[0]));
-		foreach ($name_facts as $name_fact) {
-			// Ignore advanced facts that duplicate standard facts.
-			if (!in_array($name_fact, ['TYPE', 'NPFX', 'GIVN', 'NICK', 'SPFX', 'SURN', 'NSFX']) && !empty($_POST[$name_fact])) {
-				$newged .= "\n2 " . $name_fact . ' ' . $_POST[$name_fact];
+		// Add new names after existing names
+		if (!empty($_POST['NAME'])) {
+			preg_match_all('/[_0-9A-Z]+/', $tree->getPreference('ADVANCED_NAME_FACTS'), $match);
+			$name_facts = array_unique(array_merge(['_MARNM'], $match[0]));
+			foreach ($name_facts as $name_fact) {
+				// Ignore advanced facts that duplicate standard facts.
+				if (!in_array($name_fact, ['TYPE', 'NPFX', 'GIVN', 'NICK', 'SPFX', 'SURN', 'NSFX']) && !empty($_POST[$name_fact])) {
+					$newged .= "\n2 " . $name_fact . ' ' . $_POST[$name_fact];
+				}
 			}
 		}
-	}
 
-	$newged = substr($newged, 1); // Remove leading newline
+		$newged = substr($newged, 1); // Remove leading newline
 
-	/** @var CensusAssistantModule $census_assistant */
-	$census_assistant = Module::getModuleByName('GEDFact_assistant');
-	if ($census_assistant !== null && $record instanceof Individual) {
-		$newged = $census_assistant->updateCensusAssistant($record, $fact_id, $newged, $keep_chan);
-	}
+		/** @var CensusAssistantModule $census_assistant */
+		$census_assistant = Module::getModuleByName('GEDFact_assistant');
+		if ($census_assistant !== null && $record instanceof Individual) {
+			$newged = $census_assistant->updateCensusAssistant($record, $fact_id, $newged, $keep_chan);
+		}
 
-	$record->updateFact($fact_id, $newged, !$keep_chan);
+		$record->updateFact($fact_id, $newged, !$keep_chan);
 
-	// For the GEDFact_assistant module
-	$pid_array = Filter::post('pid_array');
-	if ($pid_array) {
-		foreach (explode(',', $pid_array) as $pid) {
-			if ($pid !== $xref) {
-				$indi = Individual::getInstance($pid, $tree);
-				if ($indi && $indi->canEdit()) {
-					$indi->updateFact($fact_id, $newged, !$keep_chan);
+		// For the GEDFact_assistant module
+		$pid_array = Filter::post('pid_array');
+		if ($pid_array) {
+			foreach (explode(',', $pid_array) as $pid) {
+				if ($pid !== $xref) {
+					$indi = Individual::getInstance($pid, $tree);
+					if ($indi && $indi->canEdit()) {
+						$indi->updateFact($fact_id, $newged, !$keep_chan);
+					}
 				}
 			}
 		}
-	}
 
-	header('Location: ' . $record->url());
-	break;
+		header('Location: ' . $record->url());
+		break;
 
-case 'add_child_to_family_action':
-	//////////////////////////////////////////////////////////////////////////////
-	// Add a child to an existing family
-	//////////////////////////////////////////////////////////////////////////////
-	$tree      = $controller->tree();
-	$xref      = Filter::post('xref', WT_REGEX_XREF);
-	$PEDI      = Filter::post('PEDI');
-	$keep_chan = Filter::postBool('keep_chan');
-	$glevels   = Filter::postArray('glevels', '[0-9]');
-	$tag       = Filter::postArray('tag', WT_REGEX_TAG);
-	$text      = Filter::postArray('text');
-	$islink    = Filter::postArray('islink', '[01]');
-
-	$family = Family::getInstance($xref, $tree);
-	check_record_access($family);
-
-	FunctionsEdit::splitSource();
-	$gedrec = '0 @REF@ INDI';
-	$gedrec .= FunctionsEdit::addNewName($tree);
-	$gedrec .= FunctionsEdit::addNewSex();
-	if (preg_match_all('/([A-Z0-9_]+)/', $tree->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
-		foreach ($matches[1] as $match) {
-			$gedrec .= FunctionsEdit::addNewFact($tree, $match);
+	case 'add_child_to_family_action':
+		//////////////////////////////////////////////////////////////////////////////
+		// Add a child to an existing family
+		//////////////////////////////////////////////////////////////////////////////
+		$tree      = $controller->tree();
+		$xref      = Filter::post('xref', WT_REGEX_XREF);
+		$PEDI      = Filter::post('PEDI');
+		$keep_chan = Filter::postBool('keep_chan');
+		$glevels   = Filter::postArray('glevels', '[0-9]');
+		$tag       = Filter::postArray('tag', WT_REGEX_TAG);
+		$text      = Filter::postArray('text');
+		$islink    = Filter::postArray('islink', '[01]');
+
+		$family = Family::getInstance($xref, $tree);
+		check_record_access($family);
+
+		FunctionsEdit::splitSource();
+		$gedrec = '0 @REF@ INDI';
+		$gedrec .= FunctionsEdit::addNewName($tree);
+		$gedrec .= FunctionsEdit::addNewSex();
+		if (preg_match_all('/([A-Z0-9_]+)/', $tree->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
+			foreach ($matches[1] as $match) {
+				$gedrec .= FunctionsEdit::addNewFact($tree, $match);
+			}
+		}
+		$gedrec .= "\n" . GedcomCodePedi::createNewFamcPedi($PEDI, $xref);
+		if (Filter::postBool('SOUR_INDI')) {
+			$gedrec = FunctionsEdit::handleUpdates($gedrec);
+		} else {
+			$gedrec = FunctionsEdit::updateRest($gedrec);
 		}
-	}
-	$gedrec .= "\n" . GedcomCodePedi::createNewFamcPedi($PEDI, $xref);
-	if (Filter::postBool('SOUR_INDI')) {
-		$gedrec = FunctionsEdit::handleUpdates($gedrec);
-	} else {
-		$gedrec = FunctionsEdit::updateRest($gedrec);
-	}
 
-	// Create the new child
-	$new_child = $family->getTree()->createRecord($gedrec);
-
-	// Insert new child at the right place
-	$done = false;
-	foreach ($family->getFacts('CHIL') as $fact) {
-		$old_child = $fact->getTarget();
-		if ($old_child && Date::compare($new_child->getEstimatedBirthDate(), $old_child->getEstimatedBirthDate()) < 0) {
-			// Insert before this child
-			$family->updateFact($fact->getFactId(), '1 CHIL @' . $new_child->getXref() . "@\n" . $fact->getGedcom(), !$keep_chan);
-			$done = true;
-			break;
+		// Create the new child
+		$new_child = $family->getTree()->createRecord($gedrec);
+
+		// Insert new child at the right place
+		$done = false;
+		foreach ($family->getFacts('CHIL') as $fact) {
+			$old_child = $fact->getTarget();
+			if ($old_child && Date::compare($new_child->getEstimatedBirthDate(), $old_child->getEstimatedBirthDate()) < 0) {
+				// Insert before this child
+				$family->updateFact($fact->getFactId(), '1 CHIL @' . $new_child->getXref() . "@\n" . $fact->getGedcom(), !$keep_chan);
+				$done = true;
+				break;
+			}
+		}
+		if (!$done) {
+			// Append child at end
+			$family->createFact('1 CHIL @' . $new_child->getXref() . '@', !$keep_chan);
 		}
-	}
-	if (!$done) {
-		// Append child at end
-		$family->createFact('1 CHIL @' . $new_child->getXref() . '@', !$keep_chan);
-	}
 
-	if (Filter::post('goto') === 'new') {
-		header('Location: ' . $new_child->url());
-	} else {
-		header('Location: ' . $family->url());
-	}
-	break;
+		if (Filter::post('goto') === 'new') {
+			header('Location: ' . $new_child->url());
+		} else {
+			header('Location: ' . $family->url());
+		}
+		break;
 
-case 'add_child_to_individual_action':
-	//////////////////////////////////////////////////////////////////////////////
-	// Add a child to an existing individual (creating a one-parent family)
-	//////////////////////////////////////////////////////////////////////////////
-	$tree      = $controller->tree();
-	$xref    = Filter::post('xref', WT_REGEX_XREF);
-	$PEDI    = Filter::post('PEDI');
-	$glevels = Filter::postArray('glevels', '[0-9]');
-	$tag     = Filter::postArray('tag', WT_REGEX_TAG);
-	$text    = Filter::postArray('text');
-	$islink  = Filter::postArray('islink', '[01]');
-
-	$person = Individual::getInstance($xref, $tree);
-	check_record_access($person);
-
-	// Create a family
-	if ($person->getSex() === 'F') {
-		$gedcom = "0 @NEW@ FAM\n1 WIFE @" . $person->getXref() . '@';
-	} else {
-		$gedcom = "0 @NEW@ FAM\n1 HUSB @" . $person->getXref() . '@';
-	}
-	$family = $tree->createRecord($gedcom);
+	case 'add_child_to_individual_action':
+		//////////////////////////////////////////////////////////////////////////////
+		// Add a child to an existing individual (creating a one-parent family)
+		//////////////////////////////////////////////////////////////////////////////
+		$tree      = $controller->tree();
+		$xref    = Filter::post('xref', WT_REGEX_XREF);
+		$PEDI    = Filter::post('PEDI');
+		$glevels = Filter::postArray('glevels', '[0-9]');
+		$tag     = Filter::postArray('tag', WT_REGEX_TAG);
+		$text    = Filter::postArray('text');
+		$islink  = Filter::postArray('islink', '[01]');
+
+		$person = Individual::getInstance($xref, $tree);
+		check_record_access($person);
+
+		// Create a family
+		if ($person->getSex() === 'F') {
+			$gedcom = "0 @NEW@ FAM\n1 WIFE @" . $person->getXref() . '@';
+		} else {
+			$gedcom = "0 @NEW@ FAM\n1 HUSB @" . $person->getXref() . '@';
+		}
+		$family = $tree->createRecord($gedcom);
 
-	// Link the parent to the family
-	$person->createFact('1 FAMS @' . $family->getXref() . '@', true);
+		// Link the parent to the family
+		$person->createFact('1 FAMS @' . $family->getXref() . '@', true);
 
-	// Create a child
-	FunctionsEdit::splitSource(); // separate SOUR record from the rest
+		// Create a child
+		FunctionsEdit::splitSource(); // separate SOUR record from the rest
 
-	$gedcom = '0 @NEW@ INDI';
-	$gedcom .= FunctionsEdit::addNewName($tree);
-	$gedcom .= FunctionsEdit::addNewSex();
-	$gedcom .= "\n" . GedcomCodePedi::createNewFamcPedi($PEDI, $family->getXref());
-	if (preg_match_all('/([A-Z0-9_]+)/', $tree->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
-		foreach ($matches[1] as $match) {
-			$gedcom .= FunctionsEdit::addNewFact($tree, $match);
+		$gedcom = '0 @NEW@ INDI';
+		$gedcom .= FunctionsEdit::addNewName($tree);
+		$gedcom .= FunctionsEdit::addNewSex();
+		$gedcom .= "\n" . GedcomCodePedi::createNewFamcPedi($PEDI, $family->getXref());
+		if (preg_match_all('/([A-Z0-9_]+)/', $tree->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
+			foreach ($matches[1] as $match) {
+				$gedcom .= FunctionsEdit::addNewFact($tree, $match);
+			}
+		}
+		if (Filter::postBool('SOUR_INDI')) {
+			$gedcom = FunctionsEdit::handleUpdates($gedcom);
+		} else {
+			$gedcom = FunctionsEdit::updateRest($gedcom);
 		}
-	}
-	if (Filter::postBool('SOUR_INDI')) {
-		$gedcom = FunctionsEdit::handleUpdates($gedcom);
-	} else {
-		$gedcom = FunctionsEdit::updateRest($gedcom);
-	}
 
-	$child = $tree->createRecord($gedcom);
+		$child = $tree->createRecord($gedcom);
 
-	// Link the family to the child
-	$family->createFact('1 CHIL @' . $child->getXref() . '@', true);
+		// Link the family to the child
+		$family->createFact('1 CHIL @' . $child->getXref() . '@', true);
 
-	if (Filter::post('goto') === 'new') {
-		header('Location: ' . $child->url());
-	} else {
-		header('Location: ' . $person->url());
-	}
-	break;
+		if (Filter::post('goto') === 'new') {
+			header('Location: ' . $child->url());
+		} else {
+			header('Location: ' . $person->url());
+		}
+		break;
 
-case 'add_parent_to_individual_action':
-	//////////////////////////////////////////////////////////////////////////////
-	// Add a new parent to an existing individual (creating a one-parent family)
-	//////////////////////////////////////////////////////////////////////////////
-	$tree    = $controller->tree();
-	$xref    = Filter::post('xref', WT_REGEX_XREF);
-	$PEDI    = Filter::post('PEDI');
-	$glevels = Filter::postArray('glevels', '[0-9]');
-	$tag     = Filter::postArray('tag', WT_REGEX_TAG);
-	$text    = Filter::postArray('text');
-	$islink  = Filter::postArray('islink', '[01]');
-
-	$person = Individual::getInstance($xref, $tree);
-	check_record_access($person);
-
-	// Create a new family
-	$gedcom = "0 @NEW@ FAM\n1 CHIL @" . $person->getXref() . '@';
-	$family = $tree->createRecord($gedcom);
-
-	// Link the child to the family
-	$person->createFact('1 FAMC @' . $family->getXref() . '@', true);
-
-	// Create a child
-	FunctionsEdit::splitSource(); // separate SOUR record from the rest
-
-	$gedcom = '0 @NEW@ INDI';
-	$gedcom .= FunctionsEdit::addNewName($tree);
-	$gedcom .= FunctionsEdit::addNewSex();
-	if (preg_match_all('/([A-Z0-9_]+)/', $tree->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
-		foreach ($matches[1] as $match) {
-			$gedcom .= FunctionsEdit::addNewFact($tree, $match);
+	case 'add_parent_to_individual_action':
+		//////////////////////////////////////////////////////////////////////////////
+		// Add a new parent to an existing individual (creating a one-parent family)
+		//////////////////////////////////////////////////////////////////////////////
+		$tree    = $controller->tree();
+		$xref    = Filter::post('xref', WT_REGEX_XREF);
+		$PEDI    = Filter::post('PEDI');
+		$glevels = Filter::postArray('glevels', '[0-9]');
+		$tag     = Filter::postArray('tag', WT_REGEX_TAG);
+		$text    = Filter::postArray('text');
+		$islink  = Filter::postArray('islink', '[01]');
+
+		$person = Individual::getInstance($xref, $tree);
+		check_record_access($person);
+
+		// Create a new family
+		$gedcom = "0 @NEW@ FAM\n1 CHIL @" . $person->getXref() . '@';
+		$family = $tree->createRecord($gedcom);
+
+		// Link the child to the family
+		$person->createFact('1 FAMC @' . $family->getXref() . '@', true);
+
+		// Create a child
+		FunctionsEdit::splitSource(); // separate SOUR record from the rest
+
+		$gedcom = '0 @NEW@ INDI';
+		$gedcom .= FunctionsEdit::addNewName($tree);
+		$gedcom .= FunctionsEdit::addNewSex();
+		if (preg_match_all('/([A-Z0-9_]+)/', $tree->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
+			foreach ($matches[1] as $match) {
+				$gedcom .= FunctionsEdit::addNewFact($tree, $match);
+			}
 		}
-	}
-	if (Filter::postBool('SOUR_INDI')) {
-		$gedcom = FunctionsEdit::handleUpdates($gedcom);
-	} else {
-		$gedcom = FunctionsEdit::updateRest($gedcom);
-	}
-	$gedcom .= "\n1 FAMS @" . $family->getXref() . '@';
+		if (Filter::postBool('SOUR_INDI')) {
+			$gedcom = FunctionsEdit::handleUpdates($gedcom);
+		} else {
+			$gedcom = FunctionsEdit::updateRest($gedcom);
+		}
+		$gedcom .= "\n1 FAMS @" . $family->getXref() . '@';
 
-	$parent = $tree->createRecord($gedcom);
+		$parent = $tree->createRecord($gedcom);
 
-	// Link the family to the child
-	if ($parent->getSex() === 'F') {
-		$family->createFact('1 WIFE @' . $parent->getXref() . '@', true);
-	} else {
-		$family->createFact('1 HUSB @' . $parent->getXref() . '@', true);
-	}
+		// Link the family to the child
+		if ($parent->getSex() === 'F') {
+			$family->createFact('1 WIFE @' . $parent->getXref() . '@', true);
+		} else {
+			$family->createFact('1 HUSB @' . $parent->getXref() . '@', true);
+		}
 
-	if (Filter::post('goto') === 'new') {
-		header('Location: ' . $parent->url());
-	} else {
-		header('Location: ' . $person->url());
-	}
-	break;
+		if (Filter::post('goto') === 'new') {
+			header('Location: ' . $parent->url());
+		} else {
+			header('Location: ' . $person->url());
+		}
+		break;
 
-case 'add_unlinked_indi_action':
-	//////////////////////////////////////////////////////////////////////////////
-	// Add a new, unlinked individual
-	//////////////////////////////////////////////////////////////////////////////
-	$tree    = $controller->tree();
-	$glevels = Filter::postArray('glevels', '[0-9]');
-	$tag     = Filter::postArray('tag', WT_REGEX_TAG);
-	$text    = Filter::postArray('text');
-	$islink  = Filter::postArray('islink', '[01]');
-
-	FunctionsEdit::splitSource();
-	$gedrec = '0 @REF@ INDI';
-	$gedrec .= FunctionsEdit::addNewName($tree);
-	$gedrec .= FunctionsEdit::addNewSex();
-	if (preg_match_all('/([A-Z0-9_]+)/', $tree->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
-		foreach ($matches[1] as $match) {
-			$gedrec .= FunctionsEdit::addNewFact($tree, $match);
+	case 'add_unlinked_indi_action':
+		//////////////////////////////////////////////////////////////////////////////
+		// Add a new, unlinked individual
+		//////////////////////////////////////////////////////////////////////////////
+		$tree    = $controller->tree();
+		$glevels = Filter::postArray('glevels', '[0-9]');
+		$tag     = Filter::postArray('tag', WT_REGEX_TAG);
+		$text    = Filter::postArray('text');
+		$islink  = Filter::postArray('islink', '[01]');
+
+		FunctionsEdit::splitSource();
+		$gedrec = '0 @REF@ INDI';
+		$gedrec .= FunctionsEdit::addNewName($tree);
+		$gedrec .= FunctionsEdit::addNewSex();
+		if (preg_match_all('/([A-Z0-9_]+)/', $tree->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
+			foreach ($matches[1] as $match) {
+				$gedrec .= FunctionsEdit::addNewFact($tree, $match);
+			}
+		}
+		if (Filter::postBool('SOUR_INDI')) {
+			$gedrec = FunctionsEdit::handleUpdates($gedrec);
+		} else {
+			$gedrec = FunctionsEdit::updateRest($gedrec);
 		}
-	}
-	if (Filter::postBool('SOUR_INDI')) {
-		$gedrec = FunctionsEdit::handleUpdates($gedrec);
-	} else {
-		$gedrec = FunctionsEdit::updateRest($gedrec);
-	}
 
-	$new_indi = $tree->createRecord($gedrec);
+		$new_indi = $tree->createRecord($gedrec);
 
-	if (Filter::post('goto') === 'new') {
-		header('Location: ' . $new_indi->url());
-	} else {
-		header('Location: ' . route('admin-trees'));
-	}
-	break;
+		if (Filter::post('goto') === 'new') {
+			header('Location: ' . $new_indi->url());
+		} else {
+			header('Location: ' . route('admin-trees'));
+		}
+		break;
 
-case 'add_spouse_to_individual_action':
-	//////////////////////////////////////////////////////////////////////////////
-	// Add a spouse to an existing individual (creating a new family)
-	//////////////////////////////////////////////////////////////////////////////
-	$tree    = $controller->tree();
-	$xref    = Filter::post('xref'); // Add a spouse to this individual
-	$sex     = Filter::post('SEX', '[MFU]', 'U');
-	$glevels = Filter::postArray('glevels', '[0-9]');
-	$tag     = Filter::postArray('tag', WT_REGEX_TAG);
-	$text    = Filter::postArray('text');
-	$islink  = Filter::postArray('islink', '[01]');
-
-	$person = Individual::getInstance($xref, $tree);
-	check_record_access($person);
-
-	FunctionsEdit::splitSource();
-	$indi_gedcom = '0 @REF@ INDI';
-	$indi_gedcom .= FunctionsEdit::addNewName($tree);
-	$indi_gedcom .= FunctionsEdit::addNewSex();
-	if (preg_match_all('/([A-Z0-9_]+)/', $tree->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
-		foreach ($matches[1] as $match) {
-			$indi_gedcom .= FunctionsEdit::addNewFact($tree, $match);
+	case 'add_spouse_to_individual_action':
+		//////////////////////////////////////////////////////////////////////////////
+		// Add a spouse to an existing individual (creating a new family)
+		//////////////////////////////////////////////////////////////////////////////
+		$tree    = $controller->tree();
+		$xref    = Filter::post('xref'); // Add a spouse to this individual
+		$sex     = Filter::post('SEX', '[MFU]', 'U');
+		$glevels = Filter::postArray('glevels', '[0-9]');
+		$tag     = Filter::postArray('tag', WT_REGEX_TAG);
+		$text    = Filter::postArray('text');
+		$islink  = Filter::postArray('islink', '[01]');
+
+		$person = Individual::getInstance($xref, $tree);
+		check_record_access($person);
+
+		FunctionsEdit::splitSource();
+		$indi_gedcom = '0 @REF@ INDI';
+		$indi_gedcom .= FunctionsEdit::addNewName($tree);
+		$indi_gedcom .= FunctionsEdit::addNewSex();
+		if (preg_match_all('/([A-Z0-9_]+)/', $tree->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
+			foreach ($matches[1] as $match) {
+				$indi_gedcom .= FunctionsEdit::addNewFact($tree, $match);
+			}
+		}
+		if (Filter::postBool('SOUR_INDI')) {
+			$indi_gedcom = FunctionsEdit::handleUpdates($indi_gedcom);
+		} else {
+			$indi_gedcom = FunctionsEdit::updateRest($indi_gedcom);
 		}
-	}
-	if (Filter::postBool('SOUR_INDI')) {
-		$indi_gedcom = FunctionsEdit::handleUpdates($indi_gedcom);
-	} else {
-		$indi_gedcom = FunctionsEdit::updateRest($indi_gedcom);
-	}
 
-	$fam_gedcom = '';
-	if (preg_match_all('/([A-Z0-9_]+)/', $tree->getPreference('QUICK_REQUIRED_FAMFACTS'), $matches)) {
-		foreach ($matches[1] as $match) {
-			$fam_gedcom .= FunctionsEdit::addNewFact($tree, $match);
+		$fam_gedcom = '';
+		if (preg_match_all('/([A-Z0-9_]+)/', $tree->getPreference('QUICK_REQUIRED_FAMFACTS'), $matches)) {
+			foreach ($matches[1] as $match) {
+				$fam_gedcom .= FunctionsEdit::addNewFact($tree, $match);
+			}
+		}
+		if (Filter::postBool('SOUR_FAM')) {
+			$fam_gedcom = FunctionsEdit::handleUpdates($fam_gedcom);
+		} else {
+			$fam_gedcom = FunctionsEdit::updateRest($fam_gedcom);
 		}
-	}
-	if (Filter::postBool('SOUR_FAM')) {
-		$fam_gedcom = FunctionsEdit::handleUpdates($fam_gedcom);
-	} else {
-		$fam_gedcom = FunctionsEdit::updateRest($fam_gedcom);
-	}
 
-	// Create the new spouse
-	$spouse = $tree->createRecord($indi_gedcom);
-	// Create a new family
-	if ($sex === 'F') {
-		$family = $tree->createRecord("0 @NEW@ FAM\n1 WIFE @" . $spouse->getXref() . "@\n1 HUSB @" . $person->getXref() . '@' . $fam_gedcom);
-	} else {
-		$family = $tree->createRecord("0 @NEW@ FAM\n1 HUSB @" . $spouse->getXref() . "@\n1 WIFE @" . $person->getXref() . '@' . $fam_gedcom);
-	}
-	// Link the spouses to the family
-	$spouse->createFact('1 FAMS @' . $family->getXref() . '@', true);
-	$person->createFact('1 FAMS @' . $family->getXref() . '@', true);
+		// Create the new spouse
+		$spouse = $tree->createRecord($indi_gedcom);
+		// Create a new family
+		if ($sex === 'F') {
+			$family = $tree->createRecord("0 @NEW@ FAM\n1 WIFE @" . $spouse->getXref() . "@\n1 HUSB @" . $person->getXref() . '@' . $fam_gedcom);
+		} else {
+			$family = $tree->createRecord("0 @NEW@ FAM\n1 HUSB @" . $spouse->getXref() . "@\n1 WIFE @" . $person->getXref() . '@' . $fam_gedcom);
+		}
+		// Link the spouses to the family
+		$spouse->createFact('1 FAMS @' . $family->getXref() . '@', true);
+		$person->createFact('1 FAMS @' . $family->getXref() . '@', true);
 
-	if (Filter::post('goto') === 'new') {
-		header('Location: ' . $spouse->url());
-	} else {
-		header('Location: ' . $person->url());
-	}
-	break;
+		if (Filter::post('goto') === 'new') {
+			header('Location: ' . $spouse->url());
+		} else {
+			header('Location: ' . $person->url());
+		}
+		break;
 
-case 'add_spouse_to_family_action':
-	//////////////////////////////////////////////////////////////////////////////
-	// Add a spouse to an existing family
-	//////////////////////////////////////////////////////////////////////////////
-	$tree    = $controller->tree();
-	$xref    = Filter::post('xref', WT_REGEX_XREF);
-	$glevels = Filter::postArray('glevels', '[0-9]');
-	$tag     = Filter::postArray('tag', WT_REGEX_TAG);
-	$text    = Filter::postArray('text');
-	$islink  = Filter::postArray('islink', '[01]');
-
-	$family = Family::getInstance($xref, $tree);
-	check_record_access($family);
-
-	// Create the new spouse
-	FunctionsEdit::splitSource(); // separate SOUR record from the rest
-
-	$gedrec = '0 @REF@ INDI';
-	$gedrec .= FunctionsEdit::addNewName($tree);
-	$gedrec .= FunctionsEdit::addNewSex();
-	if (preg_match_all('/([A-Z0-9_]+)/', $tree->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
-		foreach ($matches[1] as $match) {
-			$gedrec .= FunctionsEdit::addNewFact($tree, $match);
+	case 'add_spouse_to_family_action':
+		//////////////////////////////////////////////////////////////////////////////
+		// Add a spouse to an existing family
+		//////////////////////////////////////////////////////////////////////////////
+		$tree    = $controller->tree();
+		$xref    = Filter::post('xref', WT_REGEX_XREF);
+		$glevels = Filter::postArray('glevels', '[0-9]');
+		$tag     = Filter::postArray('tag', WT_REGEX_TAG);
+		$text    = Filter::postArray('text');
+		$islink  = Filter::postArray('islink', '[01]');
+
+		$family = Family::getInstance($xref, $tree);
+		check_record_access($family);
+
+		// Create the new spouse
+		FunctionsEdit::splitSource(); // separate SOUR record from the rest
+
+		$gedrec = '0 @REF@ INDI';
+		$gedrec .= FunctionsEdit::addNewName($tree);
+		$gedrec .= FunctionsEdit::addNewSex();
+		if (preg_match_all('/([A-Z0-9_]+)/', $tree->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
+			foreach ($matches[1] as $match) {
+				$gedrec .= FunctionsEdit::addNewFact($tree, $match);
+			}
 		}
-	}
 
-	if (Filter::postBool('SOUR_INDI')) {
-		$gedrec = FunctionsEdit::handleUpdates($gedrec);
-	} else {
-		$gedrec = FunctionsEdit::updateRest($gedrec);
-	}
-	$gedrec .= "\n1 FAMS @" . $family->getXref() . '@';
-	$spouse = $tree->createRecord($gedrec);
+		if (Filter::postBool('SOUR_INDI')) {
+			$gedrec = FunctionsEdit::handleUpdates($gedrec);
+		} else {
+			$gedrec = FunctionsEdit::updateRest($gedrec);
+		}
+		$gedrec .= "\n1 FAMS @" . $family->getXref() . '@';
+		$spouse = $tree->createRecord($gedrec);
 
-	// Update the existing family - add marriage, etc
-	if ($family->getFirstFact('HUSB')) {
-		$family->createFact('1 WIFE @' . $spouse->getXref() . '@', true);
-	} else {
-		$family->createFact('1 HUSB @' . $spouse->getXref() . '@', true);
-	}
-	$famrec = '';
-	if (preg_match_all('/([A-Z0-9_]+)/', $tree->getPreference('QUICK_REQUIRED_FAMFACTS'), $matches)) {
-		foreach ($matches[1] as $match) {
-			$famrec .= FunctionsEdit::addNewFact($tree, $match);
+		// Update the existing family - add marriage, etc
+		if ($family->getFirstFact('HUSB')) {
+			$family->createFact('1 WIFE @' . $spouse->getXref() . '@', true);
+		} else {
+			$family->createFact('1 HUSB @' . $spouse->getXref() . '@', true);
 		}
-	}
-	if (Filter::postBool('SOUR_FAM')) {
-		$famrec = FunctionsEdit::handleUpdates($famrec);
-	} else {
-		$famrec = FunctionsEdit::updateRest($famrec);
-	}
-	$family->createFact(trim($famrec), true); // trim leading \n
+		$famrec = '';
+		if (preg_match_all('/([A-Z0-9_]+)/', $tree->getPreference('QUICK_REQUIRED_FAMFACTS'), $matches)) {
+			foreach ($matches[1] as $match) {
+				$famrec .= FunctionsEdit::addNewFact($tree, $match);
+			}
+		}
+		if (Filter::postBool('SOUR_FAM')) {
+			$famrec = FunctionsEdit::handleUpdates($famrec);
+		} else {
+			$famrec = FunctionsEdit::updateRest($famrec);
+		}
+		$family->createFact(trim($famrec), true); // trim leading \n
 
-	if (Filter::post('goto') === 'new') {
-		header('Location: ' . $spouse->url());
-	} else {
-		header('Location: ' . $family->url());
-	}
-	break;
+		if (Filter::post('goto') === 'new') {
+			header('Location: ' . $spouse->url());
+		} else {
+			header('Location: ' . $family->url());
+		}
+		break;
 
-case 'addfamlink':
-	//////////////////////////////////////////////////////////////////////////////
-	// Link an individual to an existing family, as a child
-	//////////////////////////////////////////////////////////////////////////////
-	$tree = $controller->tree();
-	$xref = Filter::get('xref', WT_REGEX_XREF);
+	case 'addfamlink':
+		//////////////////////////////////////////////////////////////////////////////
+		// Link an individual to an existing family, as a child
+		//////////////////////////////////////////////////////////////////////////////
+		$tree = $controller->tree();
+		$xref = Filter::get('xref', WT_REGEX_XREF);
 
-	$person = Individual::getInstance($xref, $tree);
-	check_record_access($person);
+		$person = Individual::getInstance($xref, $tree);
+		check_record_access($person);
 
-	$controller
-		->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Link this individual to an existing family as a child'))
-		->pageHeader();
+		$controller
+			->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Link this individual to an existing family as a child'))
+			->pageHeader();
 
-	?>
-	<h2><?= $controller->getPageTitle() ?></h2>
+		?>
+		<h2><?= $controller->getPageTitle() ?></h2>
 	<form method="post">
 		<input type="hidden" name="ged" value="<?= e($tree->getName()) ?>">
 		<input type="hidden" name="action" value="linkfamaction">
@@ -699,7 +699,7 @@ 
 			</label>
 			<div class="col-sm-9">
 				<?= Bootstrap4::select(GedcomCodePedi::getValues($person), '', ['id' => 'PEDI', 'name' => 'PEDI']) ?>
-				<p class="small text-muted">
+					<p class="small text-muted">
 					<?= I18N::translate('A child may have more than one set of parents. The relationship between the child and the parents can be biological, legal, or based on local culture and tradition. If no pedigree is specified, then a biological relationship will be assumed.') ?>
 				</p>
 			</div>
@@ -711,85 +711,85 @@ 
 			<div class="col-sm-9 offset-sm-3">
 				<button class="btn btn-primary" type="submit">
 					<?= FontAwesome::decorativeIcon('save') ?>
-					<?= /* I18N: A button label. */
-					I18N::translate('save') ?>
+						<?= /* I18N: A button label. */
+						I18N::translate('save') ?>
 				</button>
 				<a class="btn btn-secondary" href="<?= e($person->url()) ?>">
 					<?= FontAwesome::decorativeIcon('cancel') ?>
-					<?= /* I18N: A button label. */
-					I18N::translate('cancel') ?>
+						<?= /* I18N: A button label. */
+						I18N::translate('cancel') ?>
 				</a>
 			</div>
 		</div>
 	</form>
 	<?php
-	break;
+		break;
 
-case 'linkfamaction':
-	//////////////////////////////////////////////////////////////////////////////
-	// Link an individual to an existing family, as a child
-	//////////////////////////////////////////////////////////////////////////////
-	$tree  = $controller->tree();
-	$xref  = Filter::post('xref', WT_REGEX_XREF);
-	$famid = Filter::post('famid', WT_REGEX_XREF);
-	$PEDI  = Filter::post('PEDI');
-
-	$person = Individual::getInstance($xref, $tree);
-	$family = Family::getInstance($famid, $tree);
-	check_record_access($person);
-	check_record_access($family);
-
-	// Replace any existing child->family link (we may be changing the PEDI);
-	$fact_id = null;
-	foreach ($person->getFacts('FAMC') as $fact) {
-		if ($family === $fact->getTarget()) {
-			$fact_id = $fact->getFactId();
-			break;
+	case 'linkfamaction':
+		//////////////////////////////////////////////////////////////////////////////
+		// Link an individual to an existing family, as a child
+		//////////////////////////////////////////////////////////////////////////////
+		$tree  = $controller->tree();
+		$xref  = Filter::post('xref', WT_REGEX_XREF);
+		$famid = Filter::post('famid', WT_REGEX_XREF);
+		$PEDI  = Filter::post('PEDI');
+
+		$person = Individual::getInstance($xref, $tree);
+		$family = Family::getInstance($famid, $tree);
+		check_record_access($person);
+		check_record_access($family);
+
+		// Replace any existing child->family link (we may be changing the PEDI);
+		$fact_id = null;
+		foreach ($person->getFacts('FAMC') as $fact) {
+			if ($family === $fact->getTarget()) {
+				$fact_id = $fact->getFactId();
+				break;
+			}
 		}
-	}
 
-	$gedcom = GedcomCodePedi::createNewFamcPedi($PEDI, $famid);
-	$person->updateFact($fact_id, $gedcom, true);
+		$gedcom = GedcomCodePedi::createNewFamcPedi($PEDI, $famid);
+		$person->updateFact($fact_id, $gedcom, true);
 
-	// Only set the family->child link if it does not already exist
-	$edit_fact = null;
-	foreach ($family->getFacts('CHIL') as $fact) {
-		if ($person === $fact->getTarget()) {
-			$edit_fact = $fact;
-			break;
+		// Only set the family->child link if it does not already exist
+		$edit_fact = null;
+		foreach ($family->getFacts('CHIL') as $fact) {
+			if ($person === $fact->getTarget()) {
+				$edit_fact = $fact;
+				break;
+			}
+		}
+		if (!$edit_fact) {
+			$family->createFact('1 CHIL @' . $person->getXref() . '@', true);
 		}
-	}
-	if (!$edit_fact) {
-		$family->createFact('1 CHIL @' . $person->getXref() . '@', true);
-	}
 
-	header('Location: ' . $person->url());
-	break;
+		header('Location: ' . $person->url());
+		break;
 
-case 'linkspouse':
-	//////////////////////////////////////////////////////////////////////////////
-	// Link and individual to an existing individual as a spouse
-	//////////////////////////////////////////////////////////////////////////////
-	$tree   = $controller->tree();
-	$famtag = Filter::get('famtag', 'HUSB|WIFE');
-	$xref   = Filter::get('xref', WT_REGEX_XREF);
+	case 'linkspouse':
+		//////////////////////////////////////////////////////////////////////////////
+		// Link and individual to an existing individual as a spouse
+		//////////////////////////////////////////////////////////////////////////////
+		$tree   = $controller->tree();
+		$famtag = Filter::get('famtag', 'HUSB|WIFE');
+		$xref   = Filter::get('xref', WT_REGEX_XREF);
 
-	$person = Individual::getInstance($xref, $tree);
-	check_record_access($person);
+		$person = Individual::getInstance($xref, $tree);
+		check_record_access($person);
 
-	if ($person->getSex() === 'F') {
-		$controller->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Add a husband using an existing individual'));
-		$label = I18N::translate('Husband');
-	} else {
-		$controller->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Add a wife using an existing individual'));
-		$label = I18N::translate('Wife');
-	}
+		if ($person->getSex() === 'F') {
+			$controller->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Add a husband using an existing individual'));
+			$label = I18N::translate('Husband');
+		} else {
+			$controller->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Add a wife using an existing individual'));
+			$label = I18N::translate('Wife');
+		}
 
-	$controller->pageHeader();
-	FunctionsPrint::initializeCalendarPopup();
+		$controller->pageHeader();
+		FunctionsPrint::initializeCalendarPopup();
 
-	?>
-	<h2><?= $controller->getPageTitle() ?></h2>
+		?>
+		<h2><?= $controller->getPageTitle() ?></h2>
 
 	<form method="post">
 		<input type="hidden" name="ged" value="<?= e($tree->getName()) ?>">
@@ -807,120 +807,120 @@ 
 		</div>
 
 		<?= FunctionsEdit::addSimpleTag($tree, '0 MARR Y') ?>
-		<?= FunctionsEdit::addSimpleTag($tree, '0 DATE', 'MARR') ?>
-		<?= FunctionsEdit::addSimpleTag($tree, '0 PLAC', 'MARR') ?>
+			<?= FunctionsEdit::addSimpleTag($tree, '0 DATE', 'MARR') ?>
+			<?= FunctionsEdit::addSimpleTag($tree, '0 PLAC', 'MARR') ?>
 
 		<div class="row form-group">
 			<div class="col-sm-9 offset-sm-3">
 				<button class="btn btn-primary" type="submit">
 					<?= FontAwesome::decorativeIcon('save') ?>
-					<?= /* I18N: A button label. */ I18N::translate('save') ?>
+						<?= /* I18N: A button label. */ I18N::translate('save') ?>
 				</button>
 				<a class="btn btn-secondary" href="<?= e($person->url()) ?>">
 					<?= FontAwesome::decorativeIcon('cancel') ?>
-					<?= /* I18N: A button label. */ I18N::translate('cancel') ?>
+						<?= /* I18N: A button label. */ I18N::translate('cancel') ?>
 				</a>
 			</div>
 		</div>
 	</form>
 	<?php
-	break;
-
-case 'linkspouseaction':
-	//////////////////////////////////////////////////////////////////////////////
-	// Link and individual to an existing individual as a spouse
-	//////////////////////////////////////////////////////////////////////////////
-	$tree    = $controller->tree();
-	$xref    = Filter::post('xref', WT_REGEX_XREF);
-	$spid    = Filter::post('spid', WT_REGEX_XREF);
-	$famtag  = Filter::post('famtag', 'HUSB|WIFE');
-	$glevels = Filter::postArray('glevels', '[0-9]');
-	$tag     = Filter::postArray('tag', WT_REGEX_TAG);
-	$text    = Filter::postArray('text');
-	$islink  = Filter::postArray('islink', '[01]');
-
-	$person = Individual::getInstance($xref, $tree);
-	$spouse = Individual::getInstance($spid, $tree);
-	check_record_access($person);
-	check_record_access($spouse);
-
-	if ($person->getSex() === 'F') {
-		$controller->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Add a husband using an existing individual'));
-	} else {
-		$controller->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Add a wife using an existing individual'));
-	}
+		break;
 
-	if ($person->getSex() === 'M') {
-		$gedcom = "0 @new@ FAM\n1 HUSB @" . $person->getXref() . "@\n1 WIFE @" . $spouse->getXref() . '@';
-	} else {
-		$gedcom = "0 @new@ FAM\n1 HUSB @" . $spouse->getXref() . "@\n1 WIFE @" . $person->getXref() . '@';
-	}
-	FunctionsEdit::splitSource();
-	$gedcom .= FunctionsEdit::addNewFact($tree, 'MARR');
+	case 'linkspouseaction':
+		//////////////////////////////////////////////////////////////////////////////
+		// Link and individual to an existing individual as a spouse
+		//////////////////////////////////////////////////////////////////////////////
+		$tree    = $controller->tree();
+		$xref    = Filter::post('xref', WT_REGEX_XREF);
+		$spid    = Filter::post('spid', WT_REGEX_XREF);
+		$famtag  = Filter::post('famtag', 'HUSB|WIFE');
+		$glevels = Filter::postArray('glevels', '[0-9]');
+		$tag     = Filter::postArray('tag', WT_REGEX_TAG);
+		$text    = Filter::postArray('text');
+		$islink  = Filter::postArray('islink', '[01]');
+
+		$person = Individual::getInstance($xref, $tree);
+		$spouse = Individual::getInstance($spid, $tree);
+		check_record_access($person);
+		check_record_access($spouse);
+
+		if ($person->getSex() === 'F') {
+			$controller->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Add a husband using an existing individual'));
+		} else {
+			$controller->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Add a wife using an existing individual'));
+		}
 
-	if (Filter::postBool('SOUR_FAM') || count($tagSOUR) > 0) {
-		// before adding 2 SOUR it needs to add 1 MARR Y first
-		if (FunctionsEdit::addNewFact($tree, 'MARR') === '') {
-			$gedcom .= "\n1 MARR Y";
+		if ($person->getSex() === 'M') {
+			$gedcom = "0 @new@ FAM\n1 HUSB @" . $person->getXref() . "@\n1 WIFE @" . $spouse->getXref() . '@';
+		} else {
+			$gedcom = "0 @new@ FAM\n1 HUSB @" . $spouse->getXref() . "@\n1 WIFE @" . $person->getXref() . '@';
 		}
-		$gedcom = FunctionsEdit::handleUpdates($gedcom);
-	} else {
-		// before adding level 2 facts it needs to add 1 MARR Y first
-		if (FunctionsEdit::addNewFact($tree, 'MARR') === '') {
-			$gedcom .= "\n1 MARR Y";
+		FunctionsEdit::splitSource();
+		$gedcom .= FunctionsEdit::addNewFact($tree, 'MARR');
+
+		if (Filter::postBool('SOUR_FAM') || count($tagSOUR) > 0) {
+			// before adding 2 SOUR it needs to add 1 MARR Y first
+			if (FunctionsEdit::addNewFact($tree, 'MARR') === '') {
+				$gedcom .= "\n1 MARR Y";
+			}
+			$gedcom = FunctionsEdit::handleUpdates($gedcom);
+		} else {
+			// before adding level 2 facts it needs to add 1 MARR Y first
+			if (FunctionsEdit::addNewFact($tree, 'MARR') === '') {
+				$gedcom .= "\n1 MARR Y";
+			}
+			$gedcom = FunctionsEdit::updateRest($gedcom);
 		}
-		$gedcom = FunctionsEdit::updateRest($gedcom);
-	}
 
-	$family = $tree->createRecord($gedcom);
-	$person->createFact('1 FAMS @' . $family->getXref() . '@', true);
-	$spouse->createFact('1 FAMS @' . $family->getXref() . '@', true);
+		$family = $tree->createRecord($gedcom);
+		$person->createFact('1 FAMS @' . $family->getXref() . '@', true);
+		$spouse->createFact('1 FAMS @' . $family->getXref() . '@', true);
 
-	header('Location: ' . $person->url());
-	break;
+		header('Location: ' . $person->url());
+		break;
 
-case 'addmedia_links':
-	//////////////////////////////////////////////////////////////////////////////
-	//
-	//////////////////////////////////////////////////////////////////////////////
-	$tree = $controller->tree();
-	$pid  = Filter::get('pid', WT_REGEX_XREF);
+	case 'addmedia_links':
+		//////////////////////////////////////////////////////////////////////////////
+		//
+		//////////////////////////////////////////////////////////////////////////////
+		$tree = $controller->tree();
+		$pid  = Filter::get('pid', WT_REGEX_XREF);
 
-	$person = Individual::getInstance($pid, $tree);
-	check_record_access($person);
+		$person = Individual::getInstance($pid, $tree);
+		check_record_access($person);
 
-	$controller
-		->setPageTitle(I18N::translate('Family navigator') . ' — ' . $person->getFullName())
-		->pageHeader();
+		$controller
+			->setPageTitle(I18N::translate('Family navigator') . ' — ' . $person->getFullName())
+			->pageHeader();
 
-	?>
-	<h2><?= $controller->getPageTitle() ?></h2>
+		?>
+		<h2><?= $controller->getPageTitle() ?></h2>
 
 	<form method="post" action="edit_interface.php?xref=<?= $person->getXref() ?>" onsubmit="findindi()">
 		<input type="hidden" name="ged" value="<?= e($tree->getName()) ?>">
 		<input type="hidden" name="action" value="addmedia_links">
 		<input type="hidden" name="noteid" value="newnote">
 		<?= Filter::getCsrf() ?>
-		<?php require WT_ROOT . WT_MODULES_DIR . 'GEDFact_assistant/MEDIA_ctrl.php' ?>
-	</form>
+			<?php require WT_ROOT . WT_MODULES_DIR . 'GEDFact_assistant/MEDIA_ctrl.php' ?>
+		</form>
 	<?php
-	break;
+		break;
 
-case 'add-media-link':
-	//////////////////////////////////////////////////////////////////////////////
-	// Link a media object to a record.
-	//////////////////////////////////////////////////////////////////////////////
-	$tree   = $controller->tree();
-	$xref   = Filter::get('xref', WT_REGEX_XREF);
-	$record = GedcomRecord::getInstance($xref, $tree);
-	check_record_access($record);
+	case 'add-media-link':
+		//////////////////////////////////////////////////////////////////////////////
+		// Link a media object to a record.
+		//////////////////////////////////////////////////////////////////////////////
+		$tree   = $controller->tree();
+		$xref   = Filter::get('xref', WT_REGEX_XREF);
+		$record = GedcomRecord::getInstance($xref, $tree);
+		check_record_access($record);
 
-	$controller
-		->setPageTitle($record->getFullName() . ' — ' . I18N::translate('Add a media object'))
-		->pageHeader();
+		$controller
+			->setPageTitle($record->getFullName() . ' — ' . I18N::translate('Add a media object'))
+			->pageHeader();
 
-	?>
-	<h2><?= $controller->getPageTitle() ?></h2>
+		?>
+		<h2><?= $controller->getPageTitle() ?></h2>
 
 	<form method="post">
 		<input type="hidden" name="ged" value="<?= e($tree->getName()) ?>">
@@ -942,7 +942,7 @@ 
 							</button>
 						</span>
 					<?php endif ?>
-					<?= FunctionsEdit::formControlMediaObject($tree, null, ['id' => 'media-xref', 'name' => 'media-xref', 'data-element-id' => 'media-xref']) ?>
+						<?= FunctionsEdit::formControlMediaObject($tree, null, ['id' => 'media-xref', 'name' => 'media-xref', 'data-element-id' => 'media-xref']) ?>
 				</div>
 			</div>
 		</div>
@@ -951,57 +951,57 @@ 
 			<div class="col-sm-9 offset-sm-3">
 				<button class="btn btn-primary" type="submit">
 					<?= FontAwesome::decorativeIcon('save') ?>
-					<?= /* I18N: A button label. */
-					I18N::translate('save') ?>
+						<?= /* I18N: A button label. */
+						I18N::translate('save') ?>
 				</button>
 				<a class="btn btn-secondary" href="<?= e($record->url()) ?>">
 					<?= FontAwesome::decorativeIcon('cancel') ?>
-					<?= /* I18N: A button label. */
-					I18N::translate('cancel') ?>
+						<?= /* I18N: A button label. */
+						I18N::translate('cancel') ?>
 				</a>
 			</div>
 		</div>
 	</form>
 	<?= view('modals/ajax') ?>
-	<?php
-	break;
+		<?php
+		break;
 
-case 'save-media-link':
-	//////////////////////////////////////////////////////////////////////////////
-	// Link a media object to a record.
-	//////////////////////////////////////////////////////////////////////////////
-	$tree       = $controller->tree();
-	$xref       = Filter::post('xref', WT_REGEX_XREF);
-	$media_xref = Filter::post('media-xref', WT_REGEX_XREF);
-	$record     = GedcomRecord::getInstance($xref, $tree);
-	check_record_access($record);
+	case 'save-media-link':
+		//////////////////////////////////////////////////////////////////////////////
+		// Link a media object to a record.
+		//////////////////////////////////////////////////////////////////////////////
+		$tree       = $controller->tree();
+		$xref       = Filter::post('xref', WT_REGEX_XREF);
+		$media_xref = Filter::post('media-xref', WT_REGEX_XREF);
+		$record     = GedcomRecord::getInstance($xref, $tree);
+		check_record_access($record);
 
-	$gedcom = '1 OBJE @' . $media_xref . '@';
+		$gedcom = '1 OBJE @' . $media_xref . '@';
 
-	$record->createFact($gedcom, true);
+		$record->createFact($gedcom, true);
 
-	header('Location: ' . $record->url());
-	break;
+		header('Location: ' . $record->url());
+		break;
 
-case 'changefamily':
-	//////////////////////////////////////////////////////////////////////////////
-	// Change the members of a family record
-	//////////////////////////////////////////////////////////////////////////////
-	$tree = $controller->tree();
-	$xref = Filter::get('xref', WT_REGEX_XREF);
+	case 'changefamily':
+		//////////////////////////////////////////////////////////////////////////////
+		// Change the members of a family record
+		//////////////////////////////////////////////////////////////////////////////
+		$tree = $controller->tree();
+		$xref = Filter::get('xref', WT_REGEX_XREF);
 
-	$family = Family::getInstance($xref, $tree);
-	check_record_access($family);
+		$family = Family::getInstance($xref, $tree);
+		check_record_access($family);
 
-	$controller
-		->setPageTitle(I18N::translate('Change family members') . ' – ' . $family->getFullName())
-		->pageHeader();
+		$controller
+			->setPageTitle(I18N::translate('Change family members') . ' – ' . $family->getFullName())
+			->pageHeader();
 
-	$father   = $family->getHusband();
-	$mother   = $family->getWife();
-	$children = $family->getChildren();
-	?>
-	<h2><?= $controller->getPageTitle() ?></h2>
+		$father   = $family->getHusband();
+		$mother   = $family->getWife();
+		$children = $family->getChildren();
+		?>
+		<h2><?= $controller->getPageTitle() ?></h2>
 
 	<div id="changefam">
 		<form name="changefamform" method="post">
@@ -1015,7 +1015,7 @@ 
 						<td class="descriptionbox">
 							<b>
 								<?php
-								switch ($father->getSex()) {
+									switch ($father->getSex()) {
 									case 'M':
 										echo I18N::translate('husband');
 										break;
@@ -1025,7 +1025,7 @@ 
 									default:
 										echo I18N::translate('spouse');
 										break;
-								}
+									}
 								?>
 							</b>
 							<input type="hidden" name="HUSB" value="<?= $father->getXref() ?>">
@@ -1157,111 +1157,111 @@ 
 	<?php
 	break;
 
-case 'changefamily_update':
-	//////////////////////////////////////////////////////////////////////////////
-	// Change the members of a family record
-	//////////////////////////////////////////////////////////////////////////////
-	$tree      = $controller->tree();
-	$xref      = Filter::post('xref', WT_REGEX_XREF);
-	$HUSB      = Filter::post('HUSB', WT_REGEX_XREF);
-	$WIFE      = Filter::post('WIFE', WT_REGEX_XREF);
-	$keep_chan = Filter::postBool('keep_chan');
-
-	$CHIL = [];
-	for ($i = 0; isset($_POST['CHIL' . $i]); ++$i) {
-		$CHIL[] = Filter::post('CHIL' . $i, WT_REGEX_XREF);
-	}
+	case 'changefamily_update':
+		//////////////////////////////////////////////////////////////////////////////
+		// Change the members of a family record
+		//////////////////////////////////////////////////////////////////////////////
+		$tree      = $controller->tree();
+		$xref      = Filter::post('xref', WT_REGEX_XREF);
+		$HUSB      = Filter::post('HUSB', WT_REGEX_XREF);
+		$WIFE      = Filter::post('WIFE', WT_REGEX_XREF);
+		$keep_chan = Filter::postBool('keep_chan');
+
+		$CHIL = [];
+		for ($i = 0; isset($_POST['CHIL' . $i]); ++$i) {
+			$CHIL[] = Filter::post('CHIL' . $i, WT_REGEX_XREF);
+		}
 
-	$family = Family::getInstance($xref, $tree);
-	check_record_access($family);
+		$family = Family::getInstance($xref, $tree);
+		check_record_access($family);
 
-	// Current family members
-	$old_father   = $family->getHusband();
-	$old_mother   = $family->getWife();
-	$old_children = $family->getChildren();
+		// Current family members
+		$old_father   = $family->getHusband();
+		$old_mother   = $family->getWife();
+		$old_children = $family->getChildren();
 
-	// New family members
-	$new_father   = Individual::getInstance($HUSB, $tree);
-	$new_mother   = Individual::getInstance($WIFE, $tree);
-	$new_children = [];
-	foreach ($CHIL as $child) {
-		$new_children[] = Individual::getInstance($child, $tree);
-	}
+		// New family members
+		$new_father   = Individual::getInstance($HUSB, $tree);
+		$new_mother   = Individual::getInstance($WIFE, $tree);
+		$new_children = [];
+		foreach ($CHIL as $child) {
+			$new_children[] = Individual::getInstance($child, $tree);
+		}
 
-	if ($old_father !== $new_father) {
-		if ($old_father) {
-			// Remove old FAMS link
-			foreach ($old_father->getFacts('FAMS') as $fact) {
-				if ($fact->getTarget() === $family) {
-					$old_father->deleteFact($fact->getFactId(), !$keep_chan);
+		if ($old_father !== $new_father) {
+			if ($old_father) {
+				// Remove old FAMS link
+				foreach ($old_father->getFacts('FAMS') as $fact) {
+					if ($fact->getTarget() === $family) {
+						$old_father->deleteFact($fact->getFactId(), !$keep_chan);
+					}
 				}
-			}
-			// Remove old HUSB link
-			foreach ($family->getFacts('HUSB|WIFE') as $fact) {
-				if ($fact->getTarget() === $old_father) {
-					$family->deleteFact($fact->getFactId(), !$keep_chan);
+				// Remove old HUSB link
+				foreach ($family->getFacts('HUSB|WIFE') as $fact) {
+					if ($fact->getTarget() === $old_father) {
+						$family->deleteFact($fact->getFactId(), !$keep_chan);
+					}
 				}
 			}
+			if ($new_father) {
+				// Add new FAMS link
+				$new_father->createFact('1 FAMS @' . $family->getXref() . '@', !$keep_chan);
+				// Add new HUSB link
+				$family->createFact('1 HUSB @' . $new_father->getXref() . '@', !$keep_chan);
+			}
 		}
-		if ($new_father) {
-			// Add new FAMS link
-			$new_father->createFact('1 FAMS @' . $family->getXref() . '@', !$keep_chan);
-			// Add new HUSB link
-			$family->createFact('1 HUSB @' . $new_father->getXref() . '@', !$keep_chan);
-		}
-	}
 
-	if ($old_mother !== $new_mother) {
-		if ($old_mother) {
-			// Remove old FAMS link
-			foreach ($old_mother->getFacts('FAMS') as $fact) {
-				if ($fact->getTarget() === $family) {
-					$old_mother->deleteFact($fact->getFactId(), !$keep_chan);
+		if ($old_mother !== $new_mother) {
+			if ($old_mother) {
+				// Remove old FAMS link
+				foreach ($old_mother->getFacts('FAMS') as $fact) {
+					if ($fact->getTarget() === $family) {
+						$old_mother->deleteFact($fact->getFactId(), !$keep_chan);
+					}
 				}
-			}
-			// Remove old WIFE link
-			foreach ($family->getFacts('HUSB|WIFE') as $fact) {
-				if ($fact->getTarget() === $old_mother) {
-					$family->deleteFact($fact->getFactId(), !$keep_chan);
+				// Remove old WIFE link
+				foreach ($family->getFacts('HUSB|WIFE') as $fact) {
+					if ($fact->getTarget() === $old_mother) {
+						$family->deleteFact($fact->getFactId(), !$keep_chan);
+					}
 				}
 			}
+			if ($new_mother) {
+				// Add new FAMS link
+				$new_mother->createFact('1 FAMS @' . $family->getXref() . '@', !$keep_chan);
+				// Add new WIFE link
+				$family->createFact('1 WIFE @' . $new_mother->getXref() . '@', !$keep_chan);
+			}
 		}
-		if ($new_mother) {
-			// Add new FAMS link
-			$new_mother->createFact('1 FAMS @' . $family->getXref() . '@', !$keep_chan);
-			// Add new WIFE link
-			$family->createFact('1 WIFE @' . $new_mother->getXref() . '@', !$keep_chan);
-		}
-	}
 
-	foreach ($old_children as $old_child) {
-		if ($old_child && !in_array($old_child, $new_children)) {
-			// Remove old FAMC link
-			foreach ($old_child->getFacts('FAMC') as $fact) {
-				if ($fact->getTarget() === $family) {
-					$old_child->deleteFact($fact->getFactId(), !$keep_chan);
+		foreach ($old_children as $old_child) {
+			if ($old_child && !in_array($old_child, $new_children)) {
+				// Remove old FAMC link
+				foreach ($old_child->getFacts('FAMC') as $fact) {
+					if ($fact->getTarget() === $family) {
+						$old_child->deleteFact($fact->getFactId(), !$keep_chan);
+					}
 				}
-			}
-			// Remove old CHIL link
-			foreach ($family->getFacts('CHIL') as $fact) {
-				if ($fact->getTarget() === $old_child) {
-					$family->deleteFact($fact->getFactId(), !$keep_chan);
+				// Remove old CHIL link
+				foreach ($family->getFacts('CHIL') as $fact) {
+					if ($fact->getTarget() === $old_child) {
+						$family->deleteFact($fact->getFactId(), !$keep_chan);
+					}
 				}
 			}
 		}
-	}
 
-	foreach ($new_children as $new_child) {
-		if ($new_child && !in_array($new_child, $old_children)) {
-			// Add new FAMC link
-			$new_child->createFact('1 FAMC @' . $family->getXref() . '@', !$keep_chan);
-			// Add new CHIL link
-			$family->createFact('1 CHIL @' . $new_child->getXref() . '@', !$keep_chan);
+		foreach ($new_children as $new_child) {
+			if ($new_child && !in_array($new_child, $old_children)) {
+				// Add new FAMC link
+				$new_child->createFact('1 FAMC @' . $family->getXref() . '@', !$keep_chan);
+				// Add new CHIL link
+				$family->createFact('1 CHIL @' . $new_child->getXref() . '@', !$keep_chan);
+			}
 		}
-	}
 
-	header('Location: ' . $family->url());
-	break;
+		header('Location: ' . $family->url());
+		break;
 }
 
 /**