fisharebest / webtrees

app/Module/IndividualSidebarModule.php

Switch Indentation +19 added lines, -19 removed lines

@@ -46,13 +46,13 @@ 
 	 */
 	public function modAction($mod_action) {
 		switch ($mod_action) {
-		case 'ajax':
-			header('Content-Type: text/html; charset=UTF-8');
-			echo $this->getSidebarAjaxContent();
-			break;
-		default:
-			http_response_code(404);
-			break;
+			case 'ajax':
+				header('Content-Type: text/html; charset=UTF-8');
+				echo $this->getSidebarAjaxContent();
+				break;
+			default:
+				http_response_code(404);
+				break;
 		}
 	}
 
@@ -150,18 +150,18 @@ 
 		$out = '<form method="post" action="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax" onsubmit="return false;"><input type="search" name="sb_indi_name" id="sb_indi_name" placeholder="' . I18N::translate('Search') . '"><p>';
 		foreach ($initials as $letter => $count) {
 			switch ($letter) {
-			case '@':
-				$html = I18N::translateContext('Unknown surname', '…');
-				break;
-			case ',':
-				$html = I18N::translate('None');
-				break;
-			case ' ':
-				$html = '&nbsp;';
-				break;
-			default:
-				$html = $letter;
-				break;
+				case '@':
+					$html = I18N::translateContext('Unknown surname', '…');
+					break;
+				case ',':
+					$html = I18N::translate('None');
+					break;
+				case ' ':
+					$html = '&nbsp;';
+					break;
+				default:
+					$html = $letter;
+					break;
 			}
 			$html = '<a href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;alpha=' . urlencode($letter) . '" class="sb_indi_letter">' . $html . '</a>';
 			$out .= $html . ' ';

app/Module/FamiliesSidebarModule.php

Switch Indentation +19 added lines, -19 removed lines

@@ -46,13 +46,13 @@ 
 	 */
 	public function modAction($mod_action) {
 		switch ($mod_action) {
-		case 'ajax':
-			header('Content-Type: text/html; charset=UTF-8');
-			echo $this->getSidebarAjaxContent();
-			break;
-		default:
-			http_response_code(404);
-			break;
+			case 'ajax':
+				header('Content-Type: text/html; charset=UTF-8');
+				echo $this->getSidebarAjaxContent();
+				break;
+			default:
+				http_response_code(404);
+				break;
 		}
 	}
 
@@ -150,18 +150,18 @@ 
 		$out = '<form method="post" action="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax" onsubmit="return false;"><input type="search" name="sb_fam_name" id="sb_fam_name" placeholder="' . I18N::translate('Search') . '"><p>';
 		foreach ($initials as $letter => $count) {
 			switch ($letter) {
-			case '@':
-				$html = I18N::translateContext('Unknown surname', '…');
-				break;
-			case ',':
-				$html = I18N::translate('None');
-				break;
-			case ' ':
-				$html = '&nbsp;';
-				break;
-			default:
-				$html = $letter;
-				break;
+				case '@':
+					$html = I18N::translateContext('Unknown surname', '…');
+					break;
+				case ',':
+					$html = I18N::translate('None');
+					break;
+				case ' ':
+					$html = '&nbsp;';
+					break;
+				default:
+					$html = $letter;
+					break;
 			}
 			$html = '<a href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;alpha=' . urlencode($letter) . '" class="sb_fam_letter">' . $html . '</a>';
 			$out .= $html . ' ';

app/Module/CensusAssistantModule.php

Switch Indentation +22 added lines, -22 removed lines

@@ -57,28 +57,28 @@
 		global $WT_TREE;
 
 		switch ($mod_action) {
-		case 'census-header':
-			header('Content-Type: text/html; charset=utf8');
-			$census = Filter::get('census');
-			echo $this->censusTableHeader(new $census);
-			break;
-
-		case 'census-individual':
-			header('Content-Type: text/html; charset=utf8');
-			$census     = Filter::get('census');
-			$individual = Individual::getInstance(Filter::get('xref'), $WT_TREE);
-			$head       = Individual::getInstance(Filter::get('head'), $WT_TREE);
-			echo $this->censusTableRow(new $census, $individual, $head);
-			break;
-
-		case 'media_find':
-			self::mediaFind();
-			break;
-		case 'media_query_3a':
-			self::mediaQuery();
-			break;
-		default:
-			http_response_code(404);
+			case 'census-header':
+				header('Content-Type: text/html; charset=utf8');
+				$census = Filter::get('census');
+				echo $this->censusTableHeader(new $census);
+				break;
+
+			case 'census-individual':
+				header('Content-Type: text/html; charset=utf8');
+				$census     = Filter::get('census');
+				$individual = Individual::getInstance(Filter::get('xref'), $WT_TREE);
+				$head       = Individual::getInstance(Filter::get('head'), $WT_TREE);
+				echo $this->censusTableRow(new $census, $individual, $head);
+				break;
+
+			case 'media_find':
+				self::mediaFind();
+				break;
+			case 'media_query_3a':
+				self::mediaQuery();
+				break;
+			default:
+				http_response_code(404);
 		}
 	}
 

app/Fact.php

Switch Indentation +26 added lines, -26 removed lines

@@ -93,23 +93,23 @@ 
 	public function getTarget() {
 		$xref = trim($this->getValue(), '@');
 		switch ($this->tag) {
-		case 'FAMC':
-		case 'FAMS':
-			return Family::getInstance($xref, $this->getParent()->getTree());
-		case 'HUSB':
-		case 'WIFE':
-		case 'CHIL':
-			return Individual::getInstance($xref, $this->getParent()->getTree());
-		case 'SOUR':
-			return Source::getInstance($xref, $this->getParent()->getTree());
-		case 'OBJE':
-			return Media::getInstance($xref, $this->getParent()->getTree());
-		case 'REPO':
-			return Repository::getInstance($xref, $this->getParent()->getTree());
-		case 'NOTE':
-			return Note::getInstance($xref, $this->getParent()->getTree());
-		default:
-			return GedcomRecord::getInstance($xref, $this->getParent()->getTree());
+			case 'FAMC':
+			case 'FAMS':
+				return Family::getInstance($xref, $this->getParent()->getTree());
+			case 'HUSB':
+			case 'WIFE':
+			case 'CHIL':
+				return Individual::getInstance($xref, $this->getParent()->getTree());
+			case 'SOUR':
+				return Source::getInstance($xref, $this->getParent()->getTree());
+			case 'OBJE':
+				return Media::getInstance($xref, $this->getParent()->getTree());
+			case 'REPO':
+				return Repository::getInstance($xref, $this->getParent()->getTree());
+			case 'NOTE':
+				return Note::getInstance($xref, $this->getParent()->getTree());
+			default:
+				return GedcomRecord::getInstance($xref, $this->getParent()->getTree());
 		}
 	}
 
@@ -263,15 +263,15 @@ 
 	 */
 	public function getLabel() {
 		switch ($this->tag) {
-		case 'EVEN':
-		case 'FACT':
-			if ($this->getAttribute('TYPE') !== '') {
-				// Custom FACT/EVEN - with a TYPE
-				return I18N::translate(Html::escape($this->getAttribute('TYPE')));
-			}
-			// no break - drop into next case
-		default:
-			return GedcomTag::getLabel($this->tag, $this->parent);
+			case 'EVEN':
+			case 'FACT':
+				if ($this->getAttribute('TYPE') !== '') {
+					// Custom FACT/EVEN - with a TYPE
+					return I18N::translate(Html::escape($this->getAttribute('TYPE')));
+				}
+				// no break - drop into next case
+			default:
+				return GedcomTag::getLabel($this->tag, $this->parent);
 		}
 	}
 

app/Stats.php

Switch Indentation +385 added lines, -385 removed lines

@@ -301,22 +301,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);
@@ -1442,32 +1442,32 @@ 
 		$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':
-			if ($row['d_year'] < 0) {
-				$row['d_year'] = abs($row['d_year']) . ' B.C.';
-			}
-			$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':
+				if ($row['d_year'] < 0) {
+					$row['d_year'] = abs($row['d_year']) . ' B.C.';
+				}
+				$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;
@@ -1632,96 +1632,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 = [];
-			$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 = [];
+				$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 = [];
-			$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 = [];
+				$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 = [];
-			$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 = [];
+				$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 = [];
-			$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 = [];
+				$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 = [];
-			$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 = [];
+				$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
@@ -2260,20 +2260,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;
@@ -2943,36 +2943,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;
@@ -3117,32 +3117,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;
@@ -3415,32 +3415,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;
@@ -4398,20 +4398,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;
@@ -4686,43 +4686,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'] . '|';
 			}
@@ -5309,16 +5309,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
@@ -5432,9 +5432,9 @@ 
 				}
 			}
 			switch ($SURNAME_TRADITION) {
-			case 'polish':
-				// most common surname should be in male variant (Kowalski, not Kowalska)
-				$top_name = preg_replace(['/ska$/', '/cka$/', '/dzka$/', '/żka$/'], ['ski', 'cki', 'dzki', 'żki'], $top_name);
+				case 'polish':
+					// most common surname should be in male variant (Kowalski, not Kowalska)
+					$top_name = preg_replace(['/ska$/', '/cka$/', '/dzka$/', '/żka$/'], ['ski', 'cki', 'dzki', 'żki'], $top_name);
 			}
 			$per = round(100 * $count_per / $tot_indi, 0);
 			$chd .= $this->arrayToExtendedEncoding([$per]);
@@ -5473,19 +5473,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();
 
@@ -5530,29 +5530,29 @@ 
 				$tot = '';
 			}
 			switch ($type) {
-			case 'table':
-				$common[] = '<tr><td>' . $given . '</td><td data-sort="' . $total . '">' . I18N::number($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 data-sort="' . $total . '">' . I18N::number($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':
-				$lookup = ['M' => I18N::translate('Male'), 'F' => I18N::translate('Female'), 'U' => I18N::translateContext('unknown gender', 'Unknown'), 'B' => I18N::translate('All')];
-
-				return '<table ' . Datatables::givenNameTableAttributes() . '><thead><tr><th colspan="3">' . $lookup[$sex] . '</th></tr><tr><th>' . I18N::translate('Name') . '</th><th>' . I18N::translate('Individuals') . '</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 '';
+				case 'table':
+					$lookup = ['M' => I18N::translate('Male'), 'F' => I18N::translate('Female'), 'U' => I18N::translateContext('unknown gender', 'Unknown'), 'B' => I18N::translate('All')];
+
+					return '<table ' . Datatables::givenNameTableAttributes() . '><thead><tr><th colspan="3">' . $lookup[$sex] . '</th></tr><tr><th>' . I18N::translate('Name') . '</th><th>' . I18N::translate('Individuals') . '</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 '';
@@ -6038,42 +6038,42 @@ 
 		}
 
 		switch ($type) {
-		default:
-		case 'userid':
-			return $user->getUserId();
-		case 'username':
-			return Html::escape($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 Html::escape($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((int) $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((int) $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, (int) $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, (int) $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([$user->getUserId()])->fetchOne() ? $yes : $no;
+				return Database::prepare("SELECT SQL_NO_CACHE 1 FROM `##session` WHERE user_id=? LIMIT 1")->execute([$user->getUserId()])->fetchOne() ? $yes : $no;
 		}
 	}
 
@@ -6890,50 +6890,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';
 		}
 	}
 }

admin_trees_manage.php

Switch Indentation +142 added lines, -142 removed lines

@@ -45,115 +45,115 @@ 
 }
 // Process POST actions
 switch (Filter::post('action')) {
-case 'delete':
-	$gedcom_id = Filter::postInteger('gedcom_id');
-	if (Filter::checkCsrf() && $gedcom_id) {
-		$tree = Tree::findById($gedcom_id);
-		FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
-		$tree->delete();
-	}
-	header('Location: admin_trees_manage.php');
-
-	return;
-case 'setdefault':
-	if (Filter::checkCsrf()) {
-		Site::setPreference('DEFAULT_GEDCOM', Filter::post('ged'));
-		FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” will be shown to visitors when they first arrive at this website.', $WT_TREE->getTitleHtml()), 'success');
-	}
-	header('Location: admin_trees_manage.php');
-
-	return;
-case 'new_tree':
-	$basename   = basename(Filter::post('tree_name'));
-	$tree_title = Filter::post('tree_title');
-
-	if (Filter::checkCsrf() && $basename && $tree_title) {
-		if (Tree::findByName($basename)) {
-			FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” already exists.', Html::escape($basename)), 'danger');
-		} else {
-			Tree::create($basename, $tree_title);
-			FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been created.', Html::escape($basename)), 'success');
+	case 'delete':
+		$gedcom_id = Filter::postInteger('gedcom_id');
+		if (Filter::checkCsrf() && $gedcom_id) {
+			$tree = Tree::findById($gedcom_id);
+			FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
+			$tree->delete();
 		}
-	}
-	header('Location: admin_trees_manage.php?ged=' . rawurlencode($basename));
-
-	return;
-case 'replace_upload':
-	$gedcom_id          = Filter::postInteger('gedcom_id');
-	$keep_media         = Filter::post('keep_media', '1', '0');
-	$GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
-	$WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
-	$tree               = Tree::findById($gedcom_id);
-
-	if (Filter::checkCsrf() && $tree) {
-		$tree->setPreference('keep_media', $keep_media);
-		$tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
-		$tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
-		if (isset($_FILES['tree_name'])) {
-			if ($_FILES['tree_name']['error'] == 0 && is_readable($_FILES['tree_name']['tmp_name'])) {
-				$tree->importGedcomFile($_FILES['tree_name']['tmp_name'], $_FILES['tree_name']['name']);
-			} else {
-				FlashMessages::addMessage(Functions::fileUploadErrorText($_FILES['tree_name']['error']), 'danger');
-			}
-		} else {
-			FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
-		}
-	}
-	header('Location: admin_trees_manage.php');
-
-	return;
-case 'replace_import':
-	$basename           = basename(Filter::post('tree_name'));
-	$gedcom_id          = Filter::postInteger('gedcom_id');
-	$keep_media         = Filter::post('keep_media', '1', '0');
-	$GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
-	$WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
-	$tree               = Tree::findById($gedcom_id);
-
-	if (Filter::checkCsrf() && $tree) {
-		$tree->setPreference('keep_media', $keep_media);
-		$tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
-		$tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
-		if ($basename) {
-			$tree->importGedcomFile(WT_DATA_DIR . $basename, $basename);
-		} else {
-			FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
-		}
-	}
-	header('Location: admin_trees_manage.php');
-
-	return;
+		header('Location: admin_trees_manage.php');
 
-case 'synchronize':
-	if (Filter::checkCsrf()) {
-		$basenames = [];
+		return;
+	case 'setdefault':
+		if (Filter::checkCsrf()) {
+			Site::setPreference('DEFAULT_GEDCOM', Filter::post('ged'));
+			FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” will be shown to visitors when they first arrive at this website.', $WT_TREE->getTitleHtml()), 'success');
+		}
+		header('Location: admin_trees_manage.php');
 
-		foreach ($gedcom_files as $gedcom_file) {
-			$filemtime   = filemtime($gedcom_file); // Only import files that have changed
-			$basename    = basename($gedcom_file);
-			$basenames[] = $basename;
+		return;
+	case 'new_tree':
+		$basename   = basename(Filter::post('tree_name'));
+		$tree_title = Filter::post('tree_title');
 
-			$tree = Tree::findByName($basename);
-			if (!$tree) {
-				$tree = Tree::create($basename, $basename);
+		if (Filter::checkCsrf() && $basename && $tree_title) {
+			if (Tree::findByName($basename)) {
+				FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” already exists.', Html::escape($basename)), 'danger');
+			} else {
+				Tree::create($basename, $tree_title);
+				FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been created.', Html::escape($basename)), 'success');
+			}
+		}
+		header('Location: admin_trees_manage.php?ged=' . rawurlencode($basename));
+
+		return;
+	case 'replace_upload':
+		$gedcom_id          = Filter::postInteger('gedcom_id');
+		$keep_media         = Filter::post('keep_media', '1', '0');
+		$GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
+		$WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
+		$tree               = Tree::findById($gedcom_id);
+
+		if (Filter::checkCsrf() && $tree) {
+			$tree->setPreference('keep_media', $keep_media);
+			$tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
+			$tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
+			if (isset($_FILES['tree_name'])) {
+				if ($_FILES['tree_name']['error'] == 0 && is_readable($_FILES['tree_name']['tmp_name'])) {
+					$tree->importGedcomFile($_FILES['tree_name']['tmp_name'], $_FILES['tree_name']['name']);
+				} else {
+					FlashMessages::addMessage(Functions::fileUploadErrorText($_FILES['tree_name']['error']), 'danger');
+				}
+			} else {
+				FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
 			}
-			if ($tree->getPreference('filemtime') != $filemtime) {
-				$tree->importGedcomFile($gedcom_file, $basename);
-				$tree->setPreference('filemtime', $filemtime);
-				FlashMessages::addMessage(I18N::translate('The GEDCOM file “%s” has been imported.', Html::escape($basename)), 'success');
+		}
+		header('Location: admin_trees_manage.php');
+
+		return;
+	case 'replace_import':
+		$basename           = basename(Filter::post('tree_name'));
+		$gedcom_id          = Filter::postInteger('gedcom_id');
+		$keep_media         = Filter::post('keep_media', '1', '0');
+		$GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
+		$WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
+		$tree               = Tree::findById($gedcom_id);
+
+		if (Filter::checkCsrf() && $tree) {
+			$tree->setPreference('keep_media', $keep_media);
+			$tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
+			$tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
+			if ($basename) {
+				$tree->importGedcomFile(WT_DATA_DIR . $basename, $basename);
+			} else {
+				FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
 			}
 		}
+		header('Location: admin_trees_manage.php');
+
+		return;
+
+	case 'synchronize':
+		if (Filter::checkCsrf()) {
+			$basenames = [];
+
+			foreach ($gedcom_files as $gedcom_file) {
+				$filemtime   = filemtime($gedcom_file); // Only import files that have changed
+				$basename    = basename($gedcom_file);
+				$basenames[] = $basename;
+
+				$tree = Tree::findByName($basename);
+				if (!$tree) {
+					$tree = Tree::create($basename, $basename);
+				}
+				if ($tree->getPreference('filemtime') != $filemtime) {
+					$tree->importGedcomFile($gedcom_file, $basename);
+					$tree->setPreference('filemtime', $filemtime);
+					FlashMessages::addMessage(I18N::translate('The GEDCOM file “%s” has been imported.', Html::escape($basename)), 'success');
+				}
+			}
 
-		foreach (Tree::getAll() as $tree) {
-			if (!in_array($tree->getName(), $basenames)) {
-				FlashMessages::addMessage(I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
-				$tree->delete();
+			foreach (Tree::getAll() as $tree) {
+				if (!in_array($tree->getName(), $basenames)) {
+					FlashMessages::addMessage(I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
+					$tree->delete();
+				}
 			}
 		}
-	}
-	header('Location: admin_trees_manage.php');
+		header('Location: admin_trees_manage.php');
 
-	return;
+		return;
 }
 
 $default_tree_title  = /* I18N: Default name for a new tree */ I18N::translate('My family tree');
@@ -167,28 +167,28 @@ 
 
 // Process GET actions
 switch (Filter::get('action')) {
-case 'importform':
-	$controller
-		->setPageTitle($WT_TREE->getTitleHtml() . ' — ' . I18N::translate('Import a GEDCOM file'))
-		->pageHeader();
+	case 'importform':
+		$controller
+			->setPageTitle($WT_TREE->getTitleHtml() . ' — ' . I18N::translate('Import a GEDCOM file'))
+			->pageHeader();
 
-	echo Bootstrap4::breadcrumbs([
-		route('admin-control-panel')              => I18N::translate('Control panel'),
-		'admin_trees_manage.php' => I18N::translate('Manage family trees'),
-	], $controller->getPageTitle());
-	?>
+		echo Bootstrap4::breadcrumbs([
+			route('admin-control-panel')              => I18N::translate('Control panel'),
+			'admin_trees_manage.php' => I18N::translate('Manage family trees'),
+		], $controller->getPageTitle());
+		?>
 
 	<h1><?= $controller->getPageTitle() ?></h1>
 	<?php
 
-	$tree = Tree::findById(Filter::getInteger('gedcom_id'));
-	// Check it exists
-	if (!$tree) {
-		break;
-	}
-	$gedcom_filename = $tree->getPreference('gedcom_filename')
-	?>
-	<p>
+		$tree = Tree::findById(Filter::getInteger('gedcom_id'));
+		// Check it exists
+		if (!$tree) {
+			break;
+		}
+		$gedcom_filename = $tree->getPreference('gedcom_filename')
+		?>
+		<p>
 		<?= /* I18N: %s is the name of a family tree */ I18N::translate('This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file.', $tree->getTitleHtml()) ?>
 	</p>
 	<form class="form form-horizontal" name="gedcomimportform" method="post" enctype="multipart/form-data" onsubmit="return checkGedcomImportForm('<?= Html::escape(I18N::translate('You have selected a GEDCOM file with a different name. Is this correct?')) ?>');">
@@ -222,35 +222,35 @@ 
 							<div class="input-group">
 								<span class="input-group-addon">
 									<?= WT_DATA_DIR ?>
-								</span>
+									</span>
 								<?php
-								$d     = opendir(WT_DATA_DIR);
-								$files = [];
-								while (($f = readdir($d)) !== false) {
-									if (!is_dir(WT_DATA_DIR . $f) && is_readable(WT_DATA_DIR . $f)) {
-										$fp     = fopen(WT_DATA_DIR . $f, 'rb');
-										$header = fread($fp, 64);
-										fclose($fp);
-										if (preg_match('/^(' . WT_UTF8_BOM . ')?0 *HEAD/', $header)) {
-											$files[] = $f;
+									$d     = opendir(WT_DATA_DIR);
+									$files = [];
+									while (($f = readdir($d)) !== false) {
+										if (!is_dir(WT_DATA_DIR . $f) && is_readable(WT_DATA_DIR . $f)) {
+											$fp     = fopen(WT_DATA_DIR . $f, 'rb');
+											$header = fread($fp, 64);
+											fclose($fp);
+											if (preg_match('/^(' . WT_UTF8_BOM . ')?0 *HEAD/', $header)) {
+												$files[] = $f;
+											}
+										}
+									}
+									echo '<select name="tree_name" class="form-control" id="import-server-file">';
+									echo '<option value=""></option>';
+									sort($files);
+									foreach ($files as $gedcom_file) {
+										echo '<option value="', Html::escape($gedcom_file), '" ';
+										if ($gedcom_file === $gedcom_filename) {
+											echo ' selected';
 										}
+										echo'>', Html::escape($gedcom_file), '</option>';
 									}
-								}
-								echo '<select name="tree_name" class="form-control" id="import-server-file">';
-								echo '<option value=""></option>';
-								sort($files);
-								foreach ($files as $gedcom_file) {
-									echo '<option value="', Html::escape($gedcom_file), '" ';
-									if ($gedcom_file === $gedcom_filename) {
-										echo ' selected';
+									if (empty($files)) {
+										echo '<option disabled selected>', I18N::translate('No GEDCOM files found.'), '</option>';
 									}
-									echo'>', Html::escape($gedcom_file), '</option>';
-								}
-								if (empty($files)) {
-									echo '<option disabled selected>', I18N::translate('No GEDCOM files found.'), '</option>';
-								}
-								echo '</select>';
-								?>
+									echo '</select>';
+									?>
 							</div>
 						</div>
 					</div>
@@ -294,7 +294,7 @@ 
 						>
 					<p class="small text-muted">
 						<?= /* I18N: Help text for the “GEDCOM media path” configuration setting. A “path” is something like “C:\Documents\Genealogy\Photos\John_Smith.jpeg” */ I18N::translate('Some genealogy software creates GEDCOM files that contain media filenames with full paths. These paths will not exist on the web-server. To allow webtrees to find the file, the first part of the path must be removed.') ?>
-						<?= /* I18N: Help text for the “GEDCOM media path” configuration setting. %s are all folder names */ I18N::translate('For example, if the GEDCOM file contains %1$s and webtrees expects to find %2$s in the media folder, then you would need to remove %3$s.', '<code>C:\\Documents\\family\\photo.jpeg</code>', '<code>family\\photo.jpeg</code>', '<code>C:\\Documents\\</code>') ?>
+							<?= /* I18N: Help text for the “GEDCOM media path” configuration setting. %s are all folder names */ I18N::translate('For example, if the GEDCOM file contains %1$s and webtrees expects to find %2$s in the media folder, then you would need to remove %3$s.', '<code>C:\\Documents\\family\\photo.jpeg</code>', '<code>family\\photo.jpeg</code>', '<code>C:\\Documents\\</code>') ?>
 					</p>
 				</div>
 			</div>
@@ -310,7 +310,7 @@ 
 	</form>
 	<?php
 
-	return;
+		return;
 }
 
 if (!Tree::getAll()) {

admin_trees_config.php

Switch Indentation +104 added lines, -104 removed lines

@@ -106,119 +106,119 @@
 $relatives_events = explode(',', $WT_TREE->getPreference('SHOW_RELATIVES_EVENTS'));
 
 switch (Filter::post('action')) {
-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', implode(',', Filter::postArray('ADVANCED_NAME_FACTS')));
-	$WT_TREE->setPreference('ADVANCED_PLAC_FACTS', implode(',', Filter::postArray('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([
-		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', implode(',', Filter::postArray('FAM_FACTS_ADD')));
-	$WT_TREE->setPreference('FAM_FACTS_QUICK', implode(',', Filter::postArray('FAM_FACTS_QUICK')));
-	$WT_TREE->setPreference('FAM_FACTS_UNIQUE', implode(',', Filter::postArray('FAM_FACTS_UNIQUE')));
-	$WT_TREE->setPreference('FULL_SOURCES', Filter::postBool('FULL_SOURCES'));
-	$WT_TREE->setPreference('FORMAT_TEXT', Filter::post('FORMAT_TEXT'));
-	$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', implode(',', Filter::postArray('INDI_FACTS_ADD')));
-	$WT_TREE->setPreference('INDI_FACTS_QUICK', implode(',', Filter::postArray('INDI_FACTS_QUICK')));
-	$WT_TREE->setPreference('INDI_FACTS_UNIQUE', implode(',', Filter::postArray('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_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('NO_UPDATE_CHAN', Filter::postBool('NO_UPDATE_CHAN'));
-	$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', implode(',', Filter::postArray('QUICK_REQUIRED_FACTS')));
-	$WT_TREE->setPreference('QUICK_REQUIRED_FAMFACTS', implode(',', Filter::postArray('QUICK_REQUIRED_FAMFACTS')));
-	$WT_TREE->setPreference('REPO_FACTS_ADD', implode(',', Filter::postArray('REPO_FACTS_ADD')));
-	$WT_TREE->setPreference('REPO_FACTS_QUICK', implode(',', Filter::postArray('REPO_FACTS_QUICK')));
-	$WT_TREE->setPreference('REPO_FACTS_UNIQUE', implode(',', Filter::postArray('REPO_FACTS_UNIQUE')));
-	$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('SOUR_FACTS_ADD', implode(',', Filter::postArray('SOUR_FACTS_ADD')));
-	$WT_TREE->setPreference('SOUR_FACTS_QUICK', implode(',', Filter::postArray('SOUR_FACTS_QUICK')));
-	$WT_TREE->setPreference('SOUR_FACTS_UNIQUE', implode(',', Filter::postArray('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('USE_SILHOUETTE', Filter::postBool('USE_SILHOUETTE'));
-	$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', implode(',', Filter::postArray('ADVANCED_NAME_FACTS')));
+		$WT_TREE->setPreference('ADVANCED_PLAC_FACTS', implode(',', Filter::postArray('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([
+			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', implode(',', Filter::postArray('FAM_FACTS_ADD')));
+		$WT_TREE->setPreference('FAM_FACTS_QUICK', implode(',', Filter::postArray('FAM_FACTS_QUICK')));
+		$WT_TREE->setPreference('FAM_FACTS_UNIQUE', implode(',', Filter::postArray('FAM_FACTS_UNIQUE')));
+		$WT_TREE->setPreference('FULL_SOURCES', Filter::postBool('FULL_SOURCES'));
+		$WT_TREE->setPreference('FORMAT_TEXT', Filter::post('FORMAT_TEXT'));
+		$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', implode(',', Filter::postArray('INDI_FACTS_ADD')));
+		$WT_TREE->setPreference('INDI_FACTS_QUICK', implode(',', Filter::postArray('INDI_FACTS_QUICK')));
+		$WT_TREE->setPreference('INDI_FACTS_UNIQUE', implode(',', Filter::postArray('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_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('NO_UPDATE_CHAN', Filter::postBool('NO_UPDATE_CHAN'));
+		$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', implode(',', Filter::postArray('QUICK_REQUIRED_FACTS')));
+		$WT_TREE->setPreference('QUICK_REQUIRED_FAMFACTS', implode(',', Filter::postArray('QUICK_REQUIRED_FAMFACTS')));
+		$WT_TREE->setPreference('REPO_FACTS_ADD', implode(',', Filter::postArray('REPO_FACTS_ADD')));
+		$WT_TREE->setPreference('REPO_FACTS_QUICK', implode(',', Filter::postArray('REPO_FACTS_QUICK')));
+		$WT_TREE->setPreference('REPO_FACTS_UNIQUE', implode(',', Filter::postArray('REPO_FACTS_UNIQUE')));
+		$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('SOUR_FACTS_ADD', implode(',', Filter::postArray('SOUR_FACTS_ADD')));
+		$WT_TREE->setPreference('SOUR_FACTS_QUICK', implode(',', Filter::postArray('SOUR_FACTS_QUICK')));
+		$WT_TREE->setPreference('SOUR_FACTS_UNIQUE', implode(',', Filter::postArray('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('USE_SILHOUETTE', Filter::postBool('USE_SILHOUETTE'));
+		$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([$gedcom, $WT_TREE->getTreeId()]);
-			Database::prepare("UPDATE `##site_setting` SET setting_value = ? WHERE setting_name='DEFAULT_GEDCOM' AND setting_value = ?")->execute([$gedcom, $WT_TREE->getName()]);
-		} catch (\Exception $ex) {
-			DebugBar::addThrowable($ex);
+		$gedcom = Filter::post('gedcom');
+		if ($gedcom && $gedcom !== $WT_TREE->getName()) {
+			try {
+				Database::prepare("UPDATE `##gedcom` SET gedcom_name = ? WHERE gedcom_id = ?")->execute([$gedcom, $WT_TREE->getTreeId()]);
+				Database::prepare("UPDATE `##site_setting` SET setting_value = ? WHERE setting_name='DEFAULT_GEDCOM' AND setting_value = ?")->execute([$gedcom, $WT_TREE->getName()]);
+			} catch (\Exception $ex) {
+				DebugBar::addThrowable($ex);
 
-			// Probably a duplicate name.
+				// Probably a duplicate name.
+			}
 		}
-	}
 
-	FlashMessages::addMessage(I18N::translate('The preferences for the family tree “%s” have been updated.', $WT_TREE->getTitleHtml()), 'success');
-	header('Location: admin_trees_manage.php');
+		FlashMessages::addMessage(I18N::translate('The preferences for the family tree “%s” have been updated.', $WT_TREE->getTitleHtml()), 'success');
+		header('Location: admin_trees_manage.php');
 
-	return;
+		return;
 }
 
 switch (Filter::get('action')) {

help_text.php

Switch Indentation +176 added lines, -176 removed lines

@@ -28,102 +28,102 @@ 
 	// Generally, these tags need to be lists explicitly in FunctionsEdit::add_simple_tag()
 	//////////////////////////////////////////////////////////////////////////////
 
-case 'DATE':
-	$title = I18N::translate('Date');
-	$dates = [
-		'1900'                                                     => new Date('1900'),
-		'JAN 1900'                                                 => new Date('JAN 1900'),
-		'FEB 1900'                                                 => new Date('FEB 1900'),
-		'MAR 1900'                                                 => new Date('MAR 1900'),
-		'APR 1900'                                                 => new Date('APR 1900'),
-		'MAY 1900'                                                 => new Date('MAY 1900'),
-		'JUN 1900'                                                 => new Date('JUN 1900'),
-		'JUL 1900'                                                 => new Date('JUL 1900'),
-		'AUG 1900'                                                 => new Date('AUG 1900'),
-		'SEP 1900'                                                 => new Date('SEP 1900'),
-		'OCT 1900'                                                 => new Date('OCT 1900'),
-		'NOV 1900'                                                 => new Date('NOV 1900'),
-		'DEC 1900'                                                 => new Date('DEC 1900'),
-		'11 DEC 1913'                                              => new Date('11 DEC 1913'),
-		'01 FEB 2003'                                              => new Date('01 FEB 2003'),
-		'ABT 1900'                                                 => new Date('ABT 1900'),
-		'EST 1900'                                                 => new Date('EST 1900'),
-		'CAL 1900'                                                 => new Date('CAL 1900'),
-		'INT 1900 (...)'                                           => new Date('INT 1900 (...)'),
-		'@#DJULIAN@ 44 B.C.'                                       => new Date('@#DJULIAN@ 44 B.C.'),
-		'@#DJULIAN@ 14 JAN 1700'                                   => new Date('@#DJULIAN@ 14 JAN 1700'),
-		'BET @#DJULIAN@ 01 SEP 1752 AND @#DGREGORIAN@ 30 SEP 1752' => new Date('BET @#DJULIAN@ 01 SEP 1752 AND @#DGREGORIAN@ 30 SEP 1752'),
-		'@#DJULIAN@ 20 FEB 1742/43'                                => new Date('@#DJULIAN@ 20 FEB 1742/43'),
-		'FROM 1900 TO 1910'                                        => new Date('FROM 1900 TO 1910'),
-		'FROM 1900'                                                => new Date('FROM 1900'),
-		'TO 1910'                                                  => new Date('TO 1910'),
-		'BET 1900 AND 1910'                                        => new Date('BET 1900 AND 1910'),
-		'BET JAN 1900 AND MAR 1900'                                => new Date('BET JAN 1900 AND MAR 1900'),
-		'BET APR 1900 AND JUN 1900'                                => new Date('BET APR 1900 AND JUN 1900'),
-		'BET JUL 1900 AND SEP 1900'                                => new Date('BET JUL 1900 AND SEP 1900'),
-		'BET OCT 1900 AND DEC 1900'                                => new Date('BET OCT 1900 AND DEC 1900'),
-		'AFT 1900'                                                 => new Date('AFT 1900'),
-		'BEF 1910'                                                 => new Date('BEF 1910'),
-		// Hijri dates
-		'@#DHIJRI@ 1497'                                    => new Date('@#DHIJRI@ 1497'),
-		'@#DHIJRI@ MUHAR 1497'                              => new Date('@#DHIJRI@ MUHAR 1497'),
-		'ABT @#DHIJRI@ SAFAR 1497'                          => new Date('ABT @#DHIJRI@ SAFAR 1497'),
-		'BET @#DHIJRI@ RABIA 1497 AND @#DHIJRI@ RABIT 1497' => new Date('BET @#DHIJRI@ RABIA 1497 AND @#DHIJRI@ RABIT 1497'),
-		'FROM @#DHIJRI@ JUMAA 1497 TO @#DHIJRI@ JUMAT 1497' => new Date('FROM @#DHIJRI@ JUMAA 1497 TO @#DHIJRI@ JUMAT 1497'),
-		'AFT @#DHIJRI@ RAJAB 1497'                          => new Date('AFT @#DHIJRI@ RAJAB 1497'),
-		'BEF @#DHIJRI@ SHAAB 1497'                          => new Date('BEF @#DHIJRI@ SHAAB 1497'),
-		'ABT @#DHIJRI@ RAMAD 1497'                          => new Date('ABT @#DHIJRI@ RAMAD 1497'),
-		'FROM @#DHIJRI@ SHAWW 1497'                         => new Date('FROM @#DHIJRI@ SHAWW 1497'),
-		'TO @#DHIJRI@ DHUAQ 1497'                           => new Date('TO @#DHIJRI@ DHUAQ 1497'),
-		'@#DHIJRI@ 03 DHUAH 1497'                           => new Date('@#DHIJRI@ 03 DHUAH 1497'),
-		// French dates
-		'@#DFRENCH R@ 12'                                   => new Date('@#DFRENCH R@ 12'),
-		'@#DFRENCH R@ VEND 12'                              => new Date('@#DFRENCH R@ VEND 12'),
-		'ABT @#DFRENCH R@ BRUM 12'                          => new Date('ABT @#DFRENCH R@ BRUM 12'),
-		'BET @#DFRENCH R@ FRIM 12 AND @#DFRENCH R@ NIVO 12' => new Date('BET @#DFRENCH R@ FRIM 12 AND @#DFRENCH R@ NIVO 12'),
-		'FROM @#DFRENCH R@ PLUV 12 TO @#DFRENCH R@ VENT 12' => new Date('FROM @#DFRENCH R@ PLUV 12 TO @#DFRENCH R@ VENT 12'),
-		'AFT @#DFRENCH R@ GERM 12'                          => new Date('AFT @#DFRENCH R@ GERM 12'),
-		'BEF @#DFRENCH R@ FLOR 12'                          => new Date('BEF @#DFRENCH R@ FLOR 12'),
-		'ABT @#DFRENCH R@ PRAI 12'                          => new Date('ABT @#DFRENCH R@ PRAI 12'),
-		'FROM @#DFRENCH R@ MESS 12'                         => new Date('FROM @#DFRENCH R@ MESS 12'),
-		'TO @#DFRENCH R@ THER 12'                           => new Date('TO @#DFRENCH R@ THER 12'),
-		'EST @#DFRENCH R@ FRUC 12'                          => new Date('EST @#DFRENCH R@ FRUC 12'),
-		'@#DFRENCH R@ 03 COMP 12'                           => new Date('@#DFRENCH R@ 03 COMP 12'),
-		// Jewish dates
-		'@#DHEBREW@ 5481'                                 => new Date('@#DHEBREW@ 5481'),
-		'@#DHEBREW@ TSH 5481'                             => new Date('@#DHEBREW@ TSH 5481'),
-		'ABT @#DHEBREW@ CSH 5481'                         => new Date('ABT @#DHEBREW@ CSH 5481'),
-		'BET @#DHEBREW@ KSL 5481 AND @#DHEBREW@ TVT 5481' => new Date('BET @#DHEBREW@ KSL 5481 AND @#DHEBREW@ TVT 5481'),
-		'FROM @#DHEBREW@ SHV 5481 TO @#DHEBREW@ ADR 5481' => new Date('FROM @#DHEBREW@ SHV 5481 TO @#DHEBREW@ ADR 5481'),
-		'AFT @#DHEBREW@ ADR 5481'                         => new Date('AFT @#DHEBREW@ ADR 5481'),
-		'AFT @#DHEBREW@ ADS 5480'                         => new Date('AFT @#DHEBREW@ ADS 5480'),
-		'BEF @#DHEBREW@ NSN 5481'                         => new Date('BEF @#DHEBREW@ NSN 5481'),
-		'ABT @#DHEBREW@ IYR 5481'                         => new Date('ABT @#DHEBREW@ IYR 5481'),
-		'FROM @#DHEBREW@ SVN 5481'                        => new Date('FROM @#DHEBREW@ SVN 5481'),
-		'TO @#DHEBREW@ TMZ 5481'                          => new Date('TO @#DHEBREW@ TMZ 5481'),
-		'EST @#DHEBREW@ AAV 5481'                         => new Date('EST @#DHEBREW@ AAV 5481'),
-		'@#DHEBREW@ 03 ELL 5481'                          => new Date('@#DHEBREW@ 03 ELL 5481'),
-	];
+	case 'DATE':
+		$title = I18N::translate('Date');
+		$dates = [
+			'1900'                                                     => new Date('1900'),
+			'JAN 1900'                                                 => new Date('JAN 1900'),
+			'FEB 1900'                                                 => new Date('FEB 1900'),
+			'MAR 1900'                                                 => new Date('MAR 1900'),
+			'APR 1900'                                                 => new Date('APR 1900'),
+			'MAY 1900'                                                 => new Date('MAY 1900'),
+			'JUN 1900'                                                 => new Date('JUN 1900'),
+			'JUL 1900'                                                 => new Date('JUL 1900'),
+			'AUG 1900'                                                 => new Date('AUG 1900'),
+			'SEP 1900'                                                 => new Date('SEP 1900'),
+			'OCT 1900'                                                 => new Date('OCT 1900'),
+			'NOV 1900'                                                 => new Date('NOV 1900'),
+			'DEC 1900'                                                 => new Date('DEC 1900'),
+			'11 DEC 1913'                                              => new Date('11 DEC 1913'),
+			'01 FEB 2003'                                              => new Date('01 FEB 2003'),
+			'ABT 1900'                                                 => new Date('ABT 1900'),
+			'EST 1900'                                                 => new Date('EST 1900'),
+			'CAL 1900'                                                 => new Date('CAL 1900'),
+			'INT 1900 (...)'                                           => new Date('INT 1900 (...)'),
+			'@#DJULIAN@ 44 B.C.'                                       => new Date('@#DJULIAN@ 44 B.C.'),
+			'@#DJULIAN@ 14 JAN 1700'                                   => new Date('@#DJULIAN@ 14 JAN 1700'),
+			'BET @#DJULIAN@ 01 SEP 1752 AND @#DGREGORIAN@ 30 SEP 1752' => new Date('BET @#DJULIAN@ 01 SEP 1752 AND @#DGREGORIAN@ 30 SEP 1752'),
+			'@#DJULIAN@ 20 FEB 1742/43'                                => new Date('@#DJULIAN@ 20 FEB 1742/43'),
+			'FROM 1900 TO 1910'                                        => new Date('FROM 1900 TO 1910'),
+			'FROM 1900'                                                => new Date('FROM 1900'),
+			'TO 1910'                                                  => new Date('TO 1910'),
+			'BET 1900 AND 1910'                                        => new Date('BET 1900 AND 1910'),
+			'BET JAN 1900 AND MAR 1900'                                => new Date('BET JAN 1900 AND MAR 1900'),
+			'BET APR 1900 AND JUN 1900'                                => new Date('BET APR 1900 AND JUN 1900'),
+			'BET JUL 1900 AND SEP 1900'                                => new Date('BET JUL 1900 AND SEP 1900'),
+			'BET OCT 1900 AND DEC 1900'                                => new Date('BET OCT 1900 AND DEC 1900'),
+			'AFT 1900'                                                 => new Date('AFT 1900'),
+			'BEF 1910'                                                 => new Date('BEF 1910'),
+			// Hijri dates
+			'@#DHIJRI@ 1497'                                    => new Date('@#DHIJRI@ 1497'),
+			'@#DHIJRI@ MUHAR 1497'                              => new Date('@#DHIJRI@ MUHAR 1497'),
+			'ABT @#DHIJRI@ SAFAR 1497'                          => new Date('ABT @#DHIJRI@ SAFAR 1497'),
+			'BET @#DHIJRI@ RABIA 1497 AND @#DHIJRI@ RABIT 1497' => new Date('BET @#DHIJRI@ RABIA 1497 AND @#DHIJRI@ RABIT 1497'),
+			'FROM @#DHIJRI@ JUMAA 1497 TO @#DHIJRI@ JUMAT 1497' => new Date('FROM @#DHIJRI@ JUMAA 1497 TO @#DHIJRI@ JUMAT 1497'),
+			'AFT @#DHIJRI@ RAJAB 1497'                          => new Date('AFT @#DHIJRI@ RAJAB 1497'),
+			'BEF @#DHIJRI@ SHAAB 1497'                          => new Date('BEF @#DHIJRI@ SHAAB 1497'),
+			'ABT @#DHIJRI@ RAMAD 1497'                          => new Date('ABT @#DHIJRI@ RAMAD 1497'),
+			'FROM @#DHIJRI@ SHAWW 1497'                         => new Date('FROM @#DHIJRI@ SHAWW 1497'),
+			'TO @#DHIJRI@ DHUAQ 1497'                           => new Date('TO @#DHIJRI@ DHUAQ 1497'),
+			'@#DHIJRI@ 03 DHUAH 1497'                           => new Date('@#DHIJRI@ 03 DHUAH 1497'),
+			// French dates
+			'@#DFRENCH R@ 12'                                   => new Date('@#DFRENCH R@ 12'),
+			'@#DFRENCH R@ VEND 12'                              => new Date('@#DFRENCH R@ VEND 12'),
+			'ABT @#DFRENCH R@ BRUM 12'                          => new Date('ABT @#DFRENCH R@ BRUM 12'),
+			'BET @#DFRENCH R@ FRIM 12 AND @#DFRENCH R@ NIVO 12' => new Date('BET @#DFRENCH R@ FRIM 12 AND @#DFRENCH R@ NIVO 12'),
+			'FROM @#DFRENCH R@ PLUV 12 TO @#DFRENCH R@ VENT 12' => new Date('FROM @#DFRENCH R@ PLUV 12 TO @#DFRENCH R@ VENT 12'),
+			'AFT @#DFRENCH R@ GERM 12'                          => new Date('AFT @#DFRENCH R@ GERM 12'),
+			'BEF @#DFRENCH R@ FLOR 12'                          => new Date('BEF @#DFRENCH R@ FLOR 12'),
+			'ABT @#DFRENCH R@ PRAI 12'                          => new Date('ABT @#DFRENCH R@ PRAI 12'),
+			'FROM @#DFRENCH R@ MESS 12'                         => new Date('FROM @#DFRENCH R@ MESS 12'),
+			'TO @#DFRENCH R@ THER 12'                           => new Date('TO @#DFRENCH R@ THER 12'),
+			'EST @#DFRENCH R@ FRUC 12'                          => new Date('EST @#DFRENCH R@ FRUC 12'),
+			'@#DFRENCH R@ 03 COMP 12'                           => new Date('@#DFRENCH R@ 03 COMP 12'),
+			// Jewish dates
+			'@#DHEBREW@ 5481'                                 => new Date('@#DHEBREW@ 5481'),
+			'@#DHEBREW@ TSH 5481'                             => new Date('@#DHEBREW@ TSH 5481'),
+			'ABT @#DHEBREW@ CSH 5481'                         => new Date('ABT @#DHEBREW@ CSH 5481'),
+			'BET @#DHEBREW@ KSL 5481 AND @#DHEBREW@ TVT 5481' => new Date('BET @#DHEBREW@ KSL 5481 AND @#DHEBREW@ TVT 5481'),
+			'FROM @#DHEBREW@ SHV 5481 TO @#DHEBREW@ ADR 5481' => new Date('FROM @#DHEBREW@ SHV 5481 TO @#DHEBREW@ ADR 5481'),
+			'AFT @#DHEBREW@ ADR 5481'                         => new Date('AFT @#DHEBREW@ ADR 5481'),
+			'AFT @#DHEBREW@ ADS 5480'                         => new Date('AFT @#DHEBREW@ ADS 5480'),
+			'BEF @#DHEBREW@ NSN 5481'                         => new Date('BEF @#DHEBREW@ NSN 5481'),
+			'ABT @#DHEBREW@ IYR 5481'                         => new Date('ABT @#DHEBREW@ IYR 5481'),
+			'FROM @#DHEBREW@ SVN 5481'                        => new Date('FROM @#DHEBREW@ SVN 5481'),
+			'TO @#DHEBREW@ TMZ 5481'                          => new Date('TO @#DHEBREW@ TMZ 5481'),
+			'EST @#DHEBREW@ AAV 5481'                         => new Date('EST @#DHEBREW@ AAV 5481'),
+			'@#DHEBREW@ 03 ELL 5481'                          => new Date('@#DHEBREW@ 03 ELL 5481'),
+		];
 
-	foreach ($dates as &$date) {
-		$date = strip_tags($date->display(false, null, false));
-	}
-	// These shortcuts work differently for different languages
-	switch (preg_replace('/[^DMY]/', '', str_replace(['J', 'F'], ['D', 'M'], I18N::dateFormat()))) {
-	case 'YMD':
-		$example1 = '11/12/1913'; // Note: we ignore the DMY order if it doesn't make sense.
-		$example2 = '03/02/01';
-		break;
-	case 'MDY':
-		$example1 = '12/11/1913';
-		$example2 = '02/01/03';
-		break;
-	case 'DMY':
-	default:
-		$example1 = '11/12/1913';
-		$example2 = '01/02/03';
-		break;
-	}
+		foreach ($dates as &$date) {
+			$date = strip_tags($date->display(false, null, false));
+		}
+		// These shortcuts work differently for different languages
+		switch (preg_replace('/[^DMY]/', '', str_replace(['J', 'F'], ['D', 'M'], I18N::dateFormat()))) {
+			case 'YMD':
+				$example1 = '11/12/1913'; // Note: we ignore the DMY order if it doesn't make sense.
+				$example2 = '03/02/01';
+				break;
+			case 'MDY':
+				$example1 = '12/11/1913';
+				$example2 = '02/01/03';
+				break;
+			case 'DMY':
+			default:
+				$example1 = '11/12/1913';
+				$example2 = '01/02/03';
+				break;
+		}
 	$example1 .= '<br>' . str_replace('/', '-', $example1) . '<br>' . str_replace('/', '.', $example1);
 	$example2 .= '<br>' . str_replace('/', '-', $example2) . '<br>' . str_replace('/', '.', $example2);
 	$text =
@@ -208,99 +208,99 @@ 
 	break;
 
 // This help text is used for all NAME components
-case 'NAME':
-	$title = GedcomTag::getLabel('NAME');
-	$text  =
-		'<p>' .
-		I18N::translate('The <b>name</b> field contains the individual’s full name, as they would have spelled it or as it was recorded. This is how it will be displayed on screen. It uses standard genealogy annotations to identify different parts of the name.') .
-		'</p>' .
-		'<ul><li>' .
-		I18N::translate('The surname is enclosed by slashes: <%s>John Paul /Smith/<%s>', 'span style="color:#0000ff;"', '/span') .
-		'</li><li>' .
-		I18N::translate('If the surname is unknown, use empty slashes: <%s>Mary //<%s>', 'span style="color:#0000ff;"', '/span') .
-		'</li><li>' .
-		I18N::translate('If an individual has two separate surnames, both should be enclosed by slashes: <%s>José Antonio /Gómez/ /Iglesias/<%s>', 'span style="color:#0000ff;"', '/span') .
-		'</li><li>' .
-		I18N::translate('If an individual does not have a surname, no slashes are needed: <%s>Jón Einarsson<%s>', 'span style="color:#0000ff;"', '/span') .
-		'</li><li>' .
-		I18N::translate('If an individual was not known by their first given name, the preferred name should be indicated with an asterisk: <%s>John Paul* /Smith/<%s>', 'span style="color:#0000ff;"', '/span') .
-		'</li><li>' .
-		I18N::translate('If an individual was known by a nickname which is not part of their formal name, it should be enclosed by quotation marks. For example, <%s>John &quot;Nobby&quot; /Clark/<%s>.', 'span style="color:#0000ff;"', '/span') .
-		'</li></ul>';
-	break;
+	case 'NAME':
+		$title = GedcomTag::getLabel('NAME');
+		$text  =
+			'<p>' .
+			I18N::translate('The <b>name</b> field contains the individual’s full name, as they would have spelled it or as it was recorded. This is how it will be displayed on screen. It uses standard genealogy annotations to identify different parts of the name.') .
+			'</p>' .
+			'<ul><li>' .
+			I18N::translate('The surname is enclosed by slashes: <%s>John Paul /Smith/<%s>', 'span style="color:#0000ff;"', '/span') .
+			'</li><li>' .
+			I18N::translate('If the surname is unknown, use empty slashes: <%s>Mary //<%s>', 'span style="color:#0000ff;"', '/span') .
+			'</li><li>' .
+			I18N::translate('If an individual has two separate surnames, both should be enclosed by slashes: <%s>José Antonio /Gómez/ /Iglesias/<%s>', 'span style="color:#0000ff;"', '/span') .
+			'</li><li>' .
+			I18N::translate('If an individual does not have a surname, no slashes are needed: <%s>Jón Einarsson<%s>', 'span style="color:#0000ff;"', '/span') .
+			'</li><li>' .
+			I18N::translate('If an individual was not known by their first given name, the preferred name should be indicated with an asterisk: <%s>John Paul* /Smith/<%s>', 'span style="color:#0000ff;"', '/span') .
+			'</li><li>' .
+			I18N::translate('If an individual was known by a nickname which is not part of their formal name, it should be enclosed by quotation marks. For example, <%s>John &quot;Nobby&quot; /Clark/<%s>.', 'span style="color:#0000ff;"', '/span') .
+			'</li></ul>';
+		break;
 
-case 'SURN':
-	$title = I18N::translate('Surname');
-	$text  = '<p>' .
-		I18N::translate('The <b>surname</b> field contains a name that is used for sorting and grouping. It can be different to the individual’s actual surname which is always taken from the <b>name</b> field. This field can be used to sort surnames with or without a prefix (Gogh / van Gogh) and to group spelling variations or inflections (Kowalski / Kowalska). If an individual needs to be listed under more than one surname, each name should be separated by a comma.') .
-		'</p>';
-	break;
+	case 'SURN':
+		$title = I18N::translate('Surname');
+		$text  = '<p>' .
+			I18N::translate('The <b>surname</b> field contains a name that is used for sorting and grouping. It can be different to the individual’s actual surname which is always taken from the <b>name</b> field. This field can be used to sort surnames with or without a prefix (Gogh / van Gogh) and to group spelling variations or inflections (Kowalski / Kowalska). If an individual needs to be listed under more than one surname, each name should be separated by a comma.') .
+			'</p>';
+		break;
 
-case 'OBJE':
-	$title = I18N::translate('Media object');
-	$text  =
-		'<p>' .
-		I18N::translate('A media object is a record in the family tree which contains information about a media file. This information may include a title, a copyright notice, a transcript, privacy restrictions, etc. The media file, such as the photo or video, can be stored locally (on this webserver) or remotely (on a different webserver).') .
-		'</p>';
-	break;
+	case 'OBJE':
+		$title = I18N::translate('Media object');
+		$text  =
+			'<p>' .
+			I18N::translate('A media object is a record in the family tree which contains information about a media file. This information may include a title, a copyright notice, a transcript, privacy restrictions, etc. The media file, such as the photo or video, can be stored locally (on this webserver) or remotely (on a different webserver).') .
+			'</p>';
+		break;
 
-case 'PLAC':
-	$title = I18N::translate('Place');
-	$text  = I18N::translate('Places should be entered according to the standards for genealogy. In genealogy, places are recorded with the most specific information about the place first and then working up to the least specific place last, using commas to separate the different place levels. The level at which you record the place information should represent the levels of government or church where vital records for that place are kept.<br><br>For example, a place like Salt Lake City would be entered as “Salt Lake City, Salt Lake, Utah, USA”.<br><br>Let’s examine each part of this place. The first part, “Salt Lake City,” is the city or township where the event occurred. In some countries, there may be municipalities or districts inside a city which are important to note. In that case, they should come before the city. The next part, “Salt Lake,” is the county. “Utah” is the state, and “USA” is the country. It is important to note each place because genealogy records are kept by the governments of each level.<br><br>If a level of the place is unknown, you should leave a space between the commas. Suppose, in the example above, you didn’t know the county for Salt Lake City. You should then record it like this: “Salt Lake City, , Utah, USA”. Suppose you only know that an individual was born in Utah. You would enter the information like this: “, , Utah, USA”. <br><br>You can use the <b>Find Place</b> link to help you find places that already exist in the database.');
-	break;
+	case 'PLAC':
+		$title = I18N::translate('Place');
+		$text  = I18N::translate('Places should be entered according to the standards for genealogy. In genealogy, places are recorded with the most specific information about the place first and then working up to the least specific place last, using commas to separate the different place levels. The level at which you record the place information should represent the levels of government or church where vital records for that place are kept.<br><br>For example, a place like Salt Lake City would be entered as “Salt Lake City, Salt Lake, Utah, USA”.<br><br>Let’s examine each part of this place. The first part, “Salt Lake City,” is the city or township where the event occurred. In some countries, there may be municipalities or districts inside a city which are important to note. In that case, they should come before the city. The next part, “Salt Lake,” is the county. “Utah” is the state, and “USA” is the country. It is important to note each place because genealogy records are kept by the governments of each level.<br><br>If a level of the place is unknown, you should leave a space between the commas. Suppose, in the example above, you didn’t know the county for Salt Lake City. You should then record it like this: “Salt Lake City, , Utah, USA”. Suppose you only know that an individual was born in Utah. You would enter the information like this: “, , Utah, USA”. <br><br>You can use the <b>Find Place</b> link to help you find places that already exist in the database.');
+		break;
 
-case 'RESN':
-	$title = GedcomTag::getLabel('RESN');
-	$text  = I18N::translate('Restrictions can be added to records and/or facts. They restrict who can view the data and who can edit it.') . '<br><br>' . I18N::translate('Note that if a user account is linked to a record, then that user will always be able to view that record.');
-	break;
+	case 'RESN':
+		$title = GedcomTag::getLabel('RESN');
+		$text  = I18N::translate('Restrictions can be added to records and/or facts. They restrict who can view the data and who can edit it.') . '<br><br>' . I18N::translate('Note that if a user account is linked to a record, then that user will always be able to view that record.');
+		break;
 
-case 'ROMN':
-	$title = GedcomTag::getLabel('ROMN');
-	$text  = I18N::translate('In many cultures it is customary to have a traditional name spelled in the traditional characters and also a romanized version of the name as it would be spelled or pronounced in languages based on the Latin alphabet, such as English.<br><br>If you prefer to use a non-Latin alphabet such as Hebrew, Greek, Russian, Chinese, or Arabic to enter the name in the standard name fields, then you can use this field to enter the same name using the Latin alphabet. Both versions of the name will appear in lists and charts.<br><br>Although this field is labeled “Romanized”, it is not restricted to containing only characters based on the Latin alphabet. This might be of use with Japanese names, where three different alphabets may occur.');
-	break;
+	case 'ROMN':
+		$title = GedcomTag::getLabel('ROMN');
+		$text  = I18N::translate('In many cultures it is customary to have a traditional name spelled in the traditional characters and also a romanized version of the name as it would be spelled or pronounced in languages based on the Latin alphabet, such as English.<br><br>If you prefer to use a non-Latin alphabet such as Hebrew, Greek, Russian, Chinese, or Arabic to enter the name in the standard name fields, then you can use this field to enter the same name using the Latin alphabet. Both versions of the name will appear in lists and charts.<br><br>Although this field is labeled “Romanized”, it is not restricted to containing only characters based on the Latin alphabet. This might be of use with Japanese names, where three different alphabets may occur.');
+		break;
 
-case '_HEB':
-	$title = GedcomTag::getLabel('_HEB');
-	$text  = I18N::translate('In many cultures it is customary to have a traditional name spelled in the traditional characters and also a romanized version of the name as it would be spelled or pronounced in languages based on the Latin alphabet, such as English.<br><br>If you prefer to use the Latin alphabet to enter the name in the standard name fields, then you can use this field to enter the same name in the non-Latin alphabet such as Greek, Hebrew, Russian, Arabic, or Chinese. Both versions of the name will appear in lists and charts.<br><br>Although this field is labeled “Hebrew”, it is not restricted to containing only Hebrew characters.');
-	break;
+	case '_HEB':
+		$title = GedcomTag::getLabel('_HEB');
+		$text  = I18N::translate('In many cultures it is customary to have a traditional name spelled in the traditional characters and also a romanized version of the name as it would be spelled or pronounced in languages based on the Latin alphabet, such as English.<br><br>If you prefer to use the Latin alphabet to enter the name in the standard name fields, then you can use this field to enter the same name in the non-Latin alphabet such as Greek, Hebrew, Russian, Arabic, or Chinese. Both versions of the name will appear in lists and charts.<br><br>Although this field is labeled “Hebrew”, it is not restricted to containing only Hebrew characters.');
+		break;
 
-	//////////////////////////////////////////////////////////////////////////////
-	// This section contains all the other help items.
-	//////////////////////////////////////////////////////////////////////////////
+		//////////////////////////////////////////////////////////////////////////////
+		// This section contains all the other help items.
+		//////////////////////////////////////////////////////////////////////////////
 
-case 'annivers_year_select':
-	$title = I18N::translate('Year input box');
-	$text  = I18N::translate('This input box lets you change that year of the calendar. Type a year into the box and press <b>Enter</b> to change the calendar to that year.<br><br><b>Advanced features</b> for <b>View the year</b><dl><dt><b>More than one year</b></dt><dd>You can search for dates in a range of years.<br><br>Year ranges are <u>inclusive</u>. This means that the date range extends from 1 January of the first year of the range to 31 December of the last year mentioned. Here are a few examples of year ranges:<br><br><b>1992-5</b> for all events from 1992 to 1995.<br><b>1972-89</b> for all events from 1972 to 1989.<br><b>1610-759</b> for all events from 1610 to 1759.<br><b>1880-1905</b> for all events from 1880 to 1905.<br><b>880-1105</b> for all events from 880 to 1105.<br><br>To see all the events in a given decade or century, you can use <b>?</b> in place of the final digits. For example, <b>197?</b> for all events from 1970 to 1979 or <b>16??</b> for all events from 1600 to 1699.<br><br>Selecting a range of years will change the calendar to the year view.</dd></dl>');
-	break;
+	case 'annivers_year_select':
+		$title = I18N::translate('Year input box');
+		$text  = I18N::translate('This input box lets you change that year of the calendar. Type a year into the box and press <b>Enter</b> to change the calendar to that year.<br><br><b>Advanced features</b> for <b>View the year</b><dl><dt><b>More than one year</b></dt><dd>You can search for dates in a range of years.<br><br>Year ranges are <u>inclusive</u>. This means that the date range extends from 1 January of the first year of the range to 31 December of the last year mentioned. Here are a few examples of year ranges:<br><br><b>1992-5</b> for all events from 1992 to 1995.<br><b>1972-89</b> for all events from 1972 to 1989.<br><b>1610-759</b> for all events from 1610 to 1759.<br><b>1880-1905</b> for all events from 1880 to 1905.<br><b>880-1105</b> for all events from 880 to 1105.<br><br>To see all the events in a given decade or century, you can use <b>?</b> in place of the final digits. For example, <b>197?</b> for all events from 1970 to 1979 or <b>16??</b> for all events from 1600 to 1699.<br><br>Selecting a range of years will change the calendar to the year view.</dd></dl>');
+		break;
 
-case 'edit_SOUR_EVEN':
-	$title = I18N::translate('Associate events with this source');
-	$text  = I18N::translate('Each source records specific events, generally for a given date range and for a place jurisdiction. For example a Census records census events and church records record birth, marriage, and death events.<br><br>Select the events that are recorded by this source from the list of events provided. The date should be specified in a range format such as <i>FROM 1900 TO 1910</i>. The place jurisdiction is the name of the lowest jurisdiction that encompasses all lower-level places named in this source. For example, “Oneida, Idaho, USA” would be used as a source jurisdiction place for events occurring in the various towns within Oneida County. “Idaho, USA” would be the source jurisdiction place if the events recorded took place not only in Oneida County but also in other counties in Idaho.');
-	break;
+	case 'edit_SOUR_EVEN':
+		$title = I18N::translate('Associate events with this source');
+		$text  = I18N::translate('Each source records specific events, generally for a given date range and for a place jurisdiction. For example a Census records census events and church records record birth, marriage, and death events.<br><br>Select the events that are recorded by this source from the list of events provided. The date should be specified in a range format such as <i>FROM 1900 TO 1910</i>. The place jurisdiction is the name of the lowest jurisdiction that encompasses all lower-level places named in this source. For example, “Oneida, Idaho, USA” would be used as a source jurisdiction place for events occurring in the various towns within Oneida County. “Idaho, USA” would be the source jurisdiction place if the events recorded took place not only in Oneida County but also in other counties in Idaho.');
+		break;
 
-case 'google_chart_surname':
-	$title = I18N::translate('Surname');
-	$text  = I18N::translate('The number of occurrences of the specified name will be shown on the map. If you leave this field empty, the most common surname will be used.');
-	break;
+	case 'google_chart_surname':
+		$title = I18N::translate('Surname');
+		$text  = I18N::translate('The number of occurrences of the specified name will be shown on the map. If you leave this field empty, the most common surname will be used.');
+		break;
 
-case 'pending_changes':
-	$title = I18N::translate('Pending changes');
-	$text  = '<p>' . I18N::translate('When you add, edit, or delete information, the changes are not saved immediately. Instead, they are kept in a “pending” area. These pending changes need to be reviewed by a moderator before they are accepted.') . '</p><p>' .
-		I18N::translate('This process allows the site’s owner to ensure that the new information follows the site’s standards and conventions, has proper source attributions, etc.') .
-		'</p><p>' .
-		I18N::translate('Pending changes are only shown when your account has permission to edit. When you sign out, you will no longer be able to see them. Also, pending changes are only shown on certain pages. For example, they are not shown in lists, reports, or search results.') .
-		'</p>';
-	if (Auth::isAdmin()) {
-		$text .=
-			'<p>' .
-			I18N::translate('Each user account has an option to “automatically accept changes”. When this is enabled, any changes made by that user are saved immediately. Many administrators enable this for their own user account.') .
+	case 'pending_changes':
+		$title = I18N::translate('Pending changes');
+		$text  = '<p>' . I18N::translate('When you add, edit, or delete information, the changes are not saved immediately. Instead, they are kept in a “pending” area. These pending changes need to be reviewed by a moderator before they are accepted.') . '</p><p>' .
+			I18N::translate('This process allows the site’s owner to ensure that the new information follows the site’s standards and conventions, has proper source attributions, etc.') .
+			'</p><p>' .
+			I18N::translate('Pending changes are only shown when your account has permission to edit. When you sign out, you will no longer be able to see them. Also, pending changes are only shown on certain pages. For example, they are not shown in lists, reports, or search results.') .
 			'</p>';
-	}
-	break;
+		if (Auth::isAdmin()) {
+			$text .=
+				'<p>' .
+				I18N::translate('Each user account has an option to “automatically accept changes”. When this is enabled, any changes made by that user are saved immediately. Many administrators enable this for their own user account.') .
+				'</p>';
+		}
+		break;
 
-default:
-	$title = I18N::translate('Help');
-	$text  = I18N::translate('The help text has not been written for this item.');
-	break;
+	default:
+		$title = I18N::translate('Help');
+		$text  = I18N::translate('The help text has not been written for this item.');
+		break;
 }
 

statisticsplot.php

Switch Indentation +400 added lines, -400 removed lines

@@ -792,425 +792,425 @@
 echo '<div class="statistics_chart" title="', I18N::translate('Statistics chart'), '">';
 
 switch ($x_axis) {
-case '1':
-	echo $stats->chartDistribution([Filter::get('chart_shows'), Filter::get('chart_type'), Filter::get('SURN')]);
-	break;
-case '2':
-	echo $stats->chartDistribution([Filter::get('chart_shows'), 'birth_distribution_chart']);
-	break;
-case '3':
-	echo $stats->chartDistribution([Filter::get('chart_shows'), 'death_distribution_chart']);
-	break;
-case '4':
-	echo $stats->chartDistribution([Filter::get('chart_shows'), 'marriage_distribution_chart']);
-	break;
-case '11':
-	$monthdata = [];
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
-	$xgiven            = true;
-	$zgiven            = false;
-	$title             = I18N::translate('Month of birth');
-	$xtitle            = I18N::translate('Month');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	$xdata             = $monthdata;
-	$xmax              = 12;
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
+	case '1':
+		echo $stats->chartDistribution([Filter::get('chart_shows'), Filter::get('chart_type'), Filter::get('SURN')]);
+		break;
+	case '2':
+		echo $stats->chartDistribution([Filter::get('chart_shows'), 'birth_distribution_chart']);
+		break;
+	case '3':
+		echo $stats->chartDistribution([Filter::get('chart_shows'), 'death_distribution_chart']);
+		break;
+	case '4':
+		echo $stats->chartDistribution([Filter::get('chart_shows'), 'marriage_distribution_chart']);
+		break;
+	case '11':
+		$monthdata = [];
+		for ($i = 0; $i < 12; ++$i) {
+			$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+		}
+		$xgiven            = true;
+		$zgiven            = false;
+		$title             = I18N::translate('Month of birth');
+		$xtitle            = I18N::translate('Month');
+		$ytitle            = I18N::translate('numbers');
+		$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+		$xdata             = $monthdata;
+		$xmax              = 12;
+		if ($z_axis !== 300 && $z_axis !== 301) {
+			calculate_legend($boundaries_z_axis);
+		}
 		$percentage = false;
-		$ytitle     = I18N::translate('Individuals');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
+		if ($y_axis === 201) {
+			$percentage = false;
+			$ytitle     = I18N::translate('Individuals');
+		} elseif ($y_axis === 202) {
+			$percentage = true;
+			$ytitle     = I18N::translate('percentage');
+		}
+		$male_female = false;
+		if ($z_axis === 300) {
+			$zgiven          = false;
+			$legend[0]       = 'all';
+			$zmax            = 1;
+			$z_boundaries[0] = 100000;
+		} elseif ($z_axis === 301) {
+			$male_female = true;
+			$zgiven      = true;
+			$legend[0]   = I18N::translate('Male');
+			$legend[1]   = I18N::translate('Female');
+			$zmax        = 2;
+		}
+		//-- reset the data array
+		for ($i = 0; $i < $zmax; $i++) {
+			for ($j = 0; $j < $xmax; $j++) {
+				$ydata[$i][$j] = 0;
+			}
+		}
+		$total = month_of_birth($z_axis, $z_boundaries, $stats);
+		my_plot($title, $xdata, $xtitle, $ydata, $ytitle, $legend);
+		break;
+	case '12':
+		$monthdata = [];
+		for ($i = 0; $i < 12; ++$i) {
+			$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+		}
+		$xgiven            = true;
+		$zgiven            = false;
+		$title             = I18N::translate('Month of death');
+		$xtitle            = I18N::translate('Month');
+		$ytitle            = I18N::translate('numbers');
+		$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+		$xdata             = $monthdata;
+		$xmax              = 12;
+		if ($z_axis !== 300 && $z_axis !== 301) {
+			calculate_legend($boundaries_z_axis);
 		}
-	}
-	$total = month_of_birth($z_axis, $z_boundaries, $stats);
-	my_plot($title, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '12':
-	$monthdata = [];
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
-	$xgiven            = true;
-	$zgiven            = false;
-	$title             = I18N::translate('Month of death');
-	$xtitle            = I18N::translate('Month');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	$xdata             = $monthdata;
-	$xmax              = 12;
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
 		$percentage = false;
-		$ytitle     = I18N::translate('Individuals');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
+		if ($y_axis === 201) {
+			$percentage = false;
+			$ytitle     = I18N::translate('Individuals');
+		} elseif ($y_axis === 202) {
+			$percentage = true;
+			$ytitle     = I18N::translate('percentage');
+		}
+		$male_female = false;
+		if ($z_axis === 300) {
+			$zgiven          = false;
+			$legend[0]       = 'all';
+			$zmax            = 1;
+			$z_boundaries[0] = 100000;
+		} elseif ($z_axis === 301) {
+			$male_female = true;
+			$zgiven      = true;
+			$legend[0]   = I18N::translate('Male');
+			$legend[1]   = I18N::translate('Female');
+			$zmax        = 2;
+		}
+		//-- reset the data array
+		for ($i = 0; $i < $zmax; $i++) {
+			for ($j = 0; $j < $xmax; $j++) {
+				$ydata[$i][$j] = 0;
+			}
+		}
+		$total = month_of_death($z_axis, $z_boundaries, $stats);
+		my_plot($title, $xdata, $xtitle, $ydata, $ytitle, $legend);
+		break;
+	case '13':
+		$monthdata = [];
+		for ($i = 0; $i < 12; ++$i) {
+			$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
 		}
-	}
-	$total = month_of_death($z_axis, $z_boundaries, $stats);
-	my_plot($title, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '13':
-	$monthdata = [];
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
 
-	if ($z_axis === 301) {
-		$z_axis = 300;
-	}
-	$xgiven            = true;
-	$zgiven            = false;
-	$title             = I18N::translate('Month of marriage');
-	$xtitle            = I18N::translate('Month');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	$xdata             = $monthdata;
-	$xmax              = 12;
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
+		if ($z_axis === 301) {
+			$z_axis = 300;
+		}
+		$xgiven            = true;
+		$zgiven            = false;
+		$title             = I18N::translate('Month of marriage');
+		$xtitle            = I18N::translate('Month');
+		$ytitle            = I18N::translate('numbers');
+		$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+		$xdata             = $monthdata;
+		$xmax              = 12;
+		if ($z_axis !== 300 && $z_axis !== 301) {
+			calculate_legend($boundaries_z_axis);
+		}
 		$percentage = false;
-		$ytitle     = I18N::translate('Families');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
+		if ($y_axis === 201) {
+			$percentage = false;
+			$ytitle     = I18N::translate('Families');
+		} elseif ($y_axis === 202) {
+			$percentage = true;
+			$ytitle     = I18N::translate('percentage');
+		}
+		$male_female = false;
+		if ($z_axis === 300) {
+			$zgiven          = false;
+			$legend[0]       = 'all';
+			$zmax            = 1;
+			$z_boundaries[0] = 100000;
+		} elseif ($z_axis === 301) {
+			$male_female = true;
+			$zgiven      = true;
+			$legend[0]   = I18N::translate('Male');
+			$legend[1]   = I18N::translate('Female');
+			$zmax        = 2;
+		}
+		//-- reset the data array
+		for ($i = 0; $i < $zmax; $i++) {
+			for ($j = 0; $j < $xmax; $j++) {
+				$ydata[$i][$j] = 0;
+			}
+		}
+		$total = month_of_marriage($z_axis, $z_boundaries, $stats);
+		my_plot($title, $xdata, $xtitle, $ydata, $ytitle, $legend);
+		break;
+	case '14':
+		$monthdata = [];
+		for ($i = 0; $i < 12; ++$i) {
+			$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+		}
+		$xgiven            = true;
+		$zgiven            = false;
+		$title             = I18N::translate('Month of birth of first child in a relation');
+		$xtitle            = I18N::translate('Month');
+		$ytitle            = I18N::translate('numbers');
+		$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+		$xdata             = $monthdata;
+		$xmax              = 12;
+		if ($z_axis !== 300 && $z_axis !== 301) {
+			calculate_legend($boundaries_z_axis);
 		}
-	}
-	$total = month_of_marriage($z_axis, $z_boundaries, $stats);
-	my_plot($title, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '14':
-	$monthdata = [];
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
-	$xgiven            = true;
-	$zgiven            = false;
-	$title             = I18N::translate('Month of birth of first child in a relation');
-	$xtitle            = I18N::translate('Month');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	$xdata             = $monthdata;
-	$xmax              = 12;
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
 		$percentage = false;
-		$ytitle     = I18N::translate('Children');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
+		if ($y_axis === 201) {
+			$percentage = false;
+			$ytitle     = I18N::translate('Children');
+		} elseif ($y_axis === 202) {
+			$percentage = true;
+			$ytitle     = I18N::translate('percentage');
+		}
+		$male_female = false;
+		if ($z_axis === 300) {
+			$zgiven          = false;
+			$legend[0]       = 'all';
+			$zmax            = 1;
+			$z_boundaries[0] = 100000;
+		} elseif ($z_axis === 301) {
+			$male_female = true;
+			$zgiven      = true;
+			$legend[0]   = I18N::translate('Male');
+			$legend[1]   = I18N::translate('Female');
+			$zmax        = 2;
+		}
+		//-- reset the data array
+		for ($i = 0; $i < $zmax; $i++) {
+			for ($j = 0; $j < $xmax; $j++) {
+				$ydata[$i][$j] = 0;
+			}
+		}
+		$total = month_of_birth_of_first_child($z_axis, $z_boundaries, $stats);
+		my_plot($title, $xdata, $xtitle, $ydata, $ytitle, $legend);
+		break;
+	case '15':
+		$monthdata = [];
+		for ($i = 0; $i < 12; ++$i) {
+			$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
 		}
-	}
-	$total = month_of_birth_of_first_child($z_axis, $z_boundaries, $stats);
-	my_plot($title, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '15':
-	$monthdata = [];
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
 
-	if ($z_axis === 301) {
-		$z_axis = 300;
-	}
-	$xgiven            = true;
-	$zgiven            = false;
-	$title             = I18N::translate('Month of first marriage');
-	$xtitle            = I18N::translate('Month');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	$xdata             = $monthdata;
-	$xmax              = 12;
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
-		$percentage = false;
-		$ytitle     = I18N::translate('Families');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
+		if ($z_axis === 301) {
+			$z_axis = 300;
+		}
+		$xgiven            = true;
+		$zgiven            = false;
+		$title             = I18N::translate('Month of first marriage');
+		$xtitle            = I18N::translate('Month');
+		$ytitle            = I18N::translate('numbers');
+		$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+		$xdata             = $monthdata;
+		$xmax              = 12;
+		if ($z_axis !== 300 && $z_axis !== 301) {
+			calculate_legend($boundaries_z_axis);
 		}
-	}
-	$total = month_of_first_marriage($z_axis, $z_boundaries, $stats);
-	my_plot($title, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '18':
-	$xgiven            = false;
-	$zgiven            = false;
-	$title             = /* I18N: Two axes of a graph */ I18N::translate('Longevity versus time');
-	$xtitle            = I18N::translate('age');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_x_axis = Filter::get('x-axis-boundaries-ages');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	calculate_axis($boundaries_x_axis);
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
 		$percentage = false;
-		$ytitle     = I18N::translate('Individuals');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
+		if ($y_axis === 201) {
+			$percentage = false;
+			$ytitle     = I18N::translate('Families');
+		} elseif ($y_axis === 202) {
+			$percentage = true;
+			$ytitle     = I18N::translate('percentage');
+		}
+		$male_female = false;
+		if ($z_axis === 300) {
+			$zgiven          = false;
+			$legend[0]       = 'all';
+			$zmax            = 1;
+			$z_boundaries[0] = 100000;
+		} elseif ($z_axis === 301) {
+			$male_female = true;
+			$zgiven      = true;
+			$legend[0]   = I18N::translate('Male');
+			$legend[1]   = I18N::translate('Female');
+			$zmax        = 2;
+		}
+		//-- reset the data array
+		for ($i = 0; $i < $zmax; $i++) {
+			for ($j = 0; $j < $xmax; $j++) {
+				$ydata[$i][$j] = 0;
+			}
+		}
+		$total = month_of_first_marriage($z_axis, $z_boundaries, $stats);
+		my_plot($title, $xdata, $xtitle, $ydata, $ytitle, $legend);
+		break;
+	case '18':
+		$xgiven            = false;
+		$zgiven            = false;
+		$title             = /* I18N: Two axes of a graph */ I18N::translate('Longevity versus time');
+		$xtitle            = I18N::translate('age');
+		$ytitle            = I18N::translate('numbers');
+		$boundaries_x_axis = Filter::get('x-axis-boundaries-ages');
+		$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+		calculate_axis($boundaries_x_axis);
+		if ($z_axis !== 300 && $z_axis !== 301) {
+			calculate_legend($boundaries_z_axis);
 		}
-	}
-	$total = longevity_versus_time($z_axis, $z_boundaries, $stats);
-	my_plot($title, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '19':
-	$xgiven            = false;
-	$zgiven            = false;
-	$title             = I18N::translate('Age in year of marriage');
-	$xtitle            = I18N::translate('age');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_x_axis = Filter::get('x-axis-boundaries-ages_m');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	calculate_axis($boundaries_x_axis);
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
 		$percentage = false;
-		$ytitle     = I18N::translate('Individuals');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female     = false;
-	$z_boundaries[0] = 100000;
-	if ($z_axis === 300) {
-		$zgiven    = false;
-		$legend[0] = 'all';
-		$zmax      = 1;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
+		if ($y_axis === 201) {
+			$percentage = false;
+			$ytitle     = I18N::translate('Individuals');
+		} elseif ($y_axis === 202) {
+			$percentage = true;
+			$ytitle     = I18N::translate('percentage');
+		}
+		$male_female = false;
+		if ($z_axis === 300) {
+			$zgiven          = false;
+			$legend[0]       = 'all';
+			$zmax            = 1;
+			$z_boundaries[0] = 100000;
+		} elseif ($z_axis === 301) {
+			$male_female = true;
+			$zgiven      = true;
+			$legend[0]   = I18N::translate('Male');
+			$legend[1]   = I18N::translate('Female');
+			$zmax        = 2;
+		}
+		//-- reset the data array
+		for ($i = 0; $i < $zmax; $i++) {
+			for ($j = 0; $j < $xmax; $j++) {
+				$ydata[$i][$j] = 0;
+			}
+		}
+		$total = longevity_versus_time($z_axis, $z_boundaries, $stats);
+		my_plot($title, $xdata, $xtitle, $ydata, $ytitle, $legend);
+		break;
+	case '19':
+		$xgiven            = false;
+		$zgiven            = false;
+		$title             = I18N::translate('Age in year of marriage');
+		$xtitle            = I18N::translate('age');
+		$ytitle            = I18N::translate('numbers');
+		$boundaries_x_axis = Filter::get('x-axis-boundaries-ages_m');
+		$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+		calculate_axis($boundaries_x_axis);
+		if ($z_axis !== 300 && $z_axis !== 301) {
+			calculate_legend($boundaries_z_axis);
 		}
-	}
-	$total = age_at_marriage($z_axis, $z_boundaries, $stats);
-	my_plot($title, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '20':
-	$xgiven            = false;
-	$zgiven            = false;
-	$title             = I18N::translate('Age in year of first marriage');
-	$xtitle            = I18N::translate('age');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_x_axis = Filter::get('x-axis-boundaries-ages_m');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	calculate_axis($boundaries_x_axis);
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
 		$percentage = false;
-		$ytitle     = I18N::translate('Individuals');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
+		if ($y_axis === 201) {
+			$percentage = false;
+			$ytitle     = I18N::translate('Individuals');
+		} elseif ($y_axis === 202) {
+			$percentage = true;
+			$ytitle     = I18N::translate('percentage');
+		}
+		$male_female     = false;
 		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
+		if ($z_axis === 300) {
+			$zgiven    = false;
+			$legend[0] = 'all';
+			$zmax      = 1;
+		} elseif ($z_axis === 301) {
+			$male_female = true;
+			$zgiven      = true;
+			$legend[0]   = I18N::translate('Male');
+			$legend[1]   = I18N::translate('Female');
+			$zmax        = 2;
+		}
+		//-- reset the data array
+		for ($i = 0; $i < $zmax; $i++) {
+			for ($j = 0; $j < $xmax; $j++) {
+				$ydata[$i][$j] = 0;
+			}
+		}
+		$total = age_at_marriage($z_axis, $z_boundaries, $stats);
+		my_plot($title, $xdata, $xtitle, $ydata, $ytitle, $legend);
+		break;
+	case '20':
+		$xgiven            = false;
+		$zgiven            = false;
+		$title             = I18N::translate('Age in year of first marriage');
+		$xtitle            = I18N::translate('age');
+		$ytitle            = I18N::translate('numbers');
+		$boundaries_x_axis = Filter::get('x-axis-boundaries-ages_m');
+		$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+		calculate_axis($boundaries_x_axis);
+		if ($z_axis !== 300 && $z_axis !== 301) {
+			calculate_legend($boundaries_z_axis);
 		}
-	}
-	$total = age_at_first_marriage($z_axis, $z_boundaries, $stats);
-	my_plot($title, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '21':
-	$xgiven            = false;
-	$zgiven            = false;
-	$title             = I18N::translate('Number of children');
-	$xtitle            = I18N::translate('children');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_x_axis = Filter::get('x-axis-boundaries-numbers');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	calculate_axis($boundaries_x_axis);
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
 		$percentage = false;
-		$ytitle     = I18N::translate('Families');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
+		if ($y_axis === 201) {
+			$percentage = false;
+			$ytitle     = I18N::translate('Individuals');
+		} elseif ($y_axis === 202) {
+			$percentage = true;
+			$ytitle     = I18N::translate('percentage');
 		}
-	}
-	$total = number_of_children($z_axis, $z_boundaries, $stats);
-	my_plot($title, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-default:
-	break;
+		$male_female = false;
+		if ($z_axis === 300) {
+			$zgiven          = false;
+			$legend[0]       = 'all';
+			$zmax            = 1;
+			$z_boundaries[0] = 100000;
+		} elseif ($z_axis === 301) {
+			$male_female = true;
+			$zgiven      = true;
+			$legend[0]   = I18N::translate('Male');
+			$legend[1]   = I18N::translate('Female');
+			$zmax        = 2;
+		}
+		//-- reset the data array
+		for ($i = 0; $i < $zmax; $i++) {
+			for ($j = 0; $j < $xmax; $j++) {
+				$ydata[$i][$j] = 0;
+			}
+		}
+		$total = age_at_first_marriage($z_axis, $z_boundaries, $stats);
+		my_plot($title, $xdata, $xtitle, $ydata, $ytitle, $legend);
+		break;
+	case '21':
+		$xgiven            = false;
+		$zgiven            = false;
+		$title             = I18N::translate('Number of children');
+		$xtitle            = I18N::translate('children');
+		$ytitle            = I18N::translate('numbers');
+		$boundaries_x_axis = Filter::get('x-axis-boundaries-numbers');
+		$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+		calculate_axis($boundaries_x_axis);
+		if ($z_axis !== 300 && $z_axis !== 301) {
+			calculate_legend($boundaries_z_axis);
+		}
+		$percentage = false;
+		if ($y_axis === 201) {
+			$percentage = false;
+			$ytitle     = I18N::translate('Families');
+		} elseif ($y_axis === 202) {
+			$percentage = true;
+			$ytitle     = I18N::translate('percentage');
+		}
+		$male_female = false;
+		if ($z_axis === 300) {
+			$zgiven          = false;
+			$legend[0]       = 'all';
+			$zmax            = 1;
+			$z_boundaries[0] = 100000;
+		} elseif ($z_axis === 301) {
+			$male_female = true;
+			$zgiven      = true;
+			$legend[0]   = I18N::translate('Male');
+			$legend[1]   = I18N::translate('Female');
+			$zmax        = 2;
+		}
+		//-- reset the data array
+		for ($i = 0; $i < $zmax; $i++) {
+			for ($j = 0; $j < $xmax; $j++) {
+				$ydata[$i][$j] = 0;
+			}
+		}
+		$total = number_of_children($z_axis, $z_boundaries, $stats);
+		my_plot($title, $xdata, $xtitle, $ydata, $ytitle, $legend);
+		break;
+	default:
+		break;
 }
 echo '</div>';