fisharebest / webtrees

app/Functions/FunctionsImport.php

Switch Indentation +644 added lines, -644 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,136 +635,136 @@ 
 		}
 
 		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 ($tree->getPreference('USE_RIN') && 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 ($tree->getPreference('USE_RIN') && 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 (?, ?, ?, ?, ?, ?, ?)"
-				)->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;
-			case 'HEAD':
-				// Force HEAD records to have a creation date.
-				if (!strpos($gedrec, "\n1 DATE ")) {
-					$gedrec .= "\n1 DATE " . date('j M Y');
-				}
-			// No break;
-			case 'TRLR':
-			case 'SUBM':
-			case 'SUBN':
-				Database::prepare(
-					"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, ?, ?)"
-				)->execute(array($xref, $tree_id, $type, $gedrec));
-				// Update the cross-reference/index tables.
+			$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);
-				break;
-			default:
-				$record = new GedcomRecord($xref, $gedrec, null, $tree);
-				Database::prepare(
-					"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, ?, ?)"
-				)->execute(array($xref, $tree_id, $type, $gedrec));
-				// Update the cross-reference/index tables.
-				self::updateLinks($xref, $tree_id, $gedrec);
-				self::updateNames($xref, $tree_id, $record);
-				break;
+			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 (?, ?, ?, ?, ?, ?, ?)"
+			)->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;
+		case 'HEAD':
+			// Force HEAD records to have a creation date.
+			if (!strpos($gedrec, "\n1 DATE ")) {
+				$gedrec .= "\n1 DATE " . date('j M Y');
+			}
+		// No break;
+		case 'TRLR':
+		case 'SUBM':
+		case 'SUBN':
+			Database::prepare(
+				"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, ?, ?)"
+			)->execute(array($xref, $tree_id, $type, $gedrec));
+			// Update the cross-reference/index tables.
+		self::updateLinks($xref, $tree_id, $gedrec);
+			break;
+		default:
+			$record = new GedcomRecord($xref, $gedrec, null, $tree);
+			Database::prepare(
+				"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, ?, ?)"
+			)->execute(array($xref, $tree_id, $type, $gedrec));
+			// Update the cross-reference/index tables.
+			self::updateLinks($xref, $tree_id, $gedrec);
+			self::updateNames($xref, $tree_id, $record);
+			break;
 		}
 	}
 
@@ -1137,21 +1137,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) {

Indentation +13 added lines, -13 removed lines

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

app/Functions/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;
 		}
 	}
 

Indentation +13 added lines, -13 removed lines

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

app/Functions/FunctionsPrint.php

Switch Indentation +60 added lines, -60 removed lines

@@ -50,20 +50,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;
 		}
 	}
 
@@ -259,25 +259,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;
 					}
 				}
 			}
@@ -578,33 +578,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);

Indentation +13 added lines, -13 removed lines

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

app/Functions/FunctionsPrintFacts.php

Switch Indentation +290 added lines, -290 removed lines

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

Indentation +13 added lines, -13 removed lines

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

app/Functions/FunctionsPrintLists.php

Switch Indentation +76 added lines, -76 removed lines

@@ -1687,37 +1687,37 @@ 
 
 		}
 		switch ($style) {
-			case 1:
-				return '<ul><li>' . implode('</li><li>', $html) . '</li></ul>';
-			case 2:
-				return implode(I18N::$list_separator, $html);
-			case 3:
-				$i     = 0;
-				$count = count($html);
-				if ($count > 36) {
-					$col = 4;
-				} elseif ($count > 18) {
-					$col = 3;
-				} elseif ($count > 6) {
-					$col = 2;
-				} else {
-					$col = 1;
-				}
-				$newcol = ceil($count / $col);
-				$html2  = '<table class="list_table"><tr>';
-				$html2 .= '<td class="list_value" style="padding: 14px;">';
-
-				foreach ($html as $surns) {
-					$html2 .= $surns . '<br>';
-					$i++;
-					if ($i == $newcol && $i < $count) {
-						$html2 .= '</td><td class="list_value" style="padding: 14px;">';
-						$newcol = $i + ceil($count / $col);
-					}
+		case 1:
+			return '<ul><li>' . implode('</li><li>', $html) . '</li></ul>';
+		case 2:
+			return implode(I18N::$list_separator, $html);
+		case 3:
+			$i     = 0;
+			$count = count($html);
+			if ($count > 36) {
+				$col = 4;
+			} elseif ($count > 18) {
+				$col = 3;
+			} elseif ($count > 6) {
+				$col = 2;
+			} else {
+				$col = 1;
+			}
+			$newcol = ceil($count / $col);
+			$html2  = '<table class="list_table"><tr>';
+			$html2 .= '<td class="list_value" style="padding: 14px;">';
+
+			foreach ($html as $surns) {
+				$html2 .= $surns . '<br>';
+				$i++;
+				if ($i == $newcol && $i < $count) {
+					$html2 .= '</td><td class="list_value" style="padding: 14px;">';
+					$newcol = $i + ceil($count / $col);
 				}
-				$html2 .= '</td></tr></table>';
+			}
+			$html2 .= '</td></tr></table>';
 
-				return $html2;
+			return $html2;
 		}
 	}
 
@@ -1747,15 +1747,15 @@ 
 		}
 
 		switch ($sort) {
-			case 'name':
-				uasort($arr, '\Fisharebest\Webtrees\Functions\Functions::eventSortName');
-				break;
-			case 'date_asc':
-				uasort($arr, '\Fisharebest\Webtrees\Functions\Functions::eventSort');
-				$arr = array_reverse($arr);
-				break;
-			case 'date_desc':
-				uasort($arr, '\Fisharebest\Webtrees\Functions\Functions::eventSort');
+		case 'name':
+			uasort($arr, '\Fisharebest\Webtrees\Functions\Functions::eventSortName');
+			break;
+		case 'date_asc':
+			uasort($arr, '\Fisharebest\Webtrees\Functions\Functions::eventSort');
+			$arr = array_reverse($arr);
+			break;
+		case 'date_desc':
+			uasort($arr, '\Fisharebest\Webtrees\Functions\Functions::eventSort');
 		}
 		$html = '';
 		foreach ($arr as $value) {
@@ -1788,15 +1788,15 @@ 
 		$n        = 0;
 		$table_id = 'table-chan-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
 		switch ($sort) {
-			case 'name':        //name
-				$aaSorting = "[5,'asc'], [4,'desc']";
-				break;
-			case 'date_asc':    //date ascending
-				$aaSorting = "[4,'asc'], [5,'asc']";
-				break;
-			case 'date_desc':   //date descending
-				$aaSorting = "[4,'desc'], [5,'asc']";
-				break;
+		case 'name':        //name
+			$aaSorting = "[5,'asc'], [4,'desc']";
+			break;
+		case 'date_asc':    //date ascending
+			$aaSorting = "[4,'asc'], [5,'asc']";
+			break;
+		case 'date_desc':   //date descending
+			$aaSorting = "[4,'desc'], [5,'asc']";
+			break;
 		}
 		$html = '';
 		$controller
@@ -1843,27 +1843,27 @@ 
 			}
 			$html .= '<tr><td>';
 			switch ($record::RECORD_TYPE) {
-				case 'INDI':
-					$icon = $record->getSexImage('small');
-					break;
-				case 'FAM':
-					$icon = '<i class="icon-button_family"></i>';
-					break;
-				case 'OBJE':
-					$icon = '<i class="icon-button_media"></i>';
-					break;
-				case 'NOTE':
-					$icon = '<i class="icon-button_note"></i>';
-					break;
-				case 'SOUR':
-					$icon = '<i class="icon-button_source"></i>';
-					break;
-				case 'REPO':
-					$icon = '<i class="icon-button_repository"></i>';
-					break;
-				default:
-					$icon = '&nbsp;';
-					break;
+			case 'INDI':
+				$icon = $record->getSexImage('small');
+				break;
+			case 'FAM':
+				$icon = '<i class="icon-button_family"></i>';
+				break;
+			case 'OBJE':
+				$icon = '<i class="icon-button_media"></i>';
+				break;
+			case 'NOTE':
+				$icon = '<i class="icon-button_note"></i>';
+				break;
+			case 'SOUR':
+				$icon = '<i class="icon-button_source"></i>';
+				break;
+			case 'REPO':
+				$icon = '<i class="icon-button_repository"></i>';
+				break;
+			default:
+				$icon = '&nbsp;';
+				break;
 			}
 			$html .= '<a href="' . $record->getHtmlUrl() . '">' . $icon . '</a>';
 			$html .= '</td>';
@@ -2092,14 +2092,14 @@ 
 
 		// Now we've filtered the list, we can sort by event, if required
 		switch ($sort_by) {
-			case 'anniv':
-				// Data is already sorted by anniversary date
-				break;
-			case 'alpha':
-				uasort($filtered_events, function (Fact $x, Fact $y) {
-					return GedcomRecord::compare($x->getParent(), $y->getParent());
-				});
-				break;
+		case 'anniv':
+			// Data is already sorted by anniversary date
+			break;
+		case 'alpha':
+			uasort($filtered_events, function (Fact $x, Fact $y) {
+				return GedcomRecord::compare($x->getParent(), $y->getParent());
+			});
+			break;
 		}
 
 		foreach ($filtered_events as $fact) {

Indentation +13 added lines, -13 removed lines

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

app/Functions/FunctionsRtl.php

Switch Indentation +212 added lines, -212 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;
-							}
+			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 ';'
+					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;
-					$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);
+					$currentLen        = $endPos + 2;
+					$directive         = substr($workingText, 0, $currentLen);
+					$workingText       = substr($workingText, $currentLen);
+					$result            = $result . self::$waitingText . $directive;
+					self::$waitingText = '';
 					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;
+				}
+			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
 						}
-						$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
+						// 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.  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
-									}
+							// 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
+					}
+				} 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;
+						}
 
-					// Determine the directionality of the current UTF-8 character
-					$newState = self::$currentState;
-					while (true) {
-						if (I18N::scriptDirection(I18N::textScript($currentLetter)) === 'rtl') {
-							if (self::$currentState == '') {
+						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;
+								break 2;
 							}
 
-							if (self::$currentState == 'RTL') {
-								break;
+							if (strpos(self::PUNCTUATION, $nextLetter) !== false || strpos(self::OPEN_PARENTHESES, $nextLetter) !== false) {
+								$newState = 'RTL';
+								break 2;
 							}
-							// 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];
+							if ($nextLetter === ' ') {
+								break;
 							}
-							$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;
-								}
+							$nextLetter .= substr($tempText . "\n", 0, 5);
+							if ($nextLetter === '&nbsp;') {
 								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.
-						//
+						// 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);
-						if (self::$currentState != '') {
-							$result .= self::$waitingText;
-							self::$waitingText = '';
+						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
 					}
-					if ($newState != self::$currentState) {
-						// A direction change has occurred
-						self::finishCurrentSpan($result, false);
-						self::$previousState = self::$currentState;
-						self::$currentState  = $newState;
-						self::beginCurrentSpan($result);
-					}
+
+					// 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);
-					$result .= self::$waitingText;
-					self::$waitingText = '';
+					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;
-						}
+				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;
+				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);
 

Indentation +13 added lines, -13 removed lines

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

app/I18N.php

Switch Indentation +18 added lines, -18 removed lines

@@ -283,15 +283,15 @@ 
 	 */
 	public static function gedcomAge($string) {
 		switch ($string) {
-			case 'STILLBORN':
-				// I18N: Description of an individual’s age at an event.  For example, Died 14 Jan 1900 (stillborn)
-				return self::translate('(stillborn)');
-			case 'INFANT':
-				// I18N: Description of an individual’s age at an event.  For example, Died 14 Jan 1900 (in infancy)
-				return self::translate('(in infancy)');
-			case 'CHILD':
-				// I18N: Description of an individual’s age at an event.  For example, Died 14 Jan 1900 (in childhood)
-				return self::translate('(in childhood)');
+		case 'STILLBORN':
+			// I18N: Description of an individual’s age at an event.  For example, Died 14 Jan 1900 (stillborn)
+			return self::translate('(stillborn)');
+		case 'INFANT':
+			// I18N: Description of an individual’s age at an event.  For example, Died 14 Jan 1900 (in infancy)
+			return self::translate('(in infancy)');
+		case 'CHILD':
+			// I18N: Description of an individual’s age at an event.  For example, Died 14 Jan 1900 (in childhood)
+			return self::translate('(in childhood)');
 		}
 		$age = array();
 		if (preg_match('/(\d+)y/', $string, $match)) {
@@ -871,15 +871,15 @@ 
 	 */
 	public static function defaultCalendar() {
 		switch (self::$locale->languageTag()) {
-			case 'ar':
-				return new ArabicCalendar;
-			case 'fa':
-				return new PersianCalendar;
-			case 'he':
-			case 'yi':
-				return new JewishCalendar;
-			default:
-				return new GregorianCalendar;
+		case 'ar':
+			return new ArabicCalendar;
+		case 'fa':
+			return new PersianCalendar;
+		case 'he':
+		case 'yi':
+			return new JewishCalendar;
+		default:
+			return new GregorianCalendar;
 		}
 	}
 }

Indentation +13 added lines, -13 removed lines

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

app/Module/CensusAssistantModule.php

Spacing +3 added lines, -3 removed lines

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

Indentation +13 added lines, -13 removed lines

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

app/Module/GoogleMapsModule.php

Spacing +5 added lines, -5 removed lines

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

Braces +79 added lines, -34 removed lines

@@ -826,7 +826,9 @@ 
 			$person = $this->ancestors[$i];
 			if (!empty($person)) {
 				$name = $person->getFullName();
-				if ($name == I18N::translate('Private')) $priv++;
+				if ($name == I18N::translate('Private')) {
+					$priv++;
+				}
 				$place = $person->getBirthPlace();
 				if (empty($place)) {
 					$latlongval[$i] = null;
@@ -1716,8 +1718,9 @@ 
 
 				if ($row['pl_place'] != '') {
 					$placestr2 = $mapstr_edit . $id . "&level=" . $level . $mapstr3 . $mapstr5 . I18N::translate('Zoom=') . $row['pl_zoom'] . $mapstr6 . $row['pl_placerequested'] . $mapstr8;
-					if ($row['pl_place'] === 'unknown')
-						$matched[$x]++;
+					if ($row['pl_place'] === 'unknown') {
+											$matched[$x]++;
+					}
 				} else {
 					if ($levels[$z] === 'unknown') {
 						$placestr2 = $mapstr_add . $id . "&amp;level=" . $level . $mapstr3 . $mapstr7 . "<strong>" . I18N::translate('unknown') . "</strong>" . $mapstr8; $matched[$x]++;
@@ -2829,8 +2832,9 @@ 
 			$parent[$level] = $place2['place'];
 			$this->printHowManyPeople($level + 1, $parent);
 			echo '<br>', I18N::translate('This place has no coordinates');
-			if (Auth::isAdmin())
-				echo "<br><a href='module.php?mod=googlemap&amp;mod_action=admin_places&amp;parent=", $levelm, "&amp;display=inactive'>", I18N::translate('Geographic data'), "</a>";
+			if (Auth::isAdmin()) {
+							echo "<br><a href='module.php?mod=googlemap&amp;mod_action=admin_places&amp;parent=", $levelm, "&amp;display=inactive'>", I18N::translate('Geographic data'), "</a>";
+			}
 			echo "</div>\", icon_type, \"", str_replace(array('&lrm;', '&rlm;'), array(WT_UTF8_LRM, WT_UTF8_RLM), addslashes($place2['place'])), "\");\n";
 		} else {
 			$lati = str_replace(array('N', 'S', ','), array('', '-', '.'), $place2['lati']);
@@ -3031,7 +3035,8 @@ 
 		ob_start(); // TODO: rewrite print_gm_markers, and the functions called therein, to either return text or add JS directly.
 
 		if ($numfound == 0 && $level > 0) {
-			if (isset($levelo[($level - 1)])) {  // ** BH not sure yet what this if statement is for ... TODO **
+			if (isset($levelo[($level - 1)])) {
+// ** BH not sure yet what this if statement is for ... TODO **
 				// show the current place on the map
 
 				$place = Database::prepare("SELECT pl_id as place_id, pl_place as place, pl_lati as lati, pl_long as `long`, pl_zoom as zoom, pl_icon as icon FROM `##placelocation` WHERE pl_id=?")
@@ -3306,10 +3311,11 @@ 
 			$place_name       = $row->pl_place;
 			$place_icon       = $row->pl_icon;
 			$selected_country = explode("/", $place_icon);
-			if (isset($selected_country[1]) && $selected_country[1] != "flags")
-				$selected_country = $selected_country[1];
-			else
-				$selected_country = "Countries";
+			if (isset($selected_country[1]) && $selected_country[1] != "flags") {
+							$selected_country = $selected_country[1];
+			} else {
+							$selected_country = "Countries";
+			}
 			$parent_id         = $row->pl_parent_id;
 			$level             = $row->pl_level;
 			$zoomfactor        = $row->pl_zoom;
@@ -3388,8 +3394,9 @@ 
 			} else {
 				echo '<b>', $place_name;
 			}
-			if (count($where_am_i) > 0)
-				echo ', ', Filter::escapeHtml(str_replace('Unknown', I18N::translate('unknown'), implode(I18N::$list_separator, array_reverse($where_am_i, true)))), '</b><br>';
+			if (count($where_am_i) > 0) {
+							echo ', ', Filter::escapeHtml(str_replace('Unknown', I18N::translate('unknown'), implode(I18N::$list_separator, array_reverse($where_am_i, true)))), '</b><br>';
+			}
 			echo '</b><br>';
 		}
 
@@ -3898,7 +3905,10 @@ 
 			}
 
 			function showLocation_level(address) {
-				address += '<?php if ($level > 0) echo ', ', addslashes(implode(', ', array_reverse($where_am_i, true))); ?>';
+				address += '<?php if ($level > 0) {
+	echo ', ', addslashes(implode(', ', array_reverse($where_am_i, true)));
+}
+?>';
 				geocoder.geocode({'address': address}, addAddressToMap);
 			}
 
@@ -3959,23 +3969,42 @@ 
 						$precision2 = -1;
 					}
 					($precision1 > $precision2) ? ($precision = $precision1) : ($precision = $precision2);
-					if ($precision == -1) ($level > 3) ? ($precision = 3) : ($precision = $level);
-					elseif ($precision > 5) {
+					if ($precision == -1) {
+						($level > 3) ? ($precision = 3) : ($precision = $level);
+					} elseif ($precision > 5) {
 						$precision = 5;
 					}
 				?>
 				<td class="optionbox" colspan="2">
-					<input type="radio" id="new_prec_0" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_0')) echo 'checked'; ?> value="<?php echo $this->getSetting('GM_PRECISION_0'); ?>">
+					<input type="radio" id="new_prec_0" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_0')) {
+	echo 'checked';
+}
+?> value="<?php echo $this->getSetting('GM_PRECISION_0'); ?>">
 					<label for="new_prec_0"><?php echo I18N::translate('Country'); ?></label>
-					<input type="radio" id="new_prec_1" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_1')) echo 'checked'; ?> value="<?php echo $this->getSetting('GM_PRECISION_1'); ?>">
+					<input type="radio" id="new_prec_1" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_1')) {
+	echo 'checked';
+}
+?> value="<?php echo $this->getSetting('GM_PRECISION_1'); ?>">
 					<label for="new_prec_1"><?php echo I18N::translate('State'); ?></label>
-					<input type="radio" id="new_prec_2" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_2')) echo 'checked'; ?> value="<?php echo $this->getSetting('GM_PRECISION_2'); ?>">
+					<input type="radio" id="new_prec_2" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_2')) {
+	echo 'checked';
+}
+?> value="<?php echo $this->getSetting('GM_PRECISION_2'); ?>">
 					<label for="new_prec_2"><?php echo I18N::translate('City'); ?></label>
-					<input type="radio" id="new_prec_3" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_3')) echo 'checked'; ?> value="<?php echo $this->getSetting('GM_PRECISION_3'); ?>">
+					<input type="radio" id="new_prec_3" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_3')) {
+	echo 'checked';
+}
+?> value="<?php echo $this->getSetting('GM_PRECISION_3'); ?>">
 					<label for="new_prec_3"><?php echo I18N::translate('Neighborhood'); ?></label>
-					<input type="radio" id="new_prec_4" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_4')) echo 'checked'; ?> value="<?php echo $this->getSetting('GM_PRECISION_4'); ?>">
+					<input type="radio" id="new_prec_4" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_4')) {
+	echo 'checked';
+}
+?> value="<?php echo $this->getSetting('GM_PRECISION_4'); ?>">
 					<label for="new_prec_4"><?php echo I18N::translate('House'); ?></label>
-					<input type="radio" id="new_prec_5" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision >= $this->getSetting('GM_PRECISION_5')) echo 'checked'; ?> value="<?php echo $this->getSetting('GM_PRECISION_5'); ?>">
+					<input type="radio" id="new_prec_5" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision >= $this->getSetting('GM_PRECISION_5')) {
+	echo 'checked';
+}
+?> value="<?php echo $this->getSetting('GM_PRECISION_5'); ?>">
 					<label for="new_prec_5"><?php echo I18N::translate('Max'); ?></label>
 					<p class="small text-muted">
 						<?php echo I18N::translate('Here you can enter the precision.  Based on this setting the number of digits that will be used in the latitude and longitude is determined.'); ?>
@@ -3987,8 +4016,14 @@ 
 				<td class="optionbox" colspan="2">
 					<input type="text" id="NEW_PLACE_LATI" name="NEW_PLACE_LATI" placeholder="<?php echo /* I18N: Measure of latitude/longitude */ I18N::translate('degrees'); ?>" value="<?php echo abs($place_lati); ?>" size="20" onchange="updateMap();">
 					<select name="LATI_CONTROL" onchange="updateMap();">
-						<option value="PL_N" <?php if ($place_lati >= 0) echo "selected"; echo ">", I18N::translate('north'); ?></option>
-						<option value="PL_S" <?php if ($place_lati < 0) echo "selected"; echo ">", I18N::translate('south'); ?></option>
+						<option value="PL_N" <?php if ($place_lati >= 0) {
+	echo "selected";
+}
+echo ">", I18N::translate('north'); ?></option>
+						<option value="PL_S" <?php if ($place_lati < 0) {
+	echo "selected";
+}
+echo ">", I18N::translate('south'); ?></option>
 					</select>
 				</td>
 			</tr>
@@ -3997,8 +4032,14 @@ 
 				<td class="optionbox" colspan="2">
 					<input type="text" id="NEW_PLACE_LONG" name="NEW_PLACE_LONG" placeholder="<?php echo I18N::translate('degrees'); ?>" value="<?php echo abs($place_long); ?>" size="20" onchange="updateMap();">
 					<select name="LONG_CONTROL" onchange="updateMap();">
-						<option value="PL_E" <?php if ($place_long >= 0) echo "selected"; echo ">", I18N::translate('east'); ?></option>
-						<option value="PL_W" <?php if ($place_long < 0) echo "selected"; echo ">", I18N::translate('west'); ?></option>
+						<option value="PL_E" <?php if ($place_long >= 0) {
+	echo "selected";
+}
+echo ">", I18N::translate('east'); ?></option>
+						<option value="PL_W" <?php if ($place_long < 0) {
+	echo "selected";
+}
+echo ">", I18N::translate('west'); ?></option>
 					</select>
 				</td>
 			</tr>
@@ -4211,8 +4252,9 @@ 
 				$parent    = array_reverse($parent);
 				$parent_id = 0;
 				for ($i = 0; $i < count($parent); $i++) {
-					if (!isset($default_zoom_level[$i]))
-						$default_zoom_level[$i] = $default_zoom_level[$i - 1];
+					if (!isset($default_zoom_level[$i])) {
+											$default_zoom_level[$i] = $default_zoom_level[$i - 1];
+					}
 					$escparent               = $parent[$i];
 					if ($escparent == '') {
 						$escparent = 'Unknown';
@@ -4452,7 +4494,8 @@ 
 						Database::prepare("SELECT pl_id, pl_long, pl_lati, pl_zoom, pl_icon FROM `##placelocation` WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place")
 						->execute(array($i, $parent_id, $escparent))
 						->fetchOneRow();
-					if (empty($row)) {       // this name does not yet exist: create entry
+					if (empty($row)) {
+// this name does not yet exist: create entry
 						if (!Filter::postBool('updateonly')) {
 							$highestIndex = $highestIndex + 1;
 							if (($i + 1) == count($parent)) {
@@ -4591,14 +4634,16 @@ 
 		echo '<th>', I18N::translate('Icon'), '</th>';
 		echo '<th>';
 		echo I18N::translate('Edit'), '</th><th>', I18N::translate('Delete'), '</th></tr>';
-		if (count($placelist) == 0)
-			echo '<tr><td colspan="7">', I18N::translate('No places found'), '</td></tr>';
+		if (count($placelist) == 0) {
+					echo '<tr><td colspan="7">', I18N::translate('No places found'), '</td></tr>';
+		}
 		foreach ($placelist as $place) {
 			echo '<tr><td><a href="module.php?mod=googlemap&mod_action=admin_places&parent=', $place['place_id'], '&inactive=', $inactive, '">';
-			if ($place['place'] != 'Unknown')
-					echo Filter::escapeHtml($place['place']), '</a></td>';
-				else
-					echo I18N::translate('unknown'), '</a></td>';
+			if ($place['place'] != 'Unknown') {
+								echo Filter::escapeHtml($place['place']), '</a></td>';
+			} else {
+									echo I18N::translate('unknown'), '</a></td>';
+				}
 			echo '<td>', $place['lati'], '</td>';
 			echo '<td>', $place['long'], '</td>';
 			echo '<td>', $place['zoom'], '</td>';

Indentation +13 added lines, -13 removed lines

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