fisharebest / webtrees

app/Functions/FunctionsExport.php

Switch Indentation +21 added lines, -21 removed lines

@@ -183,18 +183,18 @@ 
 	 */
 	public static function exportGedcom(Tree $tree, $gedout, $exportOptions) {
 		switch ($exportOptions['privatize']) {
-		case 'gedadmin':
-			$access_level = Auth::PRIV_NONE;
-			break;
-		case 'user':
-			$access_level = Auth::PRIV_USER;
-			break;
-		case 'visitor':
-			$access_level = Auth::PRIV_PRIVATE;
-			break;
-		case 'none':
-			$access_level = Auth::PRIV_HIDE;
-			break;
+		    case 'gedadmin':
+			    $access_level = Auth::PRIV_NONE;
+			    break;
+		    case 'user':
+			    $access_level = Auth::PRIV_USER;
+			    break;
+		    case 'visitor':
+			    $access_level = Auth::PRIV_PRIVATE;
+			    break;
+		    case 'none':
+			    $access_level = Auth::PRIV_HIDE;
+			    break;
 		}
 
 		$head = self::gedcomHeader($tree);
@@ -251,15 +251,15 @@ 
 
 		foreach ($rows as $row) {
 			switch ($row->type) {
-			case 'NOTE':
-				$record = Note::getInstance($row->xref, $tree, $row->gedcom);
-				break;
-			case 'REPO':
-				$record = Repository::getInstance($row->xref, $tree, $row->gedcom);
-				break;
-			default:
-				$record = GedcomRecord::getInstance($row->xref, $tree, $row->gedcom);
-				break;
+			    case 'NOTE':
+				    $record = Note::getInstance($row->xref, $tree, $row->gedcom);
+				    break;
+			    case 'REPO':
+				    $record = Repository::getInstance($row->xref, $tree, $row->gedcom);
+				    break;
+			    default:
+				    $record = GedcomRecord::getInstance($row->xref, $tree, $row->gedcom);
+				    break;
 			}
 
 			$rec = $record->privatizeGedcom($access_level);

app/Functions/FunctionsImport.php

Switch Indentation +632 added lines, -632 removed lines

@@ -59,477 +59,477 @@ 
 			$tag                               = strtoupper($tag); // Tags should always be upper case
 			switch ($tag) {
 				// Convert PhpGedView tags to WT
-			case '_PGVU':
-				$tag = '_WT_USER';
-				break;
-			case '_PGV_OBJS':
-				$tag = '_WT_OBJE_SORT';
-				break;
-				// Convert FTM-style "TAG_FORMAL_NAME" into "TAG".
-			case 'ABBREVIATION':
-				$tag = 'ABBR';
-				break;
-			case 'ADDRESS':
-				$tag = 'ADDR';
-				break;
-			case 'ADDRESS1':
-				$tag = 'ADR1';
-				break;
-			case 'ADDRESS2':
-				$tag = 'ADR2';
-				break;
-			case 'ADDRESS3':
-				$tag = 'ADR3';
-				break;
-			case 'ADOPTION':
-				$tag = 'ADOP';
-				break;
-			case 'ADULT_CHRISTENING':
-				$tag = 'CHRA';
-				break;
-			case 'AFN':
-				// AFN values are upper case
-				$data = strtoupper($data);
-				break;
-			case 'AGENCY':
-				$tag = 'AGNC';
-				break;
-			case 'ALIAS':
-				$tag = 'ALIA';
-				break;
-			case 'ANCESTORS':
-				$tag = 'ANCE';
-				break;
-			case 'ANCES_INTEREST':
-				$tag = 'ANCI';
-				break;
-			case 'ANNULMENT':
-				$tag = 'ANUL';
-				break;
-			case 'ASSOCIATES':
-				$tag = 'ASSO';
-				break;
-			case 'AUTHOR':
-				$tag = 'AUTH';
-				break;
-			case 'BAPTISM':
-				$tag = 'BAPM';
-				break;
-			case 'BAPTISM_LDS':
-				$tag = 'BAPL';
-				break;
-			case 'BAR_MITZVAH':
-				$tag = 'BARM';
-				break;
-			case 'BAS_MITZVAH':
-				$tag = 'BASM';
-				break;
-			case 'BIRTH':
-				$tag = 'BIRT';
-				break;
-			case 'BLESSING':
-				$tag = 'BLES';
-				break;
-			case 'BURIAL':
-				$tag = 'BURI';
-				break;
-			case 'CALL_NUMBER':
-				$tag = 'CALN';
-				break;
-			case 'CASTE':
-				$tag = 'CAST';
-				break;
-			case 'CAUSE':
-				$tag = 'CAUS';
-				break;
-			case 'CENSUS':
-				$tag = 'CENS';
-				break;
-			case 'CHANGE':
-				$tag = 'CHAN';
-				break;
-			case 'CHARACTER':
-				$tag = 'CHAR';
-				break;
-			case 'CHILD':
-				$tag = 'CHIL';
-				break;
-			case 'CHILDREN_COUNT':
-				$tag = 'NCHI';
-				break;
-			case 'CHRISTENING':
-				$tag = 'CHR';
-				break;
-			case 'CONCATENATION':
-				$tag = 'CONC';
-				break;
-			case 'CONFIRMATION':
-				$tag = 'CONF';
-				break;
-			case 'CONFIRMATION_LDS':
-				$tag = 'CONL';
-				break;
-			case 'CONTINUED':
-				$tag = 'CONT';
-				break;
-			case 'COPYRIGHT':
-				$tag = 'COPR';
-				break;
-			case 'CORPORATE':
-				$tag = 'CORP';
-				break;
-			case 'COUNTRY':
-				$tag = 'CTRY';
-				break;
-			case 'CREMATION':
-				$tag = 'CREM';
-				break;
-			case 'DATE':
-				// Preserve text from INT dates
-				if (strpos($data, '(') !== false) {
-					list($date, $text) = explode('(', $data, 2);
-					$text              = ' (' . $text;
-				} else {
-					$date = $data;
-					$text = '';
-				}
-				// Capitals
-				$date = strtoupper($date);
-				// Temporarily add leading/trailing spaces, to allow efficient matching below
-				$date = " {$date} ";
-				// Ensure space digits and letters
-				$date = preg_replace('/([A-Z])(\d)/', '$1 $2', $date);
-				$date = preg_replace('/(\d)([A-Z])/', '$1 $2', $date);
-				// Ensure space before/after calendar escapes
-				$date = preg_replace('/@#[^@]+@/', ' $0 ', $date);
-				// "BET." => "BET"
-				$date = preg_replace('/(\w\w)\./', '$1', $date);
-				// "CIR" => "ABT"
-				$date = str_replace(' CIR ', ' ABT ', $date);
-				$date = str_replace(' APX ', ' ABT ', $date);
-				// B.C. => BC (temporarily, to allow easier handling of ".")
-				$date = str_replace(' B.C. ', ' BC ', $date);
-				// "BET X - Y " => "BET X AND Y"
-				$date = preg_replace('/^(.* BET .+) - (.+)/', '$1 AND $2', $date);
-				$date = preg_replace('/^(.* FROM .+) - (.+)/', '$1 TO $2', $date);
-				// "@#ESC@ FROM X TO Y" => "FROM @#ESC@ X TO @#ESC@ Y"
-				$date = preg_replace('/^ +(@#[^@]+@) +FROM +(.+) +TO +(.+)/', ' FROM $1 $2 TO $1 $3', $date);
-				$date = preg_replace('/^ +(@#[^@]+@) +BET +(.+) +AND +(.+)/', ' BET $1 $2 AND $1 $3', $date);
-				// "@#ESC@ AFT X" => "AFT @#ESC@ X"
-				$date = preg_replace('/^ +(@#[^@]+@) +(FROM|BET|TO|AND|BEF|AFT|CAL|EST|INT|ABT) +(.+)/', ' $2 $1 $3', $date);
-				// Ignore any remaining punctuation, e.g. "14-MAY, 1900" => "14 MAY 1900"
-				// (don't change "/" - it is used in NS/OS dates)
-				$date = preg_replace('/[.,:;-]/', ' ', $date);
-				// BC => B.C.
-				$date = str_replace(' BC ', ' B.C. ', $date);
-				// Append the "INT" text
-				$data = $date . $text;
-				break;
-			case 'DEATH':
-				$tag = 'DEAT';
-				break;
-			case '_DEATH_OF_SPOUSE':
-				$tag = '_DETS';
-				break;
-			case '_DEGREE':
-				$tag = '_DEG';
-				break;
-			case 'DESCENDANTS':
-				$tag = 'DESC';
-				break;
-			case 'DESCENDANT_INT':
-				$tag = 'DESI';
-				break;
-			case 'DESTINATION':
-				$tag = 'DEST';
-				break;
-			case 'DIVORCE':
-				$tag = 'DIV';
-				break;
-			case 'DIVORCE_FILED':
-				$tag = 'DIVF';
-				break;
-			case 'EDUCATION':
-				$tag = 'EDUC';
-				break;
-			case 'EMIGRATION':
-				$tag = 'EMIG';
-				break;
-			case 'ENDOWMENT':
-				$tag = 'ENDL';
-				break;
-			case 'ENGAGEMENT':
-				$tag = 'ENGA';
-				break;
-			case 'EVENT':
-				$tag = 'EVEN';
-				break;
-			case 'FACSIMILE':
-				$tag = 'FAX';
-				break;
-			case 'FAMILY':
-				$tag = 'FAM';
-				break;
-			case 'FAMILY_CHILD':
-				$tag = 'FAMC';
-				break;
-			case 'FAMILY_FILE':
-				$tag = 'FAMF';
-				break;
-			case 'FAMILY_SPOUSE':
-				$tag = 'FAMS';
-				break;
-			case 'FIRST_COMMUNION':
-				$tag = 'FCOM';
-				break;
-			case '_FILE':
-				$tag = 'FILE';
-				break;
-			case 'FORMAT':
-				$tag = 'FORM';
-			case 'FORM':
-				// Consistent commas
-				$data = preg_replace('/ *, */', ', ', $data);
-				break;
-			case 'GEDCOM':
-				$tag = 'GEDC';
-				break;
-			case 'GIVEN_NAME':
-				$tag = 'GIVN';
-				break;
-			case 'GRADUATION':
-				$tag = 'GRAD';
-				break;
-			case 'HEADER':
-				$tag = 'HEAD';
-			case 'HEAD':
-				// HEAD records don't have an XREF or DATA
-				if ($level == '0') {
-					$xref = '';
-					$data = '';
-				}
-				break;
-			case 'HUSBAND':
-				$tag = 'HUSB';
-				break;
-			case 'IDENT_NUMBER':
-				$tag = 'IDNO';
-				break;
-			case 'IMMIGRATION':
-				$tag = 'IMMI';
-				break;
-			case 'INDIVIDUAL':
-				$tag = 'INDI';
-				break;
-			case 'LANGUAGE':
-				$tag = 'LANG';
-				break;
-			case 'LATITUDE':
-				$tag = 'LATI';
-				break;
-			case 'LONGITUDE':
-				$tag = 'LONG';
-				break;
-			case 'MARRIAGE':
-				$tag = 'MARR';
-				break;
-			case 'MARRIAGE_BANN':
-				$tag = 'MARB';
-				break;
-			case 'MARRIAGE_COUNT':
-				$tag = 'NMR';
-				break;
-			case 'MARRIAGE_CONTRACT':
-				$tag = 'MARC';
-				break;
-			case 'MARRIAGE_LICENSE':
-				$tag = 'MARL';
-				break;
-			case 'MARRIAGE_SETTLEMENT':
-				$tag = 'MARS';
-				break;
-			case 'MEDIA':
-				$tag = 'MEDI';
-				break;
-			case '_MEDICAL':
-				$tag = '_MDCL';
-				break;
-			case '_MILITARY_SERVICE':
-				$tag = '_MILT';
-				break;
-			case 'NAME':
-				// Tidy up whitespace
-				$data = preg_replace('/  +/', ' ', trim($data));
-				break;
-			case 'NAME_PREFIX':
-				$tag = 'NPFX';
-				break;
-			case 'NAME_SUFFIX':
-				$tag = 'NSFX';
-				break;
-			case 'NATIONALITY':
-				$tag = 'NATI';
-				break;
-			case 'NATURALIZATION':
-				$tag = 'NATU';
-				break;
-			case 'NICKNAME':
-				$tag = 'NICK';
-				break;
-			case 'OBJECT':
-				$tag = 'OBJE';
-				break;
-			case 'OCCUPATION':
-				$tag = 'OCCU';
-				break;
-			case 'ORDINANCE':
-				$tag = 'ORDI';
-				break;
-			case 'ORDINATION':
-				$tag = 'ORDN';
-				break;
-			case 'PEDIGREE':
-				$tag = 'PEDI';
-			case 'PEDI':
-				// PEDI values are lower case
-				$data = strtolower($data);
-				break;
-			case 'PHONE':
-				$tag = 'PHON';
-				break;
-			case 'PHONETIC':
-				$tag = 'FONE';
-				break;
-			case 'PHY_DESCRIPTION':
-				$tag = 'DSCR';
-				break;
-			case 'PLACE':
-				$tag = 'PLAC';
-			case 'PLAC':
-				// Consistent commas
-				$data = preg_replace('/ *(،|,) */', ', ', $data);
-				// The Master Genealogist stores LAT/LONG data in the PLAC field, e.g. Pennsylvania, USA, 395945N0751013W
-				if (preg_match('/(.*), (\d\d)(\d\d)(\d\d)([NS])(\d\d\d)(\d\d)(\d\d)([EW])$/', $data, $match)) {
-					$data =
-						$match[1] . "\n" .
-						($level + 1) . " MAP\n" .
-						($level + 2) . " LATI " . ($match[5] . (round($match[2] + ($match[3] / 60) + ($match[4] / 3600), 4))) . "\n" .
-						($level + 2) . " LONG " . ($match[9] . (round($match[6] + ($match[7] / 60) + ($match[8] / 3600), 4)));
-				}
-				break;
-			case 'POSTAL_CODE':
-				$tag = 'POST';
-				break;
-			case 'PROBATE':
-				$tag = 'PROB';
-				break;
-			case 'PROPERTY':
-				$tag = 'PROP';
-				break;
-			case 'PUBLICATION':
-				$tag = 'PUBL';
-				break;
-			case 'QUALITY_OF_DATA':
-				$tag = 'QUAL';
-				break;
-			case 'REC_FILE_NUMBER':
-				$tag = 'RFN';
-				break;
-			case 'REC_ID_NUMBER':
-				$tag = 'RIN';
-				break;
-			case 'REFERENCE':
-				$tag = 'REFN';
-				break;
-			case 'RELATIONSHIP':
-				$tag = 'RELA';
-				break;
-			case 'RELIGION':
-				$tag = 'RELI';
-				break;
-			case 'REPOSITORY':
-				$tag = 'REPO';
-				break;
-			case 'RESIDENCE':
-				$tag = 'RESI';
-				break;
-			case 'RESTRICTION':
-				$tag = 'RESN';
-			case 'RESN':
-				// RESN values are lower case (confidential, privacy, locked, none)
-				$data = strtolower($data);
-				if ($data == 'invisible') {
-					$data = 'confidential'; // From old versions of Legacy.
-				}
-				break;
-			case 'RETIREMENT':
-				$tag = 'RETI';
-				break;
-			case 'ROMANIZED':
-				$tag = 'ROMN';
-				break;
-			case 'SEALING_CHILD':
-				$tag = 'SLGC';
-				break;
-			case 'SEALING_SPOUSE':
-				$tag = 'SLGS';
-				break;
-			case 'SOC_SEC_NUMBER':
-				$tag = 'SSN';
-				break;
-			case 'SEX':
-				$data = strtoupper($data);
-				break;
-			case 'SOURCE':
-				$tag = 'SOUR';
-				break;
-			case 'STATE':
-				$tag = 'STAE';
-				break;
-			case 'STATUS':
-				$tag = 'STAT';
-			case 'STAT':
-				if ($data == 'CANCELLED') {
-					// PhpGedView mis-spells this tag - correct it.
-					$data = 'CANCELED';
-				}
-				break;
-			case 'SUBMISSION':
-				$tag = 'SUBN';
-				break;
-			case 'SUBMITTER':
-				$tag = 'SUBM';
-				break;
-			case 'SURNAME':
-				$tag = 'SURN';
-				break;
-			case 'SURN_PREFIX':
-				$tag = 'SPFX';
-				break;
-			case 'TEMPLE':
-				$tag = 'TEMP';
-			case 'TEMP':
-				// Temple codes are upper case
-				$data = strtoupper($data);
-				break;
-			case 'TITLE':
-				$tag = 'TITL';
-				break;
-			case 'TRAILER':
-				$tag = 'TRLR';
-			case 'TRLR':
-				// TRLR records don't have an XREF or DATA
-				if ($level == '0') {
-					$xref = '';
-					$data = '';
-				}
-				break;
-			case 'VERSION':
-				$tag = 'VERS';
-				break;
-			case 'WEB':
-				$tag = 'WWW';
-				break;
+			    case '_PGVU':
+				    $tag = '_WT_USER';
+				    break;
+			    case '_PGV_OBJS':
+				    $tag = '_WT_OBJE_SORT';
+				    break;
+				    // Convert FTM-style "TAG_FORMAL_NAME" into "TAG".
+			    case 'ABBREVIATION':
+				    $tag = 'ABBR';
+				    break;
+			    case 'ADDRESS':
+				    $tag = 'ADDR';
+				    break;
+			    case 'ADDRESS1':
+				    $tag = 'ADR1';
+				    break;
+			    case 'ADDRESS2':
+				    $tag = 'ADR2';
+				    break;
+			    case 'ADDRESS3':
+				    $tag = 'ADR3';
+				    break;
+			    case 'ADOPTION':
+				    $tag = 'ADOP';
+				    break;
+			    case 'ADULT_CHRISTENING':
+				    $tag = 'CHRA';
+				    break;
+			    case 'AFN':
+				    // AFN values are upper case
+				    $data = strtoupper($data);
+				    break;
+			    case 'AGENCY':
+				    $tag = 'AGNC';
+				    break;
+			    case 'ALIAS':
+				    $tag = 'ALIA';
+				    break;
+			    case 'ANCESTORS':
+				    $tag = 'ANCE';
+				    break;
+			    case 'ANCES_INTEREST':
+				    $tag = 'ANCI';
+				    break;
+			    case 'ANNULMENT':
+				    $tag = 'ANUL';
+				    break;
+			    case 'ASSOCIATES':
+				    $tag = 'ASSO';
+				    break;
+			    case 'AUTHOR':
+				    $tag = 'AUTH';
+				    break;
+			    case 'BAPTISM':
+				    $tag = 'BAPM';
+				    break;
+			    case 'BAPTISM_LDS':
+				    $tag = 'BAPL';
+				    break;
+			    case 'BAR_MITZVAH':
+				    $tag = 'BARM';
+				    break;
+			    case 'BAS_MITZVAH':
+				    $tag = 'BASM';
+				    break;
+			    case 'BIRTH':
+				    $tag = 'BIRT';
+				    break;
+			    case 'BLESSING':
+				    $tag = 'BLES';
+				    break;
+			    case 'BURIAL':
+				    $tag = 'BURI';
+				    break;
+			    case 'CALL_NUMBER':
+				    $tag = 'CALN';
+				    break;
+			    case 'CASTE':
+				    $tag = 'CAST';
+				    break;
+			    case 'CAUSE':
+				    $tag = 'CAUS';
+				    break;
+			    case 'CENSUS':
+				    $tag = 'CENS';
+				    break;
+			    case 'CHANGE':
+				    $tag = 'CHAN';
+				    break;
+			    case 'CHARACTER':
+				    $tag = 'CHAR';
+				    break;
+			    case 'CHILD':
+				    $tag = 'CHIL';
+				    break;
+			    case 'CHILDREN_COUNT':
+				    $tag = 'NCHI';
+				    break;
+			    case 'CHRISTENING':
+				    $tag = 'CHR';
+				    break;
+			    case 'CONCATENATION':
+				    $tag = 'CONC';
+				    break;
+			    case 'CONFIRMATION':
+				    $tag = 'CONF';
+				    break;
+			    case 'CONFIRMATION_LDS':
+				    $tag = 'CONL';
+				    break;
+			    case 'CONTINUED':
+				    $tag = 'CONT';
+				    break;
+			    case 'COPYRIGHT':
+				    $tag = 'COPR';
+				    break;
+			    case 'CORPORATE':
+				    $tag = 'CORP';
+				    break;
+			    case 'COUNTRY':
+				    $tag = 'CTRY';
+				    break;
+			    case 'CREMATION':
+				    $tag = 'CREM';
+				    break;
+			    case 'DATE':
+				    // Preserve text from INT dates
+				    if (strpos($data, '(') !== false) {
+					    list($date, $text) = explode('(', $data, 2);
+					    $text              = ' (' . $text;
+				    } else {
+					    $date = $data;
+					    $text = '';
+				    }
+				    // Capitals
+				    $date = strtoupper($date);
+				    // Temporarily add leading/trailing spaces, to allow efficient matching below
+				    $date = " {$date} ";
+				    // Ensure space digits and letters
+				    $date = preg_replace('/([A-Z])(\d)/', '$1 $2', $date);
+				    $date = preg_replace('/(\d)([A-Z])/', '$1 $2', $date);
+				    // Ensure space before/after calendar escapes
+				    $date = preg_replace('/@#[^@]+@/', ' $0 ', $date);
+				    // "BET." => "BET"
+				    $date = preg_replace('/(\w\w)\./', '$1', $date);
+				    // "CIR" => "ABT"
+				    $date = str_replace(' CIR ', ' ABT ', $date);
+				    $date = str_replace(' APX ', ' ABT ', $date);
+				    // B.C. => BC (temporarily, to allow easier handling of ".")
+				    $date = str_replace(' B.C. ', ' BC ', $date);
+				    // "BET X - Y " => "BET X AND Y"
+				    $date = preg_replace('/^(.* BET .+) - (.+)/', '$1 AND $2', $date);
+				    $date = preg_replace('/^(.* FROM .+) - (.+)/', '$1 TO $2', $date);
+				    // "@#ESC@ FROM X TO Y" => "FROM @#ESC@ X TO @#ESC@ Y"
+				    $date = preg_replace('/^ +(@#[^@]+@) +FROM +(.+) +TO +(.+)/', ' FROM $1 $2 TO $1 $3', $date);
+				    $date = preg_replace('/^ +(@#[^@]+@) +BET +(.+) +AND +(.+)/', ' BET $1 $2 AND $1 $3', $date);
+				    // "@#ESC@ AFT X" => "AFT @#ESC@ X"
+				    $date = preg_replace('/^ +(@#[^@]+@) +(FROM|BET|TO|AND|BEF|AFT|CAL|EST|INT|ABT) +(.+)/', ' $2 $1 $3', $date);
+				    // Ignore any remaining punctuation, e.g. "14-MAY, 1900" => "14 MAY 1900"
+				    // (don't change "/" - it is used in NS/OS dates)
+				    $date = preg_replace('/[.,:;-]/', ' ', $date);
+				    // BC => B.C.
+				    $date = str_replace(' BC ', ' B.C. ', $date);
+				    // Append the "INT" text
+				    $data = $date . $text;
+				    break;
+			    case 'DEATH':
+				    $tag = 'DEAT';
+				    break;
+			    case '_DEATH_OF_SPOUSE':
+				    $tag = '_DETS';
+				    break;
+			    case '_DEGREE':
+				    $tag = '_DEG';
+				    break;
+			    case 'DESCENDANTS':
+				    $tag = 'DESC';
+				    break;
+			    case 'DESCENDANT_INT':
+				    $tag = 'DESI';
+				    break;
+			    case 'DESTINATION':
+				    $tag = 'DEST';
+				    break;
+			    case 'DIVORCE':
+				    $tag = 'DIV';
+				    break;
+			    case 'DIVORCE_FILED':
+				    $tag = 'DIVF';
+				    break;
+			    case 'EDUCATION':
+				    $tag = 'EDUC';
+				    break;
+			    case 'EMIGRATION':
+				    $tag = 'EMIG';
+				    break;
+			    case 'ENDOWMENT':
+				    $tag = 'ENDL';
+				    break;
+			    case 'ENGAGEMENT':
+				    $tag = 'ENGA';
+				    break;
+			    case 'EVENT':
+				    $tag = 'EVEN';
+				    break;
+			    case 'FACSIMILE':
+				    $tag = 'FAX';
+				    break;
+			    case 'FAMILY':
+				    $tag = 'FAM';
+				    break;
+			    case 'FAMILY_CHILD':
+				    $tag = 'FAMC';
+				    break;
+			    case 'FAMILY_FILE':
+				    $tag = 'FAMF';
+				    break;
+			    case 'FAMILY_SPOUSE':
+				    $tag = 'FAMS';
+				    break;
+			    case 'FIRST_COMMUNION':
+				    $tag = 'FCOM';
+				    break;
+			    case '_FILE':
+				    $tag = 'FILE';
+				    break;
+			    case 'FORMAT':
+				    $tag = 'FORM';
+			    case 'FORM':
+				    // Consistent commas
+				    $data = preg_replace('/ *, */', ', ', $data);
+				    break;
+			    case 'GEDCOM':
+				    $tag = 'GEDC';
+				    break;
+			    case 'GIVEN_NAME':
+				    $tag = 'GIVN';
+				    break;
+			    case 'GRADUATION':
+				    $tag = 'GRAD';
+				    break;
+			    case 'HEADER':
+				    $tag = 'HEAD';
+			    case 'HEAD':
+				    // HEAD records don't have an XREF or DATA
+				    if ($level == '0') {
+					    $xref = '';
+					    $data = '';
+				    }
+				    break;
+			    case 'HUSBAND':
+				    $tag = 'HUSB';
+				    break;
+			    case 'IDENT_NUMBER':
+				    $tag = 'IDNO';
+				    break;
+			    case 'IMMIGRATION':
+				    $tag = 'IMMI';
+				    break;
+			    case 'INDIVIDUAL':
+				    $tag = 'INDI';
+				    break;
+			    case 'LANGUAGE':
+				    $tag = 'LANG';
+				    break;
+			    case 'LATITUDE':
+				    $tag = 'LATI';
+				    break;
+			    case 'LONGITUDE':
+				    $tag = 'LONG';
+				    break;
+			    case 'MARRIAGE':
+				    $tag = 'MARR';
+				    break;
+			    case 'MARRIAGE_BANN':
+				    $tag = 'MARB';
+				    break;
+			    case 'MARRIAGE_COUNT':
+				    $tag = 'NMR';
+				    break;
+			    case 'MARRIAGE_CONTRACT':
+				    $tag = 'MARC';
+				    break;
+			    case 'MARRIAGE_LICENSE':
+				    $tag = 'MARL';
+				    break;
+			    case 'MARRIAGE_SETTLEMENT':
+				    $tag = 'MARS';
+				    break;
+			    case 'MEDIA':
+				    $tag = 'MEDI';
+				    break;
+			    case '_MEDICAL':
+				    $tag = '_MDCL';
+				    break;
+			    case '_MILITARY_SERVICE':
+				    $tag = '_MILT';
+				    break;
+			    case 'NAME':
+				    // Tidy up whitespace
+				    $data = preg_replace('/  +/', ' ', trim($data));
+				    break;
+			    case 'NAME_PREFIX':
+				    $tag = 'NPFX';
+				    break;
+			    case 'NAME_SUFFIX':
+				    $tag = 'NSFX';
+				    break;
+			    case 'NATIONALITY':
+				    $tag = 'NATI';
+				    break;
+			    case 'NATURALIZATION':
+				    $tag = 'NATU';
+				    break;
+			    case 'NICKNAME':
+				    $tag = 'NICK';
+				    break;
+			    case 'OBJECT':
+				    $tag = 'OBJE';
+				    break;
+			    case 'OCCUPATION':
+				    $tag = 'OCCU';
+				    break;
+			    case 'ORDINANCE':
+				    $tag = 'ORDI';
+				    break;
+			    case 'ORDINATION':
+				    $tag = 'ORDN';
+				    break;
+			    case 'PEDIGREE':
+				    $tag = 'PEDI';
+			    case 'PEDI':
+				    // PEDI values are lower case
+				    $data = strtolower($data);
+				    break;
+			    case 'PHONE':
+				    $tag = 'PHON';
+				    break;
+			    case 'PHONETIC':
+				    $tag = 'FONE';
+				    break;
+			    case 'PHY_DESCRIPTION':
+				    $tag = 'DSCR';
+				    break;
+			    case 'PLACE':
+				    $tag = 'PLAC';
+			    case 'PLAC':
+				    // Consistent commas
+				    $data = preg_replace('/ *(،|,) */', ', ', $data);
+				    // The Master Genealogist stores LAT/LONG data in the PLAC field, e.g. Pennsylvania, USA, 395945N0751013W
+				    if (preg_match('/(.*), (\d\d)(\d\d)(\d\d)([NS])(\d\d\d)(\d\d)(\d\d)([EW])$/', $data, $match)) {
+					    $data =
+						    $match[1] . "\n" .
+						    ($level + 1) . " MAP\n" .
+						    ($level + 2) . " LATI " . ($match[5] . (round($match[2] + ($match[3] / 60) + ($match[4] / 3600), 4))) . "\n" .
+						    ($level + 2) . " LONG " . ($match[9] . (round($match[6] + ($match[7] / 60) + ($match[8] / 3600), 4)));
+				    }
+				    break;
+			    case 'POSTAL_CODE':
+				    $tag = 'POST';
+				    break;
+			    case 'PROBATE':
+				    $tag = 'PROB';
+				    break;
+			    case 'PROPERTY':
+				    $tag = 'PROP';
+				    break;
+			    case 'PUBLICATION':
+				    $tag = 'PUBL';
+				    break;
+			    case 'QUALITY_OF_DATA':
+				    $tag = 'QUAL';
+				    break;
+			    case 'REC_FILE_NUMBER':
+				    $tag = 'RFN';
+				    break;
+			    case 'REC_ID_NUMBER':
+				    $tag = 'RIN';
+				    break;
+			    case 'REFERENCE':
+				    $tag = 'REFN';
+				    break;
+			    case 'RELATIONSHIP':
+				    $tag = 'RELA';
+				    break;
+			    case 'RELIGION':
+				    $tag = 'RELI';
+				    break;
+			    case 'REPOSITORY':
+				    $tag = 'REPO';
+				    break;
+			    case 'RESIDENCE':
+				    $tag = 'RESI';
+				    break;
+			    case 'RESTRICTION':
+				    $tag = 'RESN';
+			    case 'RESN':
+				    // RESN values are lower case (confidential, privacy, locked, none)
+				    $data = strtolower($data);
+				    if ($data == 'invisible') {
+					    $data = 'confidential'; // From old versions of Legacy.
+				    }
+				    break;
+			    case 'RETIREMENT':
+				    $tag = 'RETI';
+				    break;
+			    case 'ROMANIZED':
+				    $tag = 'ROMN';
+				    break;
+			    case 'SEALING_CHILD':
+				    $tag = 'SLGC';
+				    break;
+			    case 'SEALING_SPOUSE':
+				    $tag = 'SLGS';
+				    break;
+			    case 'SOC_SEC_NUMBER':
+				    $tag = 'SSN';
+				    break;
+			    case 'SEX':
+				    $data = strtoupper($data);
+				    break;
+			    case 'SOURCE':
+				    $tag = 'SOUR';
+				    break;
+			    case 'STATE':
+				    $tag = 'STAE';
+				    break;
+			    case 'STATUS':
+				    $tag = 'STAT';
+			    case 'STAT':
+				    if ($data == 'CANCELLED') {
+					    // PhpGedView mis-spells this tag - correct it.
+					    $data = 'CANCELED';
+				    }
+				    break;
+			    case 'SUBMISSION':
+				    $tag = 'SUBN';
+				    break;
+			    case 'SUBMITTER':
+				    $tag = 'SUBM';
+				    break;
+			    case 'SURNAME':
+				    $tag = 'SURN';
+				    break;
+			    case 'SURN_PREFIX':
+				    $tag = 'SPFX';
+				    break;
+			    case 'TEMPLE':
+				    $tag = 'TEMP';
+			    case 'TEMP':
+				    // Temple codes are upper case
+				    $data = strtoupper($data);
+				    break;
+			    case 'TITLE':
+				    $tag = 'TITL';
+				    break;
+			    case 'TRAILER':
+				    $tag = 'TRLR';
+			    case 'TRLR':
+				    // TRLR records don't have an XREF or DATA
+				    if ($level == '0') {
+					    $xref = '';
+					    $data = '';
+				    }
+				    break;
+			    case 'VERSION':
+				    $tag = 'VERS';
+				    break;
+			    case 'WEB':
+				    $tag = 'WWW';
+				    break;
 			}
 			// Suppress "Y", for facts/events with a DATE or PLAC
 			if ($data == 'y') {
@@ -545,40 +545,40 @@ 
 			}
 			// Reassemble components back into a single line
 			switch ($tag) {
-			default:
-				// Remove tabs and multiple/leading/trailing spaces
-				if (strpos($data, "\t") !== false) {
-					$data = str_replace("\t", ' ', $data);
-				}
-				if (substr($data, 0, 1) == ' ' || substr($data, -1, 1) == ' ') {
-					$data = trim($data);
-				}
-				while (strpos($data, '  ')) {
-					$data = str_replace('  ', ' ', $data);
-				}
-				$newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level == '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag != "NOTE" ? '' : ' ' . $data);
-				break;
-			case 'NOTE':
-			case 'TEXT':
-			case 'DATA':
-			case 'CONT':
-				$newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level == '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag != "NOTE" ? '' : ' ' . $data);
-				break;
-			case 'FILE':
-				// Strip off the user-defined path prefix
-				$GEDCOM_MEDIA_PATH = $tree->getPreference('GEDCOM_MEDIA_PATH');
-				if ($GEDCOM_MEDIA_PATH && strpos($data, $GEDCOM_MEDIA_PATH) === 0) {
-					$data = substr($data, strlen($GEDCOM_MEDIA_PATH));
-				}
-				// convert backslashes in filenames to forward slashes
-				$data = preg_replace("/\\\/", "/", $data);
+			    default:
+				    // Remove tabs and multiple/leading/trailing spaces
+				    if (strpos($data, "\t") !== false) {
+					    $data = str_replace("\t", ' ', $data);
+				    }
+				    if (substr($data, 0, 1) == ' ' || substr($data, -1, 1) == ' ') {
+					    $data = trim($data);
+				    }
+				    while (strpos($data, '  ')) {
+					    $data = str_replace('  ', ' ', $data);
+				    }
+				    $newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level == '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag != "NOTE" ? '' : ' ' . $data);
+				    break;
+			    case 'NOTE':
+			    case 'TEXT':
+			    case 'DATA':
+			    case 'CONT':
+				    $newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level == '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag != "NOTE" ? '' : ' ' . $data);
+				    break;
+			    case 'FILE':
+				    // Strip off the user-defined path prefix
+				    $GEDCOM_MEDIA_PATH = $tree->getPreference('GEDCOM_MEDIA_PATH');
+				    if ($GEDCOM_MEDIA_PATH && strpos($data, $GEDCOM_MEDIA_PATH) === 0) {
+					    $data = substr($data, strlen($GEDCOM_MEDIA_PATH));
+				    }
+				    // convert backslashes in filenames to forward slashes
+				    $data = preg_replace("/\\\/", "/", $data);
 
-				$newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level == '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag != "NOTE" ? '' : ' ' . $data);
-				break;
-			case 'CONC':
-				// Merge CONC lines, to simplify access later on.
-				$newrec .= ($tree->getPreference('WORD_WRAPPED_NOTES') ? ' ' : '') . $data;
-				break;
+				    $newrec .= ($newrec ? "\n" : '') . $level . ' ' . ($level == '0' && $xref ? $xref . ' ' : '') . $tag . ($data === '' && $tag != "NOTE" ? '' : ' ' . $data);
+				    break;
+			    case 'CONC':
+				    // Merge CONC lines, to simplify access later on.
+				    $newrec .= ($tree->getPreference('WORD_WRAPPED_NOTES') ? ' ' : '') . $data;
+				    break;
 			}
 		}
 
@@ -635,123 +635,123 @@ 
 		}
 
 		switch ($type) {
-		case 'INDI':
-			// Convert inline media into media objects
-			$gedrec = self::convertInlineMedia($tree, $gedrec);
+		    case 'INDI':
+			    // Convert inline media into media objects
+			    $gedrec = self::convertInlineMedia($tree, $gedrec);
 
-			$record = new Individual($xref, $gedrec, null, $tree);
-			if (preg_match('/\n1 RIN (.+)/', $gedrec, $match)) {
-				$rin = $match[1];
-			} else {
-				$rin = $xref;
-			}
-			Database::prepare(
-				"INSERT INTO `##individuals` (i_id, i_file, i_rin, i_sex, i_gedcom) VALUES (?, ?, ?, ?, ?)"
-			)->execute(array(
-				$xref, $tree_id, $rin, $record->getSex(), $gedrec,
-			));
-			// Update the cross-reference/index tables.
-			self::updatePlaces($xref, $tree_id, $gedrec);
-			self::updateDates($xref, $tree_id, $gedrec);
-			self::updateLinks($xref, $tree_id, $gedrec);
-			self::updateNames($xref, $tree_id, $record);
-			break;
-		case 'FAM':
-			// Convert inline media into media objects
-			$gedrec = self::convertInlineMedia($tree, $gedrec);
+			    $record = new Individual($xref, $gedrec, null, $tree);
+			    if (preg_match('/\n1 RIN (.+)/', $gedrec, $match)) {
+				    $rin = $match[1];
+			    } else {
+				    $rin = $xref;
+			    }
+			    Database::prepare(
+				    "INSERT INTO `##individuals` (i_id, i_file, i_rin, i_sex, i_gedcom) VALUES (?, ?, ?, ?, ?)"
+			    )->execute(array(
+				    $xref, $tree_id, $rin, $record->getSex(), $gedrec,
+			    ));
+			    // Update the cross-reference/index tables.
+			    self::updatePlaces($xref, $tree_id, $gedrec);
+			    self::updateDates($xref, $tree_id, $gedrec);
+			    self::updateLinks($xref, $tree_id, $gedrec);
+			    self::updateNames($xref, $tree_id, $record);
+			    break;
+		    case 'FAM':
+			    // Convert inline media into media objects
+			    $gedrec = self::convertInlineMedia($tree, $gedrec);
 
-			if (preg_match('/\n1 HUSB @(' . WT_REGEX_XREF . ')@/', $gedrec, $match)) {
-				$husb = $match[1];
-			} else {
-				$husb = '';
-			}
-			if (preg_match('/\n1 WIFE @(' . WT_REGEX_XREF . ')@/', $gedrec, $match)) {
-				$wife = $match[1];
-			} else {
-				$wife = '';
-			}
-			$nchi = preg_match_all('/\n1 CHIL @(' . WT_REGEX_XREF . ')@/', $gedrec, $match);
-			if (preg_match('/\n1 NCHI (\d+)/', $gedrec, $match)) {
-				$nchi = max($nchi, $match[1]);
-			}
-			Database::prepare(
-				"INSERT INTO `##families` (f_id, f_file, f_husb, f_wife, f_gedcom, f_numchil) VALUES (?, ?, ?, ?, ?, ?)"
-			)->execute(array(
-				$xref, $tree_id, $husb, $wife, $gedrec, $nchi,
-			));
-			// Update the cross-reference/index tables.
-			self::updatePlaces($xref, $tree_id, $gedrec);
-			self::updateDates($xref, $tree_id, $gedrec);
-			self::updateLinks($xref, $tree_id, $gedrec);
-			break;
-		case 'SOUR':
-			// Convert inline media into media objects
-			$gedrec = self::convertInlineMedia($tree, $gedrec);
+			    if (preg_match('/\n1 HUSB @(' . WT_REGEX_XREF . ')@/', $gedrec, $match)) {
+				    $husb = $match[1];
+			    } else {
+				    $husb = '';
+			    }
+			    if (preg_match('/\n1 WIFE @(' . WT_REGEX_XREF . ')@/', $gedrec, $match)) {
+				    $wife = $match[1];
+			    } else {
+				    $wife = '';
+			    }
+			    $nchi = preg_match_all('/\n1 CHIL @(' . WT_REGEX_XREF . ')@/', $gedrec, $match);
+			    if (preg_match('/\n1 NCHI (\d+)/', $gedrec, $match)) {
+				    $nchi = max($nchi, $match[1]);
+			    }
+			    Database::prepare(
+				    "INSERT INTO `##families` (f_id, f_file, f_husb, f_wife, f_gedcom, f_numchil) VALUES (?, ?, ?, ?, ?, ?)"
+			    )->execute(array(
+				    $xref, $tree_id, $husb, $wife, $gedrec, $nchi,
+			    ));
+			    // Update the cross-reference/index tables.
+			    self::updatePlaces($xref, $tree_id, $gedrec);
+			    self::updateDates($xref, $tree_id, $gedrec);
+			    self::updateLinks($xref, $tree_id, $gedrec);
+			    break;
+		    case 'SOUR':
+			    // Convert inline media into media objects
+			    $gedrec = self::convertInlineMedia($tree, $gedrec);
 
-			$record = new Source($xref, $gedrec, null, $tree);
-			if (preg_match('/\n1 TITL (.+)/', $gedrec, $match)) {
-				$name = $match[1];
-			} elseif (preg_match('/\n1 ABBR (.+)/', $gedrec, $match)) {
-				$name = $match[1];
-			} else {
-				$name = $xref;
-			}
-			Database::prepare(
-				"INSERT INTO `##sources` (s_id, s_file, s_name, s_gedcom) VALUES (?, ?, LEFT(?, 255), ?)"
-			)->execute(array(
-				$xref, $tree_id, $name, $gedrec,
-			));
-			// Update the cross-reference/index tables.
-			self::updateLinks($xref, $tree_id, $gedrec);
-			self::updateNames($xref, $tree_id, $record);
-			break;
-		case 'REPO':
-			// Convert inline media into media objects
-			$gedrec = self::convertInlineMedia($tree, $gedrec);
+			    $record = new Source($xref, $gedrec, null, $tree);
+			    if (preg_match('/\n1 TITL (.+)/', $gedrec, $match)) {
+				    $name = $match[1];
+			    } elseif (preg_match('/\n1 ABBR (.+)/', $gedrec, $match)) {
+				    $name = $match[1];
+			    } else {
+				    $name = $xref;
+			    }
+			    Database::prepare(
+				    "INSERT INTO `##sources` (s_id, s_file, s_name, s_gedcom) VALUES (?, ?, LEFT(?, 255), ?)"
+			    )->execute(array(
+				    $xref, $tree_id, $name, $gedrec,
+			    ));
+			    // Update the cross-reference/index tables.
+			    self::updateLinks($xref, $tree_id, $gedrec);
+			    self::updateNames($xref, $tree_id, $record);
+			    break;
+		    case 'REPO':
+			    // Convert inline media into media objects
+			    $gedrec = self::convertInlineMedia($tree, $gedrec);
 
-			$record = new Repository($xref, $gedrec, null, $tree);
-			Database::prepare(
-				"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, 'REPO', ?)"
-			)->execute(array(
-				$xref, $tree_id, $gedrec,
-			));
-			// Update the cross-reference/index tables.
-			self::updateLinks($xref, $tree_id, $gedrec);
-			self::updateNames($xref, $tree_id, $record);
-			break;
-		case 'NOTE':
-			$record = new Note($xref, $gedrec, null, $tree);
-			Database::prepare(
-				"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, 'NOTE', ?)"
-			)->execute(array(
-				$xref, $tree_id, $gedrec,
-			));
-			// Update the cross-reference/index tables.
-			self::updateLinks($xref, $tree_id, $gedrec);
-			self::updateNames($xref, $tree_id, $record);
-			break;
-		case 'OBJE':
-			$record = new Media($xref, $gedrec, null, $tree);
-			Database::prepare(
-				"INSERT INTO `##media` (m_id, m_ext, m_type, m_titl, m_filename, m_file, m_gedcom) VALUES (?, LEFT(?, 6), LEFT(?, 60), LEFT(?, 255), left(?, 512), ?, ?)"
-			)->execute(array(
-				$xref, $record->extension(), $record->getMediaType(), $record->getTitle(), $record->getFilename(), $tree_id, $gedrec,
-			));
-			// Update the cross-reference/index tables.
-			self::updateLinks($xref, $tree_id, $gedrec);
-			self::updateNames($xref, $tree_id, $record);
-			break;
-		default: // HEAD, TRLR, SUBM, SUBN, and custom record types.
-			// Force HEAD records to have a creation date.
-			if ($type === 'HEAD' && strpos($gedrec, "\n1 DATE ") === false) {
-				$gedrec .= "\n1 DATE " . date('j M Y');
-			}
-			Database::prepare(
-				"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, LEFT(?, 15), ?)"
-			)->execute(array($xref, $tree_id, $type, $gedrec));
-			// Update the cross-reference/index tables.
-			self::updateLinks($xref, $tree_id, $gedrec);
-			break;
+			    $record = new Repository($xref, $gedrec, null, $tree);
+			    Database::prepare(
+				    "INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, 'REPO', ?)"
+			    )->execute(array(
+				    $xref, $tree_id, $gedrec,
+			    ));
+			    // Update the cross-reference/index tables.
+			    self::updateLinks($xref, $tree_id, $gedrec);
+			    self::updateNames($xref, $tree_id, $record);
+			    break;
+		    case 'NOTE':
+			    $record = new Note($xref, $gedrec, null, $tree);
+			    Database::prepare(
+				    "INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, 'NOTE', ?)"
+			    )->execute(array(
+				    $xref, $tree_id, $gedrec,
+			    ));
+			    // Update the cross-reference/index tables.
+			    self::updateLinks($xref, $tree_id, $gedrec);
+			    self::updateNames($xref, $tree_id, $record);
+			    break;
+		    case 'OBJE':
+			    $record = new Media($xref, $gedrec, null, $tree);
+			    Database::prepare(
+				    "INSERT INTO `##media` (m_id, m_ext, m_type, m_titl, m_filename, m_file, m_gedcom) VALUES (?, LEFT(?, 6), LEFT(?, 60), LEFT(?, 255), left(?, 512), ?, ?)"
+			    )->execute(array(
+				    $xref, $record->extension(), $record->getMediaType(), $record->getTitle(), $record->getFilename(), $tree_id, $gedrec,
+			    ));
+			    // Update the cross-reference/index tables.
+			    self::updateLinks($xref, $tree_id, $gedrec);
+			    self::updateNames($xref, $tree_id, $record);
+			    break;
+		    default: // HEAD, TRLR, SUBM, SUBN, and custom record types.
+			    // Force HEAD records to have a creation date.
+			    if ($type === 'HEAD' && strpos($gedrec, "\n1 DATE ") === false) {
+				    $gedrec .= "\n1 DATE " . date('j M Y');
+			    }
+			    Database::prepare(
+				    "INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, LEFT(?, 15), ?)"
+			    )->execute(array($xref, $tree_id, $type, $gedrec));
+			    // Update the cross-reference/index tables.
+			    self::updateLinks($xref, $tree_id, $gedrec);
+			    break;
 		}
 	}
 
@@ -1130,21 +1130,21 @@ 
 		Database::prepare("DELETE FROM `##link` WHERE l_from=? AND l_file=?")->execute(array($gid, $ged_id));
 
 		switch ($type) {
-		case 'INDI':
-			Database::prepare("DELETE FROM `##individuals` WHERE i_id=? AND i_file=?")->execute(array($gid, $ged_id));
-			break;
-		case 'FAM':
-			Database::prepare("DELETE FROM `##families` WHERE f_id=? AND f_file=?")->execute(array($gid, $ged_id));
-			break;
-		case 'SOUR':
-			Database::prepare("DELETE FROM `##sources` WHERE s_id=? AND s_file=?")->execute(array($gid, $ged_id));
-			break;
-		case 'OBJE':
-			Database::prepare("DELETE FROM `##media` WHERE m_id=? AND m_file=?")->execute(array($gid, $ged_id));
-			break;
-		default:
-			Database::prepare("DELETE FROM `##other` WHERE o_id=? AND o_file=?")->execute(array($gid, $ged_id));
-			break;
+		    case 'INDI':
+			    Database::prepare("DELETE FROM `##individuals` WHERE i_id=? AND i_file=?")->execute(array($gid, $ged_id));
+			    break;
+		    case 'FAM':
+			    Database::prepare("DELETE FROM `##families` WHERE f_id=? AND f_file=?")->execute(array($gid, $ged_id));
+			    break;
+		    case 'SOUR':
+			    Database::prepare("DELETE FROM `##sources` WHERE s_id=? AND s_file=?")->execute(array($gid, $ged_id));
+			    break;
+		    case 'OBJE':
+			    Database::prepare("DELETE FROM `##media` WHERE m_id=? AND m_file=?")->execute(array($gid, $ged_id));
+			    break;
+		    default:
+			    Database::prepare("DELETE FROM `##other` WHERE o_id=? AND o_file=?")->execute(array($gid, $ged_id));
+			    break;
 		}
 
 		if (!$delete) {

app/Functions/FunctionsPrintFacts.php

Switch Indentation +306 added lines, -306 removed lines

@@ -60,34 +60,34 @@ 
 
 		// Some facts don't get printed here ...
 		switch ($fact->getTag()) {
-		case 'NOTE':
-			self::printMainNotes($fact, 1);
-
-			return;
-		case 'SOUR':
-			self::printMainSources($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') === '0' && !GedcomTag::isTag($fact->getTag())) {
-				return;
-			}
-			break;
+		    case 'NOTE':
+			    self::printMainNotes($fact, 1);
+
+			    return;
+		    case 'SOUR':
+			    self::printMainSources($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') === '0' && !GedcomTag::isTag($fact->getTag())) {
+				    return;
+			    }
+			    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
-			$label = $fact->getLabel();
-			break;
+		    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
+			    $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;
-		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;
-			}
+		    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:
+			        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;
-				}
+			    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]));
-				}
-				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') === '1' || 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]));
-						}
-					} else {
-						// Non links
-						echo GedcomTag::getLabelValue($fact->getTag() . ':' . $match[1], Filter::escapeHtml($match[2]));
-					}
-				}
-				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') === '1' || 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]));
+						    }
+					    } else {
+						    // Non links
+						    echo GedcomTag::getLabelValue($fact->getTag() . ':' . $match[1], Filter::escapeHtml($match[2]));
+					    }
+				    }
+				    break;
 			}
 		}
 		echo self::printFactSources($fact->getGedcom(), 2);
@@ -824,23 +824,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>';
 						}
@@ -1090,23 +1090,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>';
 				}
@@ -1207,12 +1207,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/FunctionsMedia.php

Switch Indentation +11 added lines, -11 removed lines

@@ -34,17 +34,17 @@
 			$val = -1;
 		}
 		switch (substr($val, -1)) {
-		case 'g':
-		case 'G':
-			return (int) $val * 1024 * 1024 * 1024;
-		case 'm':
-		case 'M':
-			return (int) $val * 1024 * 1024;
-		case 'k':
-		case 'K':
-			return (int) $val * 1024;
-		default:
-			return (int) $val;
+		    case 'g':
+		    case 'G':
+			    return (int) $val * 1024 * 1024 * 1024;
+		    case 'm':
+		    case 'M':
+			    return (int) $val * 1024 * 1024;
+		    case 'k':
+		    case 'K':
+			    return (int) $val * 1024;
+		    default:
+			    return (int) $val;
 		}
 	}
 

app/Functions/FunctionsRtl.php

Switch Indentation +249 added lines, -249 removed lines

@@ -124,227 +124,227 @@ 
 			$closeParIndex = strpos(self::CLOSE_PARENTHESES, $currentLetter); // Which closing parenthesis is this?
 
 			switch ($currentLetter) {
-			case '<':
-				// Assume this '<' starts an HTML element
-				$endPos = strpos($workingText, '>'); // look for the terminating '>'
-				if ($endPos === false) {
-					$endPos = 0;
-				}
-				$currentLen += $endPos;
-				$element = substr($workingText, 0, $currentLen);
-				$temp    = strtolower(substr($element, 0, 3));
-				if (strlen($element) < 7 && $temp == '<br') {
-					if ($numberState) {
-						$numberState = false;
-						if (self::$currentState == 'RTL') {
-							self::$waitingText .= WT_UTF8_PDF;
-						}
-					}
-					self::breakCurrentSpan($result);
-				} elseif (self::$waitingText == '') {
-					$result .= $element;
-				} else {
-					self::$waitingText .= $element;
-				}
-				$workingText = substr($workingText, $currentLen);
-				break;
-			case '&':
-				// Assume this '&' starts an HTML entity
-				$endPos = strpos($workingText, ';'); // look for the terminating ';'
-				if ($endPos === false) {
-					$endPos = 0;
-				}
-				$currentLen += $endPos;
-				$entity = substr($workingText, 0, $currentLen);
-				if (strtolower($entity) == '&nbsp;') {
-					$entity .= '&nbsp;'; // Ensure consistent case for this entity
-				}
-				if (self::$waitingText == '') {
-					$result .= $entity;
-				} else {
-					self::$waitingText .= $entity;
-				}
-				$workingText = substr($workingText, $currentLen);
-				break;
-			case '{':
-				if (substr($workingText, 1, 1) == '{') {
-					// Assume this '{{' starts a TCPDF directive
-					$endPos = strpos($workingText, '}}'); // look for the terminating '}}'
-					if ($endPos === false) {
-						$endPos = 0;
-					}
-					$currentLen        = $endPos + 2;
-					$directive         = substr($workingText, 0, $currentLen);
-					$workingText       = substr($workingText, $currentLen);
-					$result            = $result . self::$waitingText . $directive;
-					self::$waitingText = '';
-					break;
-				}
-			default:
-				// Look for strings of numbers with optional leading or trailing + or -
-				// and with optional embedded numeric punctuation
-				if ($numberState) {
-					// If we're inside a numeric string, look for reasons to end it
-					$offset    = 0; // Be sure to look at the current character first
-					$charArray = self::getChar($workingText . "\n", $offset);
-					if (strpos(self::NUMBERS, $charArray['letter']) === false) {
-						// This is not a digit. Is it numeric punctuation?
-						if (substr($workingText . "\n", $offset, 6) == '&nbsp;') {
-							$offset += 6; // This could be numeric punctuation
-						} elseif (strpos(self::NUMBER_PUNCTUATION, $charArray['letter']) !== false) {
-							$offset += $charArray['length']; // This could be numeric punctuation
-						}
-						// If the next character is a digit, the current character is numeric punctuation
-						$charArray = self::getChar($workingText . "\n", $offset);
-						if (strpos(self::NUMBERS, $charArray['letter']) === false) {
-							// This is not a digit. End the run of digits and punctuation.
-							$numberState = false;
-							if (self::$currentState == 'RTL') {
-								if (strpos(self::NUMBER_PREFIX, $currentLetter) === false) {
-									$currentLetter = WT_UTF8_PDF . $currentLetter;
-								} else {
-									$currentLetter = $currentLetter . WT_UTF8_PDF; // Include a trailing + or - in the run
-								}
-							}
-						}
-					}
-				} else {
-					// If we're outside a numeric string, look for reasons to start it
-					if (strpos(self::NUMBER_PREFIX, $currentLetter) !== false) {
-						// This might be a number lead-in
-						$offset   = $currentLen;
-						$nextChar = substr($workingText . "\n", $offset, 1);
-						if (strpos(self::NUMBERS, $nextChar) !== false) {
-							$numberState = true; // We found a digit: the lead-in is therefore numeric
-							if (self::$currentState == 'RTL') {
-								$currentLetter = WT_UTF8_LRE . $currentLetter;
-							}
-						}
-					} elseif (strpos(self::NUMBERS, $currentLetter) !== false) {
-						$numberState = true; // The current letter is a digit
-						if (self::$currentState == 'RTL') {
-							$currentLetter = WT_UTF8_LRE . $currentLetter;
-						}
-					}
-				}
-
-				// Determine the directionality of the current UTF-8 character
-				$newState = self::$currentState;
-				while (true) {
-					if (I18N::scriptDirection(I18N::textScript($currentLetter)) === 'rtl') {
-						if (self::$currentState == '') {
-							$newState = 'RTL';
-							break;
-						}
-
-						if (self::$currentState == 'RTL') {
-							break;
-						}
-						// Switch to RTL only if this isn't a solitary RTL letter
-						$tempText = substr($workingText, $currentLen);
-						while ($tempText != '') {
-							$nextCharArray = self::getChar($tempText, 0);
-							$nextLetter    = $nextCharArray['letter'];
-							$nextLen       = $nextCharArray['length'];
-							$tempText      = substr($tempText, $nextLen);
-
-							if (I18N::scriptDirection(I18N::textScript($nextLetter)) === 'rtl') {
-								$newState = 'RTL';
-								break 2;
-							}
-
-							if (strpos(self::PUNCTUATION, $nextLetter) !== false || strpos(self::OPEN_PARENTHESES, $nextLetter) !== false) {
-								$newState = 'RTL';
-								break 2;
-							}
-
-							if ($nextLetter === ' ') {
-								break;
-							}
-							$nextLetter .= substr($tempText . "\n", 0, 5);
-							if ($nextLetter === '&nbsp;') {
-								break;
-							}
-						}
-						// This is a solitary RTL letter : wrap it in UTF8 control codes to force LTR directionality
-						$currentLetter = WT_UTF8_LRO . $currentLetter . WT_UTF8_PDF;
-						$newState      = 'LTR';
-						break;
-					}
-					if (($currentLen != 1) || ($currentLetter >= 'A' && $currentLetter <= 'Z') || ($currentLetter >= 'a' && $currentLetter <= 'z')) {
-						// Since it’s neither Hebrew nor Arabic, this UTF-8 character or ASCII letter must be LTR
-						$newState = 'LTR';
-						break;
-					}
-					if ($closeParIndex !== false) {
-						// This closing parenthesis has to inherit the matching opening parenthesis' directionality
-						if (!empty($openParDirection[$closeParIndex]) && $openParDirection[$closeParIndex] != '?') {
-							$newState = $openParDirection[$closeParIndex];
-						}
-						$openParDirection[$closeParIndex] = '';
-						break;
-					}
-					if ($openParIndex !== false) {
-						// Opening parentheses always inherit the following directionality
-						self::$waitingText .= $currentLetter;
-						$workingText = substr($workingText, $currentLen);
-						while (true) {
-							if ($workingText === '') {
-								break;
-							}
-							if (substr($workingText, 0, 1) === ' ') {
-								// Spaces following this left parenthesis inherit the following directionality too
-								self::$waitingText .= ' ';
-								$workingText = substr($workingText, 1);
-								continue;
-							}
-							if (substr($workingText, 0, 6) === '&nbsp;') {
-								// Spaces following this left parenthesis inherit the following directionality too
-								self::$waitingText .= '&nbsp;';
-								$workingText = substr($workingText, 6);
-								continue;
-							}
-							break;
-						}
-						$openParDirection[$openParIndex] = '?';
-						break 2; // double break because we're waiting for more information
-					}
-
-					// We have a digit or a "normal" special character.
-					//
-					// When this character is not at the start of the input string, it inherits the preceding directionality;
-					// at the start of the input string, it assumes the following directionality.
-					//
-					// Exceptions to this rule will be handled later during final clean-up.
-					//
-					self::$waitingText .= $currentLetter;
-					$workingText = substr($workingText, $currentLen);
-					if (self::$currentState != '') {
-						$result .= self::$waitingText;
-						self::$waitingText = '';
-					}
-					break 2; // double break because we're waiting for more information
-				}
-				if ($newState != self::$currentState) {
-					// A direction change has occurred
-					self::finishCurrentSpan($result, false);
-					self::$previousState = self::$currentState;
-					self::$currentState  = $newState;
-					self::beginCurrentSpan($result);
-				}
-				self::$waitingText .= $currentLetter;
-				$workingText = substr($workingText, $currentLen);
-				$result .= self::$waitingText;
-				self::$waitingText = '';
-
-				foreach ($openParDirection as $index => $value) {
-					// Since we now know the proper direction, remember it for all waiting opening parentheses
-					if ($value === '?') {
-						$openParDirection[$index] = self::$currentState;
-					}
-				}
-
-				break;
+			    case '<':
+				    // Assume this '<' starts an HTML element
+				    $endPos = strpos($workingText, '>'); // look for the terminating '>'
+				    if ($endPos === false) {
+					    $endPos = 0;
+				    }
+				    $currentLen += $endPos;
+				    $element = substr($workingText, 0, $currentLen);
+				    $temp    = strtolower(substr($element, 0, 3));
+				    if (strlen($element) < 7 && $temp == '<br') {
+					    if ($numberState) {
+						    $numberState = false;
+						    if (self::$currentState == 'RTL') {
+							    self::$waitingText .= WT_UTF8_PDF;
+						    }
+					    }
+					    self::breakCurrentSpan($result);
+				    } elseif (self::$waitingText == '') {
+					    $result .= $element;
+				    } else {
+					    self::$waitingText .= $element;
+				    }
+				    $workingText = substr($workingText, $currentLen);
+				    break;
+			    case '&':
+				    // Assume this '&' starts an HTML entity
+				    $endPos = strpos($workingText, ';'); // look for the terminating ';'
+				    if ($endPos === false) {
+					    $endPos = 0;
+				    }
+				    $currentLen += $endPos;
+				    $entity = substr($workingText, 0, $currentLen);
+				    if (strtolower($entity) == '&nbsp;') {
+					    $entity .= '&nbsp;'; // Ensure consistent case for this entity
+				    }
+				    if (self::$waitingText == '') {
+					    $result .= $entity;
+				    } else {
+					    self::$waitingText .= $entity;
+				    }
+				    $workingText = substr($workingText, $currentLen);
+				    break;
+			    case '{':
+				    if (substr($workingText, 1, 1) == '{') {
+					    // Assume this '{{' starts a TCPDF directive
+					    $endPos = strpos($workingText, '}}'); // look for the terminating '}}'
+					    if ($endPos === false) {
+						    $endPos = 0;
+					    }
+					    $currentLen        = $endPos + 2;
+					    $directive         = substr($workingText, 0, $currentLen);
+					    $workingText       = substr($workingText, $currentLen);
+					    $result            = $result . self::$waitingText . $directive;
+					    self::$waitingText = '';
+					    break;
+				    }
+			    default:
+				    // Look for strings of numbers with optional leading or trailing + or -
+				    // and with optional embedded numeric punctuation
+				    if ($numberState) {
+					    // If we're inside a numeric string, look for reasons to end it
+					    $offset    = 0; // Be sure to look at the current character first
+					    $charArray = self::getChar($workingText . "\n", $offset);
+					    if (strpos(self::NUMBERS, $charArray['letter']) === false) {
+						    // This is not a digit. Is it numeric punctuation?
+						    if (substr($workingText . "\n", $offset, 6) == '&nbsp;') {
+							    $offset += 6; // This could be numeric punctuation
+						    } elseif (strpos(self::NUMBER_PUNCTUATION, $charArray['letter']) !== false) {
+							    $offset += $charArray['length']; // This could be numeric punctuation
+						    }
+						    // If the next character is a digit, the current character is numeric punctuation
+						    $charArray = self::getChar($workingText . "\n", $offset);
+						    if (strpos(self::NUMBERS, $charArray['letter']) === false) {
+							    // This is not a digit. End the run of digits and punctuation.
+							    $numberState = false;
+							    if (self::$currentState == 'RTL') {
+								    if (strpos(self::NUMBER_PREFIX, $currentLetter) === false) {
+									    $currentLetter = WT_UTF8_PDF . $currentLetter;
+								    } else {
+									    $currentLetter = $currentLetter . WT_UTF8_PDF; // Include a trailing + or - in the run
+								    }
+							    }
+						    }
+					    }
+				    } else {
+					    // If we're outside a numeric string, look for reasons to start it
+					    if (strpos(self::NUMBER_PREFIX, $currentLetter) !== false) {
+						    // This might be a number lead-in
+						    $offset   = $currentLen;
+						    $nextChar = substr($workingText . "\n", $offset, 1);
+						    if (strpos(self::NUMBERS, $nextChar) !== false) {
+							    $numberState = true; // We found a digit: the lead-in is therefore numeric
+							    if (self::$currentState == 'RTL') {
+								    $currentLetter = WT_UTF8_LRE . $currentLetter;
+							    }
+						    }
+					    } elseif (strpos(self::NUMBERS, $currentLetter) !== false) {
+						    $numberState = true; // The current letter is a digit
+						    if (self::$currentState == 'RTL') {
+							    $currentLetter = WT_UTF8_LRE . $currentLetter;
+						    }
+					    }
+				    }
+
+				    // Determine the directionality of the current UTF-8 character
+				    $newState = self::$currentState;
+				    while (true) {
+					    if (I18N::scriptDirection(I18N::textScript($currentLetter)) === 'rtl') {
+						    if (self::$currentState == '') {
+							    $newState = 'RTL';
+							    break;
+						    }
+
+						    if (self::$currentState == 'RTL') {
+							    break;
+						    }
+						    // Switch to RTL only if this isn't a solitary RTL letter
+						    $tempText = substr($workingText, $currentLen);
+						    while ($tempText != '') {
+							    $nextCharArray = self::getChar($tempText, 0);
+							    $nextLetter    = $nextCharArray['letter'];
+							    $nextLen       = $nextCharArray['length'];
+							    $tempText      = substr($tempText, $nextLen);
+
+							    if (I18N::scriptDirection(I18N::textScript($nextLetter)) === 'rtl') {
+								    $newState = 'RTL';
+								    break 2;
+							    }
+
+							    if (strpos(self::PUNCTUATION, $nextLetter) !== false || strpos(self::OPEN_PARENTHESES, $nextLetter) !== false) {
+								    $newState = 'RTL';
+								    break 2;
+							    }
+
+							    if ($nextLetter === ' ') {
+								    break;
+							    }
+							    $nextLetter .= substr($tempText . "\n", 0, 5);
+							    if ($nextLetter === '&nbsp;') {
+								    break;
+							    }
+						    }
+						    // This is a solitary RTL letter : wrap it in UTF8 control codes to force LTR directionality
+						    $currentLetter = WT_UTF8_LRO . $currentLetter . WT_UTF8_PDF;
+						    $newState      = 'LTR';
+						    break;
+					    }
+					    if (($currentLen != 1) || ($currentLetter >= 'A' && $currentLetter <= 'Z') || ($currentLetter >= 'a' && $currentLetter <= 'z')) {
+						    // Since it’s neither Hebrew nor Arabic, this UTF-8 character or ASCII letter must be LTR
+						    $newState = 'LTR';
+						    break;
+					    }
+					    if ($closeParIndex !== false) {
+						    // This closing parenthesis has to inherit the matching opening parenthesis' directionality
+						    if (!empty($openParDirection[$closeParIndex]) && $openParDirection[$closeParIndex] != '?') {
+							    $newState = $openParDirection[$closeParIndex];
+						    }
+						    $openParDirection[$closeParIndex] = '';
+						    break;
+					    }
+					    if ($openParIndex !== false) {
+						    // Opening parentheses always inherit the following directionality
+						    self::$waitingText .= $currentLetter;
+						    $workingText = substr($workingText, $currentLen);
+						    while (true) {
+							    if ($workingText === '') {
+								    break;
+							    }
+							    if (substr($workingText, 0, 1) === ' ') {
+								    // Spaces following this left parenthesis inherit the following directionality too
+								    self::$waitingText .= ' ';
+								    $workingText = substr($workingText, 1);
+								    continue;
+							    }
+							    if (substr($workingText, 0, 6) === '&nbsp;') {
+								    // Spaces following this left parenthesis inherit the following directionality too
+								    self::$waitingText .= '&nbsp;';
+								    $workingText = substr($workingText, 6);
+								    continue;
+							    }
+							    break;
+						    }
+						    $openParDirection[$openParIndex] = '?';
+						    break 2; // double break because we're waiting for more information
+					    }
+
+					    // We have a digit or a "normal" special character.
+					    //
+					    // When this character is not at the start of the input string, it inherits the preceding directionality;
+					    // at the start of the input string, it assumes the following directionality.
+					    //
+					    // Exceptions to this rule will be handled later during final clean-up.
+					    //
+					    self::$waitingText .= $currentLetter;
+					    $workingText = substr($workingText, $currentLen);
+					    if (self::$currentState != '') {
+						    $result .= self::$waitingText;
+						    self::$waitingText = '';
+					    }
+					    break 2; // double break because we're waiting for more information
+				    }
+				    if ($newState != self::$currentState) {
+					    // A direction change has occurred
+					    self::finishCurrentSpan($result, false);
+					    self::$previousState = self::$currentState;
+					    self::$currentState  = $newState;
+					    self::beginCurrentSpan($result);
+				    }
+				    self::$waitingText .= $currentLetter;
+				    $workingText = substr($workingText, $currentLen);
+				    $result .= self::$waitingText;
+				    self::$waitingText = '';
+
+				    foreach ($openParDirection as $index => $value) {
+					    // Since we now know the proper direction, remember it for all waiting opening parentheses
+					    if ($value === '?') {
+						    $openParDirection[$index] = self::$currentState;
+					    }
+				    }
+
+				    break;
 			}
 		}
 
@@ -461,34 +461,34 @@ 
 
 		// Finally, correct '<LTR>', '</LTR>', '<RTL>', and '</RTL>'
 		switch ($direction) {
-		case 'BOTH':
-		case 'both':
-			// LTR text: <span dir="ltr"> text </span>
-			// RTL text: <span dir="rtl"> text </span>
-			$sLTR = '<span dir="ltr" ' . $class . '>' . $nothing;
-			$eLTR = $nothing . '</span>';
-			$sRTL = '<span dir="rtl" ' . $class . '>' . $nothing;
-			$eRTL = $nothing . '</span>';
-			break;
-		case 'LTR':
-		case 'ltr':
-			// LTR text: <span dir="ltr"> text </span>
-			// RTL text: text
-			$sLTR = '<span dir="ltr" ' . $class . '>' . $nothing;
-			$eLTR = $nothing . '</span>';
-			$sRTL = '';
-			$eRTL = '';
-			break;
-		case 'RTL':
-		case 'rtl':
-		default:
-			// LTR text: text
-			// RTL text: <span dir="rtl"> text </span>
-			$sLTR = '';
-			$eLTR = '';
-			$sRTL = '<span dir="rtl" ' . $class . '>' . $nothing;
-			$eRTL = $nothing . '</span>';
-			break;
+		    case 'BOTH':
+		    case 'both':
+			    // LTR text: <span dir="ltr"> text </span>
+			    // RTL text: <span dir="rtl"> text </span>
+			    $sLTR = '<span dir="ltr" ' . $class . '>' . $nothing;
+			    $eLTR = $nothing . '</span>';
+			    $sRTL = '<span dir="rtl" ' . $class . '>' . $nothing;
+			    $eRTL = $nothing . '</span>';
+			    break;
+		    case 'LTR':
+		    case 'ltr':
+			    // LTR text: <span dir="ltr"> text </span>
+			    // RTL text: text
+			    $sLTR = '<span dir="ltr" ' . $class . '>' . $nothing;
+			    $eLTR = $nothing . '</span>';
+			    $sRTL = '';
+			    $eRTL = '';
+			    break;
+		    case 'RTL':
+		    case 'rtl':
+		    default:
+			    // LTR text: text
+			    // RTL text: <span dir="rtl"> text </span>
+			    $sLTR = '';
+			    $eLTR = '';
+			    $sRTL = '<span dir="rtl" ' . $class . '>' . $nothing;
+			    $eRTL = $nothing . '</span>';
+			    break;
 		}
 		$result = str_replace(array(self::$startLTR, self::$endLTR, self::$startRTL, self::$endRTL), array($sLTR, $eLTR, $sRTL, $eRTL), $result);
 

app/Functions/FunctionsPrint.php

Switch Indentation +60 added lines, -60 removed lines

@@ -51,20 +51,20 @@ 
 	public static function printPedigreePerson(Individual $person = null, $show_full = 1) {
 
 		switch ($show_full) {
-		case 0:
-			if ($person) {
-				echo Theme::theme()->individualBoxSmall($person);
-			} else {
-				echo Theme::theme()->individualBoxSmallEmpty();
-			}
-			break;
-		case 1:
-			if ($person) {
-				echo Theme::theme()->individualBox($person);
-			} else {
-				echo Theme::theme()->individualBoxEmpty();
-			}
-			break;
+		    case 0:
+			    if ($person) {
+				    echo Theme::theme()->individualBoxSmall($person);
+			    } else {
+				    echo Theme::theme()->individualBoxSmallEmpty();
+			    }
+			    break;
+		    case 1:
+			    if ($person) {
+				    echo Theme::theme()->individualBox($person);
+			    } else {
+				    echo Theme::theme()->individualBoxEmpty();
+			    }
+			    break;
 		}
 	}
 
@@ -260,25 +260,25 @@ 
 					$age      = Date::getAge($parent->getBirthDate(), $birth_date, 2);
 					$deatdate = $parent->getDeathDate();
 					switch ($parent->getSex()) {
-					case 'F':
-						// Highlight mothers who die in childbirth or shortly afterwards
-						if ($deatdate->isOK() && $deatdate->maximumJulianDay() < $birth_date->minimumJulianDay() + 90) {
-							$html .= ' <span title="' . GedcomTag::getLabel('_DEAT_PARE', $parent) . '" class="parentdeath">' . $sex . $age . '</span>';
-						} else {
-							$html .= ' <span title="' . I18N::translate('Mother’s age') . '">' . $sex . $age . '</span>';
-						}
-						break;
-					case 'M':
-						// Highlight fathers who die before the birth
-						if ($deatdate->isOK() && $deatdate->maximumJulianDay() < $birth_date->minimumJulianDay()) {
-							$html .= ' <span title="' . GedcomTag::getLabel('_DEAT_PARE', $parent) . '" class="parentdeath">' . $sex . $age . '</span>';
-						} else {
-							$html .= ' <span title="' . I18N::translate('Father’s age') . '">' . $sex . $age . '</span>';
-						}
-						break;
-					default:
-						$html .= ' <span title="' . I18N::translate('Parent’s age') . '">' . $sex . $age . '</span>';
-						break;
+					    case 'F':
+						    // Highlight mothers who die in childbirth or shortly afterwards
+						    if ($deatdate->isOK() && $deatdate->maximumJulianDay() < $birth_date->minimumJulianDay() + 90) {
+							    $html .= ' <span title="' . GedcomTag::getLabel('_DEAT_PARE', $parent) . '" class="parentdeath">' . $sex . $age . '</span>';
+						    } else {
+							    $html .= ' <span title="' . I18N::translate('Mother’s age') . '">' . $sex . $age . '</span>';
+						    }
+						    break;
+					    case 'M':
+						    // Highlight fathers who die before the birth
+						    if ($deatdate->isOK() && $deatdate->maximumJulianDay() < $birth_date->minimumJulianDay()) {
+							    $html .= ' <span title="' . GedcomTag::getLabel('_DEAT_PARE', $parent) . '" class="parentdeath">' . $sex . $age . '</span>';
+						    } else {
+							    $html .= ' <span title="' . I18N::translate('Father’s age') . '">' . $sex . $age . '</span>';
+						    }
+						    break;
+					    default:
+						    $html .= ' <span title="' . I18N::translate('Parent’s age') . '">' . $sex . $age . '</span>';
+						    break;
 					}
 				}
 			}
@@ -573,33 +573,33 @@ 
 
 		// -- Add from pick list
 		switch ($type) {
-		case "INDI":
-			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-			break;
-		case "FAM":
-			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-			break;
-		case "SOUR":
-			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-			break;
-		case "NOTE":
-			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-			break;
-		case "REPO":
-			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-			break;
-		default:
-			return;
+		    case "INDI":
+			    $addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+			    $uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+			    $quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+			    break;
+		    case "FAM":
+			    $addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+			    $uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+			    $quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+			    break;
+		    case "SOUR":
+			    $addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+			    $uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+			    $quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+			    break;
+		    case "NOTE":
+			    $addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+			    $uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+			    $quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+			    break;
+		    case "REPO":
+			    $addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+			    $uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+			    $quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+			    break;
+		    default:
+			    return;
 		}
 		$addfacts            = array_merge(self::checkFactUnique($uniquefacts, $usedfacts, $type), $addfacts);
 		$quickfacts          = array_intersect($quickfacts, $addfacts);

app/Functions/FunctionsEdit.php

Switch Indentation +302 added lines, -302 removed lines

@@ -559,19 +559,19 @@ 
 		} else {
 			// Not all facts have help text.
 			switch ($fact) {
-			case 'NAME':
-				if ($upperlevel !== 'REPO' && $upperlevel !== 'UNKNOWN') {
-					echo FunctionsPrint::helpLink($fact);
-				}
-				break;
-			case 'DATE':
-			case 'PLAC':
-			case 'RESN':
-			case 'ROMN':
-			case 'SURN':
-			case '_HEB':
-				echo FunctionsPrint::helpLink($fact);
-				break;
+			    case 'NAME':
+				    if ($upperlevel !== 'REPO' && $upperlevel !== 'UNKNOWN') {
+					    echo FunctionsPrint::helpLink($fact);
+				    }
+				    break;
+			    case 'DATE':
+			    case 'PLAC':
+			    case 'RESN':
+			    case 'ROMN':
+			    case 'SURN':
+			    case '_HEB':
+				    echo FunctionsPrint::helpLink($fact);
+				    break;
 			}
 		}
 		// tag level
@@ -716,51 +716,51 @@ 
 
 				// Extra markup for specific fact types
 				switch ($fact) {
-				case 'ALIA':
-				case 'ASSO':
-				case '_ASSO':
-					echo ' data-autocomplete-type="ASSO" data-autocomplete-extra="input.DATE"';
-					break;
-				case 'DATE':
-					echo ' onblur="valid_date(this);" onmouseout="valid_date(this);"';
-					break;
-				case 'GIVN':
-					echo ' autofocus data-autocomplete-type="GIVN"';
-					break;
-				case 'LATI':
-					echo ' onblur="valid_lati_long(this, \'N\', \'S\');" onmouseout="valid_lati_long(this, \'N\', \'S\');"';
-					break;
-				case 'LONG':
-					echo ' onblur="valid_lati_long(this, \'E\', \'W\');" onmouseout="valid_lati_long(this, \'E\', \'W\');"';
-					break;
-				case 'NOTE':
-					// Shared notes. Inline notes are handled elsewhere.
-					echo ' data-autocomplete-type="NOTE"';
-					break;
-				case 'OBJE':
-					echo ' data-autocomplete-type="OBJE"';
-					break;
-				case 'PAGE':
-					echo ' data-autocomplete-type="PAGE" data-autocomplete-extra="#' . $source_element_id . '"';
-					break;
-				case 'PLAC':
-					echo ' data-autocomplete-type="PLAC"';
-					break;
-				case 'REPO':
-					echo ' data-autocomplete-type="REPO"';
-					break;
-				case 'SOUR':
-					$source_element_id = $element_id;
-					echo ' data-autocomplete-type="SOUR"';
-					break;
-				case 'SURN':
-				case '_MARNM_SURN':
-					echo ' data-autocomplete-type="SURN"';
-					break;
-				case 'TIME':
-					echo ' pattern="([0-1][0-9]|2[0-3]):[0-5][0-9](:[0-5][0-9])?" dir="ltr" placeholder="' . /* I18N: Examples of valid time formats (hours:minutes:seconds) */
-						I18N::translate('hh:mm or hh:mm:ss') . '"';
-					break;
+				    case 'ALIA':
+				    case 'ASSO':
+				    case '_ASSO':
+					    echo ' data-autocomplete-type="ASSO" data-autocomplete-extra="input.DATE"';
+					    break;
+				    case 'DATE':
+					    echo ' onblur="valid_date(this);" onmouseout="valid_date(this);"';
+					    break;
+				    case 'GIVN':
+					    echo ' autofocus data-autocomplete-type="GIVN"';
+					    break;
+				    case 'LATI':
+					    echo ' onblur="valid_lati_long(this, \'N\', \'S\');" onmouseout="valid_lati_long(this, \'N\', \'S\');"';
+					    break;
+				    case 'LONG':
+					    echo ' onblur="valid_lati_long(this, \'E\', \'W\');" onmouseout="valid_lati_long(this, \'E\', \'W\');"';
+					    break;
+				    case 'NOTE':
+					    // Shared notes. Inline notes are handled elsewhere.
+					    echo ' data-autocomplete-type="NOTE"';
+					    break;
+				    case 'OBJE':
+					    echo ' data-autocomplete-type="OBJE"';
+					    break;
+				    case 'PAGE':
+					    echo ' data-autocomplete-type="PAGE" data-autocomplete-extra="#' . $source_element_id . '"';
+					    break;
+				    case 'PLAC':
+					    echo ' data-autocomplete-type="PLAC"';
+					    break;
+				    case 'REPO':
+					    echo ' data-autocomplete-type="REPO"';
+					    break;
+				    case 'SOUR':
+					    $source_element_id = $element_id;
+					    echo ' data-autocomplete-type="SOUR"';
+					    break;
+				    case 'SURN':
+				    case '_MARNM_SURN':
+					    echo ' data-autocomplete-type="SURN"';
+					    break;
+				    case 'TIME':
+					    echo ' pattern="([0-1][0-9]|2[0-3]):[0-5][0-9](:[0-5][0-9])?" dir="ltr" placeholder="' . /* I18N: Examples of valid time formats (hours:minutes:seconds) */
+						    I18N::translate('hh:mm or hh:mm:ss') . '"';
+					    break;
 				}
 				echo '>';
 			}
@@ -810,41 +810,41 @@ 
 
 		// popup links
 		switch ($fact) {
-		case 'DATE':
-			echo self::printCalendarPopup($element_id);
-			break;
-		case 'FAMC':
-		case 'FAMS':
-			echo FunctionsPrint::printFindFamilyLink($element_id);
-			break;
-		case 'ALIA':
-		case 'ASSO':
-		case '_ASSO':
-			echo FunctionsPrint::printFindIndividualLink($element_id, $element_id . '_description');
-			break;
-		case 'FILE':
-			FunctionsPrint::printFindMediaLink($element_id, '0file');
-			break;
-		case 'SOUR':
-			echo FunctionsPrint::printFindSourceLink($element_id, $element_id . '_description'), ' ', self::printAddNewSourceLink($element_id);
-			//-- checkboxes to apply '1 SOUR' to BIRT/MARR/DEAT as '2 SOUR'
-			if ($level === 1) {
-				echo '<br>';
-				switch ($WT_TREE->getPreference('PREFER_LEVEL2_SOURCES')) {
-				case '2': // records
-				$level1_checked = 'checked';
-				$level2_checked = '';
-				break;
-				case '1': // facts
-				$level1_checked = '';
-				$level2_checked = 'checked';
-				break;
-				case '0': // none
-				default:
-				$level1_checked = '';
-				$level2_checked = '';
-				break;
-				}
+		    case 'DATE':
+			    echo self::printCalendarPopup($element_id);
+			    break;
+		    case 'FAMC':
+		    case 'FAMS':
+			    echo FunctionsPrint::printFindFamilyLink($element_id);
+			    break;
+		    case 'ALIA':
+		    case 'ASSO':
+		    case '_ASSO':
+			    echo FunctionsPrint::printFindIndividualLink($element_id, $element_id . '_description');
+			    break;
+		    case 'FILE':
+			    FunctionsPrint::printFindMediaLink($element_id, '0file');
+			    break;
+		    case 'SOUR':
+			    echo FunctionsPrint::printFindSourceLink($element_id, $element_id . '_description'), ' ', self::printAddNewSourceLink($element_id);
+			    //-- checkboxes to apply '1 SOUR' to BIRT/MARR/DEAT as '2 SOUR'
+			    if ($level === 1) {
+				    echo '<br>';
+				    switch ($WT_TREE->getPreference('PREFER_LEVEL2_SOURCES')) {
+				        case '2': // records
+				        $level1_checked = 'checked';
+				        $level2_checked = '';
+				        break;
+				        case '1': // facts
+				        $level1_checked = '';
+				        $level2_checked = 'checked';
+				        break;
+				        case '0': // none
+				        default:
+				        $level1_checked = '';
+				        $level2_checked = '';
+				        break;
+				    }
 					if (strpos($bdm, 'B') !== false) {
 						echo ' <label><input type="checkbox" name="SOUR_INDI" ', $level1_checked, ' value="1">', I18N::translate('Individual'), '</label>';
 						if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
@@ -874,26 +874,26 @@ 
 					}
 				}
 				break;
-		case 'REPO':
-			echo FunctionsPrint::printFindRepositoryLink($element_id), ' ', self::printAddNewRepositoryLink($element_id);
-			break;
-		case 'NOTE':
-			// Shared Notes Icons ========================================
-			if ($islink) {
-				// Print regular Shared Note icons ---------------------------
-				echo ' ', FunctionsPrint::printFindNoteLink($element_id, $element_id . '_description'), ' ', self::printAddNewNoteLink($element_id);
-				if ($value) {
-					echo ' ', self::printEditNoteLink($value);
-				}
-			}
-			break;
-		case 'OBJE':
-			echo FunctionsPrint::printFindMediaLink($element_id, '1media');
-			if (!$value) {
-				echo ' ', self::printAddNewMediaLink($element_id);
-				$value = 'new';
-			}
-			break;
+		    case 'REPO':
+			    echo FunctionsPrint::printFindRepositoryLink($element_id), ' ', self::printAddNewRepositoryLink($element_id);
+			    break;
+		    case 'NOTE':
+			    // Shared Notes Icons ========================================
+			    if ($islink) {
+				    // Print regular Shared Note icons ---------------------------
+				    echo ' ', FunctionsPrint::printFindNoteLink($element_id, $element_id . '_description'), ' ', self::printAddNewNoteLink($element_id);
+				    if ($value) {
+					    echo ' ', self::printEditNoteLink($value);
+				    }
+			    }
+			    break;
+		    case 'OBJE':
+			    echo FunctionsPrint::printFindMediaLink($element_id, '1media');
+			    if (!$value) {
+				    echo ' ', self::printAddNewMediaLink($element_id);
+				    $value = 'new';
+			    }
+			    break;
 		}
 
 		echo '<div id="' . $element_id . '_description">';
@@ -913,38 +913,38 @@ 
 
 		if ($value && $value !== 'new' && $islink) {
 			switch ($fact) {
-			case 'ALIA':
-			case 'ASSO':
-			case '_ASSO':
-				$tmp = Individual::getInstance($value, $WT_TREE);
-				if ($tmp) {
-					echo ' ', $tmp->getFullName();
-				}
-				break;
-			case 'SOUR':
-				$tmp = Source::getInstance($value, $WT_TREE);
-				if ($tmp) {
-					echo ' ', $tmp->getFullName();
-				}
-				break;
-			case 'NOTE':
-				$tmp = Note::getInstance($value, $WT_TREE);
-				if ($tmp) {
-					echo ' ', $tmp->getFullName();
-				}
-				break;
-			case 'OBJE':
-				$tmp = Media::getInstance($value, $WT_TREE);
-				if ($tmp) {
-					echo ' ', $tmp->getFullName();
-				}
-				break;
-			case 'REPO':
-				$tmp = Repository::getInstance($value, $WT_TREE);
-				if ($tmp) {
-					echo ' ', $tmp->getFullName();
-				}
-				break;
+			    case 'ALIA':
+			    case 'ASSO':
+			    case '_ASSO':
+				    $tmp = Individual::getInstance($value, $WT_TREE);
+				    if ($tmp) {
+					    echo ' ', $tmp->getFullName();
+				    }
+				    break;
+			    case 'SOUR':
+				    $tmp = Source::getInstance($value, $WT_TREE);
+				    if ($tmp) {
+					    echo ' ', $tmp->getFullName();
+				    }
+				    break;
+			    case 'NOTE':
+				    $tmp = Note::getInstance($value, $WT_TREE);
+				    if ($tmp) {
+					    echo ' ', $tmp->getFullName();
+				    }
+				    break;
+			    case 'OBJE':
+				    $tmp = Media::getInstance($value, $WT_TREE);
+				    if ($tmp) {
+					    echo ' ', $tmp->getFullName();
+				    }
+				    break;
+			    case 'REPO':
+				    $tmp = Repository::getInstance($value, $WT_TREE);
+				    if ($tmp) {
+					    echo ' ', $tmp->getFullName();
+				    }
+				    break;
 			}
 		}
 
@@ -969,29 +969,29 @@ 
 
 		// Show more likely census details at the top of the list.
 		switch (WT_LOCALE) {
-		case 'cs':
-			$census_places = array(new CensusOfCzechRepublic);
-			break;
-		case 'en-AU':
-		case 'en-GB':
-			$census_places = array(new CensusOfEngland, new CensusOfWales, new CensusOfScotland);
-			break;
-		case 'en-US':
-			$census_places = array(new CensusOfUnitedStates);
-			break;
-		case 'fr':
-		case 'fr-CA':
-			$census_places = array(new CensusOfFrance);
-			break;
-		case 'da':
-			$census_places = array(new CensusOfDenmark);
-			break;
-		case 'de':
-			$census_places = array(new CensusOfDeutschland);
-			break;
-		default:
-			$census_places = array();
-			break;
+		    case 'cs':
+			    $census_places = array(new CensusOfCzechRepublic);
+			    break;
+		    case 'en-AU':
+		    case 'en-GB':
+			    $census_places = array(new CensusOfEngland, new CensusOfWales, new CensusOfScotland);
+			    break;
+		    case 'en-US':
+			    $census_places = array(new CensusOfUnitedStates);
+			    break;
+		    case 'fr':
+		    case 'fr-CA':
+			    $census_places = array(new CensusOfFrance);
+			    break;
+		    case 'da':
+			    $census_places = array(new CensusOfDenmark);
+			    break;
+		    case 'de':
+			    $census_places = array(new CensusOfDeutschland);
+			    break;
+		    default:
+			    $census_places = array();
+			    break;
 		}
 		foreach (Census::allCensusPlaces() as $census_place) {
 			if (!in_array($census_place, $census_places)) {
@@ -1053,97 +1053,97 @@ 
 		global $WT_TREE;
 
 		switch ($tag) {
-		case 'SOUR':
-			echo '<a href="#" onclick="return expand_layer(\'newsource\');"><i id="newsource_img" class="icon-plus"></i> ', I18N::translate('Add a source citation'), '</a>';
-			echo '<br>';
-			echo '<div id="newsource" style="display: none;">';
-			echo '<table class="facts_table">';
-			// 2 SOUR
-			self::addSimpleTag($level . ' SOUR @');
-			// 3 PAGE
-			self::addSimpleTag(($level + 1) . ' PAGE');
-			// 3 DATA
-			self::addSimpleTag(($level + 1) . ' DATA');
-			// 4 TEXT
-			self::addSimpleTag(($level + 2) . ' TEXT');
-			if ($WT_TREE->getPreference('FULL_SOURCES')) {
-				// 4 DATE
-				self::addSimpleTag(($level + 2) . ' DATE', '', GedcomTag::getLabel('DATA:DATE'));
-				// 3 QUAY
-				self::addSimpleTag(($level + 1) . ' QUAY');
-			}
-			// 3 OBJE
-			self::addSimpleTag(($level + 1) . ' OBJE');
-			// 3 SHARED_NOTE
-			self::addSimpleTag(($level + 1) . ' SHARED_NOTE');
-			echo '</table></div>';
-			break;
-
-		case 'ASSO':
-		case 'ASSO2':
-			//-- Add a new ASSOciate
-			if ($tag === 'ASSO') {
-				echo "<a href=\"#\" onclick=\"return expand_layer('newasso');\"><i id=\"newasso_img\" class=\"icon-plus\"></i> ", I18N::translate('Add an associate'), '</a>';
-				echo '<br>';
-				echo '<div id="newasso" style="display: none;">';
-			} else {
-				echo "<a href=\"#\" onclick=\"return expand_layer('newasso2');\"><i id=\"newasso2_img\" class=\"icon-plus\"></i> ", I18N::translate('Add an associate'), '</a>';
-				echo '<br>';
-				echo '<div id="newasso2" style="display: none;">';
-			}
-			echo '<table class="facts_table">';
-			// 2 ASSO
-			self::addSimpleTag($level . ' _ASSO @');
-			// 3 RELA
-			self::addSimpleTag(($level + 1) . ' RELA');
-			// 3 NOTE
-			self::addSimpleTag(($level + 1) . ' NOTE');
-			// 3 SHARED_NOTE
-			self::addSimpleTag(($level + 1) . ' SHARED_NOTE');
-			echo '</table></div>';
-			break;
-
-		case 'NOTE':
-			//-- Retrieve existing note or add new note to fact
-			echo "<a href=\"#\" onclick=\"return expand_layer('newnote');\"><i id=\"newnote_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a note'), '</a>';
-			echo '<br>';
-			echo '<div id="newnote" style="display: none;">';
-			echo '<table class="facts_table">';
-			// 2 NOTE
-			self::addSimpleTag($level . ' NOTE');
-			echo '</table></div>';
-			break;
-
-		case 'SHARED_NOTE':
-			echo "<a href=\"#\" onclick=\"return expand_layer('newshared_note');\"><i id=\"newshared_note_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a shared note'), '</a>';
-			echo '<br>';
-			echo '<div id="newshared_note" style="display: none;">';
-			echo '<table class="facts_table">';
-			// 2 SHARED NOTE
-			self::addSimpleTag($level . ' SHARED_NOTE', $parent_tag);
-			echo '</table></div>';
-			break;
-
-		case 'OBJE':
-			if ($WT_TREE->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($WT_TREE)) {
-				echo "<a href=\"#\" onclick=\"return expand_layer('newobje');\"><i id=\"newobje_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a media object'), '</a>';
-				echo '<br>';
-				echo '<div id="newobje" style="display: none;">';
-				echo '<table class="facts_table">';
-				self::addSimpleTag($level . ' OBJE');
-				echo '</table></div>';
-			}
-			break;
-
-		case 'RESN':
-			echo "<a href=\"#\" onclick=\"return expand_layer('newresn');\"><i id=\"newresn_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a restriction'), '</a>';
-			echo '<br>';
-			echo '<div id="newresn" style="display: none;">';
-			echo '<table class="facts_table">';
-			// 2 RESN
-			self::addSimpleTag($level . ' RESN');
-			echo '</table></div>';
-			break;
+		    case 'SOUR':
+			    echo '<a href="#" onclick="return expand_layer(\'newsource\');"><i id="newsource_img" class="icon-plus"></i> ', I18N::translate('Add a source citation'), '</a>';
+			    echo '<br>';
+			    echo '<div id="newsource" style="display: none;">';
+			    echo '<table class="facts_table">';
+			    // 2 SOUR
+			    self::addSimpleTag($level . ' SOUR @');
+			    // 3 PAGE
+			    self::addSimpleTag(($level + 1) . ' PAGE');
+			    // 3 DATA
+			    self::addSimpleTag(($level + 1) . ' DATA');
+			    // 4 TEXT
+			    self::addSimpleTag(($level + 2) . ' TEXT');
+			    if ($WT_TREE->getPreference('FULL_SOURCES')) {
+				    // 4 DATE
+				    self::addSimpleTag(($level + 2) . ' DATE', '', GedcomTag::getLabel('DATA:DATE'));
+				    // 3 QUAY
+				    self::addSimpleTag(($level + 1) . ' QUAY');
+			    }
+			    // 3 OBJE
+			    self::addSimpleTag(($level + 1) . ' OBJE');
+			    // 3 SHARED_NOTE
+			    self::addSimpleTag(($level + 1) . ' SHARED_NOTE');
+			    echo '</table></div>';
+			    break;
+
+		    case 'ASSO':
+		    case 'ASSO2':
+			    //-- Add a new ASSOciate
+			    if ($tag === 'ASSO') {
+				    echo "<a href=\"#\" onclick=\"return expand_layer('newasso');\"><i id=\"newasso_img\" class=\"icon-plus\"></i> ", I18N::translate('Add an associate'), '</a>';
+				    echo '<br>';
+				    echo '<div id="newasso" style="display: none;">';
+			    } else {
+				    echo "<a href=\"#\" onclick=\"return expand_layer('newasso2');\"><i id=\"newasso2_img\" class=\"icon-plus\"></i> ", I18N::translate('Add an associate'), '</a>';
+				    echo '<br>';
+				    echo '<div id="newasso2" style="display: none;">';
+			    }
+			    echo '<table class="facts_table">';
+			    // 2 ASSO
+			    self::addSimpleTag($level . ' _ASSO @');
+			    // 3 RELA
+			    self::addSimpleTag(($level + 1) . ' RELA');
+			    // 3 NOTE
+			    self::addSimpleTag(($level + 1) . ' NOTE');
+			    // 3 SHARED_NOTE
+			    self::addSimpleTag(($level + 1) . ' SHARED_NOTE');
+			    echo '</table></div>';
+			    break;
+
+		    case 'NOTE':
+			    //-- Retrieve existing note or add new note to fact
+			    echo "<a href=\"#\" onclick=\"return expand_layer('newnote');\"><i id=\"newnote_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a note'), '</a>';
+			    echo '<br>';
+			    echo '<div id="newnote" style="display: none;">';
+			    echo '<table class="facts_table">';
+			    // 2 NOTE
+			    self::addSimpleTag($level . ' NOTE');
+			    echo '</table></div>';
+			    break;
+
+		    case 'SHARED_NOTE':
+			    echo "<a href=\"#\" onclick=\"return expand_layer('newshared_note');\"><i id=\"newshared_note_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a shared note'), '</a>';
+			    echo '<br>';
+			    echo '<div id="newshared_note" style="display: none;">';
+			    echo '<table class="facts_table">';
+			    // 2 SHARED NOTE
+			    self::addSimpleTag($level . ' SHARED_NOTE', $parent_tag);
+			    echo '</table></div>';
+			    break;
+
+		    case 'OBJE':
+			    if ($WT_TREE->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($WT_TREE)) {
+				    echo "<a href=\"#\" onclick=\"return expand_layer('newobje');\"><i id=\"newobje_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a media object'), '</a>';
+				    echo '<br>';
+				    echo '<div id="newobje" style="display: none;">';
+				    echo '<table class="facts_table">';
+				    self::addSimpleTag($level . ' OBJE');
+				    echo '</table></div>';
+			    }
+			    break;
+
+		    case 'RESN':
+			    echo "<a href=\"#\" onclick=\"return expand_layer('newresn');\"><i id=\"newresn_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a restriction'), '</a>';
+			    echo '<br>';
+			    echo '<div id="newresn" style="display: none;">';
+			    echo '<table class="facts_table">';
+			    // 2 RESN
+			    self::addSimpleTag($level . ' RESN');
+			    echo '</table></div>';
+			    break;
 		}
 	}
 
@@ -1219,12 +1219,12 @@ 
 	 */
 	public static function addNewSex() {
 		switch (Filter::post('SEX', '[MF]', 'U')) {
-		case 'M':
-			return "\n1 SEX M";
-		case 'F':
-			return "\n1 SEX F";
-		default:
-			return "\n1 SEX U";
+		    case 'M':
+			    return "\n1 SEX M";
+		    case 'F':
+			    return "\n1 SEX F";
+		    default:
+			    return "\n1 SEX U";
 		}
 	}
 
@@ -1750,43 +1750,43 @@ 
 				}
 				// Add level 3/4 tags as appropriate
 				switch ($key) {
-				case 'PLAC':
-					if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('ADVANCED_PLAC_FACTS'), $match)) {
-						foreach ($match[1] as $tag) {
-							self::addSimpleTag('3 ' . $tag, '', GedcomTag::getLabel($level1tag . ':PLAC:' . $tag));
-						}
-					}
-					self::addSimpleTag('3 MAP');
-					self::addSimpleTag('4 LATI');
-					self::addSimpleTag('4 LONG');
-					break;
-				case 'FILE':
-					self::addSimpleTag('3 FORM');
-					break;
-				case 'EVEN':
-					self::addSimpleTag('3 DATE');
-					self::addSimpleTag('3 PLAC');
-					break;
-				case 'STAT':
-					if (GedcomCodeTemp::isTagLDS($level1tag)) {
-						self::addSimpleTag('3 DATE', '', GedcomTag::getLabel('STAT:DATE'));
-					}
-					break;
-				case 'DATE':
-					// TIME is NOT a valid 5.5.1 tag
-					if (in_array($level1tag, Config::dateAndTime())) {
-						self::addSimpleTag('3 TIME');
-					}
-					break;
-				case 'HUSB':
-				case 'WIFE':
-					self::addSimpleTag('3 AGE');
-					break;
-				case 'FAMC':
-					if ($level1tag === 'ADOP') {
-						self::addSimpleTag('3 ADOP BOTH');
-					}
-					break;
+				    case 'PLAC':
+					    if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('ADVANCED_PLAC_FACTS'), $match)) {
+						    foreach ($match[1] as $tag) {
+							    self::addSimpleTag('3 ' . $tag, '', GedcomTag::getLabel($level1tag . ':PLAC:' . $tag));
+						    }
+					    }
+					    self::addSimpleTag('3 MAP');
+					    self::addSimpleTag('4 LATI');
+					    self::addSimpleTag('4 LONG');
+					    break;
+				    case 'FILE':
+					    self::addSimpleTag('3 FORM');
+					    break;
+				    case 'EVEN':
+					    self::addSimpleTag('3 DATE');
+					    self::addSimpleTag('3 PLAC');
+					    break;
+				    case 'STAT':
+					    if (GedcomCodeTemp::isTagLDS($level1tag)) {
+						    self::addSimpleTag('3 DATE', '', GedcomTag::getLabel('STAT:DATE'));
+					    }
+					    break;
+				    case 'DATE':
+					    // TIME is NOT a valid 5.5.1 tag
+					    if (in_array($level1tag, Config::dateAndTime())) {
+						    self::addSimpleTag('3 TIME');
+					    }
+					    break;
+				    case 'HUSB':
+				    case 'WIFE':
+					    self::addSimpleTag('3 AGE');
+					    break;
+				    case 'FAMC':
+					    if ($level1tag === 'ADOP') {
+						    self::addSimpleTag('3 ADOP BOTH');
+					    }
+					    break;
 				}
 			} elseif ($key === 'DATE' && $add_date) {
 				self::addSimpleTag('2 DATE', $level1tag, GedcomTag::getLabel($level1tag . ':DATE'));

app/Tree.php

Switch Indentation +19 added lines, -19 removed lines

@@ -466,25 +466,25 @@
 		$tree->setPreference('WEBMASTER_USER_ID', Auth::id());
 		$tree->setPreference('LANGUAGE', WT_LOCALE); // Default to the current admin’s language
 		switch (WT_LOCALE) {
-		case 'es':
-			$tree->setPreference('SURNAME_TRADITION', 'spanish');
-			break;
-		case 'is':
-			$tree->setPreference('SURNAME_TRADITION', 'icelandic');
-			break;
-		case 'lt':
-			$tree->setPreference('SURNAME_TRADITION', 'lithuanian');
-			break;
-		case 'pl':
-			$tree->setPreference('SURNAME_TRADITION', 'polish');
-			break;
-		case 'pt':
-		case 'pt-BR':
-			$tree->setPreference('SURNAME_TRADITION', 'portuguese');
-			break;
-		default:
-			$tree->setPreference('SURNAME_TRADITION', 'paternal');
-			break;
+		    case 'es':
+			    $tree->setPreference('SURNAME_TRADITION', 'spanish');
+			    break;
+		    case 'is':
+			    $tree->setPreference('SURNAME_TRADITION', 'icelandic');
+			    break;
+		    case 'lt':
+			    $tree->setPreference('SURNAME_TRADITION', 'lithuanian');
+			    break;
+		    case 'pl':
+			    $tree->setPreference('SURNAME_TRADITION', 'polish');
+			    break;
+		    case 'pt':
+		    case 'pt-BR':
+			    $tree->setPreference('SURNAME_TRADITION', 'portuguese');
+			    break;
+		    default:
+			    $tree->setPreference('SURNAME_TRADITION', 'paternal');
+			    break;
 		}
 
 		// Genealogy data

app/SurnameTradition/SpanishSurnameTradition.php

Switch Indentation +10 added lines, -10 removed lines

@@ -62,16 +62,16 @@
 	public function newParentNames($child_name, $parent_sex) {
 		if (preg_match(self::REGEX_SURNS, $child_name, $match)) {
 			switch ($parent_sex) {
-			case 'M':
-				return array(
-					'NAME' => '/' . $match['SURN1'] . '/ //',
-					'SURN' => $match['SURN1'],
-				);
-			case 'F':
-				return array(
-					'NAME' => '/' . $match['SURN2'] . '/ //',
-					'SURN' => $match['SURN2'],
-				);
+			    case 'M':
+				    return array(
+					    'NAME' => '/' . $match['SURN1'] . '/ //',
+					    'SURN' => $match['SURN1'],
+				    );
+			    case 'F':
+				    return array(
+					    'NAME' => '/' . $match['SURN2'] . '/ //',
+					    'SURN' => $match['SURN2'],
+				    );
 			}
 		}