fisharebest / webtrees

app/Date/RomanDate.php

Indentation +13 added lines, -13 removed lines

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

app/Filter.php

Indentation +13 added lines, -13 removed lines

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

app/Functions/FunctionsCharts.php

Indentation +13 added lines, -13 removed lines

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

app/Functions/FunctionsEdit.php

Indentation +13 added lines, -13 removed lines

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

Unused Use Statements -1 removed lines

@@ -25,7 +25,6 @@
 use Fisharebest\Webtrees\Census\CensusOfUnitedStates;
 use Fisharebest\Webtrees\Census\CensusOfWales;
 use Fisharebest\Webtrees\Config;
-use Fisharebest\Webtrees\Database;
 use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Fact;
 use Fisharebest\Webtrees\Family;

app/Functions/FunctionsImport.php

Indentation +13 added lines, -13 removed lines

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

app/Functions/FunctionsPrintFacts.php

Indentation +13 added lines, -13 removed lines

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

Switch Indentation +295 added lines, -295 removed lines

@@ -60,34 +60,34 @@ 
 
 		// Some facts don't get printed here ...
 		switch ($fact->getTag()) {
-			case 'NOTE':
-				self::printMainNotes($fact, 1);
+		case 'NOTE':
+			self::printMainNotes($fact, 1);
 
-				return;
-			case 'SOUR':
-				self::printMainSources($fact, 1);
+			return;
+		case 'SOUR':
+			self::printMainSources($fact, 1);
 
-				return;
-			case 'OBJE':
-				self::printMainMedia($fact, 1);
+			return;
+		case 'OBJE':
+			self::printMainMedia($fact, 1);
 
+			return;
+		case 'FAMC':
+		case 'FAMS':
+		case 'CHIL':
+		case 'HUSB':
+		case 'WIFE':
+			// These are internal links, not facts
+			return;
+		case '_WT_OBJE_SORT':
+			// These links are used internally to record the sort order.
+			return;
+		default:
+			// Hide unrecognized/custom tags?
+			if ($fact->getParent()->getTree()->getPreference('HIDE_GEDCOM_ERRORS') && !GedcomTag::isTag($fact->getTag())) {
 				return;
-			case 'FAMC':
-			case 'FAMS':
-			case 'CHIL':
-			case 'HUSB':
-			case 'WIFE':
-				// These are internal links, not facts
-				return;
-			case '_WT_OBJE_SORT':
-				// These links are used internally to record the sort order.
-				return;
-			default:
-				// Hide unrecognized/custom tags?
-				if ($fact->getParent()->getTree()->getPreference('HIDE_GEDCOM_ERRORS') && !GedcomTag::isTag($fact->getTag())) {
-					return;
-				}
-				break;
+			}
+			break;
 		}
 
 		// Who is this fact about? Need it to translate fact label correctly
@@ -131,35 +131,35 @@ 
 		}
 
 		switch ($fact->getTag()) {
-			case 'EVEN':
-			case 'FACT':
-				if (GedcomTag::isTag($type)) {
-					// Some users (just Meliza?) use "1 EVEN/2 TYPE BIRT". Translate the TYPE.
-					$label = GedcomTag::getLabel($type, $label_person);
-					$type  = ''; // Do not print this again
-				} elseif ($type) {
-					// We don't have a translation for $type - but a custom translation might exist.
-					$label = I18N::translate(Filter::escapeHtml($type));
-					$type  = ''; // Do not print this again
-				} else {
-					// An unspecified fact/event
-					$label = $fact->getLabel();
-				}
-				break;
-			case 'MARR':
-				// This is a hack for a proprietory extension. Is it still used/needed?
-				$utype = strtoupper($type);
-				if ($utype == 'CIVIL' || $utype == 'PARTNERS' || $utype == 'RELIGIOUS') {
-					$label = GedcomTag::getLabel('MARR_' . $utype, $label_person);
-					$type  = ''; // Do not print this again
-				} else {
-					$label = $fact->getLabel();
-				}
-				break;
-			default:
-				// Normal fact/event
+		case 'EVEN':
+		case 'FACT':
+			if (GedcomTag::isTag($type)) {
+				// Some users (just Meliza?) use "1 EVEN/2 TYPE BIRT". Translate the TYPE.
+				$label = GedcomTag::getLabel($type, $label_person);
+				$type  = ''; // Do not print this again
+			} elseif ($type) {
+				// We don't have a translation for $type - but a custom translation might exist.
+				$label = I18N::translate(Filter::escapeHtml($type));
+				$type  = ''; // Do not print this again
+			} else {
+				// An unspecified fact/event
 				$label = $fact->getLabel();
-				break;
+			}
+			break;
+		case 'MARR':
+			// This is a hack for a proprietory extension. Is it still used/needed?
+			$utype = strtoupper($type);
+			if ($utype == 'CIVIL' || $utype == 'PARTNERS' || $utype == 'RELIGIOUS') {
+				$label = GedcomTag::getLabel('MARR_' . $utype, $label_person);
+				$type  = ''; // Do not print this again
+			} else {
+				$label = $fact->getLabel();
+			}
+			break;
+		default:
+			// Normal fact/event
+			$label = $fact->getLabel();
+			break;
 		}
 
 		echo '<tr class="', $styleadd, '">';
@@ -208,15 +208,15 @@ 
 		}
 
 		switch ($fact->getTag()) {
-			case '_BIRT_CHIL':
-				echo '<br>', /* I18N: Abbreviation for "number %s" */
-				I18N::translate('#%s', ++$n_chil);
-				break;
-			case '_BIRT_GCHI':
-			case '_BIRT_GCH1':
-			case '_BIRT_GCH2':
-				echo '<br>', I18N::translate('#%s', ++$n_gchi);
-				break;
+		case '_BIRT_CHIL':
+			echo '<br>', /* I18N: Abbreviation for "number %s" */
+			I18N::translate('#%s', ++$n_chil);
+			break;
+		case '_BIRT_GCHI':
+		case '_BIRT_GCH1':
+		case '_BIRT_GCH2':
+			echo '<br>', I18N::translate('#%s', ++$n_gchi);
+			break;
 		}
 
 		echo '</td><td class="optionbox ', $styleadd, ' wrap">';
@@ -237,92 +237,92 @@ 
 
 		// Print the value of this fact/event
 		switch ($fact->getTag()) {
-			case 'ADDR':
-				echo $fact->getValue();
-				break;
-			case 'AFN':
-				echo '<div class="field"><a href="https://familysearch.org/search/tree/results#count=20&query=afn:', Filter::escapeUrl($fact->getValue()), '">', Filter::escapeHtml($fact->getValue()), '</a></div>';
-				break;
-			case 'ASSO':
-				// we handle this later, in format_asso_rela_record()
-				break;
-			case 'EMAIL':
-			case 'EMAI':
-			case '_EMAIL':
-				echo '<div class="field"><a href="mailto:', Filter::escapeHtml($fact->getValue()), '">', Filter::escapeHtml($fact->getValue()), '</a></div>';
-				break;
-			case 'FILE':
-				if (Auth::isEditor($fact->getParent()->getTree())) {
-					echo '<div class="field">', Filter::escapeHtml($fact->getValue()), '</div>';
-				}
-				break;
-			case 'RESN':
-				echo '<div class="field">';
-				switch ($fact->getValue()) {
-					case 'none':
-						// Note: "1 RESN none" is not valid gedcom.
-						// However, webtrees privacy rules will interpret it as "show an otherwise private record to public".
-						echo '<i class="icon-resn-none"></i> ', I18N::translate('Show to visitors');
-						break;
-					case 'privacy':
-						echo '<i class="icon-class-none"></i> ', I18N::translate('Show to members');
-						break;
-					case 'confidential':
-						echo '<i class="icon-confidential-none"></i> ', I18N::translate('Show to managers');
-						break;
-					case 'locked':
-						echo '<i class="icon-locked-none"></i> ', I18N::translate('Only managers can edit');
-						break;
-					default:
-						echo Filter::escapeHtml($fact->getValue());
-						break;
-				}
+		case 'ADDR':
+			echo $fact->getValue();
+			break;
+		case 'AFN':
+			echo '<div class="field"><a href="https://familysearch.org/search/tree/results#count=20&query=afn:', Filter::escapeUrl($fact->getValue()), '">', Filter::escapeHtml($fact->getValue()), '</a></div>';
+			break;
+		case 'ASSO':
+			// we handle this later, in format_asso_rela_record()
+			break;
+		case 'EMAIL':
+		case 'EMAI':
+		case '_EMAIL':
+			echo '<div class="field"><a href="mailto:', Filter::escapeHtml($fact->getValue()), '">', Filter::escapeHtml($fact->getValue()), '</a></div>';
+			break;
+		case 'FILE':
+			if (Auth::isEditor($fact->getParent()->getTree())) {
+				echo '<div class="field">', Filter::escapeHtml($fact->getValue()), '</div>';
+			}
+			break;
+		case 'RESN':
+			echo '<div class="field">';
+			switch ($fact->getValue()) {
+			case 'none':
+			// Note: "1 RESN none" is not valid gedcom.
+			// However, webtrees privacy rules will interpret it as "show an otherwise private record to public".
+			echo '<i class="icon-resn-none"></i> ', I18N::translate('Show to visitors');
+			break;
+			case 'privacy':
+			echo '<i class="icon-class-none"></i> ', I18N::translate('Show to members');
+			break;
+			case 'confidential':
+			echo '<i class="icon-confidential-none"></i> ', I18N::translate('Show to managers');
+			break;
+			case 'locked':
+			echo '<i class="icon-locked-none"></i> ', I18N::translate('Only managers can edit');
+			break;
+			default:
+			echo Filter::escapeHtml($fact->getValue());
+			break;
+			}
 				echo '</div>';
 				break;
-			case 'PUBL': // Publication details might contain URLs.
-				echo '<div class="field">', Filter::expandUrls($fact->getValue()), '</div>';
-				break;
-			case 'REPO':
-				if (preg_match('/^@(' . WT_REGEX_XREF . ')@$/', $fact->getValue(), $match)) {
-					self::printRepositoryRecord($match[1]);
-				} else {
-					echo '<div class="error">', Filter::escapeHtml($fact->getValue()), '</div>';
-				}
-				break;
-			case 'URL':
-			case '_URL':
-			case 'WWW':
-				echo '<div class="field"><a href="', Filter::escapeHtml($fact->getValue()), '">', Filter::escapeHtml($fact->getValue()), '</a></div>';
-				break;
-			case 'TEXT': // 0 SOUR / 1 TEXT
-				echo '<div class="field">', nl2br(Filter::escapeHtml($fact->getValue()), false), '</div>';
-				break;
+		case 'PUBL': // Publication details might contain URLs.
+			echo '<div class="field">', Filter::expandUrls($fact->getValue()), '</div>';
+			break;
+		case 'REPO':
+			if (preg_match('/^@(' . WT_REGEX_XREF . ')@$/', $fact->getValue(), $match)) {
+				self::printRepositoryRecord($match[1]);
+			} else {
+				echo '<div class="error">', Filter::escapeHtml($fact->getValue()), '</div>';
+			}
+			break;
+		case 'URL':
+		case '_URL':
+		case 'WWW':
+			echo '<div class="field"><a href="', Filter::escapeHtml($fact->getValue()), '">', Filter::escapeHtml($fact->getValue()), '</a></div>';
+			break;
+		case 'TEXT': // 0 SOUR / 1 TEXT
+			echo '<div class="field">', nl2br(Filter::escapeHtml($fact->getValue()), false), '</div>';
+			break;
+		default:
+			// Display the value for all other facts/events
+			switch ($fact->getValue()) {
+			case '':
+			// Nothing to display
+			break;
+			case 'N':
+			// Not valid GEDCOM
+			echo '<div class="field">', I18N::translate('No'), '</div>';
+			break;
+			case 'Y':
+			// Do not display "Yes".
+			break;
 			default:
-				// Display the value for all other facts/events
-				switch ($fact->getValue()) {
-					case '':
-						// Nothing to display
-						break;
-					case 'N':
-						// Not valid GEDCOM
-						echo '<div class="field">', I18N::translate('No'), '</div>';
-						break;
-					case 'Y':
-						// Do not display "Yes".
-						break;
-					default:
-						if (preg_match('/^@(' . WT_REGEX_XREF . ')@$/', $fact->getValue(), $match)) {
-							$target = GedcomRecord::getInstance($match[1], $fact->getParent()->getTree());
-							if ($target) {
-								echo '<div><a href="', $target->getHtmlUrl(), '">', $target->getFullName(), '</a></div>';
-							} else {
-								echo '<div class="error">', Filter::escapeHtml($fact->getValue()), '</div>';
-							}
-						} else {
-							echo '<div class="field"><span dir="auto">', Filter::escapeHtml($fact->getValue()), '</span></div>';
-						}
-						break;
-				}
+			if (preg_match('/^@(' . WT_REGEX_XREF . ')@$/', $fact->getValue(), $match)) {
+			$target = GedcomRecord::getInstance($match[1], $fact->getParent()->getTree());
+			if ($target) {
+				echo '<div><a href="', $target->getHtmlUrl(), '">', $target->getFullName(), '</a></div>';
+			} else {
+				echo '<div class="error">', Filter::escapeHtml($fact->getValue()), '</div>';
+			}
+			} else {
+			echo '<div class="field"><span dir="auto">', Filter::escapeHtml($fact->getValue()), '</span></div>';
+			}
+			break;
+			}
 				break;
 		}
 
@@ -362,123 +362,123 @@ 
 		preg_match_all('/\n2 (' . WT_REGEX_TAG . ') (.+)/', $fact->getGedcom(), $matches, PREG_SET_ORDER);
 		foreach ($matches as $match) {
 			switch ($match[1]) {
-				case 'DATE':
-				case 'TIME':
-				case 'AGE':
-				case 'PLAC':
-				case 'ADDR':
-				case 'ALIA':
-				case 'ASSO':
-				case '_ASSO':
-				case 'DESC':
-				case 'RELA':
-				case 'STAT':
-				case 'TEMP':
-				case 'TYPE':
-				case 'FAMS':
-				case 'CONT':
-					// These were already shown at the beginning
-					break;
-				case 'NOTE':
-				case 'OBJE':
-				case 'SOUR':
-					// These will be shown at the end
-					break;
-				case '_UID':
-				case 'RIN':
-					// These don't belong at level 2, so do not display them.
-					// They are only shown when editing.
-					break;
-				case 'EVEN': // 0 SOUR / 1 DATA / 2 EVEN / 3 DATE / 3 PLAC
-					$events = array();
-					foreach (preg_split('/ *, */', $match[2]) as $event) {
-						$events[] = GedcomTag::getLabel($event);
-					}
-					if (count($events) == 1) {
-						echo GedcomTag::getLabelValue('EVEN', $event);
-					} else {
-						echo GedcomTag::getLabelValue('EVEN', implode(I18N::$list_separator, $events));
-					}
-					if (preg_match('/\n3 DATE (.+)/', $fact->getGedcom(), $date_match)) {
-						$date = new Date($date_match[1]);
-						echo GedcomTag::getLabelValue('DATE', $date->display());
-					}
-					if (preg_match('/\n3 PLAC (.+)/', $fact->getGedcom(), $plac_match)) {
-						echo GedcomTag::getLabelValue('PLAC', $plac_match[1]);
-					}
-					break;
-				case 'FAMC': // 0 INDI / 1 ADOP / 2 FAMC / 3 ADOP
-					$family = Family::getInstance(str_replace('@', '', $match[2]), $fact->getParent()->getTree());
-					if ($family) {
-						echo GedcomTag::getLabelValue('FAM', '<a href="' . $family->getHtmlUrl() . '">' . $family->getFullName() . '</a>');
-						if (preg_match('/\n3 ADOP (HUSB|WIFE|BOTH)/', $fact->getGedcom(), $match)) {
-							echo GedcomTag::getLabelValue('ADOP', GedcomCodeAdop::getValue($match[1], $label_person));
-						}
-					} else {
-						echo GedcomTag::getLabelValue('FAM', '<span class="error">' . $match[2] . '</span>');
-					}
-					break;
-				case '_WT_USER':
-					$user = User::findByIdentifier($match[2]); // may not exist
-					if ($user) {
-						echo GedcomTag::getLabelValue('_WT_USER', $user->getRealNameHtml());
-					} else {
-						echo GedcomTag::getLabelValue('_WT_USER', Filter::escapeHtml($match[2]));
-					}
-					break;
-				case 'RESN':
-					switch ($match[2]) {
-						case 'none':
-							// Note: "2 RESN none" is not valid gedcom.
-							// However, webtrees privacy rules will interpret it as "show an otherwise private fact to public".
-							echo GedcomTag::getLabelValue('RESN', '<i class="icon-resn-none"></i> ' . I18N::translate('Show to visitors'));
-							break;
-						case 'privacy':
-							echo GedcomTag::getLabelValue('RESN', '<i class="icon-resn-privacy"></i> ' . I18N::translate('Show to members'));
-							break;
-						case 'confidential':
-							echo GedcomTag::getLabelValue('RESN', '<i class="icon-resn-confidential"></i> ' . I18N::translate('Show to managers'));
-							break;
-						case 'locked':
-							echo GedcomTag::getLabelValue('RESN', '<i class="icon-resn-locked"></i> ' . I18N::translate('Only managers can edit'));
-							break;
-						default:
-							echo GedcomTag::getLabelValue('RESN', Filter::escapeHtml($match[2]));
-							break;
-					}
-					break;
-				case 'CALN':
-					echo GedcomTag::getLabelValue('CALN', Filter::expandUrls($match[2]));
-					break;
-				case 'FORM': // 0 OBJE / 1 FILE / 2 FORM / 3 TYPE
-					echo GedcomTag::getLabelValue('FORM', $match[2]);
-					if (preg_match('/\n3 TYPE (.+)/', $fact->getGedcom(), $type_match)) {
-						echo GedcomTag::getLabelValue('TYPE', GedcomTag::getFileFormTypeValue($type_match[1]));
+			case 'DATE':
+			case 'TIME':
+			case 'AGE':
+			case 'PLAC':
+			case 'ADDR':
+			case 'ALIA':
+			case 'ASSO':
+			case '_ASSO':
+			case 'DESC':
+			case 'RELA':
+			case 'STAT':
+			case 'TEMP':
+			case 'TYPE':
+			case 'FAMS':
+			case 'CONT':
+				// These were already shown at the beginning
+				break;
+			case 'NOTE':
+			case 'OBJE':
+			case 'SOUR':
+				// These will be shown at the end
+				break;
+			case '_UID':
+			case 'RIN':
+				// These don't belong at level 2, so do not display them.
+				// They are only shown when editing.
+				break;
+			case 'EVEN': // 0 SOUR / 1 DATA / 2 EVEN / 3 DATE / 3 PLAC
+				$events = array();
+				foreach (preg_split('/ *, */', $match[2]) as $event) {
+					$events[] = GedcomTag::getLabel($event);
+				}
+				if (count($events) == 1) {
+					echo GedcomTag::getLabelValue('EVEN', $event);
+				} else {
+					echo GedcomTag::getLabelValue('EVEN', implode(I18N::$list_separator, $events));
+				}
+				if (preg_match('/\n3 DATE (.+)/', $fact->getGedcom(), $date_match)) {
+					$date = new Date($date_match[1]);
+					echo GedcomTag::getLabelValue('DATE', $date->display());
+				}
+				if (preg_match('/\n3 PLAC (.+)/', $fact->getGedcom(), $plac_match)) {
+					echo GedcomTag::getLabelValue('PLAC', $plac_match[1]);
+				}
+				break;
+			case 'FAMC': // 0 INDI / 1 ADOP / 2 FAMC / 3 ADOP
+				$family = Family::getInstance(str_replace('@', '', $match[2]), $fact->getParent()->getTree());
+				if ($family) {
+					echo GedcomTag::getLabelValue('FAM', '<a href="' . $family->getHtmlUrl() . '">' . $family->getFullName() . '</a>');
+					if (preg_match('/\n3 ADOP (HUSB|WIFE|BOTH)/', $fact->getGedcom(), $match)) {
+						echo GedcomTag::getLabelValue('ADOP', GedcomCodeAdop::getValue($match[1], $label_person));
 					}
-					break;
-				case 'URL':
-				case '_URL':
-				case 'WWW':
-					$link = '<a href="' . Filter::escapeHtml($match[2]) . '">' . Filter::escapeHtml($match[2]) . '</a>';
-					echo GedcomTag::getLabelValue($fact->getTag() . ':' . $match[1], $link);
-					break;
+				} else {
+					echo GedcomTag::getLabelValue('FAM', '<span class="error">' . $match[2] . '</span>');
+				}
+				break;
+			case '_WT_USER':
+				$user = User::findByIdentifier($match[2]); // may not exist
+				if ($user) {
+					echo GedcomTag::getLabelValue('_WT_USER', $user->getRealNameHtml());
+				} else {
+					echo GedcomTag::getLabelValue('_WT_USER', Filter::escapeHtml($match[2]));
+				}
+				break;
+			case 'RESN':
+				switch ($match[2]) {
+				case 'none':
+				// Note: "2 RESN none" is not valid gedcom.
+				// However, webtrees privacy rules will interpret it as "show an otherwise private fact to public".
+				echo GedcomTag::getLabelValue('RESN', '<i class="icon-resn-none"></i> ' . I18N::translate('Show to visitors'));
+				break;
+				case 'privacy':
+				echo GedcomTag::getLabelValue('RESN', '<i class="icon-resn-privacy"></i> ' . I18N::translate('Show to members'));
+				break;
+				case 'confidential':
+				echo GedcomTag::getLabelValue('RESN', '<i class="icon-resn-confidential"></i> ' . I18N::translate('Show to managers'));
+				break;
+				case 'locked':
+				echo GedcomTag::getLabelValue('RESN', '<i class="icon-resn-locked"></i> ' . I18N::translate('Only managers can edit'));
+				break;
 				default:
-					if (!$fact->getParent()->getTree()->getPreference('HIDE_GEDCOM_ERRORS') || GedcomTag::isTag($match[1])) {
-						if (preg_match('/^@(' . WT_REGEX_XREF . ')@$/', $match[2], $xmatch)) {
-							// Links
-							$linked_record = GedcomRecord::getInstance($xmatch[1], $fact->getParent()->getTree());
-							if ($linked_record) {
-								$link = '<a href="' . $linked_record->getHtmlUrl() . '">' . $linked_record->getFullName() . '</a>';
-								echo GedcomTag::getLabelValue($fact->getTag() . ':' . $match[1], $link);
-							} else {
-								echo GedcomTag::getLabelValue($fact->getTag() . ':' . $match[1], Filter::escapeHtml($match[2]));
-							}
+				echo GedcomTag::getLabelValue('RESN', Filter::escapeHtml($match[2]));
+				break;
+				}
+					break;
+			case 'CALN':
+				echo GedcomTag::getLabelValue('CALN', Filter::expandUrls($match[2]));
+				break;
+			case 'FORM': // 0 OBJE / 1 FILE / 2 FORM / 3 TYPE
+				echo GedcomTag::getLabelValue('FORM', $match[2]);
+				if (preg_match('/\n3 TYPE (.+)/', $fact->getGedcom(), $type_match)) {
+					echo GedcomTag::getLabelValue('TYPE', GedcomTag::getFileFormTypeValue($type_match[1]));
+				}
+				break;
+			case 'URL':
+			case '_URL':
+			case 'WWW':
+				$link = '<a href="' . Filter::escapeHtml($match[2]) . '">' . Filter::escapeHtml($match[2]) . '</a>';
+				echo GedcomTag::getLabelValue($fact->getTag() . ':' . $match[1], $link);
+				break;
+			default:
+				if (!$fact->getParent()->getTree()->getPreference('HIDE_GEDCOM_ERRORS') || GedcomTag::isTag($match[1])) {
+					if (preg_match('/^@(' . WT_REGEX_XREF . ')@$/', $match[2], $xmatch)) {
+						// Links
+						$linked_record = GedcomRecord::getInstance($xmatch[1], $fact->getParent()->getTree());
+						if ($linked_record) {
+							$link = '<a href="' . $linked_record->getHtmlUrl() . '">' . $linked_record->getFullName() . '</a>';
+							echo GedcomTag::getLabelValue($fact->getTag() . ':' . $match[1], $link);
 						} else {
-							// Non links
 							echo GedcomTag::getLabelValue($fact->getTag() . ':' . $match[1], Filter::escapeHtml($match[2]));
 						}
+					} else {
+						// Non links
+						echo GedcomTag::getLabelValue($fact->getTag() . ':' . $match[1], Filter::escapeHtml($match[2]));
 					}
-					break;
+				}
+				break;
 			}
 		}
 		echo self::printFactSources($fact->getGedcom(), 2);
@@ -820,23 +820,23 @@ 
 						foreach ($rmatches[1] as $rmatch) {
 							echo '<br><span class="label">', GedcomTag::getLabel('RESN'), ':</span> <span class="field">';
 							switch ($rmatch) {
-								case 'none':
-									// Note: "2 RESN none" is not valid gedcom, and the GUI will not let you add it.
-									// However, webtrees privacy rules will interpret it as "show an otherwise private fact to public".
-									echo '<i class="icon-resn-none"></i> ', I18N::translate('Show to visitors');
-									break;
-								case 'privacy':
-									echo '<i class="icon-resn-privacy"></i> ', I18N::translate('Show to members');
-									break;
-								case 'confidential':
-									echo '<i class="icon-resn-confidential"></i> ', I18N::translate('Show to managers');
-									break;
-								case 'locked':
-									echo '<i class="icon-resn-locked"></i> ', I18N::translate('Only managers can edit');
-									break;
-								default:
-									echo $rmatch;
-									break;
+							case 'none':
+								// Note: "2 RESN none" is not valid gedcom, and the GUI will not let you add it.
+								// However, webtrees privacy rules will interpret it as "show an otherwise private fact to public".
+								echo '<i class="icon-resn-none"></i> ', I18N::translate('Show to visitors');
+								break;
+							case 'privacy':
+								echo '<i class="icon-resn-privacy"></i> ', I18N::translate('Show to members');
+								break;
+							case 'confidential':
+								echo '<i class="icon-resn-confidential"></i> ', I18N::translate('Show to managers');
+								break;
+							case 'locked':
+								echo '<i class="icon-resn-locked"></i> ', I18N::translate('Only managers can edit');
+								break;
+							default:
+								echo $rmatch;
+								break;
 							}
 							echo '</span>';
 						}
@@ -1086,23 +1086,23 @@ 
 				foreach ($matches[1] as $match) {
 					echo '<br><span class="label">', GedcomTag::getLabel('RESN'), ':</span> <span class="field">';
 					switch ($match) {
-						case 'none':
-							// Note: "2 RESN none" is not valid gedcom, and the GUI will not let you add it.
-							// However, webtrees privacy rules will interpret it as "show an otherwise private fact to public".
-							echo '<i class="icon-resn-none"></i> ', I18N::translate('Show to visitors');
-							break;
-						case 'privacy':
-							echo '<i class="icon-resn-privacy"></i> ', I18N::translate('Show to members');
-							break;
-						case 'confidential':
-							echo '<i class="icon-resn-confidential"></i> ', I18N::translate('Show to managers');
-							break;
-						case 'locked':
-							echo '<i class="icon-resn-locked"></i> ', I18N::translate('Only managers can edit');
-							break;
-						default:
-							echo $match;
-							break;
+					case 'none':
+						// Note: "2 RESN none" is not valid gedcom, and the GUI will not let you add it.
+						// However, webtrees privacy rules will interpret it as "show an otherwise private fact to public".
+						echo '<i class="icon-resn-none"></i> ', I18N::translate('Show to visitors');
+						break;
+					case 'privacy':
+						echo '<i class="icon-resn-privacy"></i> ', I18N::translate('Show to members');
+						break;
+					case 'confidential':
+						echo '<i class="icon-resn-confidential"></i> ', I18N::translate('Show to managers');
+						break;
+					case 'locked':
+						echo '<i class="icon-resn-locked"></i> ', I18N::translate('Only managers can edit');
+						break;
+					default:
+						echo $match;
+						break;
 					}
 					echo '</span>';
 				}
@@ -1203,12 +1203,12 @@ 
 					}
 
 					switch ($media->isPrimary()) {
-						case 'Y':
-							echo GedcomTag::getLabelValue('_PRIM', I18N::translate('yes'));
-							break;
-						case 'N':
-							echo GedcomTag::getLabelValue('_PRIM', I18N::translate('no'));
-							break;
+					case 'Y':
+						echo GedcomTag::getLabelValue('_PRIM', I18N::translate('yes'));
+						break;
+					case 'N':
+						echo GedcomTag::getLabelValue('_PRIM', I18N::translate('no'));
+						break;
 					}
 					echo FunctionsPrint::printFactNotes($media->getGedcom(), 1);
 					echo self::printFactSources($media->getGedcom(), 1);

app/Functions/FunctionsPrintLists.php

Indentation +13 added lines, -13 removed lines

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

Switch Indentation +37 added lines, -37 removed lines

@@ -1689,37 +1689,37 @@ 
 
 		}
 		switch ($style) {
-			case 1:
-				return '<ul><li>' . implode('</li><li>', $html) . '</li></ul>';
-			case 2:
-				return implode(I18N::$list_separator, $html);
-			case 3:
-				$i     = 0;
-				$count = count($html);
-				if ($count > 36) {
-					$col = 4;
-				} elseif ($count > 18) {
-					$col = 3;
-				} elseif ($count > 6) {
-					$col = 2;
-				} else {
-					$col = 1;
-				}
-				$newcol = ceil($count / $col);
-				$html2  = '<table class="list_table"><tr>';
-				$html2 .= '<td class="list_value" style="padding: 14px;">';
-
-				foreach ($html as $surns) {
-					$html2 .= $surns . '<br>';
-					$i++;
-					if ($i == $newcol && $i < $count) {
-						$html2 .= '</td><td class="list_value" style="padding: 14px;">';
-						$newcol = $i + ceil($count / $col);
-					}
+		case 1:
+			return '<ul><li>' . implode('</li><li>', $html) . '</li></ul>';
+		case 2:
+			return implode(I18N::$list_separator, $html);
+		case 3:
+			$i     = 0;
+			$count = count($html);
+			if ($count > 36) {
+				$col = 4;
+			} elseif ($count > 18) {
+				$col = 3;
+			} elseif ($count > 6) {
+				$col = 2;
+			} else {
+				$col = 1;
+			}
+			$newcol = ceil($count / $col);
+			$html2  = '<table class="list_table"><tr>';
+			$html2 .= '<td class="list_value" style="padding: 14px;">';
+
+			foreach ($html as $surns) {
+				$html2 .= $surns . '<br>';
+				$i++;
+				if ($i == $newcol && $i < $count) {
+					$html2 .= '</td><td class="list_value" style="padding: 14px;">';
+					$newcol = $i + ceil($count / $col);
 				}
-				$html2 .= '</td></tr></table>';
+			}
+			$html2 .= '</td></tr></table>';
 
-				return $html2;
+			return $html2;
 		}
 	}
 	/**
@@ -1920,14 +1920,14 @@ 
 
 		// Now we've filtered the list, we can sort by event, if required
 		switch ($sort_by) {
-			case 'anniv':
-				// Data is already sorted by anniversary date
-				break;
-			case 'alpha':
-				uasort($filtered_events, function (Fact $x, Fact $y) {
-					return GedcomRecord::compare($x->getParent(), $y->getParent());
-				});
-				break;
+		case 'anniv':
+			// Data is already sorted by anniversary date
+			break;
+		case 'alpha':
+			uasort($filtered_events, function (Fact $x, Fact $y) {
+				return GedcomRecord::compare($x->getParent(), $y->getParent());
+			});
+			break;
 		}
 
 		foreach ($filtered_events as $fact) {

app/GedcomCode/GedcomCodeAdop.php

Indentation +13 added lines, -13 removed lines

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

app/GedcomCode/GedcomCodeName.php

Indentation +13 added lines, -13 removed lines

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