fisharebest / webtrees

edit_interface.php

Switch Indentation +93 added lines, -93 removed lines

@@ -288,40 +288,40 @@ 
 
 	$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') {
-			FunctionsEdit::printAddLayer('NOTE');
-			FunctionsEdit::printAddLayer('SHARED_NOTE');
-		}
-		break;
-	case 'FAM':
-	case 'INDI':
-		// FAM and INDI records have real facts. They can take NOTE/SOUR/OBJE/etc.
-		if ($level1type !== 'SEX' && $level1type !== 'NOTE' && $level1type !== 'ALIA') {
-			if ($level1type !== 'SOUR') {
-				FunctionsEdit::printAddLayer('SOUR');
-			}
-			if ($level1type !== 'OBJE') {
-				FunctionsEdit::printAddLayer('OBJE');
-			}
-			FunctionsEdit::printAddLayer('NOTE');
-			FunctionsEdit::printAddLayer('SHARED_NOTE', 2, $level1type);
-			if ($level1type !== 'ASSO' && $level1type !== 'NOTE' && $level1type !== 'SOUR') {
-				FunctionsEdit::printAddLayer('ASSO');
-			}
-			// allow to add godfather and godmother for CHR fact or best man and bridesmaid  for MARR fact in one window
-			if (in_array($level1type, Config::twoAssociates())) {
-				FunctionsEdit::printAddLayer('ASSO2');
+		case 'REPO':
+			// REPO:NAME facts may take a NOTE (but the REPO record may not).
+			if ($level1type === 'NAME') {
+				FunctionsEdit::printAddLayer('NOTE');
+				FunctionsEdit::printAddLayer('SHARED_NOTE');
 			}
-			if ($level1type !== 'SOUR') {
-				FunctionsEdit::printAddLayer('RESN');
+			break;
+		case 'FAM':
+		case 'INDI':
+			// FAM and INDI records have real facts. They can take NOTE/SOUR/OBJE/etc.
+			if ($level1type !== 'SEX' && $level1type !== 'NOTE' && $level1type !== 'ALIA') {
+				if ($level1type !== 'SOUR') {
+					FunctionsEdit::printAddLayer('SOUR');
+				}
+				if ($level1type !== 'OBJE') {
+					FunctionsEdit::printAddLayer('OBJE');
+				}
+				FunctionsEdit::printAddLayer('NOTE');
+				FunctionsEdit::printAddLayer('SHARED_NOTE', 2, $level1type);
+				if ($level1type !== 'ASSO' && $level1type !== 'NOTE' && $level1type !== 'SOUR') {
+					FunctionsEdit::printAddLayer('ASSO');
+				}
+				// allow to add godfather and godmother for CHR fact or best man and bridesmaid  for MARR fact in one window
+				if (in_array($level1type, Config::twoAssociates())) {
+					FunctionsEdit::printAddLayer('ASSO2');
+				}
+				if ($level1type !== 'SOUR') {
+					FunctionsEdit::printAddLayer('RESN');
+				}
 			}
-		}
-		break;
-	default:
-		// Other types of record do not have these lower-level records
-		break;
+			break;
+		default:
+			// Other types of record do not have these lower-level records
+			break;
 	}
 
 	?>
@@ -2120,15 +2120,15 @@ 
 							<b>
 								<?php
 								switch ($father->getSex()) {
-								case 'M':
-									echo I18N::translate('husband');
-									break;
-								case 'F':
-									echo I18N::translate('wife');
-									break;
-								default:
-									echo I18N::translate('spouse');
-									break;
+									case 'M':
+										echo I18N::translate('husband');
+										break;
+									case 'F':
+										echo I18N::translate('wife');
+										break;
+									default:
+										echo I18N::translate('spouse');
+										break;
 								}
 								?>
 							</b>
@@ -2159,15 +2159,15 @@ 
 							<b>
 								<?php
 								switch ($mother->getSex()) {
-								case 'M':
-									echo I18N::translate('husband');
-									break;
-								case 'F':
-									echo I18N::translate('wife');
-									break;
-								default:
-									echo I18N::translate('spouse');
-									break;
+									case 'M':
+										echo I18N::translate('husband');
+										break;
+									case 'F':
+										echo I18N::translate('wife');
+										break;
+									default:
+										echo I18N::translate('spouse');
+										break;
 								}
 								?>
 							</b>
@@ -2200,15 +2200,15 @@ 
 							<b>
 								<?php
 								switch ($child->getSex()) {
-								case 'M':
-									echo I18N::translate('son');
-									break;
-								case 'F':
-									echo I18N::translate('daughter');
-									break;
-								default:
-									echo I18N::translate('child');
-									break;
+									case 'M':
+										echo I18N::translate('son');
+										break;
+									case 'F':
+										echo I18N::translate('daughter');
+										break;
+									default:
+										echo I18N::translate('child');
+										break;
 								}
 								?>
 							</b>
@@ -2886,35 +2886,35 @@ 
 		}
 
 		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 ($person->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;
+			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 ($person->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;
 		}
 	}
 
@@ -2934,11 +2934,11 @@ 
 	echo '<table class="table wt-facts-table">';
 
 	switch ($nextaction) {
-	case 'add_child_to_family_action':
-	case 'add_child_to_individual_action':
-		// When adding a new child, specify the pedigree
-		echo FunctionsEdit::addSimpleTag('0 PEDI');
-		break;
+		case 'add_child_to_family_action':
+		case 'add_child_to_individual_action':
+			// When adding a new child, specify the pedigree
+			echo FunctionsEdit::addSimpleTag('0 PEDI');
+			break;
 	}
 	// First - standard name fields
 	foreach ($name_fields as $tag => $value) {

autocomplete.php

Switch Indentation +448 added lines, -448 removed lines

@@ -29,505 +29,505 @@
 
 
 switch ($type) {
-case 'ASSO': // Associates of an individuals, whose name contains the search terms
-	header('Content-Type: text/plain; charset=UTF-8');
-
-	$data = [];
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT 'INDI' AS type, i_id AS xref, i_gedcom AS gedcom, n_full" .
-		" FROM `##individuals`" .
-		" JOIN `##name` ON i_id = n_id AND i_file = n_file" .
-		" WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
-		" ORDER BY n_full COLLATE :collate"
-	)->execute([
-		'term_1'  => $term,
-		'term_2'  => $term,
-		'tree_id' => $WT_TREE->getTreeId(),
-		'collate' => I18N::collation(),
-	])->fetchAll();
-
-	// Filter for privacy and whether they could be alive at the right time
-	$event_date = Filter::get('extra');
-	$date       = new Date($event_date);
-	$event_jd   = $date->julianDay();
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShow()) {
-			if ($event_jd) {
-				// Exclude individuals who were born after the event.
-				$person_birth_jd = $person->getEstimatedBirthDate()->minimumJulianDay();
-				if ($person_birth_jd && $person_birth_jd > $event_jd) {
-					continue;
+	case 'ASSO': // Associates of an individuals, whose name contains the search terms
+		header('Content-Type: text/plain; charset=UTF-8');
+
+		$data = [];
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT 'INDI' AS type, i_id AS xref, i_gedcom AS gedcom, n_full" .
+			" FROM `##individuals`" .
+			" JOIN `##name` ON i_id = n_id AND i_file = n_file" .
+			" WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
+			" ORDER BY n_full COLLATE :collate"
+		)->execute([
+			'term_1'  => $term,
+			'term_2'  => $term,
+			'tree_id' => $WT_TREE->getTreeId(),
+			'collate' => I18N::collation(),
+		])->fetchAll();
+
+		// Filter for privacy and whether they could be alive at the right time
+		$event_date = Filter::get('extra');
+		$date       = new Date($event_date);
+		$event_jd   = $date->julianDay();
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($person->canShow()) {
+				if ($event_jd) {
+					// Exclude individuals who were born after the event.
+					$person_birth_jd = $person->getEstimatedBirthDate()->minimumJulianDay();
+					if ($person_birth_jd && $person_birth_jd > $event_jd) {
+						continue;
+					}
+					// Exclude individuals who died before the event.
+					$person_death_jd = $person->getEstimatedDeathDate()->maximumJulianDay();
+					if ($person_death_jd && $person_death_jd < $event_jd) {
+						continue;
+					}
 				}
-				// Exclude individuals who died before the event.
-				$person_death_jd = $person->getEstimatedDeathDate()->maximumJulianDay();
-				if ($person_death_jd && $person_death_jd < $event_jd) {
-					continue;
+				// Add the age (if we have it) or the lifespan (if we do not).
+				$label = $person->getFullName();
+				if ($event_jd && $person->getBirthDate()->isOK()) {
+					$label .= ', <span class="age">(' . I18N::translate('Age') . ' ' . Date::getAge($person->getBirthDate(), $date, 0) . ')</span>';
+				} else {
+					$label .= ', <i>' . $person->getLifeSpan() . '</i>';
 				}
+				$data[$row->xref] = ['value' => $row->xref, 'label' => $label];
 			}
-			// Add the age (if we have it) or the lifespan (if we do not).
-			$label = $person->getFullName();
-			if ($event_jd && $person->getBirthDate()->isOK()) {
-				$label .= ', <span class="age">(' . I18N::translate('Age') . ' ' . Date::getAge($person->getBirthDate(), $date, 0) . ')</span>';
-			} else {
-				$label .= ', <i>' . $person->getLifeSpan() . '</i>';
-			}
-			$data[$row->xref] = ['value' => $row->xref, 'label' => $label];
 		}
-	}
-	echo json_encode($data);
+		echo json_encode($data);
 
-	return;
+		return;
 
-case 'CEME': // Cemetery fields, that contain the search term
-	header('Content-Type: text/plain; charset=UTF-8');
+	case 'CEME': // Cemetery fields, that contain the search term
+		header('Content-Type: text/plain; charset=UTF-8');
 
-	$data = [];
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT SQL_CACHE i_id AS xref, i_gedcom AS gedcom" .
-		" FROM `##individuals`" .
-		" WHERE i_gedcom LIKE '%\n2 CEME %' AND i_file = :tree_id" .
-		" ORDER BY SUBSTRING_INDEX(i_gedcom, '\n2 CEME ', -1) COLLATE :collation"
-	)->execute([
-		'tree_id'   => $WT_TREE->getTreeId(),
-		'collation' => I18N::collation(),
-	])->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if (preg_match('/\n2 CEME (.*' . preg_quote($term, '/') . '.*)/i', $person->getGedcom(), $match)) {
-			if (!in_array($match[1], $data)) {
-				$data[] = $match[1];
+		$data = [];
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT SQL_CACHE i_id AS xref, i_gedcom AS gedcom" .
+			" FROM `##individuals`" .
+			" WHERE i_gedcom LIKE '%\n2 CEME %' AND i_file = :tree_id" .
+			" ORDER BY SUBSTRING_INDEX(i_gedcom, '\n2 CEME ', -1) COLLATE :collation"
+		)->execute([
+			'tree_id'   => $WT_TREE->getTreeId(),
+			'collation' => I18N::collation(),
+		])->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if (preg_match('/\n2 CEME (.*' . preg_quote($term, '/') . '.*)/i', $person->getGedcom(), $match)) {
+				if (!in_array($match[1], $data)) {
+					$data[] = $match[1];
+				}
 			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'FAM': // Families, whose name contains the search terms
-	header('Content-Type: text/plain; charset=UTF-8');
-
-	$data = [];
-	// Fetch all data, regardless of privacy
-	$rows = get_FAM_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($family->canShowName()) {
-			$marriage_year = $family->getMarriageYear();
-			if ($marriage_year) {
-				$data[] = ['value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>'];
-			} else {
-				$data[] = ['value' => $family->getXref(), 'label' => $family->getFullName()];
+		echo json_encode($data);
+
+		return;
+
+	case 'FAM': // Families, whose name contains the search terms
+		header('Content-Type: text/plain; charset=UTF-8');
+
+		$data = [];
+		// Fetch all data, regardless of privacy
+		$rows = get_FAM_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($family->canShowName()) {
+				$marriage_year = $family->getMarriageYear();
+				if ($marriage_year) {
+					$data[] = ['value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>'];
+				} else {
+					$data[] = ['value' => $family->getXref(), 'label' => $family->getFullName()];
+				}
 			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'GIVN': // Given names, that start with the search term
-	header('Content-Type: text/plain; charset=UTF-8');
-
-	// Do not filter by privacy. Given names on their own do not identify individuals.
-	echo json_encode(
-		Database::prepare(
-			"SELECT SQL_CACHE DISTINCT n_givn" .
-			" FROM `##name`" .
-			" WHERE n_givn LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
-			" ORDER BY n_givn COLLATE :collation"
+		echo json_encode($data);
+
+		return;
+
+	case 'GIVN': // Given names, that start with the search term
+		header('Content-Type: text/plain; charset=UTF-8');
+
+		// Do not filter by privacy. Given names on their own do not identify individuals.
+		echo json_encode(
+			Database::prepare(
+				"SELECT SQL_CACHE DISTINCT n_givn" .
+				" FROM `##name`" .
+				" WHERE n_givn LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
+				" ORDER BY n_givn COLLATE :collation"
+			)->execute([
+				'term'      => $term,
+				'tree_id'   => $WT_TREE->getTreeId(),
+				'collation' => I18N::collation(),
+			])->fetchOneColumn()
+		);
+
+		return;
+
+	case 'INDI': // Individuals, whose name contains the search terms
+		header('Content-Type: text/plain; charset=UTF-8');
+
+		$data = [];
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT i_id AS xref, i_gedcom AS gedcom, n_full" .
+			" FROM `##individuals`" .
+			" JOIN `##name` ON i_id = n_id AND i_file = n_file" .
+			" WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
+			" ORDER BY n_full COLLATE :collation"
 		)->execute([
-			'term'      => $term,
+			'term_1'    => $term,
+			'term_2'    => $term,
 			'tree_id'   => $WT_TREE->getTreeId(),
 			'collation' => I18N::collation(),
-		])->fetchOneColumn()
-	);
+		])->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($person->canShowName()) {
+				$data[] = ['value' => $row->xref, 'label' => str_replace(['@N.N.', '@P.N.'], [I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')], $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>'];
+			}
+		}
+		echo json_encode($data);
 
-	return;
+		return;
 
-case 'INDI': // Individuals, whose name contains the search terms
-	header('Content-Type: text/plain; charset=UTF-8');
+	case 'NOTE': // Notes which contain the search terms
+		header('Content-Type: text/plain; charset=UTF-8');
 
-	$data = [];
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT i_id AS xref, i_gedcom AS gedcom, n_full" .
-		" FROM `##individuals`" .
-		" JOIN `##name` ON i_id = n_id AND i_file = n_file" .
-		" WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
-		" ORDER BY n_full COLLATE :collation"
-	)->execute([
-		'term_1'    => $term,
-		'term_2'    => $term,
-		'tree_id'   => $WT_TREE->getTreeId(),
-		'collation' => I18N::collation(),
-	])->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShowName()) {
-			$data[] = ['value' => $row->xref, 'label' => str_replace(['@N.N.', '@P.N.'], [I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')], $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>'];
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'NOTE': // Notes which contain the search terms
-	header('Content-Type: text/plain; charset=UTF-8');
-
-	$data = [];
-	// Fetch all data, regardless of privacy
-	$rows = get_NOTE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($note->canShowName()) {
-			$data[] = ['value' => $note->getXref(), 'label' => $note->getFullName()];
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'OBJE':
-	header('Content-Type: text/plain; charset=UTF-8');
-
-	$data = [];
-	// Fetch all data, regardless of privacy
-	$rows = get_OBJE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($media->canShowName()) {
-			$data[] = ['value' => $row->xref, 'label' => '<img src="' . $media->imageUrl(25, 25, 'crop') . '" width="25" height="25"> ' . $media->getFullName()];
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'PLAC': // Place names (with hierarchy), that include the search term
-	header('Content-Type: text/plain; charset=UTF-8');
-
-	// Do not filter by privacy. Place names on their own do not identify individuals.
-	$data = [];
-	foreach (Place::findPlaces($term, $WT_TREE) as $place) {
-		$data[] = $place->getGedcomName();
-	}
-	if (!$data && $WT_TREE->getPreference('GEONAMES_ACCOUNT')) {
-		// No place found? Use an external gazetteer
-		$url =
-			"http://api.geonames.org/searchJSON" .
-			"?name_startsWith=" . urlencode($term) .
-			"&lang=" . WT_LOCALE .
-			"&fcode=CMTY&fcode=ADM4&fcode=PPL&fcode=PPLA&fcode=PPLC" .
-			"&style=full" .
-			"&username=" . $WT_TREE->getPreference('GEONAMES_ACCOUNT');
-		// try to use curl when file_get_contents not allowed
-		if (ini_get('allow_url_fopen')) {
-			$json = file_get_contents($url);
-		} elseif (function_exists('curl_init')) {
-			$ch = curl_init();
-			curl_setopt($ch, CURLOPT_URL, $url);
-			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-			$json = curl_exec($ch);
-			curl_close($ch);
-		} else {
-			return $data;
-		}
-		$places = json_decode($json, true);
-		if (isset($places['geonames']) && is_array($places['geonames'])) {
-			foreach ($places['geonames'] as $k => $place) {
-				$data[] = $place['name'] . ', ' . $place['adminName2'] . ', ' . $place['adminName1'] . ', ' . $place['countryName'];
+		$data = [];
+		// Fetch all data, regardless of privacy
+		$rows = get_NOTE_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($note->canShowName()) {
+				$data[] = ['value' => $note->getXref(), 'label' => $note->getFullName()];
 			}
 		}
-	}
-	echo json_encode($data);
+		echo json_encode($data);
 
-	return;
+		return;
 
-case 'PLAC2': // Place names (without hierarchy), that include the search term
-	header('Content-Type: text/plain; charset=UTF-8');
+	case 'OBJE':
+		header('Content-Type: text/plain; charset=UTF-8');
 
-	// Do not filter by privacy. Place names on their own do not identify individuals.
-	echo json_encode(
-		Database::prepare(
-			"SELECT SQL_CACHE p_place" .
-			" FROM `##places`" .
-			" WHERE p_place LIKE CONCAT('%', :term, '%') AND p_file = :tree_id" .
-			" ORDER BY p_place COLLATE :collation"
-		)->execute([
-			'term'      => $term,
-			'tree_id'   => $WT_TREE->getTreeId(),
-			'collation' => I18N::collation(),
-		])->fetchOneColumn()
-	);
-
-	return;
-
-case 'REPO': // Repositories, that include the search terms
-	header('Content-Type: text/plain; charset=UTF-8');
-
-	$data = [];
-	// Fetch all data, regardless of privacy
-	$rows = get_REPO_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($record->canShowName()) {
-			foreach ($record->getFacts('NAME') as $fact) {
-				$data[] = ['value' => $record->getXref(), 'label' => $fact->getValue()];
-			}
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'REPO_NAME': // Repository names, that include the search terms
-	header('Content-Type: text/plain; charset=UTF-8');
-
-	$data = [];
-	// Fetch all data, regardless of privacy
-	$rows = get_REPO_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($record->canShowName()) {
-			$data[] = strip_tags($record->getFullName());
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'SOUR': // Sources, that include the search terms
-	header('Content-Type: text/plain; charset=UTF-8');
-
-	$data = [];
-	// Fetch all data, regardless of privacy
-	$rows = get_SOUR_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$record = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($record->canShowName()) {
-			foreach ($record->getFacts('TITL') as $fact) {
-				$data[] = ['value' => $record->getXref(), 'label' => $fact->getValue()];
+		$data = [];
+		// Fetch all data, regardless of privacy
+		$rows = get_OBJE_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($media->canShowName()) {
+				$data[] = ['value' => $row->xref, 'label' => '<img src="' . $media->imageUrl(25, 25, 'crop') . '" width="25" height="25"> ' . $media->getFullName()];
 			}
 		}
-	}
-	echo json_encode($data);
+		echo json_encode($data);
 
-	return;
+		return;
 
-case 'PAGE': // Citation details, for a given source, that contain the search term
-	header('Content-Type: text/plain; charset=UTF-8');
+	case 'PLAC': // Place names (with hierarchy), that include the search term
+		header('Content-Type: text/plain; charset=UTF-8');
 
-	$data = [];
-	$sid  = Filter::get('extra', WT_REGEX_XREF);
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT SQL_CACHE i_id AS xref, i_gedcom AS gedcom" .
-		" FROM `##individuals`" .
-		" WHERE i_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND i_file = :tree_id"
-	)->execute([
-		'xref'    => $sid,
-		'term'    => $term,
-		'tree_id' => $WT_TREE->getTreeId(),
-	])->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
-			$data[] = $match[1];
+		// Do not filter by privacy. Place names on their own do not identify individuals.
+		$data = [];
+		foreach (Place::findPlaces($term, $WT_TREE) as $place) {
+			$data[] = $place->getGedcomName();
 		}
-		if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
-			$data[] = $match[1];
+		if (!$data && $WT_TREE->getPreference('GEONAMES_ACCOUNT')) {
+			// No place found? Use an external gazetteer
+			$url =
+				"http://api.geonames.org/searchJSON" .
+				"?name_startsWith=" . urlencode($term) .
+				"&lang=" . WT_LOCALE .
+				"&fcode=CMTY&fcode=ADM4&fcode=PPL&fcode=PPLA&fcode=PPLC" .
+				"&style=full" .
+				"&username=" . $WT_TREE->getPreference('GEONAMES_ACCOUNT');
+			// try to use curl when file_get_contents not allowed
+			if (ini_get('allow_url_fopen')) {
+				$json = file_get_contents($url);
+			} elseif (function_exists('curl_init')) {
+				$ch = curl_init();
+				curl_setopt($ch, CURLOPT_URL, $url);
+				curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+				$json = curl_exec($ch);
+				curl_close($ch);
+			} else {
+				return $data;
+			}
+			$places = json_decode($json, true);
+			if (isset($places['geonames']) && is_array($places['geonames'])) {
+				foreach ($places['geonames'] as $k => $place) {
+					$data[] = $place['name'] . ', ' . $place['adminName2'] . ', ' . $place['adminName1'] . ', ' . $place['countryName'];
+				}
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT SQL_CACHE f_id AS xref, f_gedcom AS gedcom" .
-		" FROM `##families`" .
-		" WHERE f_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND f_file = :tree_id"
-	)->execute([
-		'xref'    => $sid,
-		'term'    => $term,
-		'tree_id' => $WT_TREE->getTreeId(),
-	])->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
-			$data[] = $match[1];
+		echo json_encode($data);
+
+		return;
+
+	case 'PLAC2': // Place names (without hierarchy), that include the search term
+		header('Content-Type: text/plain; charset=UTF-8');
+
+		// Do not filter by privacy. Place names on their own do not identify individuals.
+		echo json_encode(
+			Database::prepare(
+				"SELECT SQL_CACHE p_place" .
+				" FROM `##places`" .
+				" WHERE p_place LIKE CONCAT('%', :term, '%') AND p_file = :tree_id" .
+				" ORDER BY p_place COLLATE :collation"
+			)->execute([
+				'term'      => $term,
+				'tree_id'   => $WT_TREE->getTreeId(),
+				'collation' => I18N::collation(),
+			])->fetchOneColumn()
+		);
+
+		return;
+
+	case 'REPO': // Repositories, that include the search terms
+		header('Content-Type: text/plain; charset=UTF-8');
+
+		$data = [];
+		// Fetch all data, regardless of privacy
+		$rows = get_REPO_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($record->canShowName()) {
+				foreach ($record->getFacts('NAME') as $fact) {
+					$data[] = ['value' => $record->getXref(), 'label' => $fact->getValue()];
+				}
+			}
 		}
-		if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
-			$data[] = $match[1];
+		echo json_encode($data);
+
+		return;
+
+	case 'REPO_NAME': // Repository names, that include the search terms
+		header('Content-Type: text/plain; charset=UTF-8');
+
+		$data = [];
+		// Fetch all data, regardless of privacy
+		$rows = get_REPO_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($record->canShowName()) {
+				$data[] = strip_tags($record->getFullName());
+			}
 		}
-	}
-	// array_unique() converts the keys from integer to string, which breaks
-	// the JSON encoding - so need to call array_values() to convert them
-	// back into integers.
-	$data = array_values(array_unique($data));
-	echo json_encode($data);
-
-	return;
-
-case 'SOUR_TITL': // Source titles, that include the search terms
-	header('Content-Type: text/plain; charset=UTF-8');
-
-	$data = [];
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT s_id AS xref, s_gedcom AS gedcom, s_name" .
-		" FROM `##sources`" .
-		" WHERE s_name LIKE CONCAT('%', REPLACE(:term, ' ', '%'), '%') AND s_file = :tree_id" .
-		" ORDER BY s_name COLLATE :collation"
-	)->execute([
-		'term'      => $term,
-		'tree_id'   => $WT_TREE->getTreeId(),
-		'collation' => I18N::collation(),
-	])->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($source->canShowName()) {
-			$data[] = $row->s_name;
+		echo json_encode($data);
+
+		return;
+
+	case 'SOUR': // Sources, that include the search terms
+		header('Content-Type: text/plain; charset=UTF-8');
+
+		$data = [];
+		// Fetch all data, regardless of privacy
+		$rows = get_SOUR_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$record = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($record->canShowName()) {
+				foreach ($record->getFacts('TITL') as $fact) {
+					$data[] = ['value' => $record->getXref(), 'label' => $fact->getValue()];
+				}
+			}
 		}
-	}
-	echo json_encode($data);
+		echo json_encode($data);
 
-	return;
+		return;
 
-case 'SURN': // Surnames, that start with the search term
-	header('Content-Type: text/plain; charset=UTF-8');
+	case 'PAGE': // Citation details, for a given source, that contain the search term
+		header('Content-Type: text/plain; charset=UTF-8');
 
-	// Do not filter by privacy. Surnames on their own do not identify individuals.
-	echo json_encode(
-		Database::prepare(
-			"SELECT SQL_CACHE DISTINCT n_surname" .
-			" FROM `##name`" .
-			" WHERE n_surname LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
-			" ORDER BY n_surname COLLATE :collation"
+		$data = [];
+		$sid  = Filter::get('extra', WT_REGEX_XREF);
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT SQL_CACHE i_id AS xref, i_gedcom AS gedcom" .
+			" FROM `##individuals`" .
+			" WHERE i_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND i_file = :tree_id"
+		)->execute([
+			'xref'    => $sid,
+			'term'    => $term,
+			'tree_id' => $WT_TREE->getTreeId(),
+		])->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
+				$data[] = $match[1];
+			}
+			if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
+				$data[] = $match[1];
+			}
+		}
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT SQL_CACHE f_id AS xref, f_gedcom AS gedcom" .
+			" FROM `##families`" .
+			" WHERE f_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND f_file = :tree_id"
+		)->execute([
+			'xref'    => $sid,
+			'term'    => $term,
+			'tree_id' => $WT_TREE->getTreeId(),
+		])->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
+				$data[] = $match[1];
+			}
+			if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
+				$data[] = $match[1];
+			}
+		}
+		// array_unique() converts the keys from integer to string, which breaks
+		// the JSON encoding - so need to call array_values() to convert them
+		// back into integers.
+		$data = array_values(array_unique($data));
+		echo json_encode($data);
+
+		return;
+
+	case 'SOUR_TITL': // Source titles, that include the search terms
+		header('Content-Type: text/plain; charset=UTF-8');
+
+		$data = [];
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT s_id AS xref, s_gedcom AS gedcom, s_name" .
+			" FROM `##sources`" .
+			" WHERE s_name LIKE CONCAT('%', REPLACE(:term, ' ', '%'), '%') AND s_file = :tree_id" .
+			" ORDER BY s_name COLLATE :collation"
 		)->execute([
 			'term'      => $term,
 			'tree_id'   => $WT_TREE->getTreeId(),
 			'collation' => I18N::collation(),
-		])->fetchOneColumn()
-	);
-
-	return;
-
-case 'IFSRO':
-	header('Content-Type: text/plain; charset=UTF-8');
-
-	$data = [];
-	// Fetch all data, regardless of privacy
-	$rows = get_INDI_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShowName()) {
-			$data[] = ['value' => $person->getXref(), 'label' => str_replace(['@N.N.', '@P.N.'], [I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')], $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>'];
+		])->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($source->canShowName()) {
+				$data[] = $row->s_name;
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_SOUR_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($source->canShowName()) {
-			$data[] = ['value' => $source->getXref(), 'label' => $source->getFullName()];
+		echo json_encode($data);
+
+		return;
+
+	case 'SURN': // Surnames, that start with the search term
+		header('Content-Type: text/plain; charset=UTF-8');
+
+		// Do not filter by privacy. Surnames on their own do not identify individuals.
+		echo json_encode(
+			Database::prepare(
+				"SELECT SQL_CACHE DISTINCT n_surname" .
+				" FROM `##name`" .
+				" WHERE n_surname LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
+				" ORDER BY n_surname COLLATE :collation"
+			)->execute([
+				'term'      => $term,
+				'tree_id'   => $WT_TREE->getTreeId(),
+				'collation' => I18N::collation(),
+			])->fetchOneColumn()
+		);
+
+		return;
+
+	case 'IFSRO':
+		header('Content-Type: text/plain; charset=UTF-8');
+
+		$data = [];
+		// Fetch all data, regardless of privacy
+		$rows = get_INDI_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($person->canShowName()) {
+				$data[] = ['value' => $person->getXref(), 'label' => str_replace(['@N.N.', '@P.N.'], [I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')], $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>'];
+			}
+		}
+		// Fetch all data, regardless of privacy
+		$rows = get_SOUR_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($source->canShowName()) {
+				$data[] = ['value' => $source->getXref(), 'label' => $source->getFullName()];
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_REPO_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$repository = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($repository->canShowName()) {
-			$data[] = ['value' => $repository->getXref(), 'label' => $repository->getFullName()];
+		// Fetch all data, regardless of privacy
+		$rows = get_REPO_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$repository = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($repository->canShowName()) {
+				$data[] = ['value' => $repository->getXref(), 'label' => $repository->getFullName()];
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_OBJE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($media->canShowName()) {
-			$data[] = ['value' => $media->getXref(), 'label' => '<img src="' . $media->imageUrl(25, 25, 'crop') . '" width="25" height="25"> ' . $media->getFullName()];
+		// Fetch all data, regardless of privacy
+		$rows = get_OBJE_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($media->canShowName()) {
+				$data[] = ['value' => $media->getXref(), 'label' => '<img src="' . $media->imageUrl(25, 25, 'crop') . '" width="25" height="25"> ' . $media->getFullName()];
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_FAM_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($family->canShowName()) {
-			$marriage_year = $family->getMarriageYear();
-			if ($marriage_year) {
-				$data[] = ['value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>'];
-			} else {
-				$data[] = ['value' => $family->getXref(), 'label' => $family->getFullName()];
+		// Fetch all data, regardless of privacy
+		$rows = get_FAM_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($family->canShowName()) {
+				$marriage_year = $family->getMarriageYear();
+				if ($marriage_year) {
+					$data[] = ['value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>'];
+				} else {
+					$data[] = ['value' => $family->getXref(), 'label' => $family->getFullName()];
+				}
 			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_NOTE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($note->canShowName()) {
-			$data[] = ['value' => $note->getXref(), 'label' => $note->getFullName()];
+		// Fetch all data, regardless of privacy
+		$rows = get_NOTE_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($note->canShowName()) {
+				$data[] = ['value' => $note->getXref(), 'label' => $note->getFullName()];
+			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'IFS':
-	header('Content-Type: text/plain; charset=UTF-8');
-
-	$data = [];
-	// Fetch all data, regardless of privacy
-	$rows = get_INDI_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShowName()) {
-			$data[] = ['value' => $person->getXref(), 'label' => str_replace(['@N.N.', '@P.N.'], [I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')], $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>'];
+		echo json_encode($data);
+
+		return;
+
+	case 'IFS':
+		header('Content-Type: text/plain; charset=UTF-8');
+
+		$data = [];
+		// Fetch all data, regardless of privacy
+		$rows = get_INDI_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($person->canShowName()) {
+				$data[] = ['value' => $person->getXref(), 'label' => str_replace(['@N.N.', '@P.N.'], [I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')], $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>'];
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_SOUR_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($source->canShowName()) {
-			$data[] = ['value' => $source->getXref(), 'label' => $source->getFullName()];
+		// Fetch all data, regardless of privacy
+		$rows = get_SOUR_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($source->canShowName()) {
+				$data[] = ['value' => $source->getXref(), 'label' => $source->getFullName()];
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_FAM_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($family->canShowName()) {
-			$marriage_year = $family->getMarriageYear();
-			if ($marriage_year) {
-				$data[] = ['value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>'];
-			} else {
-				$data[] = ['value' => $family->getXref(), 'label' => $family->getFullName()];
+		// Fetch all data, regardless of privacy
+		$rows = get_FAM_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($family->canShowName()) {
+				$marriage_year = $family->getMarriageYear();
+				if ($marriage_year) {
+					$data[] = ['value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>'];
+				} else {
+					$data[] = ['value' => $family->getXref(), 'label' => $family->getFullName()];
+				}
 			}
 		}
-	}
-	echo json_encode($data);
+		echo json_encode($data);
 
-	return;
+		return;
 }
 
 /**