fisharebest / webtrees

app/Module/StoriesModule.php

Braces +5 added lines, -2 removed lines

@@ -389,8 +389,11 @@
 						<a href="<?php echo $individual->getHtmlUrl(); ?>#stories">
 							<?php echo $individual->getFullName(); ?>
 						</a>
-						<?php else: ?>
-							<?php echo $story->xref; ?>
+						<?php else {
+	: ?>
+							<?php echo $story->xref;
+}
+?>
 						<?php endif; ?>
 						</td>
 						<td>

Switch Indentation +15 added lines, -15 removed lines

@@ -50,21 +50,21 @@
 	 */
 	public function modAction($mod_action) {
 		switch ($mod_action) {
-		case 'admin_edit':
-			$this->edit();
-			break;
-		case 'admin_delete':
-			$this->delete();
-			$this->config();
-			break;
-		case 'admin_config':
-			$this->config();
-			break;
-		case 'show_list':
-			$this->showList();
-			break;
-		default:
-			http_response_code(404);
+			case 'admin_edit':
+				$this->edit();
+				break;
+			case 'admin_delete':
+				$this->delete();
+				$this->config();
+				break;
+			case 'admin_config':
+				$this->config();
+				break;
+			case 'show_list':
+				$this->showList();
+				break;
+			default:
+				http_response_code(404);
 		}
 	}
 

calendar.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -67,14 +67,14 @@
 	if (strlen($match[1]) > strlen($match[2])) {
 		$match[2] = substr($match[1], 0, strlen($match[1]) - strlen($match[2])) . $match[2];
 	}
-	$ged_date = new Date("FROM {$cal} {$match[1]} TO {$cal} {$match[2]}");
+	$ged_date = new Date("from {$cal} {$match[1]} TO {$cal} {$match[2]}");
 	$view     = 'year';
 } else {
 	// advanced-year "decade/century wildcard"
 	if (preg_match('/^(\d+)(\?+)$/', $year, $match)) {
 		$y1       = $match[1] . str_replace('?', '0', $match[2]);
 		$y2       = $match[1] . str_replace('?', '9', $match[2]);
-		$ged_date = new Date("FROM {$cal} {$y1} TO {$cal} {$y2}");
+		$ged_date = new Date("from {$cal} {$y1} TO {$cal} {$y2}");
 		$view     = 'year';
 	} else {
 		if ($year < 0) {

Switch Indentation +99 added lines, -99 removed lines

@@ -118,15 +118,15 @@ 
 $controller->setPageTitle(I18N::translate('Anniversary calendar'));
 
 switch ($view) {
-case 'day':
-	$controller->setPageTitle(I18N::translate('On this day…') . ' ' . $ged_date->display(false));
-	break;
-case 'month':
-	$controller->setPageTitle(I18N::translate('In this month…') . ' ' . $ged_date->display(false, '%F %Y'));
-	break;
-case 'year':
-	$controller->setPageTitle(I18N::translate('In this year…') . ' ' . $ged_date->display(false, '%Y'));
-	break;
+	case 'day':
+		$controller->setPageTitle(I18N::translate('On this day…') . ' ' . $ged_date->display(false));
+		break;
+	case 'month':
+		$controller->setPageTitle(I18N::translate('In this month…') . ' ' . $ged_date->display(false, '%F %Y'));
+		break;
+	case 'year':
+		$controller->setPageTitle(I18N::translate('In this year…') . ' ' . $ged_date->display(false, '%Y'));
+		break;
 }
 
 $controller->pageHeader();
@@ -329,38 +329,38 @@ 
 $found_facts = array();
 
 switch ($view) {
-case 'day':
-	$found_facts = apply_filter(FunctionsDb::getAnniversaryEvents($cal_date->minJD, $filterev, $WT_TREE), $filterof, $filtersx);
-	break;
-case 'month':
-	$cal_date->d = 0;
-	$cal_date->setJdFromYmd();
-	// Make a separate list for each day. Unspecified/invalid days go in day 0.
-	for ($d = 0; $d <= $days_in_month; ++$d) {
-		$found_facts[$d] = array();
-	}
-	// Fetch events for each day
-	for ($jd = $cal_date->minJD; $jd <= $cal_date->maxJD; ++$jd) {
-		foreach (apply_filter(FunctionsDb::getAnniversaryEvents($jd, $filterev, $WT_TREE), $filterof, $filtersx) as $fact) {
-			$tmp = $fact->getDate()->minimumDate();
-			if ($tmp->d >= 1 && $tmp->d <= $tmp->daysInMonth()) {
-				// If the day is valid (for its own calendar), display it in the
-				// anniversary day (for the display calendar).
-				$found_facts[$jd - $cal_date->minJD + 1][] = $fact;
-			} else {
-				// Otherwise, display it in the "Day not set" box.
-				$found_facts[0][] = $fact;
+	case 'day':
+		$found_facts = apply_filter(FunctionsDb::getAnniversaryEvents($cal_date->minJD, $filterev, $WT_TREE), $filterof, $filtersx);
+		break;
+	case 'month':
+		$cal_date->d = 0;
+		$cal_date->setJdFromYmd();
+		// Make a separate list for each day. Unspecified/invalid days go in day 0.
+		for ($d = 0; $d <= $days_in_month; ++$d) {
+			$found_facts[$d] = array();
+		}
+		// Fetch events for each day
+		for ($jd = $cal_date->minJD; $jd <= $cal_date->maxJD; ++$jd) {
+			foreach (apply_filter(FunctionsDb::getAnniversaryEvents($jd, $filterev, $WT_TREE), $filterof, $filtersx) as $fact) {
+				$tmp = $fact->getDate()->minimumDate();
+				if ($tmp->d >= 1 && $tmp->d <= $tmp->daysInMonth()) {
+					// If the day is valid (for its own calendar), display it in the
+					// anniversary day (for the display calendar).
+					$found_facts[$jd - $cal_date->minJD + 1][] = $fact;
+				} else {
+					// Otherwise, display it in the "Day not set" box.
+					$found_facts[0][] = $fact;
+				}
 			}
 		}
-	}
-	break;
-case 'year':
-	$cal_date->m = 0;
-	$cal_date->setJdFromYmd();
-	$found_facts = apply_filter(FunctionsDb::getCalendarEvents($ged_date->minimumJulianDay(), $ged_date->maximumJulianDay(), $filterev, $WT_TREE), $filterof, $filtersx);
-	// Eliminate duplicates (e.g. BET JUL 1900 AND SEP 1900 will appear twice in 1900)
-	$found_facts = array_unique($found_facts);
-	break;
+		break;
+	case 'year':
+		$cal_date->m = 0;
+		$cal_date->setJdFromYmd();
+		$found_facts = apply_filter(FunctionsDb::getCalendarEvents($ged_date->minimumJulianDay(), $ged_date->maximumJulianDay(), $filterev, $WT_TREE), $filterof, $filtersx);
+		// Eliminate duplicates (e.g. BET JUL 1900 AND SEP 1900 will appear twice in 1900)
+		$found_facts = array_unique($found_facts);
+		break;
 }
 
 // Group the facts by family/individual
@@ -369,39 +369,39 @@ 
 $cal_facts = array();
 
 switch ($view) {
-case 'year':
-case 'day':
-	foreach ($found_facts as $fact) {
-		$record = $fact->getParent();
-		$xref   = $record->getXref();
-		if ($record instanceof Individual) {
-			if (empty($indis[$xref])) {
-				$indis[$xref] = calendar_fact_text($fact, true);
-			} else {
-				$indis[$xref] .= '<br>' . calendar_fact_text($fact, true);
-			}
-		} elseif ($record instanceof Family) {
-			if (empty($indis[$xref])) {
-				$fams[$xref] = calendar_fact_text($fact, true);
-			} else {
-				$fams[$xref] .= '<br>' . calendar_fact_text($fact, true);
+	case 'year':
+	case 'day':
+		foreach ($found_facts as $fact) {
+			$record = $fact->getParent();
+			$xref   = $record->getXref();
+			if ($record instanceof Individual) {
+				if (empty($indis[$xref])) {
+					$indis[$xref] = calendar_fact_text($fact, true);
+				} else {
+					$indis[$xref] .= '<br>' . calendar_fact_text($fact, true);
+				}
+			} elseif ($record instanceof Family) {
+				if (empty($indis[$xref])) {
+					$fams[$xref] = calendar_fact_text($fact, true);
+				} else {
+					$fams[$xref] .= '<br>' . calendar_fact_text($fact, true);
+				}
 			}
 		}
-	}
-	break;
-case 'month':
-	foreach ($found_facts as $d => $facts) {
-		$cal_facts[$d] = array();
-		foreach ($facts as $fact) {
-			$xref = $fact->getParent()->getXref();
-			if (empty($cal_facts[$d][$xref])) {
-				$cal_facts[$d][$xref] = calendar_fact_text($fact, false);
-			} else {
-				$cal_facts[$d][$xref] .= '<br>' . calendar_fact_text($fact, false);
+		break;
+	case 'month':
+		foreach ($found_facts as $d => $facts) {
+			$cal_facts[$d] = array();
+			foreach ($facts as $fact) {
+				$xref = $fact->getParent()->getXref();
+				if (empty($cal_facts[$d][$xref])) {
+					$cal_facts[$d][$xref] = calendar_fact_text($fact, false);
+				} else {
+					$cal_facts[$d][$xref] .= '<br>' . calendar_fact_text($fact, false);
+				}
 			}
 		}
-	}
-	break;
+		break;
 }
 
 switch ($view) {
@@ -498,26 +498,26 @@ 
 			// Show a converted date
 			foreach (explode('_and_', $CALENDAR_FORMAT) as $convcal) {
 				switch ($convcal) {
-				case 'french':
-					$alt_date = new FrenchDate($cal_date->minJD + $d - 1);
-					break;
-				case 'gregorian':
-					$alt_date = new GregorianDate($cal_date->minJD + $d - 1);
-					break;
-				case 'jewish':
-					$alt_date = new JewishDate($cal_date->minJD + $d - 1);
-					break;
-				case 'julian':
-					$alt_date = new JulianDate($cal_date->minJD + $d - 1);
-					break;
-				case 'hijri':
-					$alt_date = new HijriDate($cal_date->minJD + $d - 1);
-					break;
-				case 'jalali':
-					$alt_date = new JalaliDate($cal_date->minJD + $d - 1);
-					break;
-				default:
-					break 2;
+					case 'french':
+						$alt_date = new FrenchDate($cal_date->minJD + $d - 1);
+						break;
+					case 'gregorian':
+						$alt_date = new GregorianDate($cal_date->minJD + $d - 1);
+						break;
+					case 'jewish':
+						$alt_date = new JewishDate($cal_date->minJD + $d - 1);
+						break;
+					case 'julian':
+						$alt_date = new JulianDate($cal_date->minJD + $d - 1);
+						break;
+					case 'hijri':
+						$alt_date = new HijriDate($cal_date->minJD + $d - 1);
+						break;
+					case 'jalali':
+						$alt_date = new JalaliDate($cal_date->minJD + $d - 1);
+						break;
+					default:
+						break 2;
 				}
 				if (get_class($alt_date) !== get_class($cal_date) && $alt_date->inValidRange()) {
 					echo '<span class="rtl_cal_day">' . $alt_date->format("%j %M") . '</span>';
@@ -627,17 +627,17 @@ 
 		$html .= $tag1 . '<a href="' . $tmp->getHtmlUrl() . '">' . $tmp->getFullName() . '</a> ';
 		if ($show_sex_symbols && $tmp instanceof Individual) {
 			switch ($tmp->getSex()) {
-			case 'M':
-				$html .= '<i class="icon-sex_m_9x9" title="' . I18N::translate('Male') . '"></i>';
-				++$males;
-				break;
-			case 'F':
-				$html .= '<i class="icon-sex_f_9x9" title="' . I18N::translate('Female') . '"></i>';
-				++$females;
-				break;
-			default:
-				$html .= '<i class="icon-sex_u_9x9" title="' . I18N::translateContext('unknown gender', 'Unknown') . '"></i>';
-				break;
+				case 'M':
+					$html .= '<i class="icon-sex_m_9x9" title="' . I18N::translate('Male') . '"></i>';
+					++$males;
+					break;
+				case 'F':
+					$html .= '<i class="icon-sex_f_9x9" title="' . I18N::translate('Female') . '"></i>';
+					++$females;
+					break;
+				default:
+					$html .= '<i class="icon-sex_u_9x9" title="' . I18N::translateContext('unknown gender', 'Unknown') . '"></i>';
+					break;
 			}
 		}
 		$html .= '<div class="indent">' . $facts . '</div>' . $tag2;

medialist.php

Braces +5 added lines, -2 removed lines

@@ -110,10 +110,13 @@
 						</option>
 					</select>
 				</td>
-				<?php else: ?>
+				<?php else {
+	: ?>
 					<td class="descriptionbox wrap"></td>
 					<td class="optionbox wrap"></td>
-				<?php endif; ?>
+				<?php endif;
+}
+?>
 			</tr>
 			<tr>
 				<td class="descriptionbox wrap">

search_advanced.php

Braces +92 added lines, -23 removed lines

@@ -154,10 +154,22 @@ 
 				<input type="text" id="value<?php echo $i; ?>" name="values[<?php echo $i; ?>]" value="<?php echo Filter::escapeHtml($controller->getValue($i)); ?>"<?php echo substr($controller->getField($i), -4) == 'PLAC' ? 'data-autocomplete-type="PLAC"' : ''; ?>>
 			<?php if (preg_match("/^NAME:/", $currentFieldSearch) > 0) { ?>
 				<select name="fields[<?php echo $i; ?>]">
-					<option value="<?php echo $currentField; ?>:EXACT" <?php if (preg_match("/:EXACT$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-					<option value="<?php echo $currentField; ?>:BEGINS" <?php if (preg_match("/:BEGINS$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-					<option value="<?php echo $currentField; ?>:CONTAINS" <?php if (preg_match("/:CONTAINS$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-					<option value="<?php echo $currentField; ?>:SDX" <?php if (preg_match("/:SDX$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+					<option value="<?php echo $currentField; ?>:EXACT" <?php if (preg_match("/:EXACT$/", $currentFieldSearch) > 0) {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+					<option value="<?php echo $currentField; ?>:BEGINS" <?php if (preg_match("/:BEGINS$/", $currentFieldSearch) > 0) {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+					<option value="<?php echo $currentField; ?>:CONTAINS" <?php if (preg_match("/:CONTAINS$/", $currentFieldSearch) > 0) {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+					<option value="<?php echo $currentField; ?>:SDX" <?php if (preg_match("/:SDX$/", $currentFieldSearch) > 0) {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
 				</select>
 			<?php } else { ?>
 			<input type="hidden" name="fields[<?php echo $i; ?>]" value="<?php echo $controller->getField($i); ?>">
@@ -166,9 +178,18 @@ 
 				?>
 				<select name="plusminus[<?php echo $i; ?>]">
 					<option value=""><?php echo I18N::translate('Exact date'); ?></option>
-					<option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 2) echo 'selected'; ?>><?php echo I18N::plural('±%s year', '±%s years', 2, I18N::number(2)); ?></option>
-					<option value="5" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 5) echo 'selected'; ?>><?php echo I18N::plural('±%s year', '±%s years', 5, I18N::number(5)); ?></option>
-					<option value="10" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 10) echo 'selected'; ?>><?php echo I18N::plural('±%s year', '±%s years', 10, I18N::number(10)); ?></option>
+					<option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 2) {
+	echo 'selected';
+}
+?>><?php echo I18N::plural('±%s year', '±%s years', 2, I18N::number(2)); ?></option>
+					<option value="5" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 5) {
+	echo 'selected';
+}
+?>><?php echo I18N::plural('±%s year', '±%s years', 5, I18N::number(5)); ?></option>
+					<option value="10" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 10) {
+	echo 'selected';
+}
+?>><?php echo I18N::plural('±%s year', '±%s years', 10, I18N::number(10)); ?></option>
 				</select>
 			<?php } ?>
 		</td>
@@ -216,10 +237,22 @@ 
 		<td class="list_value">
 			<input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:HUSB:NAME:GIVN:' . $fatherGivnOption)); ?>">
 			<select name="fields[<?php echo $j; ?>]">
-				<option value="FAMC:HUSB:NAME:GIVN:EXACT" <?php if ($fatherGivnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-				<option value="FAMC:HUSB:NAME:GIVN:BEGINS" <?php if ($fatherGivnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-				<option value="FAMC:HUSB:NAME:GIVN:CONTAINS" <?php if ($fatherGivnOption == 'CONTAINS') echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-				<option value="FAMC:HUSB:NAME:GIVN:SDX" <?php if ($fatherGivnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+				<option value="FAMC:HUSB:NAME:GIVN:EXACT" <?php if ($fatherGivnOption == 'EXACT') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+				<option value="FAMC:HUSB:NAME:GIVN:BEGINS" <?php if ($fatherGivnOption == 'BEGINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+				<option value="FAMC:HUSB:NAME:GIVN:CONTAINS" <?php if ($fatherGivnOption == 'CONTAINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+				<option value="FAMC:HUSB:NAME:GIVN:SDX" <?php if ($fatherGivnOption == 'SDX') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
 			</select>
 		</td>
 	</tr>
@@ -231,10 +264,22 @@ 
 		<td class="list_value">
 			<input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:HUSB:NAME:SURN:' . $fatherSurnOption)); ?>">
 			<select name="fields[<?php echo $j; ?>]">
-				<option value="FAMC:HUSB:NAME:SURN:EXACT" <?php if ($fatherSurnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-				<option value="FAMC:HUSB:NAME:SURN:BEGINS" <?php if ($fatherSurnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-				<option value="FAMC:HUSB:NAME:SURN:CONTAINS" <?php if ($fatherSurnOption == 'CONTAINS') echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-				<option value="FAMC:HUSB:NAME:SURN:SDX" <?php if ($fatherSurnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+				<option value="FAMC:HUSB:NAME:SURN:EXACT" <?php if ($fatherSurnOption == 'EXACT') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+				<option value="FAMC:HUSB:NAME:SURN:BEGINS" <?php if ($fatherSurnOption == 'BEGINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+				<option value="FAMC:HUSB:NAME:SURN:CONTAINS" <?php if ($fatherSurnOption == 'CONTAINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+				<option value="FAMC:HUSB:NAME:SURN:SDX" <?php if ($fatherSurnOption == 'SDX') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
 			</select>
 		</td>
 	</tr>
@@ -252,10 +297,22 @@ 
 		<td class="list_value">
 			<input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:WIFE:NAME:GIVN:' . $motherGivnOption)); ?>">
 			<select name="fields[<?php echo $j; ?>]">
-				<option value="FAMC:WIFE:NAME:GIVN:EXACT" <?php if ($motherGivnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-				<option value="FAMC:WIFE:NAME:GIVN:BEGINS" <?php if ($motherGivnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-				<option value="FAMC:WIFE:NAME:GIVN:CONTAINS" <?php if ($motherGivnOption == 'CONTAINS') echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-				<option value="FAMC:WIFE:NAME:GIVN:SDX" <?php if ($motherGivnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+				<option value="FAMC:WIFE:NAME:GIVN:EXACT" <?php if ($motherGivnOption == 'EXACT') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+				<option value="FAMC:WIFE:NAME:GIVN:BEGINS" <?php if ($motherGivnOption == 'BEGINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+				<option value="FAMC:WIFE:NAME:GIVN:CONTAINS" <?php if ($motherGivnOption == 'CONTAINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+				<option value="FAMC:WIFE:NAME:GIVN:SDX" <?php if ($motherGivnOption == 'SDX') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
 			</select>
 		</td>
 		<?php $j++; ?>
@@ -267,10 +324,22 @@ 
 		<td class="list_value">
 			<input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:WIFE:NAME:SURN:' . $motherSurnOption)); ?>">
 			<select name="fields[<?php echo $j; ?>]">
-				<option value="FAMC:WIFE:NAME:SURN:EXACT" <?php if ($motherSurnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-				<option value="FAMC:WIFE:NAME:SURN:BEGINS" <?php if ($motherSurnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-				<option value="FAMC:WIFE:NAME:SURN:CONTAINS" <?php if ($motherSurnOption == 'CONTAINS') 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-				<option value="FAMC:WIFE:NAME:SURN:SDX" <?php if ($motherSurnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+				<option value="FAMC:WIFE:NAME:SURN:EXACT" <?php if ($motherSurnOption == 'EXACT') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+				<option value="FAMC:WIFE:NAME:SURN:BEGINS" <?php if ($motherSurnOption == 'BEGINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+				<option value="FAMC:WIFE:NAME:SURN:CONTAINS" <?php if ($motherSurnOption == 'CONTAINS') {
+	'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+				<option value="FAMC:WIFE:NAME:SURN:SDX" <?php if ($motherSurnOption == 'SDX') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
 			</select>
 		</td>
 		<?php $j++; ?>

Switch Indentation +12 added lines, -12 removed lines

@@ -185,18 +185,18 @@
 				$searchField  = $controller->getField($k);
 				$searchOption = substr($searchField, 20); // Assume we have something like "FAMC:HUSB:NAME:GIVN:foo"
 				switch (substr($searchField, 0, 20)) {
-				case 'FAMC:HUSB:NAME:GIVN:':
-					$fatherGivnOption = $searchOption;
-					break;
-				case 'FAMC:HUSB:NAME:SURN:':
-					$fatherSurnOption = $searchOption;
-					break;
-				case 'FAMC:WIFE:NAME:GIVN:':
-					$motherGivnOption = $searchOption;
-					break;
-				case 'FAMC:WIFE:NAME:SURN:':
-					$motherSurnOption = $searchOption;
-					break;
+					case 'FAMC:HUSB:NAME:GIVN:':
+						$fatherGivnOption = $searchOption;
+						break;
+					case 'FAMC:HUSB:NAME:SURN:':
+						$fatherSurnOption = $searchOption;
+						break;
+					case 'FAMC:WIFE:NAME:GIVN:':
+						$motherGivnOption = $searchOption;
+						break;
+					case 'FAMC:WIFE:NAME:SURN:':
+						$motherSurnOption = $searchOption;
+						break;
 				}
 			}
 			?>

app/Module/BatchUpdateModule.php

Braces +10 added lines, -4 removed lines

@@ -236,12 +236,15 @@ 
 					<?php // Reset - otherwise we might "undo all changes", which refreshes the ?>
 					<?php // page, which makes them all again!  ?>
 					<script>reset_reload();</script>
-			<?php else: ?>
+			<?php else {
+	: ?>
 					<hr>
 					<div id="batch_update2" class="col-sm-12">
 						<?php if ($this->curr_xref): ?>
 							<?php // Create an object, so we can get the latest version of the name. ?>
-								<?php $this->record = GedcomRecord::getInstance($this->curr_xref, $WT_TREE); ?>
+								<?php $this->record = GedcomRecord::getInstance($this->curr_xref, $WT_TREE);
+}
+?>
 							<div class="form-group">
 								<?php echo self::createSubmitButton(I18N::translate('previous'), $this->prev_xref) ?>
 					<?php echo self::createSubmitButton(I18N::translate('next'), $this->next_xref) ?>
@@ -253,8 +256,11 @@ 
 							<div class="form-group">
 							<?php echo implode(' ', $this->PLUGIN->getActionButtons($this->curr_xref, $this->record)); ?>
 							</div>
-						<?php else: ?>
-							<div class="alert alert-info"><?php echo I18N::translate('Nothing found.'); ?></div>
+						<?php else {
+	: ?>
+							<div class="alert alert-info"><?php echo I18N::translate('Nothing found.');
+}
+?></div>
 					<?php endif; ?>
 					</div>
 				<?php endif; ?>

Switch Indentation +66 added lines, -66 removed lines

@@ -94,13 +94,13 @@ 
 	 */
 	public function modAction($mod_action) {
 		switch ($mod_action) {
-		case 'admin_batch_update':
-			echo $this->main();
-			break;
+			case 'admin_batch_update':
+				echo $this->main();
+				break;
 
-		default:
-			http_response_code(404);
-			break;
+			default:
+				http_response_code(404);
+				break;
 		}
 	}
 
@@ -125,36 +125,36 @@ 
 			$this->getAllXrefs();
 
 			switch ($this->action) {
-			case 'update':
-				$record = self::getLatestRecord($this->xref, $this->all_xrefs[$this->xref]);
-				if ($this->PLUGIN->doesRecordNeedUpdate($this->xref, $record)) {
-					$newrecord = $this->PLUGIN->updateRecord($this->xref, $record);
-					if ($newrecord != $record) {
-						if ($newrecord) {
-							GedcomRecord::getInstance($this->xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan);
-						} else {
-							GedcomRecord::getInstance($this->xref, $WT_TREE)->deleteRecord();
-						}
-					}
-				}
-				$this->xref = $this->findNextXref($this->xref);
-				break;
-			case 'update_all':
-				foreach ($this->all_xrefs as $xref => $type) {
-					$record = self::getLatestRecord($xref, $type);
-					if ($this->PLUGIN->doesRecordNeedUpdate($xref, $record)) {
-						$newrecord = $this->PLUGIN->updateRecord($xref, $record);
+				case 'update':
+					$record = self::getLatestRecord($this->xref, $this->all_xrefs[$this->xref]);
+					if ($this->PLUGIN->doesRecordNeedUpdate($this->xref, $record)) {
+						$newrecord = $this->PLUGIN->updateRecord($this->xref, $record);
 						if ($newrecord != $record) {
 							if ($newrecord) {
-								GedcomRecord::getInstance($xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan);
+								GedcomRecord::getInstance($this->xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan);
 							} else {
-								GedcomRecord::getInstance($xref, $WT_TREE)->deleteRecord();
+								GedcomRecord::getInstance($this->xref, $WT_TREE)->deleteRecord();
 							}
 						}
 					}
-				}
-				$this->xref = '';
-				break;
+					$this->xref = $this->findNextXref($this->xref);
+					break;
+				case 'update_all':
+					foreach ($this->all_xrefs as $xref => $type) {
+						$record = self::getLatestRecord($xref, $type);
+						if ($this->PLUGIN->doesRecordNeedUpdate($xref, $record)) {
+							$newrecord = $this->PLUGIN->updateRecord($xref, $record);
+							if ($newrecord != $record) {
+								if ($newrecord) {
+									GedcomRecord::getInstance($xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan);
+								} else {
+									GedcomRecord::getInstance($xref, $WT_TREE)->deleteRecord();
+								}
+							}
+						}
+					}
+					$this->xref = '';
+					break;
 			}
 
 			// Make sure that our requested record really does need updating.
@@ -313,28 +313,28 @@ 
 		$vars = array();
 		foreach ($this->PLUGIN->getRecordTypesToUpdate() as $type) {
 			switch ($type) {
-			case 'INDI':
-				$sql[]  = "SELECT i_id, 'INDI' FROM `##individuals` WHERE i_file=?";
-				$vars[] = $WT_TREE->getTreeId();
-				break;
-			case 'FAM':
-				$sql[]  = "SELECT f_id, 'FAM' FROM `##families` WHERE f_file=?";
-				$vars[] = $WT_TREE->getTreeId();
-				break;
-			case 'SOUR':
-				$sql[]  = "SELECT s_id, 'SOUR' FROM `##sources` WHERE s_file=?";
-				$vars[] = $WT_TREE->getTreeId();
-				break;
-			case 'OBJE':
-				$sql[]  = "SELECT m_id, 'OBJE' FROM `##media` WHERE m_file=?";
-				$vars[] = $WT_TREE->getTreeId();
-				break;
-			default:
-				$sql[]  = "SELECT o_id, ? FROM `##other` WHERE o_type=? AND o_file=?";
-				$vars[] = $type;
-				$vars[] = $type;
-				$vars[] = $WT_TREE->getTreeId();
-				break;
+				case 'INDI':
+					$sql[]  = "SELECT i_id, 'INDI' FROM `##individuals` WHERE i_file=?";
+					$vars[] = $WT_TREE->getTreeId();
+					break;
+				case 'FAM':
+					$sql[]  = "SELECT f_id, 'FAM' FROM `##families` WHERE f_file=?";
+					$vars[] = $WT_TREE->getTreeId();
+					break;
+				case 'SOUR':
+					$sql[]  = "SELECT s_id, 'SOUR' FROM `##sources` WHERE s_file=?";
+					$vars[] = $WT_TREE->getTreeId();
+					break;
+				case 'OBJE':
+					$sql[]  = "SELECT m_id, 'OBJE' FROM `##media` WHERE m_file=?";
+					$vars[] = $WT_TREE->getTreeId();
+					break;
+				default:
+					$sql[]  = "SELECT o_id, ? FROM `##other` WHERE o_type=? AND o_file=?";
+					$vars[] = $type;
+					$vars[] = $type;
+					$vars[] = $WT_TREE->getTreeId();
+					break;
 			}
 		}
 		$this->all_xrefs =
@@ -411,20 +411,20 @@ 
 		global $WT_TREE;
 
 		switch ($type) {
-		case 'INDI':
-			return Individual::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'FAM':
-			return Family::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'SOUR':
-			return Source::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'REPO':
-			return Repository::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'OBJE':
-			return Media::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'NOTE':
-			return Note::getInstance($xref, $WT_TREE)->getGedcom();
-		default:
-			return GedcomRecord::getInstance($xref, $WT_TREE)->getGedcom();
+			case 'INDI':
+				return Individual::getInstance($xref, $WT_TREE)->getGedcom();
+			case 'FAM':
+				return Family::getInstance($xref, $WT_TREE)->getGedcom();
+			case 'SOUR':
+				return Source::getInstance($xref, $WT_TREE)->getGedcom();
+			case 'REPO':
+				return Repository::getInstance($xref, $WT_TREE)->getGedcom();
+			case 'OBJE':
+				return Media::getInstance($xref, $WT_TREE)->getGedcom();
+			case 'NOTE':
+				return Note::getInstance($xref, $WT_TREE)->getGedcom();
+			default:
+				return GedcomRecord::getInstance($xref, $WT_TREE)->getGedcom();
 		}
 	}
 

admin.php

Braces +35 added lines, -14 removed lines

@@ -611,8 +611,11 @@ 
 					<a href="admin_site_upgrade.php" class="error">
 						<?php echo /* I18N: %s is a version number */ I18N::translate('Upgrade to webtrees %s.', Filter::escapeHtml($latest_version)); ?>
 					</a>
-					<?php else: ?>
-						<?php echo I18N::translate('This is the latest version of webtrees. No upgrade is available.'); ?>
+					<?php else {
+	: ?>
+						<?php echo I18N::translate('This is the latest version of webtrees. No upgrade is available.');
+}
+?>
 					<?php endif; ?>
 				</p>
 				<?php endif; ?>
@@ -774,9 +777,12 @@ 
 									<?php echo I18N::number($changes[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Pending changes'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 							<td class="text-right flip">
 								<?php if ($individuals[$tree->getTreeId()]): ?>
@@ -784,9 +790,12 @@ 
 									<?php echo I18N::number($individuals[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Individuals'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 									-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 								</td>
 							<td class="text-right flip">
 								<?php if ($families[$tree->getTreeId()]): ?>
@@ -794,9 +803,12 @@ 
 									<?php echo I18N::number($families[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Families'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 								</td>
 							<td class="text-right flip">
 								<?php if ($sources[$tree->getTreeId()]): ?>
@@ -804,9 +816,12 @@ 
 									<?php echo I18N::number($sources[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Sources'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 							<td class="text-right flip">
 								<?php if ($repositories[$tree->getTreeId()]): ?>
@@ -814,9 +829,12 @@ 
 									<?php echo I18N::number($repositories[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Repositories'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 									-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 							<td class="text-right flip">
 								<?php if ($media[$tree->getTreeId()]): ?>
@@ -824,9 +842,12 @@ 
 									<?php echo I18N::number($media[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Media objects'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 						</tr>
 						<?php endforeach; ?>

admin_modules.php

Braces +40 added lines, -16 removed lines

@@ -176,9 +176,12 @@ 
 							<a href="<?php echo $module->getConfigLink() ?>">
 								<?php echo $module->getTitle() ?> <i class="fa fa-cogs"></i>
 							</a>
-						<?php else: ?>
+						<?php else {
+	: ?>
 							<?php echo $module->getTitle() ?>
-						<?php endif; ?>
+						<?php endif;
+}
+?>
 						<?php if (!in_array($module->getName(), Module::getCoreModuleNames())): ?>
 							<br>
 						<?php endif; ?>
@@ -202,23 +205,32 @@ 
 					<td class="text-center text-muted hidden-xs">
 						<?php if ($module instanceof ModuleMenuInterface): ?>
 							<i class="fa fa-list-ul" title="<?php echo I18N::translate('Menu') ?>"></i>
-						<?php else: ?>
+						<?php else {
+	: ?>
 							-
-						<?php endif; ?>
+						<?php endif;
+}
+?>
 					</td>
 					<td class="text-center text-muted hidden-xs">
 						<?php if ($module instanceof ModuleTabInterface): ?>
 							<i class="fa fa-folder" title="<?php echo I18N::translate('Tab') ?>"></i>
-						<?php else: ?>
+						<?php else {
+	: ?>
 							-
-						<?php endif; ?>
+						<?php endif;
+}
+?>
 					</td>
 					<td class="text-center text-muted hidden-xs">
 						<?php if ($module instanceof ModuleSidebarInterface): ?>
 							<i class="fa fa-th-large" title="<?php echo I18N::translate('Sidebar') ?>"></i>
-						<?php else: ?>
+						<?php else {
+	: ?>
 							-
-						<?php endif; ?>
+						<?php endif;
+}
+?>
 					</td>
 					<td class="text-center text-muted hidden-xs">
 						<?php if ($module instanceof ModuleBlockInterface): ?>
@@ -228,30 +240,42 @@ 
 							<?php if ($module->isUserBlock()): ?>
 								<i class="fa fa-tree" title="<?php echo I18N::translate('Home page') ?>"></i>
 							<?php endif; ?>
-						<?php else: ?>
+						<?php else {
+	: ?>
 							-
-						<?php endif; ?>
+						<?php endif;
+}
+?>
 					</td>
 					<td class="text-center text-muted hidden-xs">
 						<?php if ($module instanceof ModuleChartInterface): ?>
 							<i class="fa fa-share-alt" title="<?php echo I18N::translate('Chart') ?>"></i>
-						<?php else: ?>
+						<?php else {
+	: ?>
 							-
-						<?php endif; ?>
+						<?php endif;
+}
+?>
 					</td>
 					<td class="text-center text-muted hidden-xs">
 						<?php if ($module instanceof ModuleReportInterface): ?>
 							<i class="fa fa-file" title="<?php echo I18N::translate('Report') ?>"></i>
-						<?php else: ?>
+						<?php else {
+	: ?>
 							-
-						<?php endif; ?>
+						<?php endif;
+}
+?>
 					</td>
 					<td class="text-center text-muted hidden">
 						<?php if ($module instanceof ModuleThemeInterface): ?>
 							<i class="fa fa-check" title="<?php echo I18N::translate('Theme') ?>"></i>
-						<?php else: ?>
+						<?php else {
+	: ?>
 							-
-						<?php endif; ?>
+						<?php endif;
+}
+?>
 					</td>
 				</tr>
 			<?php endforeach; ?>

app/Report/ReportParserGenerate.php

Spacing +1 added lines, -1 removed lines

@@ -2743,7 +2743,7 @@
 		$tags      = explode(':', $tag);
 		$origlevel = $level;
 		if ($level == 0) {
-			$level = $gedrec{0} + 1;
+			$level = $gedrec{0} +1;
 		}
 
 		$subrec = $gedrec;

Switch Indentation +310 added lines, -310 removed lines

@@ -934,14 +934,14 @@ 
 				$tags  = preg_split('/[: ]/', $tag);
 				$value = $this->getGedcomValue($tag, $level, $this->gedrec);
 				switch (end($tags)) {
-				case 'DATE':
-					$tmp   = new Date($value);
-					$value = $tmp->display();
-					break;
-				case 'PLAC':
-					$tmp   = new Place($value, $WT_TREE);
-					$value = $tmp->getShortName();
-					break;
+					case 'DATE':
+						$tmp   = new Date($value);
+						$value = $tmp->display();
+						break;
+					case 'PLAC':
+						$tmp   = new Place($value, $WT_TREE);
+						$value = $tmp->getShortName();
+						break;
 				}
 				if ($useBreak == "1") {
 					// Insert <br> when multiple dates exist.
@@ -1335,22 +1335,22 @@ 
 		// Arithmetic functions
 		if (preg_match("/(\d+)\s*([\-\+\*\/])\s*(\d+)/", $value, $match)) {
 			switch ($match[2]) {
-			case "+":
-				$t     = $match[1] + $match[3];
-				$value = preg_replace("/" . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . "/", $t, $value);
-				break;
-			case "-":
-				$t     = $match[1] - $match[3];
-				$value = preg_replace("/" . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . "/", $t, $value);
-				break;
-			case "*":
-				$t     = $match[1] * $match[3];
-				$value = preg_replace("/" . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . "/", $t, $value);
-				break;
-			case "/":
-				$t     = $match[1] / $match[3];
-				$value = preg_replace("/" . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . "/", $t, $value);
-				break;
+				case "+":
+					$t     = $match[1] + $match[3];
+					$value = preg_replace("/" . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . "/", $t, $value);
+					break;
+				case "-":
+					$t     = $match[1] - $match[3];
+					$value = preg_replace("/" . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . "/", $t, $value);
+					break;
+				case "*":
+					$t     = $match[1] * $match[3];
+					$value = preg_replace("/" . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . "/", $t, $value);
+					break;
+				case "/":
+					$t     = $match[1] / $match[3];
+					$value = preg_replace("/" . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . "/", $t, $value);
+					break;
 			}
 		}
 		if (strpos($value, "@") !== false) {
@@ -1859,180 +1859,180 @@ 
 		}
 		// Some filters/sorts can be applied using SQL, while others require PHP
 		switch ($listname) {
-		case "pending":
-			$rows = Database::prepare(
-				"SELECT xref, CASE new_gedcom WHEN '' THEN old_gedcom ELSE new_gedcom END AS gedcom" .
-				" FROM `##change`" . " WHERE (xref, change_id) IN (" .
-				"  SELECT xref, MAX(change_id)" .
-				"  FROM `##change`" .
-				"  WHERE status = 'pending' AND gedcom_id = :tree_id" .
-				"  GROUP BY xref" .
-				" )"
-			)->execute(array(
-				'tree_id' => $WT_TREE->getTreeId(),
-			))->fetchAll();
-			$this->list = array();
-			foreach ($rows as $row) {
-				$this->list[] = GedcomRecord::getInstance($row->xref, $WT_TREE, $row->gedcom);
-			}
-			break;
-		case 'individual':
-			$sql_select   = "SELECT i_id AS xref, i_gedcom AS gedcom FROM `##individuals` ";
-			$sql_join     = "";
-			$sql_where    = " WHERE i_file = :tree_id";
-			$sql_order_by = "";
-			$sql_params   = array('tree_id' => $WT_TREE->getTreeId());
-			foreach ($attrs as $attr => $value) {
-				if (strpos($attr, 'filter') === 0 && $value) {
-					$value = $this->substituteVars($value, false);
-					// Convert the various filters into SQL
-					if (preg_match('/^(\w+):DATE (LTE|GTE) (.+)$/', $value, $match)) {
-						$sql_join .= " JOIN `##dates` AS {$attr} ON ({$attr}.d_file=i_file AND {$attr}.d_gid=i_id)";
-						$sql_where .= " AND {$attr}.d_fact = :{$attr}fact";
-						$sql_params[$attr . 'fact'] = $match[1];
-						$date                       = new Date($match[3]);
-						if ($match[2] == "LTE") {
-							$sql_where .= " AND {$attr}.d_julianday2 <= :{$attr}date";
-							$sql_params[$attr . 'date'] = $date->maximumJulianDay();
-						} else {
-							$sql_where .= " AND {$attr}.d_julianday1 >= :{$attr}date";
-							$sql_params[$attr . 'date'] = $date->minimumJulianDay();
-						}
-						if ($sortby == $match[1]) {
-							$sortby = "";
-							$sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.d_julianday1";
-						}
-						unset($attrs[$attr]); // This filter has been fully processed
-					} elseif (preg_match('/^NAME CONTAINS (.*)$/', $value, $match)) {
-						// Do nothing, unless you have to
-						if ($match[1] != '' || $sortby == 'NAME') {
-							$sql_join .= " JOIN `##name` AS {$attr} ON (n_file=i_file AND n_id=i_id)";
-							// Search the DB only if there is any name supplied
-							if ($match[1] != "") {
-								$names = explode(" ", $match[1]);
-								foreach ($names as $n => $name) {
-									$sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
-									$sql_params[$attr . 'name' . $n] = $name;
-								}
+			case "pending":
+				$rows = Database::prepare(
+					"SELECT xref, CASE new_gedcom WHEN '' THEN old_gedcom ELSE new_gedcom END AS gedcom" .
+					" FROM `##change`" . " WHERE (xref, change_id) IN (" .
+					"  SELECT xref, MAX(change_id)" .
+					"  FROM `##change`" .
+					"  WHERE status = 'pending' AND gedcom_id = :tree_id" .
+					"  GROUP BY xref" .
+					" )"
+				)->execute(array(
+					'tree_id' => $WT_TREE->getTreeId(),
+				))->fetchAll();
+				$this->list = array();
+				foreach ($rows as $row) {
+					$this->list[] = GedcomRecord::getInstance($row->xref, $WT_TREE, $row->gedcom);
+				}
+				break;
+			case 'individual':
+				$sql_select   = "SELECT i_id AS xref, i_gedcom AS gedcom FROM `##individuals` ";
+				$sql_join     = "";
+				$sql_where    = " WHERE i_file = :tree_id";
+				$sql_order_by = "";
+				$sql_params   = array('tree_id' => $WT_TREE->getTreeId());
+				foreach ($attrs as $attr => $value) {
+					if (strpos($attr, 'filter') === 0 && $value) {
+						$value = $this->substituteVars($value, false);
+						// Convert the various filters into SQL
+						if (preg_match('/^(\w+):DATE (LTE|GTE) (.+)$/', $value, $match)) {
+							$sql_join .= " JOIN `##dates` AS {$attr} ON ({$attr}.d_file=i_file AND {$attr}.d_gid=i_id)";
+							$sql_where .= " AND {$attr}.d_fact = :{$attr}fact";
+							$sql_params[$attr . 'fact'] = $match[1];
+							$date                       = new Date($match[3]);
+							if ($match[2] == "LTE") {
+								$sql_where .= " AND {$attr}.d_julianday2 <= :{$attr}date";
+								$sql_params[$attr . 'date'] = $date->maximumJulianDay();
+							} else {
+								$sql_where .= " AND {$attr}.d_julianday1 >= :{$attr}date";
+								$sql_params[$attr . 'date'] = $date->minimumJulianDay();
 							}
-							// Let the DB do the name sorting even when no name was entered
-							if ($sortby == "NAME") {
+							if ($sortby == $match[1]) {
 								$sortby = "";
-								$sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.n_sort";
+								$sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.d_julianday1";
 							}
+							unset($attrs[$attr]); // This filter has been fully processed
+						} elseif (preg_match('/^NAME CONTAINS (.*)$/', $value, $match)) {
+							// Do nothing, unless you have to
+							if ($match[1] != '' || $sortby == 'NAME') {
+								$sql_join .= " JOIN `##name` AS {$attr} ON (n_file=i_file AND n_id=i_id)";
+								// Search the DB only if there is any name supplied
+								if ($match[1] != "") {
+									$names = explode(" ", $match[1]);
+									foreach ($names as $n => $name) {
+										$sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
+										$sql_params[$attr . 'name' . $n] = $name;
+									}
+								}
+								// Let the DB do the name sorting even when no name was entered
+								if ($sortby == "NAME") {
+									$sortby = "";
+									$sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.n_sort";
+								}
+							}
+							unset($attrs[$attr]); // This filter has been fully processed
+						} elseif (preg_match('/^REGEXP \/(.+)\//', $value, $match)) {
+							$sql_where .= " AND i_gedcom REGEXP :{$attr}gedcom";
+							// PDO helpfully escapes backslashes for us, preventing us from matching "\n1 FACT"
+							$sql_params[$attr . 'gedcom'] = str_replace('\n', "\n", $match[1]);
+							unset($attrs[$attr]); // This filter has been fully processed
+						} elseif (preg_match('/^(?:\w+):PLAC CONTAINS (.+)$/', $value, $match)) {
+							$sql_join .= " JOIN `##places` AS {$attr}a ON ({$attr}a.p_file = i_file)";
+							$sql_join .= " JOIN `##placelinks` AS {$attr}b ON ({$attr}a.p_file = {$attr}b.pl_file AND {$attr}b.pl_p_id = {$attr}a.p_id AND {$attr}b.pl_gid = i_id)";
+							$sql_where .= " AND {$attr}a.p_place LIKE CONCAT('%', :{$attr}place, '%')";
+							$sql_params[$attr . 'place'] = $match[1];
+							// Don't unset this filter. This is just initial filtering
+						} elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
+							$sql_where .= " AND i_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
+							$sql_params[$attr . 'contains1'] = $match[1];
+							$sql_params[$attr . 'contains2'] = $match[2];
+							$sql_params[$attr . 'contains3'] = $match[3];
+							// Don't unset this filter. This is just initial filtering
 						}
-						unset($attrs[$attr]); // This filter has been fully processed
-					} elseif (preg_match('/^REGEXP \/(.+)\//', $value, $match)) {
-						$sql_where .= " AND i_gedcom REGEXP :{$attr}gedcom";
-						// PDO helpfully escapes backslashes for us, preventing us from matching "\n1 FACT"
-						$sql_params[$attr . 'gedcom'] = str_replace('\n', "\n", $match[1]);
-						unset($attrs[$attr]); // This filter has been fully processed
-					} elseif (preg_match('/^(?:\w+):PLAC CONTAINS (.+)$/', $value, $match)) {
-						$sql_join .= " JOIN `##places` AS {$attr}a ON ({$attr}a.p_file = i_file)";
-						$sql_join .= " JOIN `##placelinks` AS {$attr}b ON ({$attr}a.p_file = {$attr}b.pl_file AND {$attr}b.pl_p_id = {$attr}a.p_id AND {$attr}b.pl_gid = i_id)";
-						$sql_where .= " AND {$attr}a.p_place LIKE CONCAT('%', :{$attr}place, '%')";
-						$sql_params[$attr . 'place'] = $match[1];
-						// Don't unset this filter. This is just initial filtering
-					} elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
-						$sql_where .= " AND i_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
-						$sql_params[$attr . 'contains1'] = $match[1];
-						$sql_params[$attr . 'contains2'] = $match[2];
-						$sql_params[$attr . 'contains3'] = $match[3];
-						// Don't unset this filter. This is just initial filtering
 					}
 				}
-			}
 
-			$this->list = array();
-			$rows       = Database::prepare(
-				$sql_select . $sql_join . $sql_where . $sql_order_by
-			)->execute($sql_params)->fetchAll();
-
-			foreach ($rows as $row) {
-				$this->list[$row->xref] = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-			}
-			break;
-
-		case 'family':
-			$sql_select   = "SELECT f_id AS xref, f_gedcom AS gedcom FROM `##families`";
-			$sql_join     = "";
-			$sql_where    = " WHERE f_file = :tree_id";
-			$sql_order_by = "";
-			$sql_params   = array('tree_id' => $WT_TREE->getTreeId());
-			foreach ($attrs as $attr => $value) {
-				if (strpos($attr, 'filter') === 0 && $value) {
-					$value = $this->substituteVars($value, false);
-					// Convert the various filters into SQL
-					if (preg_match('/^(\w+):DATE (LTE|GTE) (.+)$/', $value, $match)) {
-						$sql_join .= " JOIN `##dates` AS {$attr} ON ({$attr}.d_file=f_file AND {$attr}.d_gid=f_id)";
-						$sql_where .= " AND {$attr}.d_fact = :{$attr}fact";
-						$sql_params[$attr . 'fact'] = $match[1];
-						$date                       = new Date($match[3]);
-						if ($match[2] == "LTE") {
-							$sql_where .= " AND {$attr}.d_julianday2 <= :{$attr}date";
-							$sql_params[$attr . 'date'] = $date->maximumJulianDay();
-						} else {
-							$sql_where .= " AND {$attr}.d_julianday1 >= :{$attr}date";
-							$sql_params[$attr . 'date'] = $date->minimumJulianDay();
-						}
-						if ($sortby == $match[1]) {
-							$sortby = "";
-							$sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.d_julianday1";
-						}
-						unset($attrs[$attr]); // This filter has been fully processed
-					} elseif (preg_match('/^REGEXP \/(.+)\//', $value, $match)) {
-						$sql_where .= " AND f_gedcom REGEXP :{$attr}gedcom";
-						// PDO helpfully escapes backslashes for us, preventing us from matching "\n1 FACT"
-						$sql_params[$attr . 'gedcom'] = str_replace('\n', "\n", $match[1]);
-						unset($attrs[$attr]); // This filter has been fully processed
-					} elseif (preg_match('/^NAME CONTAINS (.+)$/', $value, $match)) {
-						// Do nothing, unless you have to
-						if ($match[1] != '' || $sortby == 'NAME') {
-							$sql_join .= " JOIN `##name` AS {$attr} ON n_file = f_file AND n_id IN (f_husb, f_wife)";
-							// Search the DB only if there is any name supplied
-							if ($match[1] != "") {
-								$names = explode(" ", $match[1]);
-								foreach ($names as $n => $name) {
-									$sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
-									$sql_params[$attr . 'name' . $n] = $name;
-								}
+				$this->list = array();
+				$rows       = Database::prepare(
+					$sql_select . $sql_join . $sql_where . $sql_order_by
+				)->execute($sql_params)->fetchAll();
+
+				foreach ($rows as $row) {
+					$this->list[$row->xref] = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+				}
+				break;
+
+			case 'family':
+				$sql_select   = "SELECT f_id AS xref, f_gedcom AS gedcom FROM `##families`";
+				$sql_join     = "";
+				$sql_where    = " WHERE f_file = :tree_id";
+				$sql_order_by = "";
+				$sql_params   = array('tree_id' => $WT_TREE->getTreeId());
+				foreach ($attrs as $attr => $value) {
+					if (strpos($attr, 'filter') === 0 && $value) {
+						$value = $this->substituteVars($value, false);
+						// Convert the various filters into SQL
+						if (preg_match('/^(\w+):DATE (LTE|GTE) (.+)$/', $value, $match)) {
+							$sql_join .= " JOIN `##dates` AS {$attr} ON ({$attr}.d_file=f_file AND {$attr}.d_gid=f_id)";
+							$sql_where .= " AND {$attr}.d_fact = :{$attr}fact";
+							$sql_params[$attr . 'fact'] = $match[1];
+							$date                       = new Date($match[3]);
+							if ($match[2] == "LTE") {
+								$sql_where .= " AND {$attr}.d_julianday2 <= :{$attr}date";
+								$sql_params[$attr . 'date'] = $date->maximumJulianDay();
+							} else {
+								$sql_where .= " AND {$attr}.d_julianday1 >= :{$attr}date";
+								$sql_params[$attr . 'date'] = $date->minimumJulianDay();
 							}
-							// Let the DB do the name sorting even when no name was entered
-							if ($sortby == "NAME") {
+							if ($sortby == $match[1]) {
 								$sortby = "";
-								$sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.n_sort";
+								$sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.d_julianday1";
+							}
+							unset($attrs[$attr]); // This filter has been fully processed
+						} elseif (preg_match('/^REGEXP \/(.+)\//', $value, $match)) {
+							$sql_where .= " AND f_gedcom REGEXP :{$attr}gedcom";
+							// PDO helpfully escapes backslashes for us, preventing us from matching "\n1 FACT"
+							$sql_params[$attr . 'gedcom'] = str_replace('\n', "\n", $match[1]);
+							unset($attrs[$attr]); // This filter has been fully processed
+						} elseif (preg_match('/^NAME CONTAINS (.+)$/', $value, $match)) {
+							// Do nothing, unless you have to
+							if ($match[1] != '' || $sortby == 'NAME') {
+								$sql_join .= " JOIN `##name` AS {$attr} ON n_file = f_file AND n_id IN (f_husb, f_wife)";
+								// Search the DB only if there is any name supplied
+								if ($match[1] != "") {
+									$names = explode(" ", $match[1]);
+									foreach ($names as $n => $name) {
+										$sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
+										$sql_params[$attr . 'name' . $n] = $name;
+									}
+								}
+								// Let the DB do the name sorting even when no name was entered
+								if ($sortby == "NAME") {
+									$sortby = "";
+									$sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.n_sort";
+								}
 							}
+							unset($attrs[$attr]); // This filter has been fully processed
+
+						} elseif (preg_match('/^(?:\w+):PLAC CONTAINS (.+)$/', $value, $match)) {
+							$sql_join .= " JOIN `##places` AS {$attr}a ON ({$attr}a.p_file=f_file)";
+							$sql_join .= " JOIN `##placelinks` AS {$attr}b ON ({$attr}a.p_file={$attr}b.pl_file AND {$attr}b.pl_p_id={$attr}a.p_id AND {$attr}b.pl_gid=f_id)";
+							$sql_where .= " AND {$attr}a.p_place LIKE CONCAT('%', :{$attr}place, '%')";
+							$sql_params[$attr . 'place'] = $match[1];
+							// Don't unset this filter. This is just initial filtering
+						} elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
+							$sql_where .= " AND f_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
+							$sql_params[$attr . 'contains1'] = $match[1];
+							$sql_params[$attr . 'contains2'] = $match[2];
+							$sql_params[$attr . 'contains3'] = $match[3];
+							// Don't unset this filter. This is just initial filtering
 						}
-						unset($attrs[$attr]); // This filter has been fully processed
-
-					} elseif (preg_match('/^(?:\w+):PLAC CONTAINS (.+)$/', $value, $match)) {
-						$sql_join .= " JOIN `##places` AS {$attr}a ON ({$attr}a.p_file=f_file)";
-						$sql_join .= " JOIN `##placelinks` AS {$attr}b ON ({$attr}a.p_file={$attr}b.pl_file AND {$attr}b.pl_p_id={$attr}a.p_id AND {$attr}b.pl_gid=f_id)";
-						$sql_where .= " AND {$attr}a.p_place LIKE CONCAT('%', :{$attr}place, '%')";
-						$sql_params[$attr . 'place'] = $match[1];
-						// Don't unset this filter. This is just initial filtering
-					} elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
-						$sql_where .= " AND f_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
-						$sql_params[$attr . 'contains1'] = $match[1];
-						$sql_params[$attr . 'contains2'] = $match[2];
-						$sql_params[$attr . 'contains3'] = $match[3];
-						// Don't unset this filter. This is just initial filtering
 					}
 				}
-			}
 
-			$this->list = array();
-			$rows       = Database::prepare(
-				$sql_select . $sql_join . $sql_where . $sql_order_by
-			)->execute($sql_params)->fetchAll();
+				$this->list = array();
+				$rows       = Database::prepare(
+					$sql_select . $sql_join . $sql_where . $sql_order_by
+				)->execute($sql_params)->fetchAll();
 
-			foreach ($rows as $row) {
-				$this->list[$row->xref] = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-			}
-			break;
+				foreach ($rows as $row) {
+					$this->list[$row->xref] = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+				}
+				break;
 
-		default:
-			throw new \DomainException('Invalid list name: ' . $listname);
+			default:
+				throw new \DomainException('Invalid list name: ' . $listname);
 		}
 
 		$filters  = array();
@@ -2093,17 +2093,17 @@ 
 								$searchstr = "1 " . $tag;
 							}
 							switch ($expr) {
-							case "CONTAINS":
-								if ($t == "PLAC") {
-									$searchstr .= "[^\n]*[, ]*" . $val;
-								} else {
-									$searchstr .= "[^\n]*" . $val;
-								}
-								$filters[] = $searchstr;
-								break;
-							default:
-								$filters2[] = array("tag" => $tag, "expr" => $expr, "val" => $val);
-								break;
+								case "CONTAINS":
+									if ($t == "PLAC") {
+										$searchstr .= "[^\n]*[, ]*" . $val;
+									} else {
+										$searchstr .= "[^\n]*" . $val;
+									}
+									$filters[] = $searchstr;
+									break;
+								default:
+									$filters2[] = array("tag" => $tag, "expr" => $expr, "val" => $val);
+									break;
 							}
 						}
 					}
@@ -2147,31 +2147,31 @@ 
 						}
 
 						switch ($expr) {
-						case "GTE":
-							if ($t == "DATE") {
-								$date1 = new Date($v);
-								$date2 = new Date($val);
-								$keep  = (Date::compare($date1, $date2) >= 0);
-							} elseif ($val >= $v) {
-								$keep = true;
-							}
-							break;
-						case "LTE":
-							if ($t == "DATE") {
-								$date1 = new Date($v);
-								$date2 = new Date($val);
-								$keep  = (Date::compare($date1, $date2) <= 0);
-							} elseif ($val >= $v) {
-								$keep = true;
-							}
-							break;
-						default:
-							if ($v == $val) {
-								$keep = true;
-							} else {
-								$keep = false;
-							}
-							break;
+							case "GTE":
+								if ($t == "DATE") {
+									$date1 = new Date($v);
+									$date2 = new Date($val);
+									$keep  = (Date::compare($date1, $date2) >= 0);
+								} elseif ($val >= $v) {
+									$keep = true;
+								}
+								break;
+							case "LTE":
+								if ($t == "DATE") {
+									$date1 = new Date($v);
+									$date2 = new Date($val);
+									$keep  = (Date::compare($date1, $date2) <= 0);
+								} elseif ($val >= $v) {
+									$keep = true;
+								}
+								break;
+							default:
+								if ($v == $val) {
+									$keep = true;
+								} else {
+									$keep = false;
+								}
+								break;
 						}
 					}
 				}
@@ -2183,26 +2183,26 @@ 
 		}
 
 		switch ($sortby) {
-		case 'NAME':
-			uasort($this->list, '\Fisharebest\Webtrees\GedcomRecord::compare');
-			break;
-		case 'CHAN':
-			uasort($this->list, function (GedcomRecord $x, GedcomRecord $y) {
-				return $y->lastChangeTimestamp(true) - $x->lastChangeTimestamp(true);
-			});
-			break;
-		case 'BIRT:DATE':
-			uasort($this->list, '\Fisharebest\Webtrees\Individual::compareBirthDate');
-			break;
-		case 'DEAT:DATE':
-			uasort($this->list, '\Fisharebest\Webtrees\Individual::compareDeathDate');
-			break;
-		case 'MARR:DATE':
-			uasort($this->list, '\Fisharebest\Webtrees\Family::compareMarrDate');
-			break;
-		default:
-			// unsorted or already sorted by SQL
-			break;
+			case 'NAME':
+				uasort($this->list, '\Fisharebest\Webtrees\GedcomRecord::compare');
+				break;
+			case 'CHAN':
+				uasort($this->list, function (GedcomRecord $x, GedcomRecord $y) {
+					return $y->lastChangeTimestamp(true) - $x->lastChangeTimestamp(true);
+				});
+				break;
+			case 'BIRT:DATE':
+				uasort($this->list, '\Fisharebest\Webtrees\Individual::compareBirthDate');
+				break;
+			case 'DEAT:DATE':
+				uasort($this->list, '\Fisharebest\Webtrees\Individual::compareDeathDate');
+				break;
+			case 'MARR:DATE':
+				uasort($this->list, '\Fisharebest\Webtrees\Family::compareMarrDate');
+				break;
+			default:
+				// unsorted or already sorted by SQL
+				break;
 		}
 
 		array_push($this->repeats_stack, array($this->repeats, $this->repeat_bytes));
@@ -2353,88 +2353,88 @@ 
 		if (!empty($person)) {
 			$this->list[$id] = $person;
 			switch ($group) {
-			case "child-family":
-				foreach ($person->getChildFamilies() as $family) {
-					$husband = $family->getHusband();
-					$wife    = $family->getWife();
-					if (!empty($husband)) {
-						$this->list[$husband->getXref()] = $husband;
-					}
-					if (!empty($wife)) {
-						$this->list[$wife->getXref()] = $wife;
-					}
-					$children = $family->getChildren();
-					foreach ($children as $child) {
-						if (!empty($child)) {
-							$this->list[$child->getXref()] = $child;
+				case "child-family":
+					foreach ($person->getChildFamilies() as $family) {
+						$husband = $family->getHusband();
+						$wife    = $family->getWife();
+						if (!empty($husband)) {
+							$this->list[$husband->getXref()] = $husband;
+						}
+						if (!empty($wife)) {
+							$this->list[$wife->getXref()] = $wife;
+						}
+						$children = $family->getChildren();
+						foreach ($children as $child) {
+							if (!empty($child)) {
+								$this->list[$child->getXref()] = $child;
+							}
 						}
 					}
-				}
-				break;
-			case "spouse-family":
-				foreach ($person->getSpouseFamilies() as $family) {
-					$husband = $family->getHusband();
-					$wife    = $family->getWife();
-					if (!empty($husband)) {
-						$this->list[$husband->getXref()] = $husband;
-					}
-					if (!empty($wife)) {
-						$this->list[$wife->getXref()] = $wife;
-					}
-					$children = $family->getChildren();
-					foreach ($children as $child) {
-						if (!empty($child)) {
-							$this->list[$child->getXref()] = $child;
+					break;
+				case "spouse-family":
+					foreach ($person->getSpouseFamilies() as $family) {
+						$husband = $family->getHusband();
+						$wife    = $family->getWife();
+						if (!empty($husband)) {
+							$this->list[$husband->getXref()] = $husband;
+						}
+						if (!empty($wife)) {
+							$this->list[$wife->getXref()] = $wife;
+						}
+						$children = $family->getChildren();
+						foreach ($children as $child) {
+							if (!empty($child)) {
+								$this->list[$child->getXref()] = $child;
+							}
 						}
 					}
-				}
-				break;
-			case "direct-ancestors":
-				$this->addAncestors($this->list, $id, false, $maxgen);
-				break;
-			case "ancestors":
-				$this->addAncestors($this->list, $id, true, $maxgen);
-				break;
-			case "descendants":
-				$this->list[$id]->generation = 1;
-				$this->addDescendancy($this->list, $id, false, $maxgen);
-				break;
-			case "all":
-				$this->addAncestors($this->list, $id, true, $maxgen);
-				$this->addDescendancy($this->list, $id, true, $maxgen);
-				break;
+					break;
+				case "direct-ancestors":
+					$this->addAncestors($this->list, $id, false, $maxgen);
+					break;
+				case "ancestors":
+					$this->addAncestors($this->list, $id, true, $maxgen);
+					break;
+				case "descendants":
+					$this->list[$id]->generation = 1;
+					$this->addDescendancy($this->list, $id, false, $maxgen);
+					break;
+				case "all":
+					$this->addAncestors($this->list, $id, true, $maxgen);
+					$this->addDescendancy($this->list, $id, true, $maxgen);
+					break;
 			}
 		}
 
 		switch ($sortby) {
-		case 'NAME':
-			uasort($this->list, '\Fisharebest\Webtrees\GedcomRecord::compare');
-			break;
-		case 'BIRT:DATE':
-			uasort($this->list, '\Fisharebest\Webtrees\Individual::compareBirthDate');
-			break;
-		case 'DEAT:DATE':
-			uasort($this->list, '\Fisharebest\Webtrees\Individual::compareDeathDate');
-			break;
-		case 'generation':
-			$newarray = array();
-			reset($this->list);
-			$genCounter = 1;
-			while (count($newarray) < count($this->list)) {
-				foreach ($this->list as $key => $value) {
-					$this->generation = $value->generation;
-					if ($this->generation == $genCounter) {
-						$newarray[$key]             = new \stdClass;
-						$newarray[$key]->generation = $this->generation;
+			case 'NAME':
+				uasort($this->list, '\Fisharebest\Webtrees\GedcomRecord::compare');
+				break;
+			case 'BIRT:DATE':
+				uasort($this->list, '\Fisharebest\Webtrees\Individual::compareBirthDate');
+				break;
+			case 'DEAT:DATE':
+				uasort($this->list, '\Fisharebest\Webtrees\Individual::compareDeathDate');
+				break;
+			case 'generation':
+				$newarray = array();
+				reset($this->list);
+				$genCounter = 1;
+				while (count($newarray) < count($this->list)) {
+					foreach ($this->list as $key => $value) {
+						$this->generation = $value->generation;
+						if ($this->generation == $genCounter) {
+							$newarray[$key]             = new \stdClass;
+							$newarray[$key]->generation = $this->generation;
+						}
 					}
+					$genCounter++;
 				}
-				$genCounter++;
-			}
-			$this->list = $newarray;
-			break;
-		default:
-			// unsorted
-			break;
+				$this->list = $newarray;
+				break;
+			default:
+				// unsorted
+				break;
 		}
 		array_push($this->repeats_stack, array($this->repeats, $this->repeat_bytes));
 		$this->repeat_bytes = xml_get_current_line_number($this->parser) + 1;

app/GedcomCode/GedcomCodeTemp.php

Spacing +6 added lines, -6 removed lines

@@ -57,14 +57,14 @@
 			'MADRI', 'MANAU', 'MANHA', 'MANIL', 'MANTI', 'MEDFO', 'MELBO', 'MEMPH',
 			'MERID', 'MEXIC', 'MNTVD', 'MONTE', 'MONTI', 'MONTR', 'MTIMP', 'NASHV',
 			'NAUV2', 'NAUVO', 'NBEAC', 'NUKUA', 'NYORK', 'NZEAL', 'OAKLA', 'OAXAC',
-			'OGDEN', 'OKLAH',	'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE',
-			'PAYSO', 'PERTH',	'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO',
+			'OGDEN', 'OKLAH', 'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE',
+			'PAYSO', 'PERTH', 'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO',
 			'QUETZ', 'RALEI', 'RECIF', 'REDLA', 'REGIN', 'RENO', 'REXBU', 'SACRA',
-			'SAMOA', 'SANTI',	'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL',
-			'SGEOR', 'SJOSE',	'SLAKE', 'SLOUI', 'SNOWF','SPAUL', 'SPMIN', 'SPOKA',
+			'SAMOA', 'SANTI', 'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL',
+			'SGEOR', 'SJOSE', 'SLAKE', 'SLOUI', 'SNOWF', 'SPAUL', 'SPMIN', 'SPOKA',
 			'STOCK', 'SUVA', 'SWISS', 'SYDNE', 'TAIPE', 'TAMPI', 'TEGUC', 'TGUTI',
-			'TIHUA', 'TOKYO',	'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA',
-			'VILLA', 'WASHI',	'WINTE',
+			'TIHUA', 'TOKYO', 'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA',
+			'VILLA', 'WASHI', 'WINTE',
 		);
 	}
 

Switch Indentation +312 added lines, -312 removed lines

@@ -77,318 +77,318 @@
 	 */
 	public static function templeName($temple_code) {
 		switch ($temple_code) {
-		case 'ABA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Aba, Nigeria');
-		case 'ACCRA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Accra, Ghana');
-		case 'ADELA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Adelaide, Australia');
-		case 'ALBER':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Cardston, Alberta, Canada');
-		case 'ALBUQ':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Albuquerque, New Mexico, United States');
-		case 'ANCHO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Anchorage, Alaska, United States');
-		case 'APIA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Apia, Samoa');
-		case 'ARIZO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Mesa, Arizona, United States');
-		case 'ASUNC':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Asuncion, Paraguay');
-		case 'ATLAN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Atlanta, Georgia, United States');
-		case 'BAIRE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Buenos Aires, Argentina');
-		case 'BILLI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Billings, Montana, United States');
-		case 'BIRMI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Birmingham, Alabama, United States');
-		case 'BISMA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Bismarck, North Dakota, United States');
-		case 'BOGOT':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Bogota, Colombia');
-		case 'BOISE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Boise, Idaho, United States');
-		case 'BOSTO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Boston, Massachusetts, United States');
-		case 'BOUNT':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Bountiful, Utah, United States');
-		case 'BRIGH':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Brigham City, Utah, United States');
-		case 'BRISB':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Brisbane, Australia');
-		case 'BROUG':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Baton Rouge, Louisiana, United States');
-		case 'CALGA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Calgary, Alberta, Canada');
-		case 'CAMPI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Campinas, Brazil');
-		case 'CARAC':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Caracas, Venezuela');
-		case 'CEBUP':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Cebu City, Philippines');
-		case 'CHICA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Chicago, Illinois, United States');
-		case 'CIUJU':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Ciudad Juarez, Mexico');
-		case 'COCHA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Cochabamba, Bolivia');
-		case 'COLJU':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Colonia Juarez, Mexico');
-		case 'COLSC':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Columbia, South Carolina, United States');
-		case 'COLUM':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Columbus, Ohio, United States');
-		case 'COPEN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Copenhagen, Denmark');
-		case 'CORDO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Cordoba, Argentina');
-		case 'CRIVE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Columbia River, Washington, United States');
-		case 'CURIT':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Curitiba, Brazil');
-		case 'DALLA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Dallas, Texas, United States');
-		case 'DENVE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Denver, Colorado, United States');
-		case 'DETRO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Detroit, Michigan, United States');
-		case 'DRAPE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Draper, Utah, United States');
-		case 'EDMON':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Edmonton, Alberta, Canada');
-		case 'EHOUS':
-			return /* I18N: Location of an historic LDS church temple - http://en.wikipedia.org/wiki/Endowment_house */ I18N::translate('Endowment House');
-		case 'FORTL':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Fort Lauderdale, Florida, United States');
-		case 'FRANK':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Frankfurt am Main, Germany');
-		case 'FREIB':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Freiburg, Germany');
-		case 'FRESN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Fresno, California, United States');
-		case 'FUKUO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Fukuoka, Japan');
-		case 'GILAV':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Gila Valley, Arizona, United States');
-		case 'GILBE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Gilbert, Arizona, United States');
-		case 'GUADA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Guadalajara, Mexico');
-		case 'GUATE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Guatemala City, Guatemala');
-		case 'GUAYA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Guayaquil, Ecuador');
-		case 'HAGUE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('The Hague, Netherlands');
-		case 'HALIF':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Halifax, Nova Scotia, Canada');
-		case 'HARTF':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Hartford, Connecticut, United States');
-		case 'HAWAI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Laie, Hawaii, United States');
-		case 'HELSI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Helsinki, Finland');
-		case 'HERMO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Hermosillo, Mexico');
-		case 'HKONG':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Hong Kong');
-		case 'HOUST':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Houston, Texas, United States');
-		case 'IFALL':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Idaho Falls, Idaho, United States');
-		case 'INDIA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Indianapolis, Indiana, United States');
-		case 'JOHAN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Johannesburg, South Africa');
-		case 'JRIVE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Jordan River, Utah, United States');
-		case 'KANSA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Kansas City, Missouri, United States');
-		case 'KONA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Kona, Hawaii, United States');
-		case 'KYIV':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Kiev, Ukraine');
-		case 'LANGE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Los Angeles, California, United States');
-		case 'LIMA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Lima, Peru');
-		case 'LOGAN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Logan, Utah, United States');
-		case 'LONDO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('London, England');
-		case 'LOUIS':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Louisville, Kentucky, United States');
-		case 'LUBBO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Lubbock, Texas, United States');
-		case 'LVEGA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Las Vegas, Nevada, United States');
-		case 'MADRI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Madrid, Spain');
-		case 'MANAU':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Manaus, Brazil');
-		case 'MANHA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Manhattan, New York, United States');
-		case 'MANIL':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Manila, Philippines');
-		case 'MANTI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Manti, Utah, United States');
-		case 'MEDFO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Medford, Oregon, United States');
-		case 'MELBO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Melbourne, Australia');
-		case 'MEMPH':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Memphis, Tennessee, United States');
-		case 'MERID':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Merida, Mexico');
-		case 'MEXIC':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Mexico City, Mexico');
-		case 'MNTVD':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Montevideo, Uruguay');
-		case 'MONTE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Monterrey, Mexico');
-		case 'MONTI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Monticello, Utah, United States');
-		case 'MONTR':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Montreal, Quebec, Canada');
-		case 'MTIMP':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Mount Timpanogos, Utah, United States');
-		case 'NASHV':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Nashville, Tennessee, United States');
-		case 'NAUV2':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Nauvoo (new), Illinois, United States');
-		case 'NAUVO':
-			return /* I18N: Location of an historic LDS church temple */ I18N::translate('Nauvoo (original), Illinois, United States');
-		case 'NBEAC':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Newport Beach, California, United States');
-		case 'NUKUA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Nuku’Alofa, Tonga');
-		case 'NYORK':
-			return /* I18N: Location of an historic LDS church temple */ I18N::translate('New York, New York, United States');
-		case 'NZEAL':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Hamilton, New Zealand');
-		case 'OAKLA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Oakland, California, United States');
-		case 'OAXAC':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Oaxaca, Mexico');
-		case 'OGDEN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Ogden, Utah, United States');
-		case 'OKLAH':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Oklahoma City, Oklahoma, United States');
-		case 'OQUIR':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Oquirrh Mountain, Utah, United States');
-		case 'ORLAN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Orlando, Florida, United States');
-		case 'PALEG':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Porto Alegre, Brazil');
-		case 'PALMY':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Palmyra, New York, United States');
-		case 'PANAM':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Panama City, Panama');
-		case 'PAPEE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Papeete, Tahiti');
-		case 'PAYSO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Payson, Utah, United States');
-		case 'PERTH':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Perth, Australia');
-		case 'PHOEN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Phoenix, Arizona, United States');
-		case 'POFFI':
-			return /* I18N: I18N: Location of an historic LDS church temple - http://en.wikipedia.org/wiki/President_of_the_Church */ I18N::translate('President’s Office');
-		case 'PORTL':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Portland, Oregon, United States');
-		case 'PREST':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Preston, England');
-		case 'PROCC':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Provo City Center, Utah, United States');
-		case 'PROVO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Provo, Utah, United States');
-		case 'QUETZ':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Quetzaltenango, Guatemala');
-		case 'RALEI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Raleigh, North Carolina, United States');
-		case 'RECIF':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Recife, Brazil');
-		case 'REDLA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Redlands, California, United States');
-		case 'REGIN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Regina, Saskatchewan, Canada');
-		case 'RENO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Reno, Nevada, United States');
-		case 'REXBU':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Rexburg, Idaho, United States');
-		case 'SACRA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Sacramento, California, United States');
-		case 'SANSA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('San Salvador, El Salvador');
-		case 'SANTI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Santiago, Chile');
-		case 'SANTO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('San Antonio, Texas, United States');
-		case 'SDIEG':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('San Diego, California, United States');
-		case 'SDOMI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Santo Domingo, Dominican Republic');
-		case 'SEATT':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Seattle, Washington, United States');
-		case 'SEOUL':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Seoul, Korea');
-		case 'SGEOR':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('St. George, Utah, United States');
-		case 'SJOSE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('San Jose, Costa Rica');
-		case 'SLAKE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Salt Lake City, Utah, United States');
-		case 'SLOUI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('St. Louis, Missouri, United States');
-		case 'SNOWF':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Snowflake, Arizona, United States');
-		case 'SPAUL':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Sao Paulo, Brazil');
-		case 'SPMIN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('St. Paul, Minnesota, United States');
-		case 'SPOKA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Spokane, Washington, United States');
-		case 'STOCK':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Stockholm, Sweden');
-		case 'SUVA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Suva, Fiji');
-		case 'SWISS':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Bern, Switzerland');
-		case 'SYDNE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Sydney, Australia');
-		case 'TAIPE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Taipei, Taiwan');
-		case 'TAMPI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Tampico, Mexico');
-		case 'TEGUC':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Tegucigalpa, Honduras');
-		case 'TGUTI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Tuxtla Gutierrez, Mexico');
-		case 'TIJUA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Tijuana, Mexico');
-		case 'TOKYO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Tokyo, Japan');
-		case 'TORNO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Toronto, Ontario, Canada');
-		case 'TRUJI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Trujillo, Peru');
-		case 'TWINF':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Twin Falls, Idaho, United States');
-		case 'VANCO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Vancouver, British Columbia, Canada');
-		case 'VERAC':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Veracruz, Mexico');
-		case 'VERNA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Vernal, Utah, United States');
-		case 'VILLA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Villa Hermosa, Mexico');
-		case 'WASHI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Washington, District of Columbia, United States');
-		case 'WINTE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Winter Quarters, Nebraska, United States');
-		default:
-			return $temple_code;
+			case 'ABA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Aba, Nigeria');
+			case 'ACCRA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Accra, Ghana');
+			case 'ADELA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Adelaide, Australia');
+			case 'ALBER':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Cardston, Alberta, Canada');
+			case 'ALBUQ':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Albuquerque, New Mexico, United States');
+			case 'ANCHO':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Anchorage, Alaska, United States');
+			case 'APIA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Apia, Samoa');
+			case 'ARIZO':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Mesa, Arizona, United States');
+			case 'ASUNC':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Asuncion, Paraguay');
+			case 'ATLAN':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Atlanta, Georgia, United States');
+			case 'BAIRE':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Buenos Aires, Argentina');
+			case 'BILLI':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Billings, Montana, United States');
+			case 'BIRMI':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Birmingham, Alabama, United States');
+			case 'BISMA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Bismarck, North Dakota, United States');
+			case 'BOGOT':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Bogota, Colombia');
+			case 'BOISE':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Boise, Idaho, United States');
+			case 'BOSTO':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Boston, Massachusetts, United States');
+			case 'BOUNT':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Bountiful, Utah, United States');
+			case 'BRIGH':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Brigham City, Utah, United States');
+			case 'BRISB':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Brisbane, Australia');
+			case 'BROUG':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Baton Rouge, Louisiana, United States');
+			case 'CALGA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Calgary, Alberta, Canada');
+			case 'CAMPI':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Campinas, Brazil');
+			case 'CARAC':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Caracas, Venezuela');
+			case 'CEBUP':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Cebu City, Philippines');
+			case 'CHICA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Chicago, Illinois, United States');
+			case 'CIUJU':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Ciudad Juarez, Mexico');
+			case 'COCHA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Cochabamba, Bolivia');
+			case 'COLJU':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Colonia Juarez, Mexico');
+			case 'COLSC':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Columbia, South Carolina, United States');
+			case 'COLUM':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Columbus, Ohio, United States');
+			case 'COPEN':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Copenhagen, Denmark');
+			case 'CORDO':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Cordoba, Argentina');
+			case 'CRIVE':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Columbia River, Washington, United States');
+			case 'CURIT':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Curitiba, Brazil');
+			case 'DALLA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Dallas, Texas, United States');
+			case 'DENVE':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Denver, Colorado, United States');
+			case 'DETRO':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Detroit, Michigan, United States');
+			case 'DRAPE':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Draper, Utah, United States');
+			case 'EDMON':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Edmonton, Alberta, Canada');
+			case 'EHOUS':
+				return /* I18N: Location of an historic LDS church temple - http://en.wikipedia.org/wiki/Endowment_house */ I18N::translate('Endowment House');
+			case 'FORTL':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Fort Lauderdale, Florida, United States');
+			case 'FRANK':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Frankfurt am Main, Germany');
+			case 'FREIB':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Freiburg, Germany');
+			case 'FRESN':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Fresno, California, United States');
+			case 'FUKUO':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Fukuoka, Japan');
+			case 'GILAV':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Gila Valley, Arizona, United States');
+			case 'GILBE':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Gilbert, Arizona, United States');
+			case 'GUADA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Guadalajara, Mexico');
+			case 'GUATE':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Guatemala City, Guatemala');
+			case 'GUAYA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Guayaquil, Ecuador');
+			case 'HAGUE':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('The Hague, Netherlands');
+			case 'HALIF':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Halifax, Nova Scotia, Canada');
+			case 'HARTF':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Hartford, Connecticut, United States');
+			case 'HAWAI':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Laie, Hawaii, United States');
+			case 'HELSI':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Helsinki, Finland');
+			case 'HERMO':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Hermosillo, Mexico');
+			case 'HKONG':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Hong Kong');
+			case 'HOUST':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Houston, Texas, United States');
+			case 'IFALL':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Idaho Falls, Idaho, United States');
+			case 'INDIA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Indianapolis, Indiana, United States');
+			case 'JOHAN':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Johannesburg, South Africa');
+			case 'JRIVE':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Jordan River, Utah, United States');
+			case 'KANSA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Kansas City, Missouri, United States');
+			case 'KONA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Kona, Hawaii, United States');
+			case 'KYIV':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Kiev, Ukraine');
+			case 'LANGE':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Los Angeles, California, United States');
+			case 'LIMA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Lima, Peru');
+			case 'LOGAN':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Logan, Utah, United States');
+			case 'LONDO':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('London, England');
+			case 'LOUIS':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Louisville, Kentucky, United States');
+			case 'LUBBO':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Lubbock, Texas, United States');
+			case 'LVEGA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Las Vegas, Nevada, United States');
+			case 'MADRI':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Madrid, Spain');
+			case 'MANAU':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Manaus, Brazil');
+			case 'MANHA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Manhattan, New York, United States');
+			case 'MANIL':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Manila, Philippines');
+			case 'MANTI':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Manti, Utah, United States');
+			case 'MEDFO':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Medford, Oregon, United States');
+			case 'MELBO':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Melbourne, Australia');
+			case 'MEMPH':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Memphis, Tennessee, United States');
+			case 'MERID':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Merida, Mexico');
+			case 'MEXIC':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Mexico City, Mexico');
+			case 'MNTVD':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Montevideo, Uruguay');
+			case 'MONTE':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Monterrey, Mexico');
+			case 'MONTI':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Monticello, Utah, United States');
+			case 'MONTR':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Montreal, Quebec, Canada');
+			case 'MTIMP':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Mount Timpanogos, Utah, United States');
+			case 'NASHV':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Nashville, Tennessee, United States');
+			case 'NAUV2':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Nauvoo (new), Illinois, United States');
+			case 'NAUVO':
+				return /* I18N: Location of an historic LDS church temple */ I18N::translate('Nauvoo (original), Illinois, United States');
+			case 'NBEAC':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Newport Beach, California, United States');
+			case 'NUKUA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Nuku’Alofa, Tonga');
+			case 'NYORK':
+				return /* I18N: Location of an historic LDS church temple */ I18N::translate('New York, New York, United States');
+			case 'NZEAL':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Hamilton, New Zealand');
+			case 'OAKLA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Oakland, California, United States');
+			case 'OAXAC':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Oaxaca, Mexico');
+			case 'OGDEN':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Ogden, Utah, United States');
+			case 'OKLAH':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Oklahoma City, Oklahoma, United States');
+			case 'OQUIR':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Oquirrh Mountain, Utah, United States');
+			case 'ORLAN':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Orlando, Florida, United States');
+			case 'PALEG':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Porto Alegre, Brazil');
+			case 'PALMY':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Palmyra, New York, United States');
+			case 'PANAM':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Panama City, Panama');
+			case 'PAPEE':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Papeete, Tahiti');
+			case 'PAYSO':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Payson, Utah, United States');
+			case 'PERTH':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Perth, Australia');
+			case 'PHOEN':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Phoenix, Arizona, United States');
+			case 'POFFI':
+				return /* I18N: I18N: Location of an historic LDS church temple - http://en.wikipedia.org/wiki/President_of_the_Church */ I18N::translate('President’s Office');
+			case 'PORTL':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Portland, Oregon, United States');
+			case 'PREST':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Preston, England');
+			case 'PROCC':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Provo City Center, Utah, United States');
+			case 'PROVO':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Provo, Utah, United States');
+			case 'QUETZ':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Quetzaltenango, Guatemala');
+			case 'RALEI':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Raleigh, North Carolina, United States');
+			case 'RECIF':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Recife, Brazil');
+			case 'REDLA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Redlands, California, United States');
+			case 'REGIN':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Regina, Saskatchewan, Canada');
+			case 'RENO':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Reno, Nevada, United States');
+			case 'REXBU':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Rexburg, Idaho, United States');
+			case 'SACRA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Sacramento, California, United States');
+			case 'SANSA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('San Salvador, El Salvador');
+			case 'SANTI':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Santiago, Chile');
+			case 'SANTO':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('San Antonio, Texas, United States');
+			case 'SDIEG':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('San Diego, California, United States');
+			case 'SDOMI':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Santo Domingo, Dominican Republic');
+			case 'SEATT':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Seattle, Washington, United States');
+			case 'SEOUL':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Seoul, Korea');
+			case 'SGEOR':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('St. George, Utah, United States');
+			case 'SJOSE':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('San Jose, Costa Rica');
+			case 'SLAKE':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Salt Lake City, Utah, United States');
+			case 'SLOUI':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('St. Louis, Missouri, United States');
+			case 'SNOWF':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Snowflake, Arizona, United States');
+			case 'SPAUL':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Sao Paulo, Brazil');
+			case 'SPMIN':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('St. Paul, Minnesota, United States');
+			case 'SPOKA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Spokane, Washington, United States');
+			case 'STOCK':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Stockholm, Sweden');
+			case 'SUVA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Suva, Fiji');
+			case 'SWISS':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Bern, Switzerland');
+			case 'SYDNE':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Sydney, Australia');
+			case 'TAIPE':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Taipei, Taiwan');
+			case 'TAMPI':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Tampico, Mexico');
+			case 'TEGUC':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Tegucigalpa, Honduras');
+			case 'TGUTI':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Tuxtla Gutierrez, Mexico');
+			case 'TIJUA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Tijuana, Mexico');
+			case 'TOKYO':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Tokyo, Japan');
+			case 'TORNO':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Toronto, Ontario, Canada');
+			case 'TRUJI':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Trujillo, Peru');
+			case 'TWINF':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Twin Falls, Idaho, United States');
+			case 'VANCO':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Vancouver, British Columbia, Canada');
+			case 'VERAC':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Veracruz, Mexico');
+			case 'VERNA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Vernal, Utah, United States');
+			case 'VILLA':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Villa Hermosa, Mexico');
+			case 'WASHI':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Washington, District of Columbia, United States');
+			case 'WINTE':
+				return /* I18N: Location of an LDS church temple */ I18N::translate('Winter Quarters, Nebraska, United States');
+			default:
+				return $temple_code;
 		}
 	}