fisharebest / webtrees

app/Report/ReportParserGenerate.php

Spacing +2 added lines, -2 removed lines

@@ -954,7 +954,7 @@ 
 					}
 				}
 				$tmp = explode(':', $tag);
-				if (in_array(end($tmp),  array('NOTE', 'TEXT'))) {
+				if (in_array(end($tmp), array('NOTE', 'TEXT'))) {
 					$value = Filter::formatText($value, $WT_TREE); // We'll strip HTML in addText()
 				}
 				$this->current_element->addText($value);
@@ -2734,7 +2734,7 @@ 
 		$tags      = explode(':', $tag);
 		$origlevel = $level;
 		if ($level == 0) {
-			$level = $gedrec{0} + 1;
+			$level = $gedrec{0} +1;
 		}
 
 		$subrec = $gedrec;

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;

Switch Indentation +310 added lines, -310 removed lines

@@ -934,14 +934,14 @@ 
 				$tags  = preg_split('/[: ]/', $tag);
 				$value = $this->getGedcomValue($tag, $level, $this->gedrec);
 				switch (end($tags)) {
-					case 'DATE':
-						$tmp   = new Date($value);
-						$value = $tmp->display();
-						break;
-					case 'PLAC':
-						$tmp   = new Place($value, $WT_TREE);
-						$value = $tmp->getShortName();
-						break;
+				case 'DATE':
+					$tmp   = new Date($value);
+					$value = $tmp->display();
+					break;
+				case 'PLAC':
+					$tmp   = new Place($value, $WT_TREE);
+					$value = $tmp->getShortName();
+					break;
 				}
 				if ($useBreak == "1") {
 					// Insert <br> when multiple dates exist.
@@ -1325,22 +1325,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) {
@@ -1849,180 +1849,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();
+		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;
+								}
 							}
-							if ($sortby == $match[1]) {
+							// 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}.d_julianday1";
+								$sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.n_sort";
 							}
-							unset($attrs[$attr]); // This filter has been fully processed
-						} elseif (preg_match('/^NAME CONTAINS (.*)$/', $value, $match)) {
-							// Do nothing, unless you have to
-							if ($match[1] != '' || $sortby == 'NAME') {
-								$sql_join .= " JOIN `##name` AS {$attr} ON (n_file=i_file AND n_id=i_id)";
-								// Search the DB only if there is any name supplied
-								if ($match[1] != "") {
-									$names = explode(" ", $match[1]);
-									foreach ($names as $n => $name) {
-										$sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
-										$sql_params[$attr . 'name' . $n] = $name;
-									}
-								}
-								// Let the DB do the name sorting even when no name was entered
-								if ($sortby == "NAME") {
-									$sortby = "";
-									$sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.n_sort";
-								}
-							}
-							unset($attrs[$attr]); // This filter has been fully processed
-						} elseif (preg_match('/^REGEXP \/(.+)\//', $value, $match)) {
-							$sql_where .= " AND i_gedcom REGEXP :{$attr}gedcom";
-							// PDO helpfully escapes backslashes for us, preventing us from matching "\n1 FACT"
-							$sql_params[$attr . 'gedcom'] = str_replace('\n', "\n", $match[1]);
-							unset($attrs[$attr]); // This filter has been fully processed
-						} elseif (preg_match('/^(?:\w+):PLAC CONTAINS (.+)$/', $value, $match)) {
-							$sql_join .= " JOIN `##places` AS {$attr}a ON ({$attr}a.p_file = i_file)";
-							$sql_join .= " JOIN `##placelinks` AS {$attr}b ON ({$attr}a.p_file = {$attr}b.pl_file AND {$attr}b.pl_p_id = {$attr}a.p_id AND {$attr}b.pl_gid = i_id)";
-							$sql_where .= " AND {$attr}a.p_place LIKE CONCAT('%', :{$attr}place, '%')";
-							$sql_params[$attr . 'place'] = $match[1];
-							// Don't unset this filter. This is just initial filtering
-						} elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
-							$sql_where .= " AND i_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
-							$sql_params[$attr . 'contains1'] = $match[1];
-							$sql_params[$attr . 'contains2'] = $match[2];
-							$sql_params[$attr . 'contains3'] = $match[3];
-							// Don't unset this filter. This is just initial filtering
 						}
+						unset($attrs[$attr]); // This filter has been fully processed
+					} elseif (preg_match('/^REGEXP \/(.+)\//', $value, $match)) {
+						$sql_where .= " AND i_gedcom REGEXP :{$attr}gedcom";
+						// PDO helpfully escapes backslashes for us, preventing us from matching "\n1 FACT"
+						$sql_params[$attr . 'gedcom'] = str_replace('\n', "\n", $match[1]);
+						unset($attrs[$attr]); // This filter has been fully processed
+					} elseif (preg_match('/^(?:\w+):PLAC CONTAINS (.+)$/', $value, $match)) {
+						$sql_join .= " JOIN `##places` AS {$attr}a ON ({$attr}a.p_file = i_file)";
+						$sql_join .= " JOIN `##placelinks` AS {$attr}b ON ({$attr}a.p_file = {$attr}b.pl_file AND {$attr}b.pl_p_id = {$attr}a.p_id AND {$attr}b.pl_gid = i_id)";
+						$sql_where .= " AND {$attr}a.p_place LIKE CONCAT('%', :{$attr}place, '%')";
+						$sql_params[$attr . 'place'] = $match[1];
+						// Don't unset this filter. This is just initial filtering
+					} elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
+						$sql_where .= " AND i_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
+						$sql_params[$attr . 'contains1'] = $match[1];
+						$sql_params[$attr . 'contains2'] = $match[2];
+						$sql_params[$attr . 'contains3'] = $match[3];
+						// Don't unset this filter. This is just initial filtering
 					}
 				}
+			}
 
-				$this->list = array();
-				$rows       = Database::prepare(
-					$sql_select . $sql_join . $sql_where . $sql_order_by
-				)->execute($sql_params)->fetchAll();
-
-				foreach ($rows as $row) {
-					$this->list[$row->xref] = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-				}
-				break;
-
-			case 'family':
-				$sql_select   = "SELECT f_id AS xref, f_gedcom AS gedcom FROM `##families`";
-				$sql_join     = "";
-				$sql_where    = " WHERE f_file = :tree_id";
-				$sql_order_by = "";
-				$sql_params   = array('tree_id' => $WT_TREE->getTreeId());
-				foreach ($attrs as $attr => $value) {
-					if (strpos($attr, 'filter') === 0 && $value) {
-						$value = $this->substituteVars($value, false);
-						// Convert the various filters into SQL
-						if (preg_match('/^(\w+):DATE (LTE|GTE) (.+)$/', $value, $match)) {
-							$sql_join .= " JOIN `##dates` AS {$attr} ON ({$attr}.d_file=f_file AND {$attr}.d_gid=f_id)";
-							$sql_where .= " AND {$attr}.d_fact = :{$attr}fact";
-							$sql_params[$attr . 'fact'] = $match[1];
-							$date                       = new Date($match[3]);
-							if ($match[2] == "LTE") {
-								$sql_where .= " AND {$attr}.d_julianday2 <= :{$attr}date";
-								$sql_params[$attr . 'date'] = $date->maximumJulianDay();
-							} else {
-								$sql_where .= " AND {$attr}.d_julianday1 >= :{$attr}date";
-								$sql_params[$attr . 'date'] = $date->minimumJulianDay();
+			$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;
+								}
 							}
-							if ($sortby == $match[1]) {
+							// 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}.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";
-								}
+								$sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.n_sort";
 							}
-							unset($attrs[$attr]); // This filter has been fully processed
-
-						} elseif (preg_match('/^(?:\w+):PLAC CONTAINS (.+)$/', $value, $match)) {
-							$sql_join .= " JOIN `##places` AS {$attr}a ON ({$attr}a.p_file=f_file)";
-							$sql_join .= " JOIN `##placelinks` AS {$attr}b ON ({$attr}a.p_file={$attr}b.pl_file AND {$attr}b.pl_p_id={$attr}a.p_id AND {$attr}b.pl_gid=f_id)";
-							$sql_where .= " AND {$attr}a.p_place LIKE CONCAT('%', :{$attr}place, '%')";
-							$sql_params[$attr . 'place'] = $match[1];
-							// Don't unset this filter. This is just initial filtering
-						} elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
-							$sql_where .= " AND f_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
-							$sql_params[$attr . 'contains1'] = $match[1];
-							$sql_params[$attr . 'contains2'] = $match[2];
-							$sql_params[$attr . 'contains3'] = $match[3];
-							// Don't unset this filter. This is just initial filtering
 						}
+						unset($attrs[$attr]); // This filter has been fully processed
+
+					} elseif (preg_match('/^(?:\w+):PLAC CONTAINS (.+)$/', $value, $match)) {
+						$sql_join .= " JOIN `##places` AS {$attr}a ON ({$attr}a.p_file=f_file)";
+						$sql_join .= " JOIN `##placelinks` AS {$attr}b ON ({$attr}a.p_file={$attr}b.pl_file AND {$attr}b.pl_p_id={$attr}a.p_id AND {$attr}b.pl_gid=f_id)";
+						$sql_where .= " AND {$attr}a.p_place LIKE CONCAT('%', :{$attr}place, '%')";
+						$sql_params[$attr . 'place'] = $match[1];
+						// Don't unset this filter. This is just initial filtering
+					} elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
+						$sql_where .= " AND f_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
+						$sql_params[$attr . 'contains1'] = $match[1];
+						$sql_params[$attr . 'contains2'] = $match[2];
+						$sql_params[$attr . 'contains3'] = $match[3];
+						// Don't unset this filter. This is just initial filtering
 					}
 				}
+			}
 
-				$this->list = array();
-				$rows       = Database::prepare(
-					$sql_select . $sql_join . $sql_where . $sql_order_by
-				)->execute($sql_params)->fetchAll();
+			$this->list = array();
+			$rows       = Database::prepare(
+				$sql_select . $sql_join . $sql_where . $sql_order_by
+			)->execute($sql_params)->fetchAll();
 
-				foreach ($rows as $row) {
-					$this->list[$row->xref] = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-				}
-				break;
+			foreach ($rows as $row) {
+				$this->list[$row->xref] = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			}
+			break;
 
-			default:
-				throw new \DomainException('Invalid list name: ' . $listname);
+		default:
+			throw new \DomainException('Invalid list name: ' . $listname);
 		}
 
 		$filters  = array();
@@ -2083,17 +2083,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;
 							}
 						}
 					}
@@ -2137,31 +2137,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;
 						}
 					}
 				}
@@ -2173,26 +2173,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));
@@ -2343,88 +2343,88 @@ 
 		if (!empty($person)) {
 			$this->list[$id] = $person;
 			switch ($group) {
-				case "child-family":
-					foreach ($person->getChildFamilies() as $family) {
-						$husband = $family->getHusband();
-						$wife    = $family->getWife();
-						if (!empty($husband)) {
-							$this->list[$husband->getXref()] = $husband;
-						}
-						if (!empty($wife)) {
-							$this->list[$wife->getXref()] = $wife;
-						}
-						$children = $family->getChildren();
-						foreach ($children as $child) {
-							if (!empty($child)) {
-								$this->list[$child->getXref()] = $child;
-							}
-						}
+			case "child-family":
+				foreach ($person->getChildFamilies() as $family) {
+					$husband = $family->getHusband();
+					$wife    = $family->getWife();
+					if (!empty($husband)) {
+						$this->list[$husband->getXref()] = $husband;
 					}
-					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;
+					if (!empty($wife)) {
+						$this->list[$wife->getXref()] = $wife;
+					}
+					$children = $family->getChildren();
+					foreach ($children as $child) {
+						if (!empty($child)) {
+							$this->list[$child->getXref()] = $child;
 						}
-						$children = $family->getChildren();
-						foreach ($children as $child) {
-							if (!empty($child)) {
-								$this->list[$child->getXref()] = $child;
-							}
+					}
+				}
+				break;
+			case "spouse-family":
+				foreach ($person->getSpouseFamilies() as $family) {
+					$husband = $family->getHusband();
+					$wife    = $family->getWife();
+					if (!empty($husband)) {
+						$this->list[$husband->getXref()] = $husband;
+					}
+					if (!empty($wife)) {
+						$this->list[$wife->getXref()] = $wife;
+					}
+					$children = $family->getChildren();
+					foreach ($children as $child) {
+						if (!empty($child)) {
+							$this->list[$child->getXref()] = $child;
 						}
 					}
-					break;
-				case "direct-ancestors":
-					$this->addAncestors($this->list, $id, false, $maxgen);
-					break;
-				case "ancestors":
-					$this->addAncestors($this->list, $id, true, $maxgen);
-					break;
-				case "descendants":
-					$this->list[$id]->generation = 1;
-					$this->addDescendancy($this->list, $id, false, $maxgen);
-					break;
-				case "all":
-					$this->addAncestors($this->list, $id, true, $maxgen);
-					$this->addDescendancy($this->list, $id, true, $maxgen);
-					break;
+				}
+				break;
+			case "direct-ancestors":
+				$this->addAncestors($this->list, $id, false, $maxgen);
+				break;
+			case "ancestors":
+				$this->addAncestors($this->list, $id, true, $maxgen);
+				break;
+			case "descendants":
+				$this->list[$id]->generation = 1;
+				$this->addDescendancy($this->list, $id, false, $maxgen);
+				break;
+			case "all":
+				$this->addAncestors($this->list, $id, true, $maxgen);
+				$this->addDescendancy($this->list, $id, true, $maxgen);
+				break;
 			}
 		}
 
 		switch ($sortby) {
-			case 'NAME':
-				uasort($this->list, '\Fisharebest\Webtrees\GedcomRecord::compare');
-				break;
-			case 'BIRT:DATE':
-				uasort($this->list, '\Fisharebest\Webtrees\Individual::compareBirthDate');
-				break;
-			case 'DEAT:DATE':
-				uasort($this->list, '\Fisharebest\Webtrees\Individual::compareDeathDate');
-				break;
-			case 'generation':
-				$newarray = array();
-				reset($this->list);
-				$genCounter = 1;
-				while (count($newarray) < count($this->list)) {
-					foreach ($this->list as $key => $value) {
-						$this->generation = $value->generation;
-						if ($this->generation == $genCounter) {
-							$newarray[$key]             = new \stdClass;
-							$newarray[$key]->generation = $this->generation;
-						}
+		case 'NAME':
+			uasort($this->list, '\Fisharebest\Webtrees\GedcomRecord::compare');
+			break;
+		case 'BIRT:DATE':
+			uasort($this->list, '\Fisharebest\Webtrees\Individual::compareBirthDate');
+			break;
+		case 'DEAT:DATE':
+			uasort($this->list, '\Fisharebest\Webtrees\Individual::compareDeathDate');
+			break;
+		case 'generation':
+			$newarray = array();
+			reset($this->list);
+			$genCounter = 1;
+			while (count($newarray) < count($this->list)) {
+				foreach ($this->list as $key => $value) {
+					$this->generation = $value->generation;
+					if ($this->generation == $genCounter) {
+						$newarray[$key]             = new \stdClass;
+						$newarray[$key]->generation = $this->generation;
 					}
-					$genCounter++;
 				}
-				$this->list = $newarray;
-				break;
-			default:
-				// unsorted
-				break;
+				$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/SurnameTradition/IcelandicSurnameTradition.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	 */
 	public function newChildNames($father_name, $mother_name, $child_sex) {
 		if (preg_match(self::REGEX_GIVN, $father_name, $father_match)) {
-			switch($child_sex) {
+			switch ($child_sex) {
 			case 'M':
 				return array(
 					'NAME' => $father_match['GIVN'] . 'sson',

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;

app/SurnameTradition/SpanishSurnameTradition.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 	 */
 	public function newParentNames($child_name, $parent_sex) {
 		if (preg_match(self::REGEX_SURNS, $child_name, $match)) {
-			switch($parent_sex) {
+			switch ($parent_sex) {
 			case 'M':
 				return array(
 					'NAME' => '/' . $match['SURN1'] . '/ //',

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;

calendar.php

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

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

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+			 * webtrees: online genealogy
+			 * Copyright (C) 2016 webtrees development team
+			 * This program is free software: you can redistribute it and/or modify
+			 * it under the terms of the GNU General Public License as published by
+			 * the Free Software Foundation, either version 3 of the License, or
+			 * (at your option) any later version.
+			 * This program is distributed in the hope that it will be useful,
+			 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+			 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+			 * GNU General Public License for more details.
+			 * You should have received a copy of the GNU General Public License
+			 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+			 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Functions\FunctionsEdit;

edit_interface.php

Spacing +1 added lines, -1 removed lines

@@ -2066,7 +2066,7 @@
 	}
 
 	$CHIL = array();
-	for ($i = 0;; ++$i) {
+	for ($i = 0; ; ++$i) {
 		if (isset($_POST['CHIL' . $i])) {
 			$CHIL[] = Filter::post('CHIL' . $i, WT_REGEX_XREF);
 		} else {

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+		 * webtrees: online genealogy
+		 * Copyright (C) 2016 webtrees development team
+		 * This program is free software: you can redistribute it and/or modify
+		 * it under the terms of the GNU General Public License as published by
+		 * the Free Software Foundation, either version 3 of the License, or
+		 * (at your option) any later version.
+		 * This program is distributed in the hope that it will be useful,
+		 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+		 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+		 * GNU General Public License for more details.
+		 * You should have received a copy of the GNU General Public License
+		 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+		 */
 namespace Fisharebest\Webtrees;
 
 define('WT_SCRIPT_NAME', 'site-offline.php');

edituser.php

Braces +5 added lines, -2 removed lines

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

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;

login.php

Braces +12 added lines, -4 removed lines

@@ -52,10 +52,18 @@
 $password        = Filter::post('password');
 
 // These parameters may come from the URL which is emailed to users.
-if (!$action)        $action        = Filter::get('action');
-if (!$user_name)     $user_name     = Filter::get('user_name');
-if (!$user_hashcode) $user_hashcode = Filter::get('user_hashcode');
-if (!$url)           $url           = Filter::get('url');
+if (!$action) {
+	$action        = Filter::get('action');
+}
+if (!$user_name) {
+	$user_name     = Filter::get('user_name');
+}
+if (!$user_hashcode) {
+	$user_hashcode = Filter::get('user_hashcode');
+}
+if (!$url) {
+	$url           = Filter::get('url');
+}
 
 $message = '';
 

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;

medialist.php

Spacing +4 added lines, -4 removed lines

@@ -239,13 +239,13 @@
 			echo '<', $tsection, '><tr><td colspan="2">';
 			echo '<table class="list_table_controls"><tr><td>';
 			if ($page > 1) {
-				echo '<a href="', $url, '&amp;page=1" class="icon-', $icons['first'] ,'"></a>';
-				echo '<a href="', $url, '&amp;page=', $page - 1 ,'" class="icon-', $icons['previous'] , '"></a>';
+				echo '<a href="', $url, '&amp;page=1" class="icon-', $icons['first'], '"></a>';
+				echo '<a href="', $url, '&amp;page=', $page - 1, '" class="icon-', $icons['previous'], '"></a>';
 			}
 			echo '</td><td>', I18N::translate('Page %s of %s', $page, $pages), '</td><td>';
 			if ($page < $pages) {
-				echo '<a href="', $url, '&amp;page=', $page + 1 ,'" class="icon-', $icons['next'] , '"></a>';
-				echo '<a href="', $url, '&amp;page=', $pages ,'" class="icon-', $icons['last'] ,'"></a>';
+				echo '<a href="', $url, '&amp;page=', $page + 1, '" class="icon-', $icons['next'], '"></a>';
+				echo '<a href="', $url, '&amp;page=', $pages, '" class="icon-', $icons['last'], '"></a>';
 			}
 			echo '</td></tr></table>';
 			echo '</td></tr></', $tsection, '>';

Braces +5 added lines, -2 removed lines

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

search_advanced.php

Braces +92 added lines, -23 removed lines

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

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;