fisharebest / webtrees

resources/views/modules/faq/edit.php

Indentation +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 	<div class="row form-group">
 		<label for="xref" class="col-sm-3 col-form-label">
 			<?= /* I18N: Label for a configuration option */
-			I18N::translate('Show this block for which languages') ?>
+            I18N::translate('Show this block for which languages') ?>
 		</label>
 
 		<div class="col-sm-9">
@@ -61,7 +61,7 @@ 
 			<?= Bootstrap4::select(['' => I18N::translate('All')] + $tree_names, $tree->getName(), ['id' => 'gedcom_id', 'name' => 'gedcom_id']) ?>
 			<p class="small text-muted">
 				<?= /* I18N: FAQ = “Frequently Asked Question” */
-				I18N::translate('An FAQ can be displayed on just one of the family trees, or on all the family trees.') ?>
+                I18N::translate('An FAQ can be displayed on just one of the family trees, or on all the family trees.') ?>
 			</p>
 		</div>
 	</div>

resources/views/modules/relationships_chart/config.php

Indentation +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 		<div class="row form-group">
 			<label class="col-sm-3 col-form-label" for="relationship-ancestors-<?= $tree->getTreeId() ?>">
 				<?= /* I18N: Configuration option */
-				I18N::translate('Relationships') ?>
+                I18N::translate('Relationships') ?>
 			</label>
 			<div class="col-sm-9">
 				<?= Bootstrap4::select($ancestors_options, $tree->getPreference('RELATIONSHIP_ANCESTORS', $default_ancestors), ['id' => 'relationship-ancestors-' . $tree->getTreeId(), 'name' => 'relationship-ancestors-' . $tree->getTreeId()]) ?>
@@ -26,7 +26,7 @@ 
 			<div class="row">
 				<legend class="col-form-label col-sm-3">
 					<?= /* I18N: Configuration option */
-					I18N::translate('How much recursion to use when searching for relationships') ?>
+                    I18N::translate('How much recursion to use when searching for relationships') ?>
 				</legend>
 				<div class="col-sm-9">
 					<?= Bootstrap4::radioButtons('relationship-recursion-' . $tree->getTreeId(), $recursion_options, $tree->getPreference('RELATIONSHIP_RECURSION', $default_recursion), true) ?>

resources/views/calendar-page.php

Indentation +28 added lines, -28 removed lines

@@ -42,24 +42,24 @@ 
 			</th>
 			<td class="wt-page-options-value" colspan="3">
 				<?php
-					for ($n = 1, $months_in_year = $cal_date->monthsInYear(); $n <= $months_in_year; ++$n) {
-						$month_name = $cal_date->monthNameNominativeCase($n, $cal_date->isLeapYear());
-						$m          = array_search($n, $cal_date::$MONTH_ABBREV);
-						if ($n === 6 && $cal_date instanceof JewishDate && !$cal_date->isLeapYear()) {
-							// No month 6 in Jewish non-leap years.
-							continue;
-						}
-						if ($n === 7 && $cal_date instanceof JewishDate && !$cal_date->isLeapYear()) {
-							// Month 7 is ADR in Jewish non-leap years.
-							$m = 'ADR';
-						}
-						if ($n === $cal_date->m) {
-							$month_name = '<span class="error">' . $month_name . '</span>';
-						}
-						echo '<a href="' . e(route('calendar', ['cal' => $cal, 'day' => $cal_date->d, 'month' => $m, 'year' => $cal_date->y, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->getName()])) . '" rel="nofollow">', $month_name, '</a>';
-						echo ' | ';
-					}
-				?>
+                    for ($n = 1, $months_in_year = $cal_date->monthsInYear(); $n <= $months_in_year; ++$n) {
+                        $month_name = $cal_date->monthNameNominativeCase($n, $cal_date->isLeapYear());
+                        $m          = array_search($n, $cal_date::$MONTH_ABBREV);
+                        if ($n === 6 && $cal_date instanceof JewishDate && !$cal_date->isLeapYear()) {
+                            // No month 6 in Jewish non-leap years.
+                            continue;
+                        }
+                        if ($n === 7 && $cal_date instanceof JewishDate && !$cal_date->isLeapYear()) {
+                            // Month 7 is ADR in Jewish non-leap years.
+                            $m = 'ADR';
+                        }
+                        if ($n === $cal_date->m) {
+                            $month_name = '<span class="error">' . $month_name . '</span>';
+                        }
+                        echo '<a href="' . e(route('calendar', ['cal' => $cal, 'day' => $cal_date->d, 'month' => $m, 'year' => $cal_date->y, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->getName()])) . '" rel="nofollow">', $month_name, '</a>';
+                        echo ' | ';
+                    }
+                ?>
 				<a href="<?= e(route('calendar', ['cal' => $cal, 'day' => min($cal_date->d, $today->daysInMonth()), 'month' => $today_month, 'year' => $today->y, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->getName()])) ?>" rel="nofollow">
 					<b><?= $today->format('%F %Y') ?></b>
 				</a>
@@ -169,16 +169,16 @@ 
 			</td>
 			<td class="topbottombar width50">
 				<?php
-					$n = 0;
-					foreach (Date::calendarNames() as $newcal => $cal_name) {
-						$tmp = $cal_date->convertToCalendar($newcal);
-						if ($tmp->inValidRange()) {
-							if ($n++) {
-								echo ' | ';
-							}
-							echo '<a ' . (get_class($tmp) === get_class($cal_date) ? 'class="error"' : '') . 'href="' . e(route('calendar', ['cal' => $tmp->format('%@'), 'day' => $tmp->d, 'month' => $tmp->format('%O'), 'year' => $tmp->y, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->getName()])) . '" rel="nofollow">', $cal_name, '</a>';
-						}
-					} ?>
+                    $n = 0;
+                    foreach (Date::calendarNames() as $newcal => $cal_name) {
+                        $tmp = $cal_date->convertToCalendar($newcal);
+                        if ($tmp->inValidRange()) {
+                            if ($n++) {
+                                echo ' | ';
+                            }
+                            echo '<a ' . (get_class($tmp) === get_class($cal_date) ? 'class="error"' : '') . 'href="' . e(route('calendar', ['cal' => $tmp->format('%@'), 'day' => $tmp->d, 'month' => $tmp->format('%O'), 'year' => $tmp->y, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->getName()])) . '" rel="nofollow">', $cal_name, '</a>';
+                        }
+                    } ?>
 			</td>
 		</tr>
 	</table>

resources/views/place-events.php

Indentation +6 added lines, -6 removed lines

@@ -21,10 +21,10 @@ 
 			<p><?= I18N::translate('No results found.') ?></p>
 		<?php else: ?>
 			<?= view('lists/individuals-table', [
-			'individuals' => $indilist,
-			'sosa'        => false,
-			'tree'        => $tree,
-			]) ?>
+            'individuals' => $indilist,
+            'sosa'        => false,
+            'tree'        => $tree,
+            ]) ?>
 		<?php endif ?>
 	</div>
 
@@ -33,8 +33,8 @@ 
 			<p><?= I18N::translate('No results found.') ?></p>
 		<?php else: ?>
 			<?= view('lists/families-table', [
-				'families' => $famlist,
-			]) ?>
+                'families' => $famlist,
+            ]) ?>
 		<?php endif ?>
 	</div>
 </div>

resources/views/interactive-tree-page.php

Indentation +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 		<div class="col-sm-3 wt-page-options-label"></div>
 		<div class="col-sm-9 wt-page-options-value">
 			<input class="btn btn-primary" type="submit" value="<?= /* I18N: A button label. */
-			I18N::translate('view') ?>">
+            I18N::translate('view') ?>">
 		</div>
 	</div>
 </form>

resources/views/edit/link-spouse-to-individual.php

Indentation +2 added lines, -2 removed lines

@@ -25,12 +25,12 @@
 			<button class="btn btn-primary" type="submit">
 				<?= FontAwesome::decorativeIcon('save') ?>
 				<?= /* I18N: A button label. */
-				I18N::translate('save') ?>
+                I18N::translate('save') ?>
 			</button>
 			<a class="btn btn-secondary" href="<?= e($individual->url()) ?>">
 				<?= FontAwesome::decorativeIcon('cancel') ?>
 				<?= /* I18N: A button label. */
-				I18N::translate('cancel') ?>
+                I18N::translate('cancel') ?>
 			</a>
 		</div>
 	</div>

resources/views/edit/change-family-members.php

Indentation +2 added lines, -2 removed lines

@@ -73,12 +73,12 @@
 			<button class="btn btn-primary" type="submit">
 				<?= FontAwesome::decorativeIcon('save') ?>
 				<?= /* I18N: A button label. */
-				I18N::translate('save') ?>
+                I18N::translate('save') ?>
 			</button>
 			<a class="btn btn-secondary" href="<?= e($family->url()) ?>">
 				<?= FontAwesome::decorativeIcon('cancel') ?>
 				<?= /* I18N: A button label. */
-				I18N::translate('cancel') ?>
+                I18N::translate('cancel') ?>
 			</a>
 		</div>
 	</div>

resources/views/edit/add-fact.php

Indentation +26 added lines, -26 removed lines

@@ -16,47 +16,47 @@ 
 
 	<?php if (($record::RECORD_TYPE === 'INDI' || $record::RECORD_TYPE === 'FAM') && $fact !== 'OBJE' && $fact !== 'NOTE' && $fact !== 'SHARED_NOTE' && $fact !== 'REPO' && $fact !== 'SOUR' && $fact !== 'SUBM' && $fact !== 'ASSO' && $fact !== 'ALIA' && $fact !== 'SEX'): ?>
 		<?= view('cards/add-source-citation', [
-			'level'          => 2,
-			'full_citations' => $tree->getPreference('FULL_SOURCES'),
-			'tree'           => $tree,
-		]); ?>
+            'level'          => 2,
+            'full_citations' => $tree->getPreference('FULL_SOURCES'),
+            'tree'           => $tree,
+        ]); ?>
 
 		<?php if ($tree->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($tree)): ?>
 			<?= view('cards/add-media-object', [
-			'level' => 2,
-			'tree' => $tree,
-			]) ?>
+            'level' => 2,
+            'tree' => $tree,
+            ]) ?>
 		<?php endif ?>
 
 		<?php if ($fact !== 'NOTE'): ?>
 			<?= view('cards/add-note', [
-				'level' => 2,
-				'tree' => $tree,
-			]) ?>
+                'level' => 2,
+                'tree' => $tree,
+            ]) ?>
 
 			<?= view('cards/add-shared-note', [
-				'level' => 2,
-				'tree' => $tree,
-			]) ?>
+                'level' => 2,
+                'tree' => $tree,
+            ]) ?>
 		<?php endif ?>
 
 		<?= view('cards/add-associate', [
-			'id'    => Uuid::uuid4()->toString(),
-			'level' => 2,
-			'tree' => $tree,
-		]) ?>
+            'id'    => Uuid::uuid4()->toString(),
+            'level' => 2,
+            'tree' => $tree,
+        ]) ?>
 		<?php if (in_array($fact, Config::twoAssociates())): ?>
 			<?= view('cards/add-associate', [
-				'id'    => Uuid::uuid4()->toString(),
-				'level' => 2,
-				'tree' => $tree,
-			]) ?>
+                'id'    => Uuid::uuid4()->toString(),
+                'level' => 2,
+                'tree' => $tree,
+            ]) ?>
 		<?php endif ?>
 
 		<?= view('cards/add-restriction', [
-			'level' => 2,
-			'tree' => $tree,
-		]) ?>
+            'level' => 2,
+            'tree' => $tree,
+        ]) ?>
 	<?php endif ?>
 
 	<div class="form-group row">
@@ -77,12 +77,12 @@ 
 			<button class="btn btn-primary" type="submit">
 				<?= FontAwesome::decorativeIcon('save') ?>
 				<?= /* I18N: A button label. */
-				I18N::translate('save') ?>
+                I18N::translate('save') ?>
 			</button>
 			<a class="btn btn-secondary" href="<?= e($record->url()) ?>">
 				<?= FontAwesome::decorativeIcon('cancel') ?>
 				<?= /* I18N: A button label. */
-				I18N::translate('cancel') ?>
+                I18N::translate('cancel') ?>
 			</a>
 		</div>
 	</div>

resources/views/edit/new-individual.php

Indentation +275 added lines, -275 removed lines

@@ -10,116 +10,116 @@ 
 
 <?php
 if ($individual !== null) {
-	$xref       = $individual->getXref();
-	$cancel_url = $individual->url();
+    $xref       = $individual->getXref();
+    $cancel_url = $individual->url();
 } elseif ($family !== null) {
-	$xref       = $family->getXref();
-	$cancel_url = $family->url();
+    $xref       = $family->getXref();
+    $cancel_url = $family->url();
 } else {
-	$cancel_url = route('admin-trees');
-	$xref       = 'new';
+    $cancel_url = route('admin-trees');
+    $xref       = 'new';
 }
 
 // Different cultures do surnames differently
 $surname_tradition = SurnameTradition::create($tree->getPreference('SURNAME_TRADITION'));
 
 if ($name_fact !== null) {
-	// Editing an existing name
-	$name_fact_id = $name_fact->getFactId();
-	$namerec      = $name_fact->getGedcom();
-	$name_fields  = [
-		'NAME' => $name_fact->getValue(),
-		'TYPE' => $name_fact->getAttribute('TYPE'),
-		'NPFX' => $name_fact->getAttribute('NPFX'),
-		'GIVN' => $name_fact->getAttribute('GIVN'),
-		'NICK' => $name_fact->getAttribute('NICK'),
-		'SPFX' => $name_fact->getAttribute('SPFX'),
-		'SURN' => $name_fact->getAttribute('SURN'),
-		'NSFX' => $name_fact->getAttribute('NSFX'),
-	];
-
-	// Populate any missing subfields from the NAME field
-	$npfx_accept = implode('|', Config::namePrefixes());
-	if (preg_match('/(((' . $npfx_accept . ')\.? +)*)([^\n\/"]*)("(.*)")? *\/(([a-z]{2,3} +)*)(.*)\/ *(.*)/i', $name_fields['NAME'], $name_bits)) {
-		$name_fields['NPFX'] = $name_fields['NPFX'] ?: $name_bits[1];
-		$name_fields['GIVN'] = $name_fields['GIVN'] ?: $name_bits[4];
-		$name_fields['NICK'] = $name_fields['NICK'] ?: $name_bits[6];
-		$name_fields['SPFX'] = $name_fields['SPFX'] ?: trim($name_bits[7]);
-		$name_fields['SURN'] = $name_fields['SURN'] ?: preg_replace('~/[^/]*/~', ',', $name_bits[9]);
-		$name_fields['NSFX'] = $name_fields['NSFX'] ?: $name_bits[10];
-	}
+    // Editing an existing name
+    $name_fact_id = $name_fact->getFactId();
+    $namerec      = $name_fact->getGedcom();
+    $name_fields  = [
+        'NAME' => $name_fact->getValue(),
+        'TYPE' => $name_fact->getAttribute('TYPE'),
+        'NPFX' => $name_fact->getAttribute('NPFX'),
+        'GIVN' => $name_fact->getAttribute('GIVN'),
+        'NICK' => $name_fact->getAttribute('NICK'),
+        'SPFX' => $name_fact->getAttribute('SPFX'),
+        'SURN' => $name_fact->getAttribute('SURN'),
+        'NSFX' => $name_fact->getAttribute('NSFX'),
+    ];
+
+    // Populate any missing subfields from the NAME field
+    $npfx_accept = implode('|', Config::namePrefixes());
+    if (preg_match('/(((' . $npfx_accept . ')\.? +)*)([^\n\/"]*)("(.*)")? *\/(([a-z]{2,3} +)*)(.*)\/ *(.*)/i', $name_fields['NAME'], $name_bits)) {
+        $name_fields['NPFX'] = $name_fields['NPFX'] ?: $name_bits[1];
+        $name_fields['GIVN'] = $name_fields['GIVN'] ?: $name_bits[4];
+        $name_fields['NICK'] = $name_fields['NICK'] ?: $name_bits[6];
+        $name_fields['SPFX'] = $name_fields['SPFX'] ?: trim($name_bits[7]);
+        $name_fields['SURN'] = $name_fields['SURN'] ?: preg_replace('~/[^/]*/~', ',', $name_bits[9]);
+        $name_fields['NSFX'] = $name_fields['NSFX'] ?: $name_bits[10];
+    }
 } else {
-	// Creating a new name
-	$name_fact_id = '';
-	$namerec      = '';
-	$name_fields  = [
-		'NAME' => '',
-		'TYPE' => '',
-		'NPFX' => '',
-		'GIVN' => '',
-		'NICK' => '',
-		'SPFX' => '',
-		'SURN' => '',
-		'NSFX' => '',
-	];
-
-	// Inherit surname from parents, spouse or child
-	if ($family) {
-		$father = $family->getHusband();
-		if ($father && $father->getFirstFact('NAME')) {
-			$father_name = $father->getFirstFact('NAME')->getValue();
-		} else {
-			$father_name = '';
-		}
-		$mother = $family->getWife();
-		if ($mother && $mother->getFirstFact('NAME')) {
-			$mother_name = $mother->getFirstFact('NAME')->getValue();
-		} else {
-			$mother_name = '';
-		}
-	} else {
-		$father      = null;
-		$mother      = null;
-		$father_name = '';
-		$mother_name = '';
-	}
-	if ($individual && $individual->getFirstFact('NAME')) {
-		$indi_name = $individual->getFirstFact('NAME')->getValue();
-	} else {
-		$indi_name = '';
-	}
-
-	switch ($nextaction) {
-		case 'add_child_to_family_action':
-			$name_fields = array_merge($name_fields, $surname_tradition->newChildNames($father_name, $mother_name, $gender));
-			break;
-		case 'add_child_to_individual_action':
-			if ($individual->getSex() === 'F') {
-				$name_fields = array_merge($name_fields, $surname_tradition->newChildNames('', $indi_name, $gender));
-			} else {
-				$name_fields = array_merge($name_fields, $surname_tradition->newChildNames($indi_name, '', $gender));
-			}
-			break;
-		case 'add_parent_to_individual_action':
-			$name_fields = array_merge($name_fields, $surname_tradition->newParentNames($indi_name, $gender));
-			break;
-		case 'add_spouse_to_family_action':
-			if ($father) {
-				$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($father_name, $gender));
-			} else {
-				$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($mother_name, $gender));
-			}
-			break;
-		case 'add_spouse_to_individual_action':
-			$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($indi_name, $gender));
-			break;
-		case 'add_unlinked_indi_action':
-		case 'update':
-			if ($surname_tradition->hasSurnames()) {
-				$name_fields['NAME'] = '//';
-			}
-			break;
-	}
+    // Creating a new name
+    $name_fact_id = '';
+    $namerec      = '';
+    $name_fields  = [
+        'NAME' => '',
+        'TYPE' => '',
+        'NPFX' => '',
+        'GIVN' => '',
+        'NICK' => '',
+        'SPFX' => '',
+        'SURN' => '',
+        'NSFX' => '',
+    ];
+
+    // Inherit surname from parents, spouse or child
+    if ($family) {
+        $father = $family->getHusband();
+        if ($father && $father->getFirstFact('NAME')) {
+            $father_name = $father->getFirstFact('NAME')->getValue();
+        } else {
+            $father_name = '';
+        }
+        $mother = $family->getWife();
+        if ($mother && $mother->getFirstFact('NAME')) {
+            $mother_name = $mother->getFirstFact('NAME')->getValue();
+        } else {
+            $mother_name = '';
+        }
+    } else {
+        $father      = null;
+        $mother      = null;
+        $father_name = '';
+        $mother_name = '';
+    }
+    if ($individual && $individual->getFirstFact('NAME')) {
+        $indi_name = $individual->getFirstFact('NAME')->getValue();
+    } else {
+        $indi_name = '';
+    }
+
+    switch ($nextaction) {
+        case 'add_child_to_family_action':
+            $name_fields = array_merge($name_fields, $surname_tradition->newChildNames($father_name, $mother_name, $gender));
+            break;
+        case 'add_child_to_individual_action':
+            if ($individual->getSex() === 'F') {
+                $name_fields = array_merge($name_fields, $surname_tradition->newChildNames('', $indi_name, $gender));
+            } else {
+                $name_fields = array_merge($name_fields, $surname_tradition->newChildNames($indi_name, '', $gender));
+            }
+            break;
+        case 'add_parent_to_individual_action':
+            $name_fields = array_merge($name_fields, $surname_tradition->newParentNames($indi_name, $gender));
+            break;
+        case 'add_spouse_to_family_action':
+            if ($father) {
+                $name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($father_name, $gender));
+            } else {
+                $name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($mother_name, $gender));
+            }
+            break;
+        case 'add_spouse_to_individual_action':
+            $name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($indi_name, $gender));
+            break;
+        case 'add_unlinked_indi_action':
+        case 'update':
+            if ($surname_tradition->hasSurnames()) {
+                $name_fields['NAME'] = '//';
+            }
+            break;
+    }
 }
 
 $bdm = ''; // used to copy '1 SOUR' to '2 SOUR' for BIRT DEAT MARR
@@ -141,196 +141,196 @@ 
 	<?php endif ?>
 
 	<?php
-	// First - standard name fields
-	foreach ($name_fields as $tag => $value) {
-		if (substr_compare($tag, '_', 0, 1) !== 0) {
-			echo FunctionsEdit::addSimpleTag($tree, '0 ' . $tag . ' ' . $value, '', '', null, $individual);
-		}
-	}
-
-	// Second - advanced name fields
-	if ($surname_tradition->hasMarriedNames() || preg_match('/\n2 _MARNM /', $namerec)) {
-		$adv_name_fields = ['_MARNM' => ''];
-	} else {
-		$adv_name_fields = [];
-	}
-	if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $tree->getPreference('ADVANCED_NAME_FACTS'), $match)) {
-		foreach ($match[1] as $tag) {
-			// Ignore advanced facts that duplicate standard facts
-			if (!in_array($tag, ['TYPE', 'NPFX', 'GIVN', 'NICK', 'SPFX', 'SURN', 'NSFX'])) {
-				$adv_name_fields[$tag] = '';
-			}
-		}
-	}
-
-	foreach (array_keys($adv_name_fields) as $tag) {
-		// Edit existing tags, grouped together
-		if (preg_match_all('/2 ' . $tag . ' (.+)/', $namerec, $match)) {
-			foreach ($match[1] as $value) {
-				echo FunctionsEdit::addSimpleTag($tree, '2 ' . $tag . ' ' . $value, '', GedcomTag::getLabel('NAME:' . $tag, $individual));
-				if ($tag === '_MARNM') {
-					preg_match_all('/\/([^\/]*)\//', $value, $matches);
-					echo FunctionsEdit::addSimpleTag($tree, '2 _MARNM_SURN ' . implode(',', $matches[1]));
-				}
-			}
-		}
-		// Allow a new tag to be entered
-		if (!array_key_exists($tag, $name_fields)) {
-			echo FunctionsEdit::addSimpleTag($tree, '0 ' . $tag, '', GedcomTag::getLabel('NAME:' . $tag, $individual));
-			if ($tag === '_MARNM') {
-				echo FunctionsEdit::addSimpleTag($tree, '0 _MARNM_SURN');
-			}
-		}
-	}
-
-	// Third - new/existing custom name fields
-	foreach ($name_fields as $tag => $value) {
-		if (substr_compare($tag, '_', 0, 1) === 0) {
-			echo FunctionsEdit::addSimpleTag($tree, '0 ' . $tag . ' ' . $value);
-			if ($tag === '_MARNM') {
-				preg_match_all('/\/([^\/]*)\//', $value, $matches);
-				echo FunctionsEdit::addSimpleTag($tree, '2 _MARNM_SURN ' . implode(',', $matches[1]));
-			}
-		}
-	}
-
-	// Fourth - SOUR, NOTE, _CUSTOM, etc.
-	if ($namerec !== '') {
-		$gedlines = explode("\n", $namerec); // -- find the number of lines in the record
-		$fields   = explode(' ', $gedlines[0]);
-		$glevel   = $fields[0];
-		$level    = $glevel;
-		$type     = $fields[1];
-		$tags     = [];
-		$i        = 0;
-		do {
-			if ($type !== 'TYPE' && !array_key_exists($type, $name_fields) && !array_key_exists($type, $adv_name_fields)) {
-				$text = '';
-				for ($j = 2; $j < count($fields); $j++) {
-					if ($j > 2) {
-						$text .= ' ';
-					}
-					$text .= $fields[$j];
-				}
-				while (($i + 1 < count($gedlines)) && (preg_match('/' . ($level + 1) . ' CONT ?(.*)/', $gedlines[$i + 1], $cmatch) > 0)) {
-					$text .= "\n" . $cmatch[1];
-					$i++;
-				}
-				echo FunctionsEdit::addSimpleTag($tree, $level . ' ' . $type . ' ' . $text);
-			}
-			$tags[] = $type;
-			$i++;
-			if (isset($gedlines[$i])) {
-				$fields = explode(' ', $gedlines[$i]);
-				$level  = $fields[0];
-				if (isset($fields[1])) {
-					$type = $fields[1];
-				}
-			}
-		} while (($level > $glevel) && ($i < count($gedlines)));
-	}
-
-	// If we are adding a new individual, add the basic details
-	if ($nextaction !== 'update') {
-		echo '</table><br><table class="table wt-facts-table">';
-		// 1 SEX
-		if ($famtag === 'HUSB' || $gender === 'M') {
-			echo FunctionsEdit::addSimpleTag($tree, '0 SEX M');
-		} elseif ($famtag === 'WIFE' || $gender === 'F') {
-			echo FunctionsEdit::addSimpleTag($tree, '0 SEX F');
-		} else {
-			echo FunctionsEdit::addSimpleTag($tree, '0 SEX U');
-		}
-		$bdm = 'BD';
-		if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $tree->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
-			foreach ($matches[1] as $match) {
-				if (!in_array($match, explode('|', WT_EVENTS_DEAT))) {
-					FunctionsEdit::addSimpleTags($tree, $match);
-				}
-			}
-		}
-		//-- if adding a spouse add the option to add a marriage fact to the new family
-		if ($nextaction === 'add_spouse_to_individual_action' || $nextaction === 'add_spouse_to_family_action') {
-			$bdm .= 'M';
-			if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $tree->getPreference('QUICK_REQUIRED_FAMFACTS'), $matches)) {
-				foreach ($matches[1] as $match) {
-					FunctionsEdit::addSimpleTags($tree, $match);
-				}
-			}
-		}
-		if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $tree->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
-			foreach ($matches[1] as $match) {
-				if (in_array($match, explode('|', WT_EVENTS_DEAT))) {
-					FunctionsEdit::addSimpleTags($tree, $match);
-				}
-			}
-		}
-	}
-
-	echo '</table>';
-	if ($nextaction === 'update') {
-		// GEDCOM 5.5.1 spec says NAME doesn’t get a OBJE
-		echo view('cards/add-source-citation', [
-			'level'          => 2,
-			'full_citations' => $tree->getPreference('FULL_SOURCES'),
-			'tree'           => $tree,
-		]);
-		echo view('cards/add-note', [
-			'level' => 2,
-			'tree' => $tree,
-		]);
-		echo view('cards/add-shared-note', [
-			'level' => 2,
-			'tree' => $tree,
-		]);
-		echo view('cards/add-restriction', [
-			'level' => 2,
-			'tree' => $tree,
-		]);
-	} else {
-		echo view('cards/add-source-citation', [
-			'bdm'                     => $bdm,
-			'level'                   => 1,
-			'full_citations'          => $tree->getPreference('FULL_SOURCES'),
-			'prefer_level2_sources'   => $tree->getPreference('PREFER_LEVEL2_SOURCES'),
-			'quick_required_facts'    => $tree->getPreference('QUICK_REQUIRED_FACTS'),
-			'quick_required_famfacts' => $tree->getPreference('QUICK_REQUIRED_FAMFACTS'),
-			'tree'                    => $tree,
-		]);
-		echo view('cards/add-note', [
-			'level' => 1,
-			'tree' => $tree,
-		]);
-		echo view('cards/add-shared-note', [
-			'level' => 1,
-			'tree' => $tree,
-		]);
-		echo view('cards/add-restriction', [
-			'level' => 1,
-			'tree' => $tree,
-		]);
-	}
-
-	?>
+    // First - standard name fields
+    foreach ($name_fields as $tag => $value) {
+        if (substr_compare($tag, '_', 0, 1) !== 0) {
+            echo FunctionsEdit::addSimpleTag($tree, '0 ' . $tag . ' ' . $value, '', '', null, $individual);
+        }
+    }
+
+    // Second - advanced name fields
+    if ($surname_tradition->hasMarriedNames() || preg_match('/\n2 _MARNM /', $namerec)) {
+        $adv_name_fields = ['_MARNM' => ''];
+    } else {
+        $adv_name_fields = [];
+    }
+    if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $tree->getPreference('ADVANCED_NAME_FACTS'), $match)) {
+        foreach ($match[1] as $tag) {
+            // Ignore advanced facts that duplicate standard facts
+            if (!in_array($tag, ['TYPE', 'NPFX', 'GIVN', 'NICK', 'SPFX', 'SURN', 'NSFX'])) {
+                $adv_name_fields[$tag] = '';
+            }
+        }
+    }
+
+    foreach (array_keys($adv_name_fields) as $tag) {
+        // Edit existing tags, grouped together
+        if (preg_match_all('/2 ' . $tag . ' (.+)/', $namerec, $match)) {
+            foreach ($match[1] as $value) {
+                echo FunctionsEdit::addSimpleTag($tree, '2 ' . $tag . ' ' . $value, '', GedcomTag::getLabel('NAME:' . $tag, $individual));
+                if ($tag === '_MARNM') {
+                    preg_match_all('/\/([^\/]*)\//', $value, $matches);
+                    echo FunctionsEdit::addSimpleTag($tree, '2 _MARNM_SURN ' . implode(',', $matches[1]));
+                }
+            }
+        }
+        // Allow a new tag to be entered
+        if (!array_key_exists($tag, $name_fields)) {
+            echo FunctionsEdit::addSimpleTag($tree, '0 ' . $tag, '', GedcomTag::getLabel('NAME:' . $tag, $individual));
+            if ($tag === '_MARNM') {
+                echo FunctionsEdit::addSimpleTag($tree, '0 _MARNM_SURN');
+            }
+        }
+    }
+
+    // Third - new/existing custom name fields
+    foreach ($name_fields as $tag => $value) {
+        if (substr_compare($tag, '_', 0, 1) === 0) {
+            echo FunctionsEdit::addSimpleTag($tree, '0 ' . $tag . ' ' . $value);
+            if ($tag === '_MARNM') {
+                preg_match_all('/\/([^\/]*)\//', $value, $matches);
+                echo FunctionsEdit::addSimpleTag($tree, '2 _MARNM_SURN ' . implode(',', $matches[1]));
+            }
+        }
+    }
+
+    // Fourth - SOUR, NOTE, _CUSTOM, etc.
+    if ($namerec !== '') {
+        $gedlines = explode("\n", $namerec); // -- find the number of lines in the record
+        $fields   = explode(' ', $gedlines[0]);
+        $glevel   = $fields[0];
+        $level    = $glevel;
+        $type     = $fields[1];
+        $tags     = [];
+        $i        = 0;
+        do {
+            if ($type !== 'TYPE' && !array_key_exists($type, $name_fields) && !array_key_exists($type, $adv_name_fields)) {
+                $text = '';
+                for ($j = 2; $j < count($fields); $j++) {
+                    if ($j > 2) {
+                        $text .= ' ';
+                    }
+                    $text .= $fields[$j];
+                }
+                while (($i + 1 < count($gedlines)) && (preg_match('/' . ($level + 1) . ' CONT ?(.*)/', $gedlines[$i + 1], $cmatch) > 0)) {
+                    $text .= "\n" . $cmatch[1];
+                    $i++;
+                }
+                echo FunctionsEdit::addSimpleTag($tree, $level . ' ' . $type . ' ' . $text);
+            }
+            $tags[] = $type;
+            $i++;
+            if (isset($gedlines[$i])) {
+                $fields = explode(' ', $gedlines[$i]);
+                $level  = $fields[0];
+                if (isset($fields[1])) {
+                    $type = $fields[1];
+                }
+            }
+        } while (($level > $glevel) && ($i < count($gedlines)));
+    }
+
+    // If we are adding a new individual, add the basic details
+    if ($nextaction !== 'update') {
+        echo '</table><br><table class="table wt-facts-table">';
+        // 1 SEX
+        if ($famtag === 'HUSB' || $gender === 'M') {
+            echo FunctionsEdit::addSimpleTag($tree, '0 SEX M');
+        } elseif ($famtag === 'WIFE' || $gender === 'F') {
+            echo FunctionsEdit::addSimpleTag($tree, '0 SEX F');
+        } else {
+            echo FunctionsEdit::addSimpleTag($tree, '0 SEX U');
+        }
+        $bdm = 'BD';
+        if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $tree->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
+            foreach ($matches[1] as $match) {
+                if (!in_array($match, explode('|', WT_EVENTS_DEAT))) {
+                    FunctionsEdit::addSimpleTags($tree, $match);
+                }
+            }
+        }
+        //-- if adding a spouse add the option to add a marriage fact to the new family
+        if ($nextaction === 'add_spouse_to_individual_action' || $nextaction === 'add_spouse_to_family_action') {
+            $bdm .= 'M';
+            if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $tree->getPreference('QUICK_REQUIRED_FAMFACTS'), $matches)) {
+                foreach ($matches[1] as $match) {
+                    FunctionsEdit::addSimpleTags($tree, $match);
+                }
+            }
+        }
+        if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $tree->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
+            foreach ($matches[1] as $match) {
+                if (in_array($match, explode('|', WT_EVENTS_DEAT))) {
+                    FunctionsEdit::addSimpleTags($tree, $match);
+                }
+            }
+        }
+    }
+
+    echo '</table>';
+    if ($nextaction === 'update') {
+        // GEDCOM 5.5.1 spec says NAME doesn’t get a OBJE
+        echo view('cards/add-source-citation', [
+            'level'          => 2,
+            'full_citations' => $tree->getPreference('FULL_SOURCES'),
+            'tree'           => $tree,
+        ]);
+        echo view('cards/add-note', [
+            'level' => 2,
+            'tree' => $tree,
+        ]);
+        echo view('cards/add-shared-note', [
+            'level' => 2,
+            'tree' => $tree,
+        ]);
+        echo view('cards/add-restriction', [
+            'level' => 2,
+            'tree' => $tree,
+        ]);
+    } else {
+        echo view('cards/add-source-citation', [
+            'bdm'                     => $bdm,
+            'level'                   => 1,
+            'full_citations'          => $tree->getPreference('FULL_SOURCES'),
+            'prefer_level2_sources'   => $tree->getPreference('PREFER_LEVEL2_SOURCES'),
+            'quick_required_facts'    => $tree->getPreference('QUICK_REQUIRED_FACTS'),
+            'quick_required_famfacts' => $tree->getPreference('QUICK_REQUIRED_FAMFACTS'),
+            'tree'                    => $tree,
+        ]);
+        echo view('cards/add-note', [
+            'level' => 1,
+            'tree' => $tree,
+        ]);
+        echo view('cards/add-shared-note', [
+            'level' => 1,
+            'tree' => $tree,
+        ]);
+        echo view('cards/add-restriction', [
+            'level' => 1,
+            'tree' => $tree,
+        ]);
+    }
+
+    ?>
 	<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::translate('save') ?>
 			</button>
 			<?php if (preg_match('/^add_(child|spouse|parent|unlinked_indi)/', $nextaction)): ?>
 
 				<button class="btn btn-primary" type="submit" name="goto" value="<?= $xref ?>">
 					<?= FontAwesome::decorativeIcon('save') ?>
 					<?= /* I18N: A button label. */
-					I18N::translate('go to new individual') ?>
+                    I18N::translate('go to new individual') ?>
 				</button>
 			<?php endif ?>
 			<a class="btn btn-secondary" href="<?= e($cancel_url) ?>">
 				<?= FontAwesome::decorativeIcon('cancel') ?>
 				<?= /* I18N: A button label. */
-				I18N::translate('cancel') ?>
+                I18N::translate('cancel') ?>
 			</a>
 
 			<?php if ($name_fact instanceof Fact && (Auth::isAdmin() || $tree->getPreference('SHOW_GEDCOM_RECORD'))): ?>