fisharebest / webtrees

app/Module/CensusAssistantModule.php

Spacing +3 added lines, -3 removed lines

@@ -425,10 +425,10 @@ 
 	 * @return string
 	 */
 	public static function censusNavigatorFamily(CensusInterface $census, Family $family, Individual $head) {
-		$headImg2  = '<i class="icon-button_head" title="' . I18N::translate('Click to choose individual as head of family.') . '"></i>';
+		$headImg2 = '<i class="icon-button_head" title="' . I18N::translate('Click to choose individual as head of family.') . '"></i>';
 
 		foreach ($family->getSpouses() as $spouse) {
-			$menu  = new Menu(Functions::getCloseRelationshipName($head, $spouse));
+			$menu = new Menu(Functions::getCloseRelationshipName($head, $spouse));
 			foreach ($spouse->getChildFamilies() as $grandparents) {
 				foreach ($grandparents->getSpouses() as $grandparent) {
 					$submenu = new Menu(
@@ -463,7 +463,7 @@ 
 		}
 
 		foreach ($family->getChildren() as $child) {
-			$menu  = new Menu(Functions::getCloseRelationshipName($head, $child));
+			$menu = new Menu(Functions::getCloseRelationshipName($head, $child));
 			foreach ($child->getSpouseFamilies() as $spouse_family) {
 				foreach ($spouse_family->getSpouses() as $spouse_family_spouse) {
 					if ($spouse_family_spouse != $child) {

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/Module/GoogleMapsModule.php

Spacing +5 added lines, -5 removed lines

@@ -408,7 +408,7 @@ 
 							if ($level == 1) {
 								$label = I18N::translate('Country');
 							} else {
-								$label = I18N::translate('Level') .  ' ' . $level;
+								$label = I18N::translate('Level') . ' ' . $level;
 							}
 							?>
 							<div class="input-group">
@@ -424,7 +424,7 @@ 
 							if ($level == 1) {
 								$label = I18N::translate('Country');
 							} else {
-								$label = I18N::translate('Level') .  ' ' . $level;
+								$label = I18N::translate('Level') . ' ' . $level;
 							}
 							?>
 							<div class="input-group">
@@ -3014,7 +3014,7 @@ 
 			}
 		');
 
-		$levelm                           = $this->setLevelMap($level, $parent);
+		$levelm = $this->setLevelMap($level, $parent);
 		if (isset($levelo[0])) {
 			$levelo[0] = 0;
 		}
@@ -4170,7 +4170,7 @@ 
 						} else {
 							$placelist[$j]['long'] = null;
 						}
-						$j                          = $j + 1;
+						$j = $j + 1;
 					}
 					$i        = $i + 1;
 					$placerec = Functions::getSubRecord(2, '2 PLAC', $gedrec, $i);
@@ -4366,7 +4366,7 @@ 
 			$j            = 0;
 			$maxLevel     = 0;
 			foreach ($lines as $p => $placerec) {
-				$fieldrec                               = explode(';', $placerec);
+				$fieldrec = explode(';', $placerec);
 				if ($fieldrec[0] > $maxLevel) {
 					$maxLevel = $fieldrec[0];
 				}

Braces +55 added lines, -29 removed lines

@@ -825,7 +825,9 @@ 
 			$person = $this->ancestors[$i];
 			if (!empty($person)) {
 				$name = $person->getFullName();
-				if ($name == I18N::translate('Private')) $priv++;
+				if ($name == I18N::translate('Private')) {
+					$priv++;
+				}
 				$place = $person->getBirthPlace();
 				if (empty($place)) {
 					$latlongval[$i] = null;
@@ -1715,8 +1717,9 @@ 
 
 				if ($row['pl_place'] != '') {
 					$placestr2 = $mapstr_edit . $id . "&level=" . $level . $mapstr3 . $mapstr5 . I18N::translate('Zoom=') . $row['pl_zoom'] . $mapstr6 . $row['pl_placerequested'] . $mapstr8;
-					if ($row['pl_place'] === 'unknown')
-						$matched[$x]++;
+					if ($row['pl_place'] === 'unknown') {
+											$matched[$x]++;
+					}
 				} else {
 					if ($levels[$z] === 'unknown') {
 						$placestr2 = $mapstr_add . $id . "&amp;level=" . $level . $mapstr3 . $mapstr7 . "<strong>" . I18N::translate('unknown') . "</strong>" . $mapstr8; $matched[$x]++;
@@ -2828,8 +2831,9 @@ 
 			$parent[$level] = $place2['place'];
 			$this->printHowManyPeople($level + 1, $parent);
 			echo '<br>', I18N::translate('This place has no coordinates');
-			if (Auth::isAdmin())
-				echo "<br><a href='module.php?mod=googlemap&amp;mod_action=admin_places&amp;parent=", $levelm, "&amp;display=inactive'>", I18N::translate('Geographic data'), "</a>";
+			if (Auth::isAdmin()) {
+							echo "<br><a href='module.php?mod=googlemap&amp;mod_action=admin_places&amp;parent=", $levelm, "&amp;display=inactive'>", I18N::translate('Geographic data'), "</a>";
+			}
 			echo "</div>\", icon_type, \"", str_replace(array('&lrm;', '&rlm;'), array(WT_UTF8_LRM, WT_UTF8_RLM), addslashes($place2['place'])), "\");\n";
 		} else {
 			$lati = str_replace(array('N', 'S', ','), array('', '-', '.'), $place2['lati']);
@@ -3030,7 +3034,8 @@ 
 		ob_start(); // TODO: rewrite print_gm_markers, and the functions called therein, to either return text or add JS directly.
 
 		if ($numfound == 0 && $level > 0) {
-			if (isset($levelo[($level - 1)])) {  // ** BH not sure yet what this if statement is for ... TODO **
+			if (isset($levelo[($level - 1)])) {
+// ** BH not sure yet what this if statement is for ... TODO **
 				// show the current place on the map
 
 				$place = Database::prepare("SELECT pl_id as place_id, pl_place as place, pl_lati as lati, pl_long as `long`, pl_zoom as zoom, pl_icon as icon FROM `##placelocation` WHERE pl_id=?")
@@ -3305,10 +3310,11 @@ 
 			$place_name       = $row->pl_place;
 			$place_icon       = $row->pl_icon;
 			$selected_country = explode("/", $place_icon);
-			if (isset($selected_country[1]) && $selected_country[1] != "flags")
-				$selected_country = $selected_country[1];
-			else
-				$selected_country = "Countries";
+			if (isset($selected_country[1]) && $selected_country[1] != "flags") {
+							$selected_country = $selected_country[1];
+			} else {
+							$selected_country = "Countries";
+			}
 			$parent_id         = $row->pl_parent_id;
 			$level             = $row->pl_level;
 			$zoomfactor        = $row->pl_zoom;
@@ -3387,8 +3393,9 @@ 
 			} else {
 				echo '<b>', $place_name;
 			}
-			if (count($where_am_i) > 0)
-				echo ', ', Filter::escapeHtml(str_replace('Unknown', I18N::translate('unknown'), implode(I18N::$list_separator, array_reverse($where_am_i, true)))), '</b><br>';
+			if (count($where_am_i) > 0) {
+							echo ', ', Filter::escapeHtml(str_replace('Unknown', I18N::translate('unknown'), implode(I18N::$list_separator, array_reverse($where_am_i, true)))), '</b><br>';
+			}
 			echo '</b><br>';
 		}
 
@@ -3897,7 +3904,8 @@ 
 			}
 
 			function showLocation_level(address) {
-				address += '<?php if ($level > 0) echo ', ', addslashes(implode(', ', array_reverse($where_am_i, true))) ?>';
+				address += '<?php if ($level > 0) {
+	echo ', ', addslashes(implode(', ', array_reverse($where_am_i, true))) ?>';
 				geocoder.geocode({'address': address}, addAddressToMap);
 			}
 
@@ -3946,6 +3954,7 @@ 
 				</td>
 				<?php
 					$exp = explode(".", $place_lati);
+}
 					if (isset($exp[1])) {
 						$precision1 = strlen($exp[1]);
 					} else {
@@ -3958,13 +3967,15 @@ 
 						$precision2 = -1;
 					}
 					($precision1 > $precision2) ? ($precision = $precision1) : ($precision = $precision2);
-					if ($precision == -1) ($level > 3) ? ($precision = 3) : ($precision = $level);
-					elseif ($precision > 5) {
+					if ($precision == -1) {
+						($level > 3) ? ($precision = 3) : ($precision = $level);
+					} elseif ($precision > 5) {
 						$precision = 5;
 					}
 				?>
 				<td class="optionbox" colspan="2">
-					<input type="radio" id="new_prec_0" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_0')) echo 'checked' ?> value="<?php echo $this->getSetting('GM_PRECISION_0') ?>">
+					<input type="radio" id="new_prec_0" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_0')) {
+	echo 'checked' ?> value="<?php echo $this->getSetting('GM_PRECISION_0') ?>">
 					<label for="new_prec_0"><?php echo I18N::translate('Country') ?></label>
 					<input type="radio" id="new_prec_1" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_1')) echo 'checked' ?> value="<?php echo $this->getSetting('GM_PRECISION_1') ?>">
 					<label for="new_prec_1"><?php echo I18N::translate('State') ?></label>
@@ -3986,8 +3997,13 @@ 
 				<td class="optionbox" colspan="2">
 					<input type="text" id="NEW_PLACE_LATI" name="NEW_PLACE_LATI" placeholder="<?php echo /* I18N: Measure of latitude/longitude */ I18N::translate('degrees') ?>" value="<?php echo abs($place_lati) ?>" size="20" onchange="updateMap();">
 					<select name="LATI_CONTROL" onchange="updateMap();">
-						<option value="PL_N" <?php if ($place_lati >= 0) echo "selected"; echo ">", I18N::translate('north') ?></option>
-						<option value="PL_S" <?php if ($place_lati < 0) echo "selected"; echo ">", I18N::translate('south') ?></option>
+						<option value="PL_N" <?php if ($place_lati >= 0) echo "selected";
+}
+echo ">", I18N::translate('north') ?></option>
+						<option value="PL_S" <?php if ($place_lati < 0) {
+	echo "selected";
+}
+echo ">", I18N::translate('south') ?></option>
 					</select>
 				</td>
 			</tr>
@@ -3996,8 +4012,14 @@ 
 				<td class="optionbox" colspan="2">
 					<input type="text" id="NEW_PLACE_LONG" name="NEW_PLACE_LONG" placeholder="<?php echo I18N::translate('degrees') ?>" value="<?php echo abs($place_long) ?>" size="20" onchange="updateMap();">
 					<select name="LONG_CONTROL" onchange="updateMap();">
-						<option value="PL_E" <?php if ($place_long >= 0) echo "selected"; echo ">", I18N::translate('east') ?></option>
-						<option value="PL_W" <?php if ($place_long < 0) echo "selected"; echo ">", I18N::translate('west') ?></option>
+						<option value="PL_E" <?php if ($place_long >= 0) {
+	echo "selected";
+}
+echo ">", I18N::translate('east') ?></option>
+						<option value="PL_W" <?php if ($place_long < 0) {
+	echo "selected";
+}
+echo ">", I18N::translate('west') ?></option>
 					</select>
 				</td>
 			</tr>
@@ -4210,8 +4232,9 @@ 
 				$parent    = array_reverse($parent);
 				$parent_id = 0;
 				for ($i = 0; $i < count($parent); $i++) {
-					if (!isset($default_zoom_level[$i]))
-						$default_zoom_level[$i] = $default_zoom_level[$i - 1];
+					if (!isset($default_zoom_level[$i])) {
+											$default_zoom_level[$i] = $default_zoom_level[$i - 1];
+					}
 					$escparent               = $parent[$i];
 					if ($escparent == '') {
 						$escparent = 'Unknown';
@@ -4451,7 +4474,8 @@ 
 						Database::prepare("SELECT pl_id, pl_long, pl_lati, pl_zoom, pl_icon FROM `##placelocation` WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place")
 						->execute(array($i, $parent_id, $escparent))
 						->fetchOneRow();
-					if (empty($row)) {       // this name does not yet exist: create entry
+					if (empty($row)) {
+// this name does not yet exist: create entry
 						if (!Filter::postBool('updateonly')) {
 							$highestIndex = $highestIndex + 1;
 							if (($i + 1) == count($parent)) {
@@ -4590,14 +4614,16 @@ 
 		echo '<th>', I18N::translate('Icon'), '</th>';
 		echo '<th>';
 		echo I18N::translate('Edit'), '</th><th>', I18N::translate('Delete'), '</th></tr>';
-		if (count($placelist) == 0)
-			echo '<tr><td colspan="7">', I18N::translate('No places found'), '</td></tr>';
+		if (count($placelist) == 0) {
+					echo '<tr><td colspan="7">', I18N::translate('No places found'), '</td></tr>';
+		}
 		foreach ($placelist as $place) {
 			echo '<tr><td><a href="module.php?mod=googlemap&mod_action=admin_places&parent=', $place['place_id'], '&inactive=', $inactive, '">';
-			if ($place['place'] != 'Unknown')
-					echo Filter::escapeHtml($place['place']), '</a></td>';
-				else
-					echo I18N::translate('unknown'), '</a></td>';
+			if ($place['place'] != 'Unknown') {
+								echo Filter::escapeHtml($place['place']), '</a></td>';
+			} else {
+									echo I18N::translate('unknown'), '</a></td>';
+				}
 			echo '<td>', $place['lati'], '</td>';
 			echo '<td>', $place['long'], '</td>';
 			echo '<td>', $place['zoom'], '</td>';

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/Report/ReportParserGenerate.php

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) {
@@ -1850,180 +1850,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 DISTINCT 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 DISTINCT 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[] = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-				}
-				break;
-
-			case 'family':
-				$sql_select   = "SELECT DISTINCT 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[] = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			}
+			break;
+
+		case 'family':
+			$sql_select   = "SELECT DISTINCT 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[] = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-				}
-				break;
+			foreach ($rows as $row) {
+				$this->list[] = 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();
@@ -2084,17 +2084,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;
 							}
 						}
 					}
@@ -2138,31 +2138,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;
 						}
 					}
 				}
@@ -2174,26 +2174,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));
@@ -2344,88 +2344,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;

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;

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

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 {

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;