fisharebest / webtrees

app/Database.php

Spacing +1 added lines, -2 removed lines

@@ -85,8 +85,7 @@
 		// Create the underlying PDO object
 		self::$pdo = new PDO(
 			(substr($DBHOST, 0, 1) === '/' ?
-				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" :
-				"mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
+				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
 			),
 			$DBUSER, $DBPASS,
 			array(

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

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');

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

app/Functions/FunctionsPrintLists.php

Spacing +6 added lines, -6 removed lines

@@ -1820,24 +1820,24 @@
 			if ($endjd === WT_CLIENT_JD) {
 				// We're dealing with the Today’s Events block
 				if ($filter === 0) {
-					$html .=  I18N::translate('No events exist for today.');
+					$html .= I18N::translate('No events exist for today.');
 				} else {
-					$html .=  I18N::translate('No events for living individuals exist for today.');
+					$html .= I18N::translate('No events for living individuals exist for today.');
 				}
 			} else {
 				// We're dealing with the Upcoming Events block
 				if ($filter === 0) {
 					if ($endjd === $startjd) {
-						$html .=  I18N::translate('No events exist for tomorrow.');
+						$html .= I18N::translate('No events exist for tomorrow.');
 					} else {
-						$html .=  /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
+						$html .= /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
 					}
 				} else {
 					if ($endjd === $startjd) {
-						$html .=  I18N::translate('No events for living individuals exist for tomorrow.');
+						$html .= I18N::translate('No events for living individuals exist for tomorrow.');
 					} else {
 						// I18N: translation for %s==1 is unused; it is translated separately as “tomorrow”
-						$html .=  I18N::plural('No events for living people exist for the next %s day.', 'No events for living people exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
+						$html .= I18N::plural('No events for living people exist for the next %s day.', 'No events for living people exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
 					}
 				}
 			}

Switch Indentation +37 added lines, -37 removed lines

@@ -1572,37 +1572,37 @@ 
 
 		}
 		switch ($style) {
-		case 1:
-			return '<ul><li>' . implode('</li><li>', $html) . '</li></ul>';
-		case 2:
-			return implode(I18N::$list_separator, $html);
-		case 3:
-			$i     = 0;
-			$count = count($html);
-			if ($count > 36) {
-				$col = 4;
-			} elseif ($count > 18) {
-				$col = 3;
-			} elseif ($count > 6) {
-				$col = 2;
-			} else {
-				$col = 1;
-			}
-			$newcol = ceil($count / $col);
-			$html2  = '<table class="list_table"><tr>';
-			$html2 .= '<td class="list_value" style="padding: 14px;">';
-
-			foreach ($html as $surns) {
-				$html2 .= $surns . '<br>';
-				$i++;
-				if ($i == $newcol && $i < $count) {
-					$html2 .= '</td><td class="list_value" style="padding: 14px;">';
-					$newcol = $i + ceil($count / $col);
+			case 1:
+				return '<ul><li>' . implode('</li><li>', $html) . '</li></ul>';
+			case 2:
+				return implode(I18N::$list_separator, $html);
+			case 3:
+				$i     = 0;
+				$count = count($html);
+				if ($count > 36) {
+					$col = 4;
+				} elseif ($count > 18) {
+					$col = 3;
+				} elseif ($count > 6) {
+					$col = 2;
+				} else {
+					$col = 1;
 				}
-			}
-			$html2 .= '</td></tr></table>';
+				$newcol = ceil($count / $col);
+				$html2  = '<table class="list_table"><tr>';
+				$html2 .= '<td class="list_value" style="padding: 14px;">';
+
+				foreach ($html as $surns) {
+					$html2 .= $surns . '<br>';
+					$i++;
+					if ($i == $newcol && $i < $count) {
+						$html2 .= '</td><td class="list_value" style="padding: 14px;">';
+						$newcol = $i + ceil($count / $col);
+					}
+				}
+				$html2 .= '</td></tr></table>';
 
-			return $html2;
+				return $html2;
 		}
 	}
 	/**
@@ -1783,14 +1783,14 @@ 
 
 		// Now we've filtered the list, we can sort by event, if required
 		switch ($sort_by) {
-		case 'anniv':
-			// Data is already sorted by anniversary date
-			break;
-		case 'alpha':
-			uasort($filtered_events, function (Fact $x, Fact $y) {
-				return GedcomRecord::compare($x->getParent(), $y->getParent());
-			});
-			break;
+			case 'anniv':
+				// Data is already sorted by anniversary date
+				break;
+			case 'alpha':
+				uasort($filtered_events, function (Fact $x, Fact $y) {
+					return GedcomRecord::compare($x->getParent(), $y->getParent());
+				});
+				break;
 		}
 
 		foreach ($filtered_events as $fact) {

app/Family.php

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)) {

expand_view.php

Switch Indentation +33 added lines, -33 removed lines

@@ -38,38 +38,38 @@
 
 foreach ($facts as $fact) {
 	switch ($fact->getTag()) {
-	case 'ADDR':
-	case 'ALIA':
-	case 'ASSO':
-	case 'CHAN':
-	case 'CHIL':
-	case 'EMAIL':
-	case 'FAMC':
-	case 'FAMS':
-	case 'HUSB':
-	case 'NAME':
-	case 'NOTE':
-	case 'OBJE':
-	case 'PHON':
-	case 'RESI':
-	case 'RESN':
-	case 'SEX':
-	case 'SOUR':
-	case 'SSN':
-	case 'SUBM':
-	case 'TITL':
-	case 'URL':
-	case 'WIFE':
-	case 'WWW':
-	case '_EMAIL':
-	case '_TODO':
-	case '_UID':
-	case '_WT_OBJE_SORT':
-		// Do not show these
-		break;
-	default:
-		// Simple version of FunctionsPrintFacts::print_fact()
-		echo $fact->summary();
-		break;
+		case 'ADDR':
+		case 'ALIA':
+		case 'ASSO':
+		case 'CHAN':
+		case 'CHIL':
+		case 'EMAIL':
+		case 'FAMC':
+		case 'FAMS':
+		case 'HUSB':
+		case 'NAME':
+		case 'NOTE':
+		case 'OBJE':
+		case 'PHON':
+		case 'RESI':
+		case 'RESN':
+		case 'SEX':
+		case 'SOUR':
+		case 'SSN':
+		case 'SUBM':
+		case 'TITL':
+		case 'URL':
+		case 'WIFE':
+		case 'WWW':
+		case '_EMAIL':
+		case '_TODO':
+		case '_UID':
+		case '_WT_OBJE_SORT':
+			// Do not show these
+			break;
+		default:
+			// Simple version of FunctionsPrintFacts::print_fact()
+			echo $fact->summary();
+			break;
 	}
 }

admin_site_logs.php

Switch Indentation +6 added lines, -6 removed lines

@@ -131,12 +131,12 @@
 			// Datatables numbers columns 0, 1, 2
 			// MySQL numbers columns 1, 2, 3
 			switch ($value['dir']) {
-			case 'asc':
-				$order_by .= (1 + $value['column']) . " ASC ";
-				break;
-			case 'desc':
-				$order_by .= (1 + $value['column']) . " DESC ";
-				break;
+				case 'asc':
+					$order_by .= (1 + $value['column']) . " ASC ";
+					break;
+				case 'desc':
+					$order_by .= (1 + $value['column']) . " DESC ";
+					break;
 			}
 		}
 	} else {

action.php

Switch Indentation +8 added lines, -8 removed lines

@@ -62,14 +62,14 @@
 		foreach ($record->getFacts() as $fact) {
 			if ($fact->getFactId() == $fact_id) {
 				switch ($fact->getTag()) {
-				case 'NOTE':
-				case 'SOUR':
-				case 'OBJE':
-					$type = 'all'; // paste this anywhere
-					break;
-				default:
-					$type = $record::RECORD_TYPE; // paste only to the same record type
-					break;
+					case 'NOTE':
+					case 'SOUR':
+					case 'OBJE':
+						$type = 'all'; // paste this anywhere
+						break;
+					default:
+						$type = $record::RECORD_TYPE; // paste only to the same record type
+						break;
 				}
 				$clipboard = Session::get('clipboard');
 				if (!is_array($clipboard)) {