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 +332 added lines, -332 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;
-								}
-							}
-							// 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
-					}
-				}
-			}
-
-			$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;
-								}
-							}
-							// 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
-					}
-				}
-			}
-
-			$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;
-
-		default:
-			throw new \DomainException('Invalid list name: ' . $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;
+								    }
+							    }
+							    // 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
+					    }
+				    }
+			    }
+
+			    $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;
+								    }
+							    }
+							    // 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
+					    }
+				    }
+			    }
+
+			    $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;
+
+		    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;
-						}
-					}
-				}
-				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;
+			    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 "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;
-					}
-				}
-				$genCounter++;
-			}
-			$this->list = $newarray;
-			break;
-		default:
-			// unsorted
-			break;
+		    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++;
+			    }
+			    $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 +46 added lines, -46 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');
-			} else {
-				Auth::user()->setPreference('theme', $form_theme);
-			}
-
-			$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;
+	    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');
+			    } else {
+				    Auth::user()->setPreference('theme', $form_theme);
+			    }
+
+			    $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;
 	}
 
 	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 +39 added lines, -39 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);
-				}
-			}
-			$html2 .= '</td></tr></table>';
-
-			return $html2;
+		    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);
+				    }
+			    }
+			    $html2 .= '</td></tr></table>';
+
+			    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)) {

admin_trees_renumber.php

Switch Indentation +137 added lines, -137 removed lines

@@ -86,143 +86,143 @@
 		);
 		$new_xref = $WT_TREE->getNewXref($type);
 		switch ($type) {
-		case 'INDI':
-			Database::prepare(
-				"UPDATE `##individuals` SET i_id = ?, i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_id = ? AND i_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ INDI\n", "0 @$new_xref@ INDI\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'HUSB') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " HUSB @$old_xref@", " HUSB @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'WIFE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " WIFE @$old_xref@", " WIFE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'CHIL') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " CHIL @$old_xref@", " CHIL @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'ASSO') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " ASSO @$old_xref@", " ASSO @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = '_ASSO') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " _ASSO @$old_xref@", " _ASSO @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'ASSO') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " ASSO @$old_xref@", " ASSO @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = '_ASSO') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " _ASSO @$old_xref@", " _ASSO @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##placelinks` SET pl_gid = ? WHERE pl_gid = ? AND pl_file = ?"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##dates` SET d_gid = ? WHERE d_gid = ? AND d_file = ?"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##user_gedcom_setting` SET setting_value = ? WHERE setting_value = ? AND gedcom_id = ? AND setting_name IN ('gedcomid', 'rootid')"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			break;
-		case 'FAM':
-			Database::prepare(
-				"UPDATE `##families` SET f_id = ?, f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_id = ? AND f_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ FAM\n", "0 @$new_xref@ FAM\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'FAMC') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " FAMC @$old_xref@", " FAMC @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'FAMS') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " FAMS @$old_xref@", " FAMS @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##placelinks` SET pl_gid = ? WHERE pl_gid = ? AND pl_file = ?"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##dates` SET d_gid = ? WHERE d_gid = ? AND d_file = ?"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			break;
-		case 'SOUR':
-			Database::prepare(
-				"UPDATE `##sources` SET s_id = ?, s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_id = ? AND s_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ SOUR\n", "0 @$new_xref@ SOUR\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'SOUR') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'SOUR') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'SOUR') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
-			)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'SOUR') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
-			)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
-			break;
-		case 'REPO':
-			Database::prepare(
-				"UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_id = ? AND o_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ REPO\n", "0 @$new_xref@ REPO\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'REPO') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
-			)->execute(array($old_xref, " REPO @$old_xref@", " REPO @$new_xref@", $WT_TREE->getTreeId()));
-			break;
-		case 'NOTE':
-			Database::prepare(
-				"UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(REPLACE(o_gedcom, ?, ?), ?, ?) WHERE o_id = ? AND o_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ NOTE\n", "0 @$new_xref@ NOTE\n", "0 @$old_xref@ NOTE ", "0 @$new_xref@ NOTE ", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'NOTE') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'NOTE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'NOTE') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'NOTE') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'NOTE') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			break;
-		case 'OBJE':
-			Database::prepare(
-				"UPDATE `##media` SET m_id = ?, m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_id = ? AND m_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ OBJE\n", "0 @$new_xref@ OBJE\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'OBJE') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'OBJE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'OBJE') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'OBJE') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'OBJE') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			break;
-		default:
-			Database::prepare(
-				"UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_id = ? AND o_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ $type\n", "0 @$new_xref@ $type\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ?) SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ?) SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ?) SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ?) SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ?) SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			break;
+		    case 'INDI':
+			    Database::prepare(
+				    "UPDATE `##individuals` SET i_id = ?, i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_id = ? AND i_file = ?"
+			    )->execute(array($new_xref, "0 @$old_xref@ INDI\n", "0 @$new_xref@ INDI\n", $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'HUSB') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+			    )->execute(array($old_xref, " HUSB @$old_xref@", " HUSB @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'WIFE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+			    )->execute(array($old_xref, " WIFE @$old_xref@", " WIFE @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'CHIL') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+			    )->execute(array($old_xref, " CHIL @$old_xref@", " CHIL @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'ASSO') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+			    )->execute(array($old_xref, " ASSO @$old_xref@", " ASSO @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = '_ASSO') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+			    )->execute(array($old_xref, " _ASSO @$old_xref@", " _ASSO @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'ASSO') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+			    )->execute(array($old_xref, " ASSO @$old_xref@", " ASSO @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = '_ASSO') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+			    )->execute(array($old_xref, " _ASSO @$old_xref@", " _ASSO @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##placelinks` SET pl_gid = ? WHERE pl_gid = ? AND pl_file = ?"
+			    )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##dates` SET d_gid = ? WHERE d_gid = ? AND d_file = ?"
+			    )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##user_gedcom_setting` SET setting_value = ? WHERE setting_value = ? AND gedcom_id = ? AND setting_name IN ('gedcomid', 'rootid')"
+			    )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+			    break;
+		    case 'FAM':
+			    Database::prepare(
+				    "UPDATE `##families` SET f_id = ?, f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_id = ? AND f_file = ?"
+			    )->execute(array($new_xref, "0 @$old_xref@ FAM\n", "0 @$new_xref@ FAM\n", $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'FAMC') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+			    )->execute(array($old_xref, " FAMC @$old_xref@", " FAMC @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'FAMS') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+			    )->execute(array($old_xref, " FAMS @$old_xref@", " FAMS @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##placelinks` SET pl_gid = ? WHERE pl_gid = ? AND pl_file = ?"
+			    )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##dates` SET d_gid = ? WHERE d_gid = ? AND d_file = ?"
+			    )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+			    break;
+		    case 'SOUR':
+			    Database::prepare(
+				    "UPDATE `##sources` SET s_id = ?, s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_id = ? AND s_file = ?"
+			    )->execute(array($new_xref, "0 @$old_xref@ SOUR\n", "0 @$new_xref@ SOUR\n", $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'SOUR') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+			    )->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'SOUR') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+			    )->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'SOUR') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
+			    )->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'SOUR') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
+			    )->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
+			    break;
+		    case 'REPO':
+			    Database::prepare(
+				    "UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_id = ? AND o_file = ?"
+			    )->execute(array($new_xref, "0 @$old_xref@ REPO\n", "0 @$new_xref@ REPO\n", $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'REPO') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
+			    )->execute(array($old_xref, " REPO @$old_xref@", " REPO @$new_xref@", $WT_TREE->getTreeId()));
+			    break;
+		    case 'NOTE':
+			    Database::prepare(
+				    "UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(REPLACE(o_gedcom, ?, ?), ?, ?) WHERE o_id = ? AND o_file = ?"
+			    )->execute(array($new_xref, "0 @$old_xref@ NOTE\n", "0 @$new_xref@ NOTE\n", "0 @$old_xref@ NOTE ", "0 @$new_xref@ NOTE ", $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'NOTE') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+			    )->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'NOTE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+			    )->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'NOTE') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
+			    )->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'NOTE') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
+			    )->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'NOTE') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
+			    )->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+			    break;
+		    case 'OBJE':
+			    Database::prepare(
+				    "UPDATE `##media` SET m_id = ?, m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_id = ? AND m_file = ?"
+			    )->execute(array($new_xref, "0 @$old_xref@ OBJE\n", "0 @$new_xref@ OBJE\n", $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'OBJE') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+			    )->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'OBJE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+			    )->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'OBJE') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
+			    )->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'OBJE') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
+			    )->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'OBJE') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
+			    )->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+			    break;
+		    default:
+			    Database::prepare(
+				    "UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_id = ? AND o_file = ?"
+			    )->execute(array($new_xref, "0 @$old_xref@ $type\n", "0 @$new_xref@ $type\n", $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ?) SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+			    )->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ?) SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+			    )->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ?) SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
+			    )->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ?) SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
+			    )->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ?) SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
+			    )->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+			    break;
 		}
 		Database::prepare(
 			"UPDATE `##name` SET n_id = ? WHERE n_id = ? AND n_file = ?"

editnews.php

Switch Indentation +38 added lines, -38 removed lines

@@ -44,44 +44,44 @@
 $text      = Filter::post('text');
 
 switch ($action) {
-case 'compose':
-	if (Module::getModuleByName('ckeditor')) {
-		CkeditorModule::enableEditor($controller);
-	}
+    case 'compose':
+	    if (Module::getModuleByName('ckeditor')) {
+		    CkeditorModule::enableEditor($controller);
+	    }
 
-	echo '<h3>' . I18N::translate('Add/edit a journal/news entry') . '</h3>';
-	echo '<form style="overflow: hidden;" name="messageform" method="post" action="editnews.php?action=save&news_id=' . $news_id . '">';
-	if ($news_id) {
-		$news = Database::prepare("SELECT news_id AS id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) AS date, subject, body FROM `##news` WHERE news_id=?")->execute(array($news_id))->fetchOneRow(PDO::FETCH_ASSOC);
-	} else {
-		$news              = array();
-		$news['user_id']   = $user_id;
-		$news['gedcom_id'] = $gedcom_id;
-		$news['date']      = WT_TIMESTAMP;
-		$news['subject']   = '';
-		$news['body']      = '';
-	}
-	echo '<input type="hidden" name="user_id" value="' . $news['user_id'] . '">';
-	echo '<input type="hidden" name="gedcom_id" value="' . $news['gedcom_id'] . '">';
-	echo '<input type="hidden" name="date" value="' . $news['date'] . '">';
-	echo '<table>';
-	echo '<tr><th style="text-align:start;">' . I18N::translate('Title') . '</th><tr>';
-	echo '<tr><td><input type="text" name="title" size="50" dir="auto" autofocus value="' . $news['subject'] . '"></td></tr>';
-	echo '<tr><th style="text-align:start;">' . I18N::translate('Content') . '</th></tr>';
-	echo '<tr><td>';
-	echo '<textarea name="text" class="html-edit" cols="80" rows="10" dir="auto">' . Filter::escapeHtml($news['body']) . '</textarea>';
-	echo '</td></tr>';
-	echo '<tr><td><input type="submit" value="' . I18N::translate('save') . '"></td></tr>';
-	echo '</table>';
-	echo '</form>';
-	break;
-case 'save':
-	if ($news_id) {
-		Database::prepare("UPDATE `##news` SET subject=?, body=?, updated=FROM_UNIXTIME(?) WHERE news_id=?")->execute(array($title, $text, $date, $news_id));
-	} else {
-		Database::prepare("INSERT INTO `##news` (user_id, gedcom_id, subject, body, updated) VALUES (NULLIF(?, ''), NULLIF(?, '') ,? ,?, CURRENT_TIMESTAMP)")->execute(array($user_id, $gedcom_id, $title, $text));
-	}
+	    echo '<h3>' . I18N::translate('Add/edit a journal/news entry') . '</h3>';
+	    echo '<form style="overflow: hidden;" name="messageform" method="post" action="editnews.php?action=save&news_id=' . $news_id . '">';
+	    if ($news_id) {
+		    $news = Database::prepare("SELECT news_id AS id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) AS date, subject, body FROM `##news` WHERE news_id=?")->execute(array($news_id))->fetchOneRow(PDO::FETCH_ASSOC);
+	    } else {
+		    $news              = array();
+		    $news['user_id']   = $user_id;
+		    $news['gedcom_id'] = $gedcom_id;
+		    $news['date']      = WT_TIMESTAMP;
+		    $news['subject']   = '';
+		    $news['body']      = '';
+	    }
+	    echo '<input type="hidden" name="user_id" value="' . $news['user_id'] . '">';
+	    echo '<input type="hidden" name="gedcom_id" value="' . $news['gedcom_id'] . '">';
+	    echo '<input type="hidden" name="date" value="' . $news['date'] . '">';
+	    echo '<table>';
+	    echo '<tr><th style="text-align:start;">' . I18N::translate('Title') . '</th><tr>';
+	    echo '<tr><td><input type="text" name="title" size="50" dir="auto" autofocus value="' . $news['subject'] . '"></td></tr>';
+	    echo '<tr><th style="text-align:start;">' . I18N::translate('Content') . '</th></tr>';
+	    echo '<tr><td>';
+	    echo '<textarea name="text" class="html-edit" cols="80" rows="10" dir="auto">' . Filter::escapeHtml($news['body']) . '</textarea>';
+	    echo '</td></tr>';
+	    echo '<tr><td><input type="submit" value="' . I18N::translate('save') . '"></td></tr>';
+	    echo '</table>';
+	    echo '</form>';
+	    break;
+    case 'save':
+	    if ($news_id) {
+		    Database::prepare("UPDATE `##news` SET subject=?, body=?, updated=FROM_UNIXTIME(?) WHERE news_id=?")->execute(array($title, $text, $date, $news_id));
+	    } else {
+		    Database::prepare("INSERT INTO `##news` (user_id, gedcom_id, subject, body, updated) VALUES (NULLIF(?, ''), NULLIF(?, '') ,? ,?, CURRENT_TIMESTAMP)")->execute(array($user_id, $gedcom_id, $title, $text));
+	    }
 
-	$controller->addInlineJavascript('window.opener.location.reload();window.close();');
-	break;
+	    $controller->addInlineJavascript('window.opener.location.reload();window.close();');
+	    break;
 }

includes/session.php

Switch Indentation +42 added lines, -42 removed lines

@@ -200,29 +200,29 @@ 
 		$frame += array('args' => array(), 'file' => 'unknown', 'line' => 'unknown');
 		array_walk($frame['args'], function (&$arg) {
 			switch (gettype($arg)) {
-			case 'boolean':
-			case 'integer':
-			case 'double':
-			case 'null':
-				$arg = var_export($arg, true);
-				break;
-			case 'string':
-				if (mb_strlen($arg) > 30) {
-					$arg = substr($arg, 0, 30) . '…';
-				}
-				$arg = var_export($arg, true);
-				break;
-			case 'object':
-				$reflection = new \ReflectionClass($arg);
-				if (is_object($arg) && method_exists($arg, '__toString')) {
-					$arg = '[' . $reflection->getShortName() . ' ' . (string) $arg . ']';
-				} else {
-					$arg = '[' . $reflection->getShortName() . ']';
-				}
-				break;
-			default:
-				$arg = '[' . gettype($arg) . ']';
-				break;
+			    case 'boolean':
+			    case 'integer':
+			    case 'double':
+			    case 'null':
+				    $arg = var_export($arg, true);
+				    break;
+			    case 'string':
+				    if (mb_strlen($arg) > 30) {
+					    $arg = substr($arg, 0, 30) . '…';
+				    }
+				    $arg = var_export($arg, true);
+				    break;
+			    case 'object':
+				    $reflection = new \ReflectionClass($arg);
+				    if (is_object($arg) && method_exists($arg, '__toString')) {
+					    $arg = '[' . $reflection->getShortName() . ' ' . (string) $arg . ']';
+				    } else {
+					    $arg = '[' . $reflection->getShortName() . ']';
+				    }
+				    break;
+			    default:
+				    $arg = '[' . gettype($arg) . ']';
+				    break;
 			}
 		});
 		$frame['file'] = str_replace(dirname(__DIR__), '', $frame['file']);
@@ -319,25 +319,25 @@ 
 )->execute(array(WT_CLIENT_IP, Filter::server('HTTP_USER_AGENT', null, '')))->fetchOne();
 
 switch ($rule) {
-case 'allow':
-	$SEARCH_SPIDER = false;
-	break;
-case 'deny':
-	http_response_code(403);
-	exit;
-case 'robot':
-case 'unknown':
-	// Search engines don’t send cookies, and so create a new session with every visit.
-	// Make sure they always use the same one
-	Session::setId('search-engine-' . str_replace('.', '-', WT_CLIENT_IP));
-	$SEARCH_SPIDER = true;
-	break;
-case '':
-	Database::prepare(
-		"INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, comment) VALUES (IFNULL(INET_ATON(?), 0), IFNULL(INET_ATON(?), 4294967295), ?, '')"
-	)->execute(array(WT_CLIENT_IP, WT_CLIENT_IP, Filter::server('HTTP_USER_AGENT', null, '')));
-	$SEARCH_SPIDER = true;
-	break;
+    case 'allow':
+	    $SEARCH_SPIDER = false;
+	    break;
+    case 'deny':
+	    http_response_code(403);
+	    exit;
+    case 'robot':
+    case 'unknown':
+	    // Search engines don’t send cookies, and so create a new session with every visit.
+	    // Make sure they always use the same one
+	    Session::setId('search-engine-' . str_replace('.', '-', WT_CLIENT_IP));
+	    $SEARCH_SPIDER = true;
+	    break;
+    case '':
+	    Database::prepare(
+		    "INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, comment) VALUES (IFNULL(INET_ATON(?), 0), IFNULL(INET_ATON(?), 4294967295), ?, '')"
+	    )->execute(array(WT_CLIENT_IP, WT_CLIENT_IP, Filter::server('HTTP_USER_AGENT', null, '')));
+	    $SEARCH_SPIDER = true;
+	    break;
 }
 
 // Store our session data in the database.