fisharebest / webtrees

app/Report/ReportTcpdf.php

Doc Comments +3 added lines, -3 removed lines

@@ -141,7 +141,7 @@ 
 	/**
 	 * Add an element to the Page Header -PDF
 	 *
-	 * @param object|string $element
+	 * @param ReportBaseElement $element
 	 *
 	 * @return int The number of the Page Header elements
 	 */
@@ -232,7 +232,7 @@ 
 	/**
 	 * Set the report.
 	 *
-	 * @param $r
+	 * @param ReportPdf $r
 	 */
 	public function setReport($r) {
 		$this->wt_report = $r;
@@ -340,7 +340,7 @@ 
 	/**
 	 * Checks the Footnote and numbers them
 	 *
-	 * @param object $footnote
+	 * @param ReportBaseFootnote $footnote
 	 *
 	 * @return bool false if not numbered befor | object if already numbered
 	 */

app/Schema/MigrationInterface.php

Doc Comments +1 added lines

@@ -21,6 +21,7 @@
 interface MigrationInterface {
 	/**
 	 * Upgrade to to the next version
+	 * @return void
 	 */
 	public function upgrade();
 }

app/Stats.php

Doc Comments +1 added lines, -1 removed lines

@@ -5362,7 +5362,7 @@
 	/**
 	 * Find common surnames.
 	 *
-	 * @return string
+	 * @return integer|null
 	 */
 	public function getCommonSurname() {
 		$surnames = array_keys(FunctionsDb::getTopSurnames($this->tree->getTreeId(), 1, 1));

Switch Indentation +387 added lines, -387 removed lines

@@ -303,22 +303,22 @@ 
 	 */
 	private function getPercentage($total, $type) {
 		switch ($type) {
-		case 'individual':
-			$type = $this->totalIndividualsQuery();
-			break;
-		case 'family':
-			$type = $this->totalFamiliesQuery();
-			break;
-		case 'source':
-			$type = $this->totalSourcesQuery();
-			break;
-		case 'note':
-			$type = $this->totalNotesQuery();
-			break;
-		case 'all':
-		default:
-			$type = $this->totalIndividualsQuery() + $this->totalFamiliesQuery() + $this->totalSourcesQuery();
-			break;
+			case 'individual':
+				$type = $this->totalIndividualsQuery();
+				break;
+			case 'family':
+				$type = $this->totalFamiliesQuery();
+				break;
+			case 'source':
+				$type = $this->totalSourcesQuery();
+				break;
+			case 'note':
+				$type = $this->totalNotesQuery();
+				break;
+			case 'all':
+			default:
+				$type = $this->totalIndividualsQuery() + $this->totalFamiliesQuery() + $this->totalSourcesQuery();
+				break;
 		}
 		if ($type == 0) {
 			return I18N::percentage(0, 1);
@@ -1444,29 +1444,29 @@ 
 		$row    = $rows[0];
 		$record = GedcomRecord::getInstance($row['d_gid'], $this->tree);
 		switch ($type) {
-		default:
-		case 'full':
-			if ($record->canShow()) {
-				$result = $record->formatList('span', false, $record->getFullName());
-			} else {
-				$result = I18N::translate('This information is private and cannot be shown.');
-			}
-			break;
-		case 'year':
-			$date   = new Date($row['d_type'] . ' ' . $row['d_year']);
-			$result = $date->display();
-			break;
-		case 'name':
-			$result = "<a href=\"" . $record->getHtmlUrl() . "\">" . $record->getFullName() . "</a>";
-			break;
-		case 'place':
-			$fact = GedcomRecord::getInstance($row['d_gid'], $this->tree)->getFirstFact($row['d_fact']);
-			if ($fact) {
-				$result = FunctionsPrint::formatFactPlace($fact, true, true, true);
-			} else {
-				$result = I18N::translate('Private');
-			}
-			break;
+			default:
+			case 'full':
+				if ($record->canShow()) {
+					$result = $record->formatList('span', false, $record->getFullName());
+				} else {
+					$result = I18N::translate('This information is private and cannot be shown.');
+				}
+				break;
+			case 'year':
+				$date   = new Date($row['d_type'] . ' ' . $row['d_year']);
+				$result = $date->display();
+				break;
+			case 'name':
+				$result = "<a href=\"" . $record->getHtmlUrl() . "\">" . $record->getFullName() . "</a>";
+				break;
+			case 'place':
+				$fact = GedcomRecord::getInstance($row['d_gid'], $this->tree)->getFirstFact($row['d_fact']);
+				if ($fact) {
+					$result = FunctionsPrint::formatFactPlace($fact, true, true, true);
+				} else {
+					$result = I18N::translate('Private');
+				}
+				break;
 		}
 
 		return $result;
@@ -1631,96 +1631,96 @@ 
 		}
 		I18N::init(WT_LOCALE);
 		switch ($chart_type) {
-		case 'surname_distribution_chart':
-			if ($surname == "") {
-				$surname = $this->getCommonSurname();
-			}
-			$chart_title = I18N::translate('Surname distribution chart') . ': ' . $surname;
-			// Count how many people are events in each country
-			$surn_countries = array();
-			$indis          = QueryName::individuals($this->tree, I18N::strtoupper($surname), '', '', false, false);
-			foreach ($indis as $person) {
-				if (preg_match_all('/^2 PLAC (?:.*, *)*(.*)/m', $person->getGedcom(), $matches)) {
-					// webtrees uses 3 letter country codes and localised country names, but google uses 2 letter codes.
-					foreach ($matches[1] as $country) {
-						if (array_key_exists($country, $country_to_iso3166)) {
-							if (array_key_exists($country_to_iso3166[$country], $surn_countries)) {
-								$surn_countries[$country_to_iso3166[$country]]++;
-							} else {
-								$surn_countries[$country_to_iso3166[$country]] = 1;
+			case 'surname_distribution_chart':
+				if ($surname == "") {
+					$surname = $this->getCommonSurname();
+				}
+				$chart_title = I18N::translate('Surname distribution chart') . ': ' . $surname;
+				// Count how many people are events in each country
+				$surn_countries = array();
+				$indis          = QueryName::individuals($this->tree, I18N::strtoupper($surname), '', '', false, false);
+				foreach ($indis as $person) {
+					if (preg_match_all('/^2 PLAC (?:.*, *)*(.*)/m', $person->getGedcom(), $matches)) {
+						// webtrees uses 3 letter country codes and localised country names, but google uses 2 letter codes.
+						foreach ($matches[1] as $country) {
+							if (array_key_exists($country, $country_to_iso3166)) {
+								if (array_key_exists($country_to_iso3166[$country], $surn_countries)) {
+									$surn_countries[$country_to_iso3166[$country]]++;
+								} else {
+									$surn_countries[$country_to_iso3166[$country]] = 1;
+								}
 							}
 						}
 					}
-				}
-			};
-			break;
-		case 'birth_distribution_chart':
-			$chart_title = I18N::translate('Birth by country');
-			// Count how many people were born in each country
-			$surn_countries = array();
-			$b_countries    = $this->statsPlaces('INDI', 'BIRT', 0, true);
-			foreach ($b_countries as $place => $count) {
-				$country = $place;
-				if (array_key_exists($country, $country_to_iso3166)) {
-					if (!isset($surn_countries[$country_to_iso3166[$country]])) {
-						$surn_countries[$country_to_iso3166[$country]] = $count;
-					} else {
-						$surn_countries[$country_to_iso3166[$country]] += $count;
+				};
+				break;
+			case 'birth_distribution_chart':
+				$chart_title = I18N::translate('Birth by country');
+				// Count how many people were born in each country
+				$surn_countries = array();
+				$b_countries    = $this->statsPlaces('INDI', 'BIRT', 0, true);
+				foreach ($b_countries as $place => $count) {
+					$country = $place;
+					if (array_key_exists($country, $country_to_iso3166)) {
+						if (!isset($surn_countries[$country_to_iso3166[$country]])) {
+							$surn_countries[$country_to_iso3166[$country]] = $count;
+						} else {
+							$surn_countries[$country_to_iso3166[$country]] += $count;
+						}
 					}
 				}
-			}
-			break;
-		case 'death_distribution_chart':
-			$chart_title = I18N::translate('Death by country');
-			// Count how many people were death in each country
-			$surn_countries = array();
-			$d_countries    = $this->statsPlaces('INDI', 'DEAT', 0, true);
-			foreach ($d_countries as $place => $count) {
-				$country = $place;
-				if (array_key_exists($country, $country_to_iso3166)) {
-					if (!isset($surn_countries[$country_to_iso3166[$country]])) {
-						$surn_countries[$country_to_iso3166[$country]] = $count;
-					} else {
-						$surn_countries[$country_to_iso3166[$country]] += $count;
+				break;
+			case 'death_distribution_chart':
+				$chart_title = I18N::translate('Death by country');
+				// Count how many people were death in each country
+				$surn_countries = array();
+				$d_countries    = $this->statsPlaces('INDI', 'DEAT', 0, true);
+				foreach ($d_countries as $place => $count) {
+					$country = $place;
+					if (array_key_exists($country, $country_to_iso3166)) {
+						if (!isset($surn_countries[$country_to_iso3166[$country]])) {
+							$surn_countries[$country_to_iso3166[$country]] = $count;
+						} else {
+							$surn_countries[$country_to_iso3166[$country]] += $count;
+						}
 					}
 				}
-			}
-			break;
-		case 'marriage_distribution_chart':
-			$chart_title = I18N::translate('Marriage by country');
-			// Count how many families got marriage in each country
-			$surn_countries = array();
-			$m_countries    = $this->statsPlaces('FAM');
-			// webtrees uses 3 letter country codes and localised country names, but google uses 2 letter codes.
-			foreach ($m_countries as $place) {
-				$country = $place['country'];
-				if (array_key_exists($country, $country_to_iso3166)) {
-					if (!isset($surn_countries[$country_to_iso3166[$country]])) {
-						$surn_countries[$country_to_iso3166[$country]] = $place['tot'];
-					} else {
-						$surn_countries[$country_to_iso3166[$country]] += $place['tot'];
+				break;
+			case 'marriage_distribution_chart':
+				$chart_title = I18N::translate('Marriage by country');
+				// Count how many families got marriage in each country
+				$surn_countries = array();
+				$m_countries    = $this->statsPlaces('FAM');
+				// webtrees uses 3 letter country codes and localised country names, but google uses 2 letter codes.
+				foreach ($m_countries as $place) {
+					$country = $place['country'];
+					if (array_key_exists($country, $country_to_iso3166)) {
+						if (!isset($surn_countries[$country_to_iso3166[$country]])) {
+							$surn_countries[$country_to_iso3166[$country]] = $place['tot'];
+						} else {
+							$surn_countries[$country_to_iso3166[$country]] += $place['tot'];
+						}
 					}
 				}
-			}
-			break;
-		case 'indi_distribution_chart':
-		default:
-			$chart_title = I18N::translate('Individual distribution chart');
-			// Count how many people have events in each country
-			$surn_countries = array();
-			$a_countries    = $this->statsPlaces('INDI');
-			// webtrees uses 3 letter country codes and localised country names, but google uses 2 letter codes.
-			foreach ($a_countries as $place) {
-				$country = $place['country'];
-				if (array_key_exists($country, $country_to_iso3166)) {
-					if (!isset($surn_countries[$country_to_iso3166[$country]])) {
-						$surn_countries[$country_to_iso3166[$country]] = $place['tot'];
-					} else {
-						$surn_countries[$country_to_iso3166[$country]] += $place['tot'];
+				break;
+			case 'indi_distribution_chart':
+			default:
+				$chart_title = I18N::translate('Individual distribution chart');
+				// Count how many people have events in each country
+				$surn_countries = array();
+				$a_countries    = $this->statsPlaces('INDI');
+				// webtrees uses 3 letter country codes and localised country names, but google uses 2 letter codes.
+				foreach ($a_countries as $place) {
+					$country = $place['country'];
+					if (array_key_exists($country, $country_to_iso3166)) {
+						if (!isset($surn_countries[$country_to_iso3166[$country]])) {
+							$surn_countries[$country_to_iso3166[$country]] = $place['tot'];
+						} else {
+							$surn_countries[$country_to_iso3166[$country]] += $place['tot'];
+						}
 					}
 				}
-			}
-			break;
+				break;
 		}
 		$chart_url = "https://chart.googleapis.com/chart?cht=t&amp;chtm=" . $chart_shows;
 		$chart_url .= "&amp;chco=" . $WT_STATS_CHART_COLOR1 . "," . $WT_STATS_CHART_COLOR3 . "," . $WT_STATS_CHART_COLOR2; // country colours
@@ -2259,20 +2259,20 @@ 
 		$row    = $rows[0];
 		$person = Individual::getInstance($row['id'], $this->tree);
 		switch ($type) {
-		default:
-		case 'full':
-			if ($person->canShowName()) {
-				$result = $person->formatList('span', false, $person->getFullName());
-			} else {
-				$result = I18N::translate('This information is private and cannot be shown.');
-			}
-			break;
-		case 'age':
-			$result = I18N::number((int) ($row['age'] / 365.25));
-			break;
-		case 'name':
-			$result = "<a href=\"" . $person->getHtmlUrl() . "\">" . $person->getFullName() . "</a>";
-			break;
+			default:
+			case 'full':
+				if ($person->canShowName()) {
+					$result = $person->formatList('span', false, $person->getFullName());
+				} else {
+					$result = I18N::translate('This information is private and cannot be shown.');
+				}
+				break;
+			case 'age':
+				$result = I18N::number((int) ($row['age'] / 365.25));
+				break;
+			case 'name':
+				$result = "<a href=\"" . $person->getHtmlUrl() . "\">" . $person->getFullName() . "</a>";
+				break;
 		}
 
 		return $result;
@@ -2942,36 +2942,36 @@ 
 		$row    = $rows[0];
 		$record = GedcomRecord::getInstance($row['id'], $this->tree);
 		switch ($type) {
-		default:
-		case 'full':
-			if ($record->canShow()) {
-				$result = $record->formatList('span', false, $record->getFullName());
-			} else {
-				$result = I18N::translate('This information is private and cannot be shown.');
-			}
-			break;
-		case 'year':
-			$date   = new Date($row['type'] . ' ' . $row['year']);
-			$result = $date->display();
-			break;
-		case 'type':
-			if (isset($eventTypes[$row['fact']])) {
-				$result = $eventTypes[$row['fact']];
-			} else {
-				$result = GedcomTag::getLabel($row['fact']);
-			}
-			break;
-		case 'name':
-			$result = "<a href=\"" . $record->getHtmlUrl() . "\">" . $record->getFullName() . "</a>";
-			break;
-		case 'place':
-			$fact = $record->getFirstFact($row['fact']);
-			if ($fact) {
-				$result = FunctionsPrint::formatFactPlace($fact, true, true, true);
-			} else {
-				$result = I18N::translate('Private');
-			}
-			break;
+			default:
+			case 'full':
+				if ($record->canShow()) {
+					$result = $record->formatList('span', false, $record->getFullName());
+				} else {
+					$result = I18N::translate('This information is private and cannot be shown.');
+				}
+				break;
+			case 'year':
+				$date   = new Date($row['type'] . ' ' . $row['year']);
+				$result = $date->display();
+				break;
+			case 'type':
+				if (isset($eventTypes[$row['fact']])) {
+					$result = $eventTypes[$row['fact']];
+				} else {
+					$result = GedcomTag::getLabel($row['fact']);
+				}
+				break;
+			case 'name':
+				$result = "<a href=\"" . $record->getHtmlUrl() . "\">" . $record->getFullName() . "</a>";
+				break;
+			case 'place':
+				$fact = $record->getFirstFact($row['fact']);
+				if ($fact) {
+					$result = FunctionsPrint::formatFactPlace($fact, true, true, true);
+				} else {
+					$result = I18N::translate('Private');
+				}
+				break;
 		}
 
 		return $result;
@@ -3116,32 +3116,32 @@ 
 			$person = Individual::getInstance($row['i_id'], $this->tree);
 		}
 		switch ($type) {
-		default:
-		case 'full':
-			if ($family->canShow()) {
-				$result = $family->formatList('span', false, $person->getFullName());
-			} else {
-				$result = I18N::translate('This information is private and cannot be shown.');
-			}
-			break;
-		case 'name':
-			$result = '<a href="' . $family->getHtmlUrl() . '">' . $person->getFullName() . '</a>';
-			break;
-		case 'age':
-			$age = $row['age'];
-			if ($show_years) {
-				if ((int) ($age / 365.25) > 0) {
-					$age = (int) ($age / 365.25) . 'y';
-				} elseif ((int) ($age / 30.4375) > 0) {
-					$age = (int) ($age / 30.4375) . 'm';
+			default:
+			case 'full':
+				if ($family->canShow()) {
+					$result = $family->formatList('span', false, $person->getFullName());
 				} else {
-					$age = $age . 'd';
+					$result = I18N::translate('This information is private and cannot be shown.');
 				}
-				$result = FunctionsDate::getAgeAtEvent($age);
-			} else {
-				$result = I18N::number((int) ($age / 365.25));
-			}
-			break;
+				break;
+			case 'name':
+				$result = '<a href="' . $family->getHtmlUrl() . '">' . $person->getFullName() . '</a>';
+				break;
+			case 'age':
+				$age = $row['age'];
+				if ($show_years) {
+					if ((int) ($age / 365.25) > 0) {
+						$age = (int) ($age / 365.25) . 'y';
+					} elseif ((int) ($age / 30.4375) > 0) {
+						$age = (int) ($age / 30.4375) . 'm';
+					} else {
+						$age = $age . 'd';
+					}
+					$result = FunctionsDate::getAgeAtEvent($age);
+				} else {
+					$result = I18N::number((int) ($age / 365.25));
+				}
+				break;
 		}
 
 		return $result;
@@ -3414,32 +3414,32 @@ 
 			$person = Individual::getInstance($row['id'], $this->tree);
 		}
 		switch ($type) {
-		default:
-		case 'full':
-			if ($person->canShow()) {
-				$result = $person->formatList('span', false, $person->getFullName());
-			} else {
-				$result = I18N::translate('This information is private and cannot be shown.');
-			}
-			break;
-		case 'name':
-			$result = '<a href="' . $person->getHtmlUrl() . '">' . $person->getFullName() . '</a>';
-			break;
-		case 'age':
-			$age = $row['age'];
-			if ($show_years) {
-				if ((int) ($age / 365.25) > 0) {
-					$age = (int) ($age / 365.25) . 'y';
-				} elseif ((int) ($age / 30.4375) > 0) {
-					$age = (int) ($age / 30.4375) . 'm';
+			default:
+			case 'full':
+				if ($person->canShow()) {
+					$result = $person->formatList('span', false, $person->getFullName());
 				} else {
-					$age = $age . 'd';
+					$result = I18N::translate('This information is private and cannot be shown.');
 				}
-				$result = FunctionsDate::getAgeAtEvent($age);
-			} else {
-				$result = (int) ($age / 365.25);
-			}
-			break;
+				break;
+			case 'name':
+				$result = '<a href="' . $person->getHtmlUrl() . '">' . $person->getFullName() . '</a>';
+				break;
+			case 'age':
+				$age = $row['age'];
+				if ($show_years) {
+					if ((int) ($age / 365.25) > 0) {
+						$age = (int) ($age / 365.25) . 'y';
+					} elseif ((int) ($age / 30.4375) > 0) {
+						$age = (int) ($age / 30.4375) . 'm';
+					} else {
+						$age = $age . 'd';
+					}
+					$result = FunctionsDate::getAgeAtEvent($age);
+				} else {
+					$result = (int) ($age / 365.25);
+				}
+				break;
 		}
 
 		return $result;
@@ -4397,20 +4397,20 @@ 
 		$row    = $rows[0];
 		$family = Family::getInstance($row['id'], $this->tree);
 		switch ($type) {
-		default:
-		case 'full':
-			if ($family->canShow()) {
-				$result = $family->formatList('span', false, $family->getFullName());
-			} else {
-				$result = I18N::translate('This information is private and cannot be shown.');
-			}
-			break;
-		case 'size':
-			$result = I18N::number($row['tot']);
-			break;
-		case 'name':
-			$result = "<a href=\"" . $family->getHtmlUrl() . "\">" . $family->getFullName() . '</a>';
-			break;
+			default:
+			case 'full':
+				if ($family->canShow()) {
+					$result = $family->formatList('span', false, $family->getFullName());
+				} else {
+					$result = I18N::translate('This information is private and cannot be shown.');
+				}
+				break;
+			case 'size':
+				$result = I18N::number($row['tot']);
+				break;
+			case 'name':
+				$result = "<a href=\"" . $family->getHtmlUrl() . "\">" . $family->getFullName() . '</a>';
+				break;
 		}
 
 		return $result;
@@ -4689,43 +4689,43 @@ 
 			foreach ($rows as $values) {
 				$counts[] = round(100 * $values['total'] / $tot, 0);
 				switch ($values['d_month']) {
-				default:
-				case 'JAN':
-					$values['d_month'] = 1;
-					break;
-				case 'FEB':
-					$values['d_month'] = 2;
-					break;
-				case 'MAR':
-					$values['d_month'] = 3;
-					break;
-				case 'APR':
-					$values['d_month'] = 4;
-					break;
-				case 'MAY':
-					$values['d_month'] = 5;
-					break;
-				case 'JUN':
-					$values['d_month'] = 6;
-					break;
-				case 'JUL':
-					$values['d_month'] = 7;
-					break;
-				case 'AUG':
-					$values['d_month'] = 8;
-					break;
-				case 'SEP':
-					$values['d_month'] = 9;
-					break;
-				case 'OCT':
-					$values['d_month'] = 10;
-					break;
-				case 'NOV':
-					$values['d_month'] = 11;
-					break;
-				case 'DEC':
-					$values['d_month'] = 12;
-					break;
+					default:
+					case 'JAN':
+						$values['d_month'] = 1;
+						break;
+					case 'FEB':
+						$values['d_month'] = 2;
+						break;
+					case 'MAR':
+						$values['d_month'] = 3;
+						break;
+					case 'APR':
+						$values['d_month'] = 4;
+						break;
+					case 'MAY':
+						$values['d_month'] = 5;
+						break;
+					case 'JUN':
+						$values['d_month'] = 6;
+						break;
+					case 'JUL':
+						$values['d_month'] = 7;
+						break;
+					case 'AUG':
+						$values['d_month'] = 8;
+						break;
+					case 'SEP':
+						$values['d_month'] = 9;
+						break;
+					case 'OCT':
+						$values['d_month'] = 10;
+						break;
+					case 'NOV':
+						$values['d_month'] = 11;
+						break;
+					case 'DEC':
+						$values['d_month'] = 12;
+						break;
 				}
 				$text .= I18N::translate(ucfirst(strtolower(($values['d_month'])))) . ' - ' . $values['total'] . '|';
 			}
@@ -5316,16 +5316,16 @@ 
 		}
 
 		switch ($sorting) {
-		default:
-		case 'alpha':
-			uksort($surname_list, '\Fisharebest\Webtrees\I18N::strcasecmp');
-			break;
-		case 'count':
-			asort($surname_list);
-			break;
-		case 'rcount':
-			arsort($surname_list);
-			break;
+			default:
+			case 'alpha':
+				uksort($surname_list, '\Fisharebest\Webtrees\I18N::strcasecmp');
+				break;
+			case 'count':
+				asort($surname_list);
+				break;
+			case 'rcount':
+				arsort($surname_list);
+				break;
 		}
 
 		// Note that we count/display SPFX SURN, but sort/group under just SURN
@@ -5439,9 +5439,9 @@ 
 				}
 			}
 			switch ($SURNAME_TRADITION) {
-			case 'polish':
-				// most common surname should be in male variant (Kowalski, not Kowalska)
-				$top_name = preg_replace(array('/ska$/', '/cka$/', '/dzka$/', '/żka$/'), array('ski', 'cki', 'dzki', 'żki'), $top_name);
+				case 'polish':
+					// most common surname should be in male variant (Kowalski, not Kowalska)
+					$top_name = preg_replace(array('/ska$/', '/cka$/', '/dzka$/', '/żka$/'), array('ski', 'cki', 'dzki', 'żki'), $top_name);
 			}
 			$per = round(100 * $count_per / $tot_indi, 0);
 			$chd .= $this->arrayToExtendedEncoding(array($per));
@@ -5481,19 +5481,19 @@ 
 		}
 
 		switch ($sex) {
-		case 'M':
-			$sex_sql = "i_sex='M'";
-			break;
-		case 'F':
-			$sex_sql = "i_sex='F'";
-			break;
-		case 'U':
-			$sex_sql = "i_sex='U'";
-			break;
-		case 'B':
-		default:
-			$sex_sql = "i_sex<>'U'";
-			break;
+			case 'M':
+				$sex_sql = "i_sex='M'";
+				break;
+			case 'F':
+				$sex_sql = "i_sex='F'";
+				break;
+			case 'U':
+				$sex_sql = "i_sex='U'";
+				break;
+			case 'B':
+			default:
+				$sex_sql = "i_sex<>'U'";
+				break;
 		}
 		$ged_id = $this->tree->getTreeId();
 
@@ -5538,25 +5538,25 @@ 
 				$tot = '';
 			}
 			switch ($type) {
-			case 'table':
-				$common[] = '<tr><td>' . $given . '</td><td>' . I18N::number($total) . '</td><td>' . $total . '</td></tr>';
-				break;
-			case 'list':
-				$common[] = '<li><span dir="auto">' . $given . '</span>' . $tot . '</li>';
-				break;
-			case 'nolist':
-				$common[] = '<span dir="auto">' . $given . '</span>' . $tot;
-				break;
+				case 'table':
+					$common[] = '<tr><td>' . $given . '</td><td>' . I18N::number($total) . '</td><td>' . $total . '</td></tr>';
+					break;
+				case 'list':
+					$common[] = '<li><span dir="auto">' . $given . '</span>' . $tot . '</li>';
+					break;
+				case 'nolist':
+					$common[] = '<span dir="auto">' . $given . '</span>' . $tot;
+					break;
 			}
 		}
 		if ($common) {
 			switch ($type) {
-			case 'table':
-				global $controller;
-				$table_id = Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
-				$controller
-					->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-					->addInlineJavascript('
+				case 'table':
+					global $controller;
+					$table_id = Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
+					$controller
+						->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+						->addInlineJavascript('
 					jQuery("#' . $table_id . '").dataTable({
 						dom: \'t\',
 						autoWidth: false,
@@ -5574,15 +5574,15 @@ 
 					});
 					jQuery("#' . $table_id . '").css("visibility", "visible");
 				');
-				$lookup = array('M' => I18N::translate('Male'), 'F' => I18N::translate('Female'), 'U' => I18N::translateContext('unknown gender', 'Unknown'), 'B' => I18N::translate('All'));
+					$lookup = array('M' => I18N::translate('Male'), 'F' => I18N::translate('Female'), 'U' => I18N::translateContext('unknown gender', 'Unknown'), 'B' => I18N::translate('All'));
 
-				return '<table id="' . $table_id . '" class="givn-list"><thead><tr><th class="ui-state-default" colspan="3">' . $lookup[$sex] . '</th></tr><tr><th>' . I18N::translate('Name') . '</th><th>' . I18N::translate('Count') . '</th><th>COUNT</th></tr></thead><tbody>' . implode('', $common) . '</tbody></table>';
-			case 'list':
-				return '<ul>' . implode('', $common) . '</ul>';
-			case 'nolist':
-				return implode(I18N::$list_separator, $common);
-			default:
-				return '';
+					return '<table id="' . $table_id . '" class="givn-list"><thead><tr><th class="ui-state-default" colspan="3">' . $lookup[$sex] . '</th></tr><tr><th>' . I18N::translate('Name') . '</th><th>' . I18N::translate('Count') . '</th><th>COUNT</th></tr></thead><tbody>' . implode('', $common) . '</tbody></table>';
+				case 'list':
+					return '<ul>' . implode('', $common) . '</ul>';
+				case 'nolist':
+					return implode(I18N::$list_separator, $common);
+				default:
+					return '';
 			}
 		} else {
 			return '';
@@ -6069,42 +6069,42 @@ 
 		}
 
 		switch ($type) {
-		default:
-		case 'userid':
-			return $user->getUserId();
-		case 'username':
-			return Filter::escapeHtml($user->getUserName());
-		case 'fullname':
-			return $user->getRealNameHtml();
-		case 'regdate':
-			if (is_array($params) && isset($params[0]) && $params[0] != '') {
-				$datestamp = $params[0];
-			} else {
-				$datestamp = I18N::dateFormat();
-			}
+			default:
+			case 'userid':
+				return $user->getUserId();
+			case 'username':
+				return Filter::escapeHtml($user->getUserName());
+			case 'fullname':
+				return $user->getRealNameHtml();
+			case 'regdate':
+				if (is_array($params) && isset($params[0]) && $params[0] != '') {
+					$datestamp = $params[0];
+				} else {
+					$datestamp = I18N::dateFormat();
+				}
 
-			return FunctionsDate::timestampToGedcomDate($user->getPreference('reg_timestamp'))->display(false, $datestamp);
-		case 'regtime':
-			if (is_array($params) && isset($params[0]) && $params[0] != '') {
-				$datestamp = $params[0];
-			} else {
-				$datestamp = str_replace('%', '', I18N::timeFormat());
-			}
+				return FunctionsDate::timestampToGedcomDate($user->getPreference('reg_timestamp'))->display(false, $datestamp);
+			case 'regtime':
+				if (is_array($params) && isset($params[0]) && $params[0] != '') {
+					$datestamp = $params[0];
+				} else {
+					$datestamp = str_replace('%', '', I18N::timeFormat());
+				}
 
-			return date($datestamp, $user->getPreference('reg_timestamp'));
-		case 'loggedin':
-			if (is_array($params) && isset($params[0]) && $params[0] != '') {
-				$yes = $params[0];
-			} else {
-				$yes = I18N::translate('yes');
-			}
-			if (is_array($params) && isset($params[1]) && $params[1] != '') {
-				$no = $params[1];
-			} else {
-				$no = I18N::translate('no');
-			}
+				return date($datestamp, $user->getPreference('reg_timestamp'));
+			case 'loggedin':
+				if (is_array($params) && isset($params[0]) && $params[0] != '') {
+					$yes = $params[0];
+				} else {
+					$yes = I18N::translate('yes');
+				}
+				if (is_array($params) && isset($params[1]) && $params[1] != '') {
+					$no = $params[1];
+				} else {
+					$no = I18N::translate('no');
+				}
 
-			return Database::prepare("SELECT SQL_NO_CACHE 1 FROM `##session` WHERE user_id=? LIMIT 1")->execute(array($user->getUserId()))->fetchOne() ? $yes : $no;
+				return Database::prepare("SELECT SQL_NO_CACHE 1 FROM `##session` WHERE user_id=? LIMIT 1")->execute(array($user->getUserId()))->fetchOne() ? $yes : $no;
 		}
 	}
 
@@ -6941,50 +6941,50 @@ 
 		}
 		// The current chart engine (Google charts) can't handle <sup></sup> markup
 		switch ($century) {
-		case 21:
-			return strip_tags(I18N::translateContext('CENTURY', '21st'));
-		case 20:
-			return strip_tags(I18N::translateContext('CENTURY', '20th'));
-		case 19:
-			return strip_tags(I18N::translateContext('CENTURY', '19th'));
-		case 18:
-			return strip_tags(I18N::translateContext('CENTURY', '18th'));
-		case 17:
-			return strip_tags(I18N::translateContext('CENTURY', '17th'));
-		case 16:
-			return strip_tags(I18N::translateContext('CENTURY', '16th'));
-		case 15:
-			return strip_tags(I18N::translateContext('CENTURY', '15th'));
-		case 14:
-			return strip_tags(I18N::translateContext('CENTURY', '14th'));
-		case 13:
-			return strip_tags(I18N::translateContext('CENTURY', '13th'));
-		case 12:
-			return strip_tags(I18N::translateContext('CENTURY', '12th'));
-		case 11:
-			return strip_tags(I18N::translateContext('CENTURY', '11th'));
-		case 10:
-			return strip_tags(I18N::translateContext('CENTURY', '10th'));
-		case  9:
-			return strip_tags(I18N::translateContext('CENTURY', '9th'));
-		case  8:
-			return strip_tags(I18N::translateContext('CENTURY', '8th'));
-		case  7:
-			return strip_tags(I18N::translateContext('CENTURY', '7th'));
-		case  6:
-			return strip_tags(I18N::translateContext('CENTURY', '6th'));
-		case  5:
-			return strip_tags(I18N::translateContext('CENTURY', '5th'));
-		case  4:
-			return strip_tags(I18N::translateContext('CENTURY', '4th'));
-		case  3:
-			return strip_tags(I18N::translateContext('CENTURY', '3rd'));
-		case  2:
-			return strip_tags(I18N::translateContext('CENTURY', '2nd'));
-		case  1:
-			return strip_tags(I18N::translateContext('CENTURY', '1st'));
-		default:
-			return ($century - 1) . '01-' . $century . '00';
+			case 21:
+				return strip_tags(I18N::translateContext('CENTURY', '21st'));
+			case 20:
+				return strip_tags(I18N::translateContext('CENTURY', '20th'));
+			case 19:
+				return strip_tags(I18N::translateContext('CENTURY', '19th'));
+			case 18:
+				return strip_tags(I18N::translateContext('CENTURY', '18th'));
+			case 17:
+				return strip_tags(I18N::translateContext('CENTURY', '17th'));
+			case 16:
+				return strip_tags(I18N::translateContext('CENTURY', '16th'));
+			case 15:
+				return strip_tags(I18N::translateContext('CENTURY', '15th'));
+			case 14:
+				return strip_tags(I18N::translateContext('CENTURY', '14th'));
+			case 13:
+				return strip_tags(I18N::translateContext('CENTURY', '13th'));
+			case 12:
+				return strip_tags(I18N::translateContext('CENTURY', '12th'));
+			case 11:
+				return strip_tags(I18N::translateContext('CENTURY', '11th'));
+			case 10:
+				return strip_tags(I18N::translateContext('CENTURY', '10th'));
+			case  9:
+				return strip_tags(I18N::translateContext('CENTURY', '9th'));
+			case  8:
+				return strip_tags(I18N::translateContext('CENTURY', '8th'));
+			case  7:
+				return strip_tags(I18N::translateContext('CENTURY', '7th'));
+			case  6:
+				return strip_tags(I18N::translateContext('CENTURY', '6th'));
+			case  5:
+				return strip_tags(I18N::translateContext('CENTURY', '5th'));
+			case  4:
+				return strip_tags(I18N::translateContext('CENTURY', '4th'));
+			case  3:
+				return strip_tags(I18N::translateContext('CENTURY', '3rd'));
+			case  2:
+				return strip_tags(I18N::translateContext('CENTURY', '2nd'));
+			case  1:
+				return strip_tags(I18N::translateContext('CENTURY', '1st'));
+			default:
+				return ($century - 1) . '01-' . $century . '00';
 		}
 	}
 }

app/Theme/ThemeInterface.php

Doc Comments +3 added lines

@@ -102,6 +102,7 @@ 
 	/**
 	 * Allow themes to do things after initialization (since they cannot use
 	 * the constructor).
+	 * @return void
 	 */
 	public function hookAfterInit();
 
@@ -193,6 +194,7 @@ 
 	 * happens in a theme file, and we need to be able to change it.
 	 *
 	 * @param Tree|null $tree The current tree (if there is one).
+	 * @return void
 	 */
 	public function init(Tree $tree = null);
 
@@ -214,6 +216,7 @@ 
 
 	/**
 	 * Send any HTTP headers.
+	 * @return void
 	 */
 	public function sendHeaders();
 

admin_media.php

Braces +10 added lines, -4 removed lines

@@ -648,16 +648,22 @@
 					<div dir="ltr">
 						<?php if (count($media_folders) > 1): ?>
 						<?php echo WT_DATA_DIR, FunctionsEdit::selectEditControl('media_folder', $media_folders, null, $media_folder, 'onchange="this.form.submit();"'); ?>
-						<?php else: ?>
-						<?php echo WT_DATA_DIR, Filter::escapeHtml($media_folder); ?>
+						<?php else {
+	: ?>
+						<?php echo WT_DATA_DIR, Filter::escapeHtml($media_folder);
+}
+?>
 						<input type="hidden" name="media_folder" value="<?php echo Filter::escapeHtml($media_folder); ?>">
 						<?php endif; ?>
 					</div>
 
 					<?php if (count($media_paths) > 1): ?>
 					<?php echo FunctionsEdit::selectEditControl('media_path', $media_paths, null, $media_path, 'onchange="this.form.submit();"'); ?>
-					<?php else: ?>
-					<?php echo Filter::escapeHtml($media_path); ?>
+					<?php else {
+	: ?>
+					<?php echo Filter::escapeHtml($media_path);
+}
+?>
 					<input type="hidden" name="media_path" value="<?php echo Filter::escapeHtml($media_path); ?>">
 					<?php endif; ?>
 

Switch Indentation +93 added lines, -93 removed lines

@@ -85,98 +85,98 @@ 
 ////////////////////////////////////////////////////////////////////////////////
 
 switch ($action) {
-case 'load_json':
-	$search = Filter::get('search');
-	$search = $search['value'];
-	$start  = Filter::getInteger('start');
-	$length = Filter::getInteger('length');
-
-	switch ($files) {
-	case 'local':
-		// Filtered rows
-		$SELECT1 =
-			"SELECT SQL_CACHE SQL_CALC_FOUND_ROWS TRIM(LEADING :media_path_1 FROM m_filename) AS media_path, m_id AS xref, m_titl, m_file AS gedcom_id, m_gedcom AS gedcom" .
-			" FROM  `##media`" .
-			" JOIN  `##gedcom_setting` ON (m_file = gedcom_id AND setting_name = 'MEDIA_DIRECTORY')" .
-			" JOIN  `##gedcom` USING (gedcom_id)" .
-			" WHERE setting_value = :media_folder" .
-			" AND   m_filename LIKE CONCAT(:media_path_2, '%')" .
-			" AND   (SUBSTRING_INDEX(m_filename, '/', -1) LIKE CONCAT('%', :search_1, '%')" .
-			"  OR   m_titl LIKE CONCAT('%', :search_2, '%'))" .
-			" AND   m_filename NOT LIKE 'http://%'" .
-			" AND   m_filename NOT LIKE 'https://%'";
-		$ARGS1 = array(
-			'media_path_1' => $media_path,
-			'media_folder' => $media_folder,
-			'media_path_2' => Filter::escapeLike($media_path),
-			'search_1'     => Filter::escapeLike($search),
-			'search_2'     => Filter::escapeLike($search),
-		);
-		// Unfiltered rows
-		$SELECT2 =
-			"SELECT SQL_CACHE COUNT(*)" .
-			" FROM  `##media`" .
-			" JOIN  `##gedcom_setting` ON (m_file = gedcom_id AND setting_name = 'MEDIA_DIRECTORY')" .
-			" WHERE setting_value = :media_folder" .
-			" AND   m_filename LIKE CONCAT(:media_path_3, '%')" .
-			" AND   m_filename NOT LIKE 'http://%'" .
-			" AND   m_filename NOT LIKE 'https://%'";
-		$ARGS2 = array(
-			'media_folder' => $media_folder,
-			'media_path_3' => $media_path,
-		);
-
-		if ($subfolders == 'exclude') {
-			$SELECT1 .= " AND m_filename NOT LIKE CONCAT(:media_path_4, '%/%')";
-			$ARGS1['media_path_4'] = Filter::escapeLike($media_path);
-			$SELECT2 .= " AND m_filename NOT LIKE CONCAT(:media_path_4, '%/%')";
-			$ARGS2['media_path_4'] = Filter::escapeLike($media_path);
-		}
-
-		$order = Filter::getArray('order');
-		$SELECT1 .= " ORDER BY ";
-		if ($order) {
-			foreach ($order as $key => $value) {
-				if ($key > 0) {
-					$SELECT1 .= ',';
+	case 'load_json':
+		$search = Filter::get('search');
+		$search = $search['value'];
+		$start  = Filter::getInteger('start');
+		$length = Filter::getInteger('length');
+
+		switch ($files) {
+			case 'local':
+				// Filtered rows
+				$SELECT1 =
+					"SELECT SQL_CACHE SQL_CALC_FOUND_ROWS TRIM(LEADING :media_path_1 FROM m_filename) AS media_path, m_id AS xref, m_titl, m_file AS gedcom_id, m_gedcom AS gedcom" .
+					" FROM  `##media`" .
+					" JOIN  `##gedcom_setting` ON (m_file = gedcom_id AND setting_name = 'MEDIA_DIRECTORY')" .
+					" JOIN  `##gedcom` USING (gedcom_id)" .
+					" WHERE setting_value = :media_folder" .
+					" AND   m_filename LIKE CONCAT(:media_path_2, '%')" .
+					" AND   (SUBSTRING_INDEX(m_filename, '/', -1) LIKE CONCAT('%', :search_1, '%')" .
+					"  OR   m_titl LIKE CONCAT('%', :search_2, '%'))" .
+					" AND   m_filename NOT LIKE 'http://%'" .
+					" AND   m_filename NOT LIKE 'https://%'";
+				$ARGS1 = array(
+					'media_path_1' => $media_path,
+					'media_folder' => $media_folder,
+					'media_path_2' => Filter::escapeLike($media_path),
+					'search_1'     => Filter::escapeLike($search),
+					'search_2'     => Filter::escapeLike($search),
+				);
+				// Unfiltered rows
+				$SELECT2 =
+					"SELECT SQL_CACHE COUNT(*)" .
+					" FROM  `##media`" .
+					" JOIN  `##gedcom_setting` ON (m_file = gedcom_id AND setting_name = 'MEDIA_DIRECTORY')" .
+					" WHERE setting_value = :media_folder" .
+					" AND   m_filename LIKE CONCAT(:media_path_3, '%')" .
+					" AND   m_filename NOT LIKE 'http://%'" .
+					" AND   m_filename NOT LIKE 'https://%'";
+				$ARGS2 = array(
+					'media_folder' => $media_folder,
+					'media_path_3' => $media_path,
+				);
+
+				if ($subfolders == 'exclude') {
+					$SELECT1 .= " AND m_filename NOT LIKE CONCAT(:media_path_4, '%/%')";
+					$ARGS1['media_path_4'] = Filter::escapeLike($media_path);
+					$SELECT2 .= " AND m_filename NOT LIKE CONCAT(:media_path_4, '%/%')";
+					$ARGS2['media_path_4'] = Filter::escapeLike($media_path);
 				}
-				// Datatables numbers columns 0, 1, 2
-				// MySQL numbers columns 1, 2, 3
-				switch ($value['dir']) {
-				case 'asc':
-					$SELECT1 .= ":col_" . $key . " ASC";
-					break;
-				case 'desc':
-					$SELECT1 .= ":col_" . $key . " DESC";
-					break;
+
+				$order = Filter::getArray('order');
+				$SELECT1 .= " ORDER BY ";
+				if ($order) {
+					foreach ($order as $key => $value) {
+						if ($key > 0) {
+							$SELECT1 .= ',';
+						}
+						// Datatables numbers columns 0, 1, 2
+						// MySQL numbers columns 1, 2, 3
+						switch ($value['dir']) {
+							case 'asc':
+								$SELECT1 .= ":col_" . $key . " ASC";
+								break;
+							case 'desc':
+								$SELECT1 .= ":col_" . $key . " DESC";
+								break;
+						}
+					$ARGS1['col_' . $key] = 1 + $value['column'];
 				}
-				$ARGS1['col_' . $key] = 1 + $value['column'];
+			} else {
+				$SELECT1 = " 1 ASC";
 			}
-		} else {
-			$SELECT1 = " 1 ASC";
-		}
 
-		if ($length > 0) {
-			$SELECT1 .= " LIMIT :length OFFSET :start";
-			$ARGS1['length'] = $length;
-			$ARGS1['start']  = $start;
-		}
-
-		$rows = Database::prepare($SELECT1)->execute($ARGS1)->fetchAll();
-		// Total filtered/unfiltered rows
-		$recordsFiltered = Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
-		$recordsTotal    = Database::prepare($SELECT2)->execute($ARGS2)->fetchOne();
+			if ($length > 0) {
+				$SELECT1 .= " LIMIT :length OFFSET :start";
+				$ARGS1['length'] = $length;
+				$ARGS1['start']  = $start;
+			}
 
-		$data = array();
-		foreach ($rows as $row) {
-			$media  = Media::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
-			$data[] = array(
-				mediaFileInfo($media_folder, $media_path, $row->media_path),
-				$media->displayImage(),
-				mediaObjectInfo($media),
-			);
-		}
-		break;
+			$rows = Database::prepare($SELECT1)->execute($ARGS1)->fetchAll();
+			// Total filtered/unfiltered rows
+			$recordsFiltered = Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
+			$recordsTotal    = Database::prepare($SELECT2)->execute($ARGS2)->fetchOne();
+
+			$data = array();
+			foreach ($rows as $row) {
+				$media  = Media::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
+				$data[] = array(
+					mediaFileInfo($media_folder, $media_path, $row->media_path),
+					$media->displayImage(),
+					mediaObjectInfo($media),
+				);
+			}
+			break;
 
 	case 'external':
 		// Filtered rows
@@ -206,12 +206,12 @@ 
 				// Datatables numbers columns 0, 1, 2
 				// MySQL numbers columns 1, 2, 3
 				switch ($value['dir']) {
-				case 'asc':
-					$SELECT1 .= ":col_" . $key . " ASC";
-					break;
-				case 'desc':
-					$SELECT1 .= ":col_" . $key . " DESC";
-					break;
+					case 'asc':
+						$SELECT1 .= ":col_" . $key . " ASC";
+						break;
+					case 'desc':
+						$SELECT1 .= ":col_" . $key . " DESC";
+						break;
 				}
 				$ARGS1['col_' . $key] = 1 + $value['column'];
 			}

admin_module_blocks.php

Braces +5 added lines, -2 removed lines

@@ -81,8 +81,11 @@
 				<td class="col-xs-2">
 					<?php if ($module instanceof ModuleConfigInterface): ?>
 						<a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a>
-					<?php else: ?>
-						<?php echo $module->getTitle(); ?>
+					<?php else {
+	: ?>
+						<?php echo $module->getTitle();
+}
+?>
 					<?php endif; ?>
 				</td>
 				<td class="col-xs-5"><?php echo $module->getDescription(); ?></td>

admin_module_menus.php

Braces +5 added lines, -2 removed lines

@@ -98,8 +98,11 @@
 				<td class="col-xs-1">
 					<?php if ($module instanceof ModuleConfigInterface): ?>
 					<a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a>
-					<?php else: ?>
-					<?php echo $module->getTitle(); ?>
+					<?php else {
+	: ?>
+					<?php echo $module->getTitle();
+}
+?>
 					<?php endif; ?>
 				</td>
 				<td class="col-xs-5"><?php echo $module->getDescription(); ?></td>

admin_site_merge.php

Braces +20 added lines, -8 removed lines

@@ -232,9 +232,12 @@ 
 				<?php endforeach; ?>
 				</tbody>
 			</table>
-			<?php else: ?>
+			<?php else {
+	: ?>
 			<p>
-				<?php echo I18N::translate('No matching facts found'); ?>
+				<?php echo I18N::translate('No matching facts found');
+}
+?>
 			</p>
 			<?php endif; ?>
 		</div>
@@ -279,9 +282,12 @@ 
 							<?php endforeach; ?>
 							</tbody>
 						</table>
-					<?php else: ?>
+					<?php else {
+	: ?>
 						<p>
-							<?php echo I18N::translate('No matching facts found'); ?>
+							<?php echo I18N::translate('No matching facts found');
+}
+?>
 						</p>
 					<?php endif; ?>
 				</div>
@@ -325,9 +331,12 @@ 
 							<?php endforeach; ?>
 							</tbody>
 						</table>
-					<?php else: ?>
+					<?php else {
+	: ?>
 						<p>
-							<?php echo I18N::translate('No matching facts found'); ?>
+							<?php echo I18N::translate('No matching facts found');
+}
+?>
 						</p>
 					<?php endif; ?>
 				</div>
@@ -341,10 +350,13 @@ 
 	</button>
 </form>
 
-<?php else: ?>
+<?php else {
+	: ?>
 
 <form class="form form-horizontal">
-	<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
+	<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml();
+}
+?>">
 	<p><?php echo /* I18N: Records are indviduals, sources, etc. */ I18N::translate('Select two records to merge.'); ?></p>
 
 	<div class="form-group">

admin_trees_config.php

Braces +10 added lines, -4 removed lines

@@ -554,18 +554,24 @@
 					<div class="bg-danger text-danger">
 						<?php echo $resn->xref, ' — ', I18N::translate('this record does not exist'); ?>
 					</div>
-					<?php else: ?>
+					<?php else {
+	: ?>
 					<div class="text-muted">
-						<?php echo I18N::translate('All records'); ?>
+						<?php echo I18N::translate('All records');
+}
+?>
 					</div>
 					<?php endif; ?>
 				</td>
 				<td>
 					<?php if ($resn->tag_label): ?>
 					<?php echo $resn->tag_label; ?>
-					<?php else: ?>
+					<?php else {
+	: ?>
 					<div class="text-muted">
-						<?php echo I18N::translate('All facts and events'); ?>
+						<?php echo I18N::translate('All facts and events');
+}
+?>
 					</div>
 					<?php endif; ?>
 				</td>

Switch Indentation +152 added lines, -152 removed lines

@@ -132,176 +132,176 @@
 $relatives_events = explode(',', $WT_TREE->getPreference('SHOW_RELATIVES_EVENTS'));
 
 switch (Filter::post('action')) {
-case 'privacy':
-	foreach (Filter::postArray('delete', WT_REGEX_INTEGER) as $delete_resn) {
-		Database::prepare(
-			"DELETE FROM `##default_resn` WHERE default_resn_id=?"
-		)->execute(array($delete_resn));
-	}
+	case 'privacy':
+		foreach (Filter::postArray('delete', WT_REGEX_INTEGER) as $delete_resn) {
+			Database::prepare(
+				"DELETE FROM `##default_resn` WHERE default_resn_id=?"
+			)->execute(array($delete_resn));
+		}
 
-	$xrefs     = Filter::postArray('xref', WT_REGEX_XREF);
-	$tag_types = Filter::postArray('tag_type', WT_REGEX_TAG);
-	$resns     = Filter::postArray('resn');
+		$xrefs     = Filter::postArray('xref', WT_REGEX_XREF);
+		$tag_types = Filter::postArray('tag_type', WT_REGEX_TAG);
+		$resns     = Filter::postArray('resn');
 
-	foreach ($xrefs as $n => $xref) {
-		$tag_type = $tag_types[$n];
-		$resn     = $resns[$n];
+		foreach ($xrefs as $n => $xref) {
+			$tag_type = $tag_types[$n];
+			$resn     = $resns[$n];
 
-		if ($tag_type || $xref) {
-			// Delete any existing data
-			if ($xref === '') {
-				Database::prepare(
-					"DELETE FROM `##default_resn` WHERE gedcom_id=? AND tag_type=? AND xref IS NULL"
-				)->execute(array($WT_TREE->getTreeId(), $tag_type));
-			}
-			if ($tag_type === '') {
+			if ($tag_type || $xref) {
+				// Delete any existing data
+				if ($xref === '') {
+					Database::prepare(
+						"DELETE FROM `##default_resn` WHERE gedcom_id=? AND tag_type=? AND xref IS NULL"
+					)->execute(array($WT_TREE->getTreeId(), $tag_type));
+				}
+				if ($tag_type === '') {
+					Database::prepare(
+						"DELETE FROM `##default_resn` WHERE gedcom_id=? AND xref=? AND tag_type IS NULL"
+					)->execute(array($WT_TREE->getTreeId(), $xref));
+				}
+				// Add (or update) the new data
 				Database::prepare(
-					"DELETE FROM `##default_resn` WHERE gedcom_id=? AND xref=? AND tag_type IS NULL"
-				)->execute(array($WT_TREE->getTreeId(), $xref));
+					"REPLACE INTO `##default_resn` (gedcom_id, xref, tag_type, resn) VALUES (?, NULLIF(?, ''), NULLIF(?, ''), ?)"
+				)->execute(array($WT_TREE->getTreeId(), $xref, $tag_type, $resn));
 			}
-			// Add (or update) the new data
-			Database::prepare(
-				"REPLACE INTO `##default_resn` (gedcom_id, xref, tag_type, resn) VALUES (?, NULLIF(?, ''), NULLIF(?, ''), ?)"
-			)->execute(array($WT_TREE->getTreeId(), $xref, $tag_type, $resn));
 		}
-	}
 
-	$WT_TREE->setPreference('HIDE_LIVE_PEOPLE', Filter::postBool('HIDE_LIVE_PEOPLE'));
-	$WT_TREE->setPreference('KEEP_ALIVE_YEARS_BIRTH', Filter::post('KEEP_ALIVE_YEARS_BIRTH', WT_REGEX_INTEGER, 0));
-	$WT_TREE->setPreference('KEEP_ALIVE_YEARS_DEATH', Filter::post('KEEP_ALIVE_YEARS_DEATH', WT_REGEX_INTEGER, 0));
-	$WT_TREE->setPreference('MAX_ALIVE_AGE', Filter::post('MAX_ALIVE_AGE', WT_REGEX_INTEGER, 100));
-	$WT_TREE->setPreference('REQUIRE_AUTHENTICATION', Filter::postBool('REQUIRE_AUTHENTICATION'));
-	$WT_TREE->setPreference('SHOW_DEAD_PEOPLE', Filter::post('SHOW_DEAD_PEOPLE'));
-	$WT_TREE->setPreference('SHOW_LIVING_NAMES', Filter::post('SHOW_LIVING_NAMES'));
-	$WT_TREE->setPreference('SHOW_PRIVATE_RELATIONSHIPS', Filter::post('SHOW_PRIVATE_RELATIONSHIPS'));
+		$WT_TREE->setPreference('HIDE_LIVE_PEOPLE', Filter::postBool('HIDE_LIVE_PEOPLE'));
+		$WT_TREE->setPreference('KEEP_ALIVE_YEARS_BIRTH', Filter::post('KEEP_ALIVE_YEARS_BIRTH', WT_REGEX_INTEGER, 0));
+		$WT_TREE->setPreference('KEEP_ALIVE_YEARS_DEATH', Filter::post('KEEP_ALIVE_YEARS_DEATH', WT_REGEX_INTEGER, 0));
+		$WT_TREE->setPreference('MAX_ALIVE_AGE', Filter::post('MAX_ALIVE_AGE', WT_REGEX_INTEGER, 100));
+		$WT_TREE->setPreference('REQUIRE_AUTHENTICATION', Filter::postBool('REQUIRE_AUTHENTICATION'));
+		$WT_TREE->setPreference('SHOW_DEAD_PEOPLE', Filter::post('SHOW_DEAD_PEOPLE'));
+		$WT_TREE->setPreference('SHOW_LIVING_NAMES', Filter::post('SHOW_LIVING_NAMES'));
+		$WT_TREE->setPreference('SHOW_PRIVATE_RELATIONSHIPS', Filter::post('SHOW_PRIVATE_RELATIONSHIPS'));
 
-	FlashMessages::addMessage(I18N::translate('The preferences for the family tree “%s” have been updated.', $WT_TREE->getTitleHtml()), 'success');
-	header('Location: ' . WT_BASE_URL . 'admin_trees_manage.php?ged=' . $WT_TREE->getNameUrl());
+		FlashMessages::addMessage(I18N::translate('The preferences for the family tree “%s” have been updated.', $WT_TREE->getTitleHtml()), 'success');
+		header('Location: ' . WT_BASE_URL . 'admin_trees_manage.php?ged=' . $WT_TREE->getNameUrl());
 
-	return;
+		return;
 
-case 'general':
-	if (!Filter::checkCsrf()) {
-		break;
-	}
+	case 'general':
+		if (!Filter::checkCsrf()) {
+			break;
+		}
 
-	// Coming soon
-	if (Filter::postBool('all_trees')) {
-		FlashMessages::addMessage(I18N::translate('The preferences for all family trees have been updated.', $WT_TREE->getTitleHtml()), 'success');
-	}
-	if (Filter::postBool('new_trees')) {
-		FlashMessages::addMessage(I18N::translate('The preferences for new family trees have been updated.', $WT_TREE->getTitleHtml()), 'success');
-	}
+		// Coming soon
+		if (Filter::postBool('all_trees')) {
+			FlashMessages::addMessage(I18N::translate('The preferences for all family trees have been updated.', $WT_TREE->getTitleHtml()), 'success');
+		}
+		if (Filter::postBool('new_trees')) {
+			FlashMessages::addMessage(I18N::translate('The preferences for new family trees have been updated.', $WT_TREE->getTitleHtml()), 'success');
+		}
 
-	$WT_TREE->setPreference('ADVANCED_NAME_FACTS', Filter::post('ADVANCED_NAME_FACTS'));
-	$WT_TREE->setPreference('ADVANCED_PLAC_FACTS', Filter::post('ADVANCED_PLAC_FACTS'));
-	$WT_TREE->setPreference('ALLOW_THEME_DROPDOWN', Filter::postBool('ALLOW_THEME_DROPDOWN'));
-	// For backwards compatibility with webtrees 1.x we store the two calendar formats in one variable
-	// e.g. "gregorian_and_jewish"
-	$WT_TREE->setPreference('CALENDAR_FORMAT', implode('_and_', array_unique(array(
-		Filter::post('CALENDAR_FORMAT0', 'gregorian|julian|french|jewish|hijri|jalali', 'none'),
-		Filter::post('CALENDAR_FORMAT1', 'gregorian|julian|french|jewish|hijri|jalali', 'none'),
-	))));
-	$WT_TREE->setPreference('CHART_BOX_TAGS', Filter::post('CHART_BOX_TAGS'));
-	$WT_TREE->setPreference('CONTACT_USER_ID', Filter::post('CONTACT_USER_ID'));
-	$WT_TREE->setPreference('DEFAULT_PEDIGREE_GENERATIONS', Filter::post('DEFAULT_PEDIGREE_GENERATIONS'));
-	$WT_TREE->setPreference('EXPAND_NOTES', Filter::postBool('EXPAND_NOTES'));
-	$WT_TREE->setPreference('EXPAND_SOURCES', Filter::postBool('EXPAND_SOURCES'));
-	$WT_TREE->setPreference('FAM_FACTS_ADD', str_replace(' ', '', Filter::post('FAM_FACTS_ADD')));
-	$WT_TREE->setPreference('FAM_FACTS_QUICK', str_replace(' ', '', Filter::post('FAM_FACTS_QUICK')));
-	$WT_TREE->setPreference('FAM_FACTS_UNIQUE', str_replace(' ', '', Filter::post('FAM_FACTS_UNIQUE')));
-	$WT_TREE->setPreference('FAM_ID_PREFIX', Filter::post('FAM_ID_PREFIX'));
-	$WT_TREE->setPreference('FULL_SOURCES', Filter::postBool('FULL_SOURCES'));
-	$WT_TREE->setPreference('FORMAT_TEXT', Filter::post('FORMAT_TEXT'));
-	$WT_TREE->setPreference('GEDCOM_ID_PREFIX', Filter::post('GEDCOM_ID_PREFIX'));
-	$WT_TREE->setPreference('GEDCOM_MEDIA_PATH', Filter::post('GEDCOM_MEDIA_PATH'));
-	$WT_TREE->setPreference('GENERATE_UIDS', Filter::postBool('GENERATE_UIDS'));
-	$WT_TREE->setPreference('GEONAMES_ACCOUNT', Filter::post('GEONAMES_ACCOUNT'));
-	$WT_TREE->setPreference('HIDE_GEDCOM_ERRORS', Filter::postBool('HIDE_GEDCOM_ERRORS'));
-	$WT_TREE->setPreference('INDI_FACTS_ADD', str_replace(' ', '', Filter::post('INDI_FACTS_ADD')));
-	$WT_TREE->setPreference('INDI_FACTS_QUICK', str_replace(' ', '', Filter::post('INDI_FACTS_QUICK')));
-	$WT_TREE->setPreference('INDI_FACTS_UNIQUE', str_replace(' ', '', Filter::post('INDI_FACTS_UNIQUE')));
-	$WT_TREE->setPreference('LANGUAGE', Filter::post('LANGUAGE'));
-	$WT_TREE->setPreference('MAX_DESCENDANCY_GENERATIONS', Filter::post('MAX_DESCENDANCY_GENERATIONS'));
-	$WT_TREE->setPreference('MAX_PEDIGREE_GENERATIONS', Filter::post('MAX_PEDIGREE_GENERATIONS'));
-	$WT_TREE->setPreference('MEDIA_ID_PREFIX', Filter::post('MEDIA_ID_PREFIX'));
-	$WT_TREE->setPreference('MEDIA_UPLOAD', Filter::post('MEDIA_UPLOAD'));
-	$WT_TREE->setPreference('META_DESCRIPTION', Filter::post('META_DESCRIPTION'));
-	$WT_TREE->setPreference('META_TITLE', Filter::post('META_TITLE'));
-	$WT_TREE->setPreference('NOTE_ID_PREFIX', Filter::post('NOTE_ID_PREFIX'));
-	$WT_TREE->setPreference('NO_UPDATE_CHAN', Filter::postBool('NO_UPDATE_CHAN'));
-	$WT_TREE->setPreference('PEDIGREE_FULL_DETAILS', Filter::postBool('PEDIGREE_FULL_DETAILS'));
-	$WT_TREE->setPreference('PEDIGREE_LAYOUT', Filter::postBool('PEDIGREE_LAYOUT'));
-	$WT_TREE->setPreference('PEDIGREE_ROOT_ID', Filter::post('PEDIGREE_ROOT_ID', WT_REGEX_XREF));
-	$WT_TREE->setPreference('PEDIGREE_SHOW_GENDER', Filter::postBool('PEDIGREE_SHOW_GENDER'));
-	$WT_TREE->setPreference('PREFER_LEVEL2_SOURCES', Filter::post('PREFER_LEVEL2_SOURCES'));
-	$WT_TREE->setPreference('QUICK_REQUIRED_FACTS', Filter::post('QUICK_REQUIRED_FACTS'));
-	$WT_TREE->setPreference('QUICK_REQUIRED_FAMFACTS', Filter::post('QUICK_REQUIRED_FAMFACTS'));
-	$WT_TREE->setPreference('REPO_FACTS_ADD', str_replace(' ', '', Filter::post('REPO_FACTS_ADD')));
-	$WT_TREE->setPreference('REPO_FACTS_QUICK', str_replace(' ', '', Filter::post('REPO_FACTS_QUICK')));
-	$WT_TREE->setPreference('REPO_FACTS_UNIQUE', str_replace(' ', '', Filter::post('REPO_FACTS_UNIQUE')));
-	$WT_TREE->setPreference('REPO_ID_PREFIX', Filter::post('REPO_ID_PREFIX'));
-	$WT_TREE->setPreference('SAVE_WATERMARK_IMAGE', Filter::postBool('SAVE_WATERMARK_IMAGE'));
-	$WT_TREE->setPreference('SAVE_WATERMARK_THUMB', Filter::postBool('SAVE_WATERMARK_THUMB'));
-	$WT_TREE->setPreference('SHOW_COUNTER', Filter::postBool('SHOW_COUNTER'));
-	$WT_TREE->setPreference('SHOW_EST_LIST_DATES', Filter::postBool('SHOW_EST_LIST_DATES'));
-	$WT_TREE->setPreference('SHOW_FACT_ICONS', Filter::postBool('SHOW_FACT_ICONS'));
-	$WT_TREE->setPreference('SHOW_GEDCOM_RECORD', Filter::postBool('SHOW_GEDCOM_RECORD'));
-	$WT_TREE->setPreference('SHOW_HIGHLIGHT_IMAGES', Filter::postBool('SHOW_HIGHLIGHT_IMAGES'));
-	$WT_TREE->setPreference('SHOW_LAST_CHANGE', Filter::postBool('SHOW_LAST_CHANGE'));
-	$WT_TREE->setPreference('SHOW_LDS_AT_GLANCE', Filter::postBool('SHOW_LDS_AT_GLANCE'));
-	$WT_TREE->setPreference('SHOW_MEDIA_DOWNLOAD', Filter::post('SHOW_MEDIA_DOWNLOAD'));
-	$WT_TREE->setPreference('SHOW_NO_WATERMARK', Filter::post('SHOW_NO_WATERMARK'));
-	$WT_TREE->setPreference('SHOW_PARENTS_AGE', Filter::postBool('SHOW_PARENTS_AGE'));
-	$WT_TREE->setPreference('SHOW_PEDIGREE_PLACES', Filter::post('SHOW_PEDIGREE_PLACES'));
-	$WT_TREE->setPreference('SHOW_PEDIGREE_PLACES_SUFFIX', Filter::postBool('SHOW_PEDIGREE_PLACES_SUFFIX'));
-	$WT_TREE->setPreference('SHOW_RELATIVES_EVENTS', implode(',', Filter::postArray('SHOW_RELATIVES_EVENTS')));
-	$WT_TREE->setPreference('SOURCE_ID_PREFIX', Filter::post('SOURCE_ID_PREFIX'));
-	$WT_TREE->setPreference('SOUR_FACTS_ADD', str_replace(' ', '', Filter::post('SOUR_FACTS_ADD')));
-	$WT_TREE->setPreference('SOUR_FACTS_QUICK', str_replace(' ', '', Filter::post('SOUR_FACTS_QUICK')));
-	$WT_TREE->setPreference('SOUR_FACTS_UNIQUE', str_replace(' ', '', Filter::post('SOUR_FACTS_UNIQUE')));
-	$WT_TREE->setPreference('SUBLIST_TRIGGER_I', Filter::post('SUBLIST_TRIGGER_I', WT_REGEX_INTEGER, 200));
-	$WT_TREE->setPreference('SURNAME_LIST_STYLE', Filter::post('SURNAME_LIST_STYLE'));
-	$WT_TREE->setPreference('SURNAME_TRADITION', Filter::post('SURNAME_TRADITION'));
-	$WT_TREE->setPreference('THEME_DIR', Filter::post('THEME_DIR'));
-	$WT_TREE->setPreference('THUMBNAIL_WIDTH', Filter::post('THUMBNAIL_WIDTH'));
-	$WT_TREE->setPreference('USE_SILHOUETTE', Filter::postBool('USE_SILHOUETTE'));
-	$WT_TREE->setPreference('WATERMARK_THUMB', Filter::postBool('WATERMARK_THUMB'));
-	$WT_TREE->setPreference('WEBMASTER_USER_ID', Filter::post('WEBMASTER_USER_ID'));
-	$WT_TREE->setPreference('WEBTREES_EMAIL', Filter::post('WEBTREES_EMAIL'));
-	$WT_TREE->setPreference('title', Filter::post('title'));
-
-	// Only accept valid folders for MEDIA_DIRECTORY
-	$MEDIA_DIRECTORY = preg_replace('/[\/\\\\]+/', '/', Filter::post('MEDIA_DIRECTORY') . '/');
-	if (substr($MEDIA_DIRECTORY, 0, 1) === '/') {
-		$MEDIA_DIRECTORY = substr($MEDIA_DIRECTORY, 1);
-	}
+		$WT_TREE->setPreference('ADVANCED_NAME_FACTS', Filter::post('ADVANCED_NAME_FACTS'));
+		$WT_TREE->setPreference('ADVANCED_PLAC_FACTS', Filter::post('ADVANCED_PLAC_FACTS'));
+		$WT_TREE->setPreference('ALLOW_THEME_DROPDOWN', Filter::postBool('ALLOW_THEME_DROPDOWN'));
+		// For backwards compatibility with webtrees 1.x we store the two calendar formats in one variable
+		// e.g. "gregorian_and_jewish"
+		$WT_TREE->setPreference('CALENDAR_FORMAT', implode('_and_', array_unique(array(
+			Filter::post('CALENDAR_FORMAT0', 'gregorian|julian|french|jewish|hijri|jalali', 'none'),
+			Filter::post('CALENDAR_FORMAT1', 'gregorian|julian|french|jewish|hijri|jalali', 'none'),
+		))));
+		$WT_TREE->setPreference('CHART_BOX_TAGS', Filter::post('CHART_BOX_TAGS'));
+		$WT_TREE->setPreference('CONTACT_USER_ID', Filter::post('CONTACT_USER_ID'));
+		$WT_TREE->setPreference('DEFAULT_PEDIGREE_GENERATIONS', Filter::post('DEFAULT_PEDIGREE_GENERATIONS'));
+		$WT_TREE->setPreference('EXPAND_NOTES', Filter::postBool('EXPAND_NOTES'));
+		$WT_TREE->setPreference('EXPAND_SOURCES', Filter::postBool('EXPAND_SOURCES'));
+		$WT_TREE->setPreference('FAM_FACTS_ADD', str_replace(' ', '', Filter::post('FAM_FACTS_ADD')));
+		$WT_TREE->setPreference('FAM_FACTS_QUICK', str_replace(' ', '', Filter::post('FAM_FACTS_QUICK')));
+		$WT_TREE->setPreference('FAM_FACTS_UNIQUE', str_replace(' ', '', Filter::post('FAM_FACTS_UNIQUE')));
+		$WT_TREE->setPreference('FAM_ID_PREFIX', Filter::post('FAM_ID_PREFIX'));
+		$WT_TREE->setPreference('FULL_SOURCES', Filter::postBool('FULL_SOURCES'));
+		$WT_TREE->setPreference('FORMAT_TEXT', Filter::post('FORMAT_TEXT'));
+		$WT_TREE->setPreference('GEDCOM_ID_PREFIX', Filter::post('GEDCOM_ID_PREFIX'));
+		$WT_TREE->setPreference('GEDCOM_MEDIA_PATH', Filter::post('GEDCOM_MEDIA_PATH'));
+		$WT_TREE->setPreference('GENERATE_UIDS', Filter::postBool('GENERATE_UIDS'));
+		$WT_TREE->setPreference('GEONAMES_ACCOUNT', Filter::post('GEONAMES_ACCOUNT'));
+		$WT_TREE->setPreference('HIDE_GEDCOM_ERRORS', Filter::postBool('HIDE_GEDCOM_ERRORS'));
+		$WT_TREE->setPreference('INDI_FACTS_ADD', str_replace(' ', '', Filter::post('INDI_FACTS_ADD')));
+		$WT_TREE->setPreference('INDI_FACTS_QUICK', str_replace(' ', '', Filter::post('INDI_FACTS_QUICK')));
+		$WT_TREE->setPreference('INDI_FACTS_UNIQUE', str_replace(' ', '', Filter::post('INDI_FACTS_UNIQUE')));
+		$WT_TREE->setPreference('LANGUAGE', Filter::post('LANGUAGE'));
+		$WT_TREE->setPreference('MAX_DESCENDANCY_GENERATIONS', Filter::post('MAX_DESCENDANCY_GENERATIONS'));
+		$WT_TREE->setPreference('MAX_PEDIGREE_GENERATIONS', Filter::post('MAX_PEDIGREE_GENERATIONS'));
+		$WT_TREE->setPreference('MEDIA_ID_PREFIX', Filter::post('MEDIA_ID_PREFIX'));
+		$WT_TREE->setPreference('MEDIA_UPLOAD', Filter::post('MEDIA_UPLOAD'));
+		$WT_TREE->setPreference('META_DESCRIPTION', Filter::post('META_DESCRIPTION'));
+		$WT_TREE->setPreference('META_TITLE', Filter::post('META_TITLE'));
+		$WT_TREE->setPreference('NOTE_ID_PREFIX', Filter::post('NOTE_ID_PREFIX'));
+		$WT_TREE->setPreference('NO_UPDATE_CHAN', Filter::postBool('NO_UPDATE_CHAN'));
+		$WT_TREE->setPreference('PEDIGREE_FULL_DETAILS', Filter::postBool('PEDIGREE_FULL_DETAILS'));
+		$WT_TREE->setPreference('PEDIGREE_LAYOUT', Filter::postBool('PEDIGREE_LAYOUT'));
+		$WT_TREE->setPreference('PEDIGREE_ROOT_ID', Filter::post('PEDIGREE_ROOT_ID', WT_REGEX_XREF));
+		$WT_TREE->setPreference('PEDIGREE_SHOW_GENDER', Filter::postBool('PEDIGREE_SHOW_GENDER'));
+		$WT_TREE->setPreference('PREFER_LEVEL2_SOURCES', Filter::post('PREFER_LEVEL2_SOURCES'));
+		$WT_TREE->setPreference('QUICK_REQUIRED_FACTS', Filter::post('QUICK_REQUIRED_FACTS'));
+		$WT_TREE->setPreference('QUICK_REQUIRED_FAMFACTS', Filter::post('QUICK_REQUIRED_FAMFACTS'));
+		$WT_TREE->setPreference('REPO_FACTS_ADD', str_replace(' ', '', Filter::post('REPO_FACTS_ADD')));
+		$WT_TREE->setPreference('REPO_FACTS_QUICK', str_replace(' ', '', Filter::post('REPO_FACTS_QUICK')));
+		$WT_TREE->setPreference('REPO_FACTS_UNIQUE', str_replace(' ', '', Filter::post('REPO_FACTS_UNIQUE')));
+		$WT_TREE->setPreference('REPO_ID_PREFIX', Filter::post('REPO_ID_PREFIX'));
+		$WT_TREE->setPreference('SAVE_WATERMARK_IMAGE', Filter::postBool('SAVE_WATERMARK_IMAGE'));
+		$WT_TREE->setPreference('SAVE_WATERMARK_THUMB', Filter::postBool('SAVE_WATERMARK_THUMB'));
+		$WT_TREE->setPreference('SHOW_COUNTER', Filter::postBool('SHOW_COUNTER'));
+		$WT_TREE->setPreference('SHOW_EST_LIST_DATES', Filter::postBool('SHOW_EST_LIST_DATES'));
+		$WT_TREE->setPreference('SHOW_FACT_ICONS', Filter::postBool('SHOW_FACT_ICONS'));
+		$WT_TREE->setPreference('SHOW_GEDCOM_RECORD', Filter::postBool('SHOW_GEDCOM_RECORD'));
+		$WT_TREE->setPreference('SHOW_HIGHLIGHT_IMAGES', Filter::postBool('SHOW_HIGHLIGHT_IMAGES'));
+		$WT_TREE->setPreference('SHOW_LAST_CHANGE', Filter::postBool('SHOW_LAST_CHANGE'));
+		$WT_TREE->setPreference('SHOW_LDS_AT_GLANCE', Filter::postBool('SHOW_LDS_AT_GLANCE'));
+		$WT_TREE->setPreference('SHOW_MEDIA_DOWNLOAD', Filter::post('SHOW_MEDIA_DOWNLOAD'));
+		$WT_TREE->setPreference('SHOW_NO_WATERMARK', Filter::post('SHOW_NO_WATERMARK'));
+		$WT_TREE->setPreference('SHOW_PARENTS_AGE', Filter::postBool('SHOW_PARENTS_AGE'));
+		$WT_TREE->setPreference('SHOW_PEDIGREE_PLACES', Filter::post('SHOW_PEDIGREE_PLACES'));
+		$WT_TREE->setPreference('SHOW_PEDIGREE_PLACES_SUFFIX', Filter::postBool('SHOW_PEDIGREE_PLACES_SUFFIX'));
+		$WT_TREE->setPreference('SHOW_RELATIVES_EVENTS', implode(',', Filter::postArray('SHOW_RELATIVES_EVENTS')));
+		$WT_TREE->setPreference('SOURCE_ID_PREFIX', Filter::post('SOURCE_ID_PREFIX'));
+		$WT_TREE->setPreference('SOUR_FACTS_ADD', str_replace(' ', '', Filter::post('SOUR_FACTS_ADD')));
+		$WT_TREE->setPreference('SOUR_FACTS_QUICK', str_replace(' ', '', Filter::post('SOUR_FACTS_QUICK')));
+		$WT_TREE->setPreference('SOUR_FACTS_UNIQUE', str_replace(' ', '', Filter::post('SOUR_FACTS_UNIQUE')));
+		$WT_TREE->setPreference('SUBLIST_TRIGGER_I', Filter::post('SUBLIST_TRIGGER_I', WT_REGEX_INTEGER, 200));
+		$WT_TREE->setPreference('SURNAME_LIST_STYLE', Filter::post('SURNAME_LIST_STYLE'));
+		$WT_TREE->setPreference('SURNAME_TRADITION', Filter::post('SURNAME_TRADITION'));
+		$WT_TREE->setPreference('THEME_DIR', Filter::post('THEME_DIR'));
+		$WT_TREE->setPreference('THUMBNAIL_WIDTH', Filter::post('THUMBNAIL_WIDTH'));
+		$WT_TREE->setPreference('USE_SILHOUETTE', Filter::postBool('USE_SILHOUETTE'));
+		$WT_TREE->setPreference('WATERMARK_THUMB', Filter::postBool('WATERMARK_THUMB'));
+		$WT_TREE->setPreference('WEBMASTER_USER_ID', Filter::post('WEBMASTER_USER_ID'));
+		$WT_TREE->setPreference('WEBTREES_EMAIL', Filter::post('WEBTREES_EMAIL'));
+		$WT_TREE->setPreference('title', Filter::post('title'));
+
+		// Only accept valid folders for MEDIA_DIRECTORY
+		$MEDIA_DIRECTORY = preg_replace('/[\/\\\\]+/', '/', Filter::post('MEDIA_DIRECTORY') . '/');
+		if (substr($MEDIA_DIRECTORY, 0, 1) === '/') {
+			$MEDIA_DIRECTORY = substr($MEDIA_DIRECTORY, 1);
+		}
 
-	if ($MEDIA_DIRECTORY) {
-		if (is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-			$WT_TREE->setPreference('MEDIA_DIRECTORY', $MEDIA_DIRECTORY);
-		} elseif (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-			$WT_TREE->setPreference('MEDIA_DIRECTORY', $MEDIA_DIRECTORY);
-			FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'info');
-		} else {
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'danger');
+		if ($MEDIA_DIRECTORY) {
+			if (is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+				$WT_TREE->setPreference('MEDIA_DIRECTORY', $MEDIA_DIRECTORY);
+			} elseif (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+				$WT_TREE->setPreference('MEDIA_DIRECTORY', $MEDIA_DIRECTORY);
+				FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'info');
+			} else {
+				FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'danger');
+			}
 		}
-	}
 
-	$gedcom = Filter::post('gedcom');
-	if ($gedcom && $gedcom !== $WT_TREE->getName()) {
-		try {
-			Database::prepare("UPDATE `##gedcom` SET gedcom_name = ? WHERE gedcom_id = ?")->execute(array($gedcom, $WT_TREE->getTreeId()));
-			Database::prepare("UPDATE `##site_setting` SET setting_value = ? WHERE setting_name='DEFAULT_GEDCOM' AND setting_value = ?")->execute(array($gedcom, $WT_TREE->getName()));
-		} catch (\Exception $ex) {
-			// Probably a duplicate name.
+		$gedcom = Filter::post('gedcom');
+		if ($gedcom && $gedcom !== $WT_TREE->getName()) {
+			try {
+				Database::prepare("UPDATE `##gedcom` SET gedcom_name = ? WHERE gedcom_id = ?")->execute(array($gedcom, $WT_TREE->getTreeId()));
+				Database::prepare("UPDATE `##site_setting` SET setting_value = ? WHERE setting_name='DEFAULT_GEDCOM' AND setting_value = ?")->execute(array($gedcom, $WT_TREE->getName()));
+			} catch (\Exception $ex) {
+				// Probably a duplicate name.
+			}
 		}
-	}
 
-	FlashMessages::addMessage(I18N::translate('The preferences for the family tree “%s” have been updated.', $WT_TREE->getTitleHtml()), 'success');
-	header('Location: ' . WT_BASE_URL . 'admin_trees_manage.php');
+		FlashMessages::addMessage(I18N::translate('The preferences for the family tree “%s” have been updated.', $WT_TREE->getTitleHtml()), 'success');
+		header('Location: ' . WT_BASE_URL . 'admin_trees_manage.php');
 
-	return;
+		return;
 }
 
 switch (Filter::get('action')) {