fisharebest / webtrees

app/Functions/FunctionsDb.php

Doc Comments +2 added lines, -2 removed lines

@@ -647,7 +647,7 @@ 
 	 * @param int $min The number of times a surname must occur before it is added to the array
 	 * @param Tree $tree
 	 *
-	 * @return int[]
+	 * @return string[]
 	 */
 	public static function getCommonSurnames($min, Tree $tree) {
 		return self::getTopSurnames($tree->getTreeId(), $min, 0);
@@ -660,7 +660,7 @@ 
 	 * @param int $min only fetch surnames occuring this many times
 	 * @param int $max only fetch this number of surnames (0=all)
 	 *
-	 * @return int[]
+	 * @return string[]
 	 */
 	public static function getTopSurnames($ged_id, $min, $max) {
 		// Use n_surn, rather than n_surname, as it is used to generate URLs for

Switch Indentation +100 added lines, -100 removed lines

@@ -249,18 +249,18 @@ 
 	 */
 	public static function searchIndividualsPhonetic($soundex, $lastname, $firstname, $place, array $trees) {
 		switch ($soundex) {
-		case 'Russell':
-			$givn_sdx = Soundex::russell($firstname);
-			$surn_sdx = Soundex::russell($lastname);
-			$plac_sdx = Soundex::russell($place);
-			break;
-		case 'DaitchM':
-			$givn_sdx = Soundex::daitchMokotoff($firstname);
-			$surn_sdx = Soundex::daitchMokotoff($lastname);
-			$plac_sdx = Soundex::daitchMokotoff($place);
-			break;
-		default:
-			throw new \DomainException('soundex: ' . $soundex);
+			case 'Russell':
+				$givn_sdx = Soundex::russell($firstname);
+				$surn_sdx = Soundex::russell($lastname);
+				$plac_sdx = Soundex::russell($place);
+				break;
+			case 'DaitchM':
+				$givn_sdx = Soundex::daitchMokotoff($firstname);
+				$surn_sdx = Soundex::daitchMokotoff($lastname);
+				$plac_sdx = Soundex::daitchMokotoff($place);
+				break;
+			default:
+				throw new \DomainException('soundex: ' . $soundex);
 		}
 
 		// Nothing to search for? Return nothing.
@@ -292,12 +292,12 @@ 
 			foreach ($givn_sdx as $n => $sdx) {
 				$sql .= $n ? " OR " : "";
 				switch ($soundex) {
-				case 'Russell':
-					$sql .= "n_soundex_givn_std LIKE CONCAT('%', :given_name_" . $n . ", '%')";
-					break;
-				case 'DaitchM':
-					$sql .= "n_soundex_givn_dm LIKE CONCAT('%', :given_name_" . $n . ", '%')";
-					break;
+					case 'Russell':
+						$sql .= "n_soundex_givn_std LIKE CONCAT('%', :given_name_" . $n . ", '%')";
+						break;
+					case 'DaitchM':
+						$sql .= "n_soundex_givn_dm LIKE CONCAT('%', :given_name_" . $n . ", '%')";
+						break;
 				}
 				$args['given_name_' . $n] = $sdx;
 			}
@@ -310,12 +310,12 @@ 
 			foreach ($surn_sdx as $n => $sdx) {
 				$sql .= $n ? " OR " : "";
 				switch ($soundex) {
-				case 'Russell':
-					$sql .= "n_soundex_surn_std LIKE CONCAT('%', :surname_" . $n . ", '%')";
-					break;
-				case 'DaitchM':
-					$sql .= "n_soundex_surn_dm LIKE CONCAT('%', :surname_" . $n . ", '%')";
-					break;
+					case 'Russell':
+						$sql .= "n_soundex_surn_std LIKE CONCAT('%', :surname_" . $n . ", '%')";
+						break;
+					case 'DaitchM':
+						$sql .= "n_soundex_surn_dm LIKE CONCAT('%', :surname_" . $n . ", '%')";
+						break;
 				}
 				$args['surname_' . $n] = $sdx;
 			}
@@ -328,12 +328,12 @@ 
 			foreach ($plac_sdx as $n => $sdx) {
 				$sql .= $n ? " OR " : "";
 				switch ($soundex) {
-				case 'Russell':
-					$sql .= "p_std_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
-					break;
-				case 'DaitchM':
-					$sql .= "p_dm_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
-					break;
+					case 'Russell':
+						$sql .= "p_std_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
+						break;
+					case 'DaitchM':
+						$sql .= "p_dm_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
+						break;
 				}
 				$args['place_' . $n] = $sdx;
 			}
@@ -758,82 +758,82 @@ 
 			} else {
 				// SPECIAL CASES:
 				switch ($anniv->m) {
-				case 2:
-					// 29 CSH does not include 30 CSH (but would include an invalid 31 CSH if there were no 30 CSH)
-					if ($anniv->d === 1) {
-						$where .= " AND d_day <= 1 AND d_mon = 2";
-					} elseif ($anniv->d === 30) {
-						$where .= " AND d_day >= 30 AND d_mon = 2";
-					} elseif ($anniv->d === 29 && $anniv->daysInMonth() === 29) {
-						$where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 2";
-					} else {
-						$where .= " AND d_day = :day AND d_mon = 2";
-						$args['day'] = $anniv->d;
-					}
-					break;
-				case 3:
-					// 1 KSL includes 30 CSH (if this year didn’t have 30 CSH)
-					// 29 KSL does not include 30 KSL (but would include an invalid 31 KSL if there were no 30 KSL)
-					if ($anniv->d === 1) {
-						$tmp = new JewishDate(array($anniv->y, 'CSH', 1));
-						if ($tmp->daysInMonth() === 29) {
-							$where .= " AND (d_day <= 1 AND d_mon = 3 OR d_day = 30 AND d_mon = 2)";
+					case 2:
+						// 29 CSH does not include 30 CSH (but would include an invalid 31 CSH if there were no 30 CSH)
+						if ($anniv->d === 1) {
+							$where .= " AND d_day <= 1 AND d_mon = 2";
+						} elseif ($anniv->d === 30) {
+							$where .= " AND d_day >= 30 AND d_mon = 2";
+						} elseif ($anniv->d === 29 && $anniv->daysInMonth() === 29) {
+							$where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 2";
 						} else {
-							$where .= " AND d_day <= 1 AND d_mon = 3";
+							$where .= " AND d_day = :day AND d_mon = 2";
+							$args['day'] = $anniv->d;
 						}
-					} elseif ($anniv->d === 30) {
-						$where .= " AND d_day >= 30 AND d_mon = 3";
-					} elseif ($anniv->d == 29 && $anniv->daysInMonth() === 29) {
-						$where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 3";
-					} else {
-						$where .= " AND d_day = :day AND d_mon = 3";
-						$args['day'] = $anniv->d;
-					}
-					break;
-				case 4:
-					// 1 TVT includes 30 KSL (if this year didn’t have 30 KSL)
-					if ($anniv->d === 1) {
-						$tmp = new JewishDate(array($anniv->y, 'KSL', 1));
-						if ($tmp->daysInMonth() === 29) {
-							$where .= " AND (d_day <=1 AND d_mon = 4 OR d_day = 30 AND d_mon = 3)";
+						break;
+					case 3:
+						// 1 KSL includes 30 CSH (if this year didn’t have 30 CSH)
+						// 29 KSL does not include 30 KSL (but would include an invalid 31 KSL if there were no 30 KSL)
+						if ($anniv->d === 1) {
+							$tmp = new JewishDate(array($anniv->y, 'CSH', 1));
+							if ($tmp->daysInMonth() === 29) {
+								$where .= " AND (d_day <= 1 AND d_mon = 3 OR d_day = 30 AND d_mon = 2)";
+							} else {
+								$where .= " AND d_day <= 1 AND d_mon = 3";
+							}
+						} elseif ($anniv->d === 30) {
+							$where .= " AND d_day >= 30 AND d_mon = 3";
+						} elseif ($anniv->d == 29 && $anniv->daysInMonth() === 29) {
+							$where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 3";
 						} else {
-							$where .= " AND d_day <= 1 AND d_mon = 4";
+							$where .= " AND d_day = :day AND d_mon = 3";
+							$args['day'] = $anniv->d;
 						}
-					} elseif ($anniv->d === $anniv->daysInMonth()) {
-						$where .= " AND d_day >= :day AND d_mon=4";
-						$args['day'] = $anniv->d;
-					} else {
-						$where .= " AND d_day = :day AND d_mon=4";
-						$args['day'] = $anniv->d;
-					}
-					break;
-				case 7: // ADS includes ADR (non-leap)
-					if ($anniv->d === 1) {
-						$where .= " AND d_day <= 1";
-					} elseif ($anniv->d === $anniv->daysInMonth()) {
-						$where .= " AND d_day >= :day";
-						$args['day'] = $anniv->d;
-					} else {
-						$where .= " AND d_day = :day";
-						$args['day'] = $anniv->d;
-					}
-					$where .= " AND (d_mon = 6 AND MOD(7 * d_year + 1, 19) >= 7 OR d_mon = 7)";
-					break;
-				case 8: // 1 NSN includes 30 ADR, if this year is non-leap
-					if ($anniv->d === 1) {
-						if ($anniv->isLeapYear()) {
-							$where .= " AND d_day <= 1 AND d_mon = 8";
+						break;
+					case 4:
+						// 1 TVT includes 30 KSL (if this year didn’t have 30 KSL)
+						if ($anniv->d === 1) {
+							$tmp = new JewishDate(array($anniv->y, 'KSL', 1));
+							if ($tmp->daysInMonth() === 29) {
+								$where .= " AND (d_day <=1 AND d_mon = 4 OR d_day = 30 AND d_mon = 3)";
+							} else {
+								$where .= " AND d_day <= 1 AND d_mon = 4";
+							}
+						} elseif ($anniv->d === $anniv->daysInMonth()) {
+							$where .= " AND d_day >= :day AND d_mon=4";
+							$args['day'] = $anniv->d;
 						} else {
-							$where .= " AND (d_day <= 1 AND d_mon = 8 OR d_day = 30 AND d_mon = 6)";
+							$where .= " AND d_day = :day AND d_mon=4";
+							$args['day'] = $anniv->d;
 						}
-					} elseif ($anniv->d === $anniv->daysInMonth()) {
-						$where .= " AND d_day >= :day AND d_mon = 8";
-						$args['day'] = $anniv->d;
-					} else {
-						$where .= " AND d_day = :day AND d_mon = 8";
-						$args['day'] = $anniv->d;
-					}
-					break;
+						break;
+					case 7: // ADS includes ADR (non-leap)
+						if ($anniv->d === 1) {
+							$where .= " AND d_day <= 1";
+						} elseif ($anniv->d === $anniv->daysInMonth()) {
+							$where .= " AND d_day >= :day";
+							$args['day'] = $anniv->d;
+						} else {
+							$where .= " AND d_day = :day";
+							$args['day'] = $anniv->d;
+						}
+						$where .= " AND (d_mon = 6 AND MOD(7 * d_year + 1, 19) >= 7 OR d_mon = 7)";
+						break;
+					case 8: // 1 NSN includes 30 ADR, if this year is non-leap
+						if ($anniv->d === 1) {
+							if ($anniv->isLeapYear()) {
+								$where .= " AND d_day <= 1 AND d_mon = 8";
+							} else {
+								$where .= " AND (d_day <= 1 AND d_mon = 8 OR d_day = 30 AND d_mon = 6)";
+							}
+						} elseif ($anniv->d === $anniv->daysInMonth()) {
+							$where .= " AND d_day >= :day AND d_mon = 8";
+							$args['day'] = $anniv->d;
+						} else {
+							$where .= " AND d_day = :day AND d_mon = 8";
+							$args['day'] = $anniv->d;
+						}
+						break;
 				}
 			}
 			// Only events in the past (includes dates without a year)

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;
 		}
 	}
 

app/Module/FamilyNavigatorModule.php

Braces +10 added lines, -4 removed lines

@@ -139,8 +139,11 @@ 
 					<div class="font9">
 						<?php echo $spouse->getLifeSpan(); ?>
 					</div>
-					<?php else: ?>
-						<?php echo $spouse->getFullName(); ?>
+					<?php else {
+	: ?>
+						<?php echo $spouse->getFullName();
+}
+?>
 					<?php endif; ?>
 				</td>
 			</tr>
@@ -164,8 +167,11 @@ 
 					<div class="font9">
 						<?php echo $child->getLifeSpan(); ?>
 					</div>
-					<?php else: ?>
-						<?php echo $child->getFullName(); ?>
+					<?php else {
+	: ?>
+						<?php echo $child->getFullName();
+}
+?>
 					<?php endif; ?>
 				</td>
 			</tr>

app/Family.php

Doc Comments +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
 	/**
 	 * Get the male (or first female) partner of the family
 	 *
-	 * @param $access_level int|null
+	 * @param integer $access_level int|null
 	 *
 	 * @return Individual|null
 	 */
@@ -118,7 +118,7 @@ 
 	/**
 	 * Get the female (or second male) partner of the family
 	 *
-	 * @param $access_level int|null
+	 * @param integer $access_level int|null
 	 *
 	 * @return Individual|null
 	 */

Spacing +2 added lines, -2 removed lines

@@ -343,7 +343,7 @@ 
 			// Check the script used by each name, so we can match cyrillic with cyrillic, greek with greek, etc.
 			$husb_names = array();
 			if ($this->husb) {
-				$husb_names = array_filter($this->husb->getAllNames(), function(array $x) { return $x['type'] !== '_MARNM'; } );
+				$husb_names = array_filter($this->husb->getAllNames(), function (array $x) { return $x['type'] !== '_MARNM'; } );
 			}
 			// If the individual only has married names, create a dummy birth name.
 			if (empty($husb_names)) {
@@ -359,7 +359,7 @@ 
 
 			$wife_names = array();
 			if ($this->wife) {
-				$wife_names = array_filter($this->wife->getAllNames(), function(array $x) { return $x['type'] !== '_MARNM'; } );
+				$wife_names = array_filter($this->wife->getAllNames(), function (array $x) { return $x['type'] !== '_MARNM'; } );
 			}
 			// If the individual only has married names, create a dummy birth name.
 			if (empty($wife_names)) {

app/Individual.php

Doc Comments +1 added lines, -1 removed lines

@@ -388,7 +388,7 @@
 	 *    (b) Level 1 object with the Highlight option missing or set to other than "Y" or "N"
 	 *    (c) Level 2 or higher object with the Highlight option set to "Y"
 	 *
-	 * @return null|Media
+	 * @return GedcomRecord|null
 	 */
 	public function findHighlightedMedia() {
 		$objectA = null;

Switch Indentation +23 added lines, -23 removed lines

@@ -879,33 +879,33 @@
 	public function getPrimaryChildFamily() {
 		$families = $this->getChildFamilies();
 		switch (count($families)) {
-		case 0:
-			return null;
-		case 1:
-			return reset($families);
-		default:
-			// If there is more than one FAMC record, choose the preferred parents:
-			// a) records with '2 _PRIMARY'
-			foreach ($families as $famid => $fam) {
-				if (preg_match("/\n1 FAMC @{$famid}@\n(?:[2-9].*\n)*(?:2 _PRIMARY Y)/", $this->getGedcom())) {
-					return $fam;
+			case 0:
+				return null;
+			case 1:
+				return reset($families);
+			default:
+				// If there is more than one FAMC record, choose the preferred parents:
+				// a) records with '2 _PRIMARY'
+				foreach ($families as $famid => $fam) {
+					if (preg_match("/\n1 FAMC @{$famid}@\n(?:[2-9].*\n)*(?:2 _PRIMARY Y)/", $this->getGedcom())) {
+						return $fam;
+					}
 				}
-			}
-			// b) records with '2 PEDI birt'
-			foreach ($families as $famid => $fam) {
-				if (preg_match("/\n1 FAMC @{$famid}@\n(?:[2-9].*\n)*(?:2 PEDI birth)/", $this->getGedcom())) {
-					return $fam;
+				// b) records with '2 PEDI birt'
+				foreach ($families as $famid => $fam) {
+					if (preg_match("/\n1 FAMC @{$famid}@\n(?:[2-9].*\n)*(?:2 PEDI birth)/", $this->getGedcom())) {
+						return $fam;
+					}
 				}
-			}
-			// c) records with no '2 PEDI'
-			foreach ($families as $famid => $fam) {
-				if (!preg_match("/\n1 FAMC @{$famid}@\n(?:[2-9].*\n)*(?:2 PEDI)/", $this->getGedcom())) {
-					return $fam;
+				// c) records with no '2 PEDI'
+				foreach ($families as $famid => $fam) {
+					if (!preg_match("/\n1 FAMC @{$famid}@\n(?:[2-9].*\n)*(?:2 PEDI)/", $this->getGedcom())) {
+						return $fam;
+					}
 				}
-			}
 
-			// d) any record
-			return reset($families);
+				// d) any record
+				return reset($families);
 		}
 	}
 

app/Statement.php

Doc Comments +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
 	 *
 	 * @param int $fetch_style
 	 *
-	 * @return \stdClass|array|null
+	 * @return \stdClass
 	 */
 	public function fetchOneRow($fetch_style = PDO::FETCH_OBJ) {
 		if (!$this->executed) {

Switch Indentation +12 added lines, -12 removed lines

@@ -64,18 +64,18 @@
 				$key = ':' . $key;
 			}
 			switch (gettype($bind_variable)) {
-			case 'NULL':
-				$this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_NULL);
-				break;
-			case 'boolean':
-				$this->pdo_statement->bindValue($key, (int) $bind_variable, PDO::PARAM_INT);
-				break;
-			case 'integer':
-				$this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_INT);
-				break;
-			default:
-				$this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_STR);
-				break;
+				case 'NULL':
+					$this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_NULL);
+					break;
+				case 'boolean':
+					$this->pdo_statement->bindValue($key, (int) $bind_variable, PDO::PARAM_INT);
+					break;
+				case 'integer':
+					$this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_INT);
+					break;
+				default:
+					$this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_STR);
+					break;
 			}
 		}
 

app/Controller/RelationshipController.php

Doc Comments +2 added lines, -2 removed lines

@@ -159,7 +159,7 @@ 
 	 * @param string $xref2
 	 * @param int    $tree_id
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	private function allAncestors($xref1, $xref2, $tree_id) {
 		$ancestors = array($xref1, $xref2);
@@ -198,7 +198,7 @@ 
 	 * @param string $xref2
 	 * @param int    $tree_id
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	private function excludeFamilies($xref1, $xref2, $tree_id) {
 		return Database::prepare(

edituser.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 $form_pass2          = Filter::post('form_pass2', WT_REGEX_PASSWORD);
 $form_email          = Filter::postEmail('form_email');
 $form_rootid         = Filter::post('form_rootid', WT_REGEX_XREF);
-$form_theme          = Filter::post('form_theme', implode('|', array_keys(Theme::themeNames())), '');;
+$form_theme          = Filter::post('form_theme', implode('|', array_keys(Theme::themeNames())), ''); ;
 $form_language       = Filter::post('form_language');
 $form_timezone       = Filter::post('form_timezone');
 $form_contact_method = Filter::post('form_contact_method');

Braces +5 added lines, -2 removed lines

@@ -183,8 +183,11 @@
 			<div class="value">
 				<?php if ($my_individual_record): ?>
 				<?php echo $my_individual_record->formatList('span'); ?>
-				<?php else: ?>
-					<?php echo I18N::translateContext('unknown people', 'Unknown'); ?>
+				<?php else {
+	: ?>
+					<?php echo I18N::translateContext('unknown people', 'Unknown');
+}
+?>
 				<?php endif; ?>
 				<p class="small text-muted">
 					<?php echo I18N::translate('This is a link to your own record in the family tree. If this is the wrong individual, contact an administrator.'); ?>

Switch Indentation +44 added lines, -44 removed lines

@@ -53,52 +53,52 @@
 // Respond to form action
 if ($form_action && Filter::checkCsrf()) {
 	switch ($form_action) {
-	case 'update':
-		if ($form_username !== Auth::user()->getUserName() && User::findByUserName($form_username)) {
-			FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
-		} elseif ($form_email !== Auth::user()->getEmail() && User::findByEmail($form_email)) {
-			FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
-		} else {
-			// Change username
-			if ($form_username !== Auth::user()->getUserName()) {
-				Log::addAuthenticationLog('User ' . Auth::user()->getUserName() . ' renamed to ' . $form_username);
-				Auth::user()->setUserName($form_username);
-			}
-
-			// Change password
-			if ($form_pass1 && $form_pass1 === $form_pass2) {
-				Auth::user()->setPassword($form_pass1);
-			}
-
-			// Change other settings
-			Auth::user()
-				->setRealName($form_realname)
-				->setEmail($form_email)
-				->setPreference('language', $form_language)
-				->setPreference('TIMEZONE', $form_timezone)
-				->setPreference('contactmethod', $form_contact_method)
-				->setPreference('visibleonline', $form_visible_online ? '1' : '0');
-
-			if ($form_theme === null) {
-				Auth::user()->deletePreference('theme');
+		case 'update':
+			if ($form_username !== Auth::user()->getUserName() && User::findByUserName($form_username)) {
+				FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
+			} elseif ($form_email !== Auth::user()->getEmail() && User::findByEmail($form_email)) {
+				FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
 			} else {
-				Auth::user()->setPreference('theme', $form_theme);
+				// Change username
+				if ($form_username !== Auth::user()->getUserName()) {
+					Log::addAuthenticationLog('User ' . Auth::user()->getUserName() . ' renamed to ' . $form_username);
+					Auth::user()->setUserName($form_username);
+				}
+
+				// Change password
+				if ($form_pass1 && $form_pass1 === $form_pass2) {
+					Auth::user()->setPassword($form_pass1);
+				}
+
+				// Change other settings
+				Auth::user()
+					->setRealName($form_realname)
+					->setEmail($form_email)
+					->setPreference('language', $form_language)
+					->setPreference('TIMEZONE', $form_timezone)
+					->setPreference('contactmethod', $form_contact_method)
+					->setPreference('visibleonline', $form_visible_online ? '1' : '0');
+
+				if ($form_theme === null) {
+					Auth::user()->deletePreference('theme');
+				} else {
+					Auth::user()->setPreference('theme', $form_theme);
+				}
+
+				$WT_TREE->setUserPreference(Auth::user(), 'rootid', $form_rootid);
 			}
-
-			$WT_TREE->setUserPreference(Auth::user(), 'rootid', $form_rootid);
-		}
-		break;
-
-	case 'delete':
-		// An administrator can only be deleted by another administrator
-		if (!Auth::user()->getPreference('canadmin')) {
-			// Keep a reference to the currently logged in user because after logging out this user,
-			// a call to Auth::user() will not return this user anymore
-			$currentUser = Auth::user();
-			Auth::logout();
-			$currentUser->delete();
-		}
-		break;
+			break;
+
+		case 'delete':
+			// An administrator can only be deleted by another administrator
+			if (!Auth::user()->getPreference('canadmin')) {
+				// Keep a reference to the currently logged in user because after logging out this user,
+				// a call to Auth::user() will not return this user anymore
+				$currentUser = Auth::user();
+				Auth::logout();
+				$currentUser->delete();
+			}
+			break;
 	}
 
 	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);