fisharebest / webtrees

app/Functions/FunctionsImport.php

Indentation +1075 added lines, -1075 removed lines

@@ -34,1121 +34,1121 @@
  * Class FunctionsImport - common functions
  */
 class FunctionsImport {
-	/**
-	 * Tidy up a gedcom record on import, so that we can access it consistently/efficiently.
-	 *
-	 * @param string $rec
-	 * @param Tree   $tree
-	 *
-	 * @return string
-	 */
-	public static function reformatRecord($rec, Tree $tree) {
-		// Strip out UTF8 formatting characters
-		$rec = str_replace(array(WT_UTF8_BOM, WT_UTF8_LRM, WT_UTF8_RLM), '', $rec);
+    /**
+     * Tidy up a gedcom record on import, so that we can access it consistently/efficiently.
+     *
+     * @param string $rec
+     * @param Tree   $tree
+     *
+     * @return string
+     */
+    public static function reformatRecord($rec, Tree $tree) {
+        // Strip out UTF8 formatting characters
+        $rec = str_replace(array(WT_UTF8_BOM, WT_UTF8_LRM, WT_UTF8_RLM), '', $rec);
 
-		// Strip out mac/msdos line endings
-		$rec = preg_replace("/[\r\n]+/", "\n", $rec);
+        // Strip out mac/msdos line endings
+        $rec = preg_replace("/[\r\n]+/", "\n", $rec);
 
-		// Extract lines from the record; lines consist of: level + optional xref + tag + optional data
-		$num_matches = preg_match_all('/^[ \t]*(\d+)[ \t]*(@[^@]*@)?[ \t]*(\w+)[ \t]?(.*)$/m', $rec, $matches, PREG_SET_ORDER);
+        // Extract lines from the record; lines consist of: level + optional xref + tag + optional data
+        $num_matches = preg_match_all('/^[ \t]*(\d+)[ \t]*(@[^@]*@)?[ \t]*(\w+)[ \t]?(.*)$/m', $rec, $matches, PREG_SET_ORDER);
 
-		// Process the record line-by-line
-		$newrec = '';
-		foreach ($matches as $n => $match) {
-			list(, $level, $xref, $tag, $data) = $match;
-			$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;
-			}
-			// Suppress "Y", for facts/events with a DATE or PLAC
-			if ($data == 'y') {
-				$data = 'Y';
-			}
-			if ($level == '1' && $data == 'Y') {
-				for ($i = $n + 1; $i < $num_matches - 1 && $matches[$i][1] != '1'; ++$i) {
-					if ($matches[$i][3] == 'DATE' || $matches[$i][3] == 'PLAC') {
-						$data = '';
-						break;
-					}
-				}
-			}
-			// 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);
+        // Process the record line-by-line
+        $newrec = '';
+        foreach ($matches as $n => $match) {
+            list(, $level, $xref, $tag, $data) = $match;
+            $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;
+            }
+            // Suppress "Y", for facts/events with a DATE or PLAC
+            if ($data == 'y') {
+                $data = 'Y';
+            }
+            if ($level == '1' && $data == 'Y') {
+                for ($i = $n + 1; $i < $num_matches - 1 && $matches[$i][1] != '1'; ++$i) {
+                    if ($matches[$i][3] == 'DATE' || $matches[$i][3] == 'PLAC') {
+                        $data = '';
+                        break;
+                    }
+                }
+            }
+            // 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);
 
-				$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;
+            }
+        }
 
-		return $newrec;
-	}
+        return $newrec;
+    }
 
-	/**
-	 * import record into database
-	 *
-	 * this function will parse the given gedcom record and add it to the database
-	 *
-	 * @param string $gedrec the raw gedcom record to parse
-	 * @param Tree   $tree   import the record into this tree
-	 * @param bool   $update whether or not this is an updated record that has been accepted
-	 */
-	public static function importRecord($gedrec, Tree $tree, $update) {
-		$tree_id = $tree->getTreeId();
+    /**
+     * import record into database
+     *
+     * this function will parse the given gedcom record and add it to the database
+     *
+     * @param string $gedrec the raw gedcom record to parse
+     * @param Tree   $tree   import the record into this tree
+     * @param bool   $update whether or not this is an updated record that has been accepted
+     */
+    public static function importRecord($gedrec, Tree $tree, $update) {
+        $tree_id = $tree->getTreeId();
 
-		// Escaped @ signs (only if importing from file)
-		if (!$update) {
-			$gedrec = str_replace('@@', '@', $gedrec);
-		}
+        // Escaped @ signs (only if importing from file)
+        if (!$update) {
+            $gedrec = str_replace('@@', '@', $gedrec);
+        }
 
-		// Standardise gedcom format
-		$gedrec = self::reformatRecord($gedrec, $tree);
+        // Standardise gedcom format
+        $gedrec = self::reformatRecord($gedrec, $tree);
 
-		// import different types of records
-		if (preg_match('/^0 @(' . WT_REGEX_XREF . ')@ (' . WT_REGEX_TAG . ')/', $gedrec, $match)) {
-			list(, $xref, $type) = $match;
-			// check for a _UID, if the record doesn't have one, add one
-			if ($tree->getPreference('GENERATE_UIDS') && !strpos($gedrec, "\n1 _UID ")) {
-				$gedrec .= "\n1 _UID " . GedcomTag::createUid();
-			}
-		} elseif (preg_match('/0 (HEAD|TRLR)/', $gedrec, $match)) {
-			$type = $match[1];
-			$xref = $type; // For HEAD/TRLR, use type as pseudo XREF.
-		} else {
-			echo I18N::translate('Invalid GEDCOM format'), '<br><pre>', $gedrec, '</pre>';
+        // import different types of records
+        if (preg_match('/^0 @(' . WT_REGEX_XREF . ')@ (' . WT_REGEX_TAG . ')/', $gedrec, $match)) {
+            list(, $xref, $type) = $match;
+            // check for a _UID, if the record doesn't have one, add one
+            if ($tree->getPreference('GENERATE_UIDS') && !strpos($gedrec, "\n1 _UID ")) {
+                $gedrec .= "\n1 _UID " . GedcomTag::createUid();
+            }
+        } elseif (preg_match('/0 (HEAD|TRLR)/', $gedrec, $match)) {
+            $type = $match[1];
+            $xref = $type; // For HEAD/TRLR, use type as pseudo XREF.
+        } else {
+            echo I18N::translate('Invalid GEDCOM format'), '<br><pre>', $gedrec, '</pre>';
 
-			return;
-		}
+            return;
+        }
 
-		// If the user has downloaded their GEDCOM data (containing media objects) and edited it
-		// using an application which does not support (and deletes) media objects, then add them
-		// back in.
-		if ($tree->getPreference('keep_media') && $xref) {
-			$old_linked_media =
-				Database::prepare("SELECT l_to FROM `##link` WHERE l_from=? AND l_file=? AND l_type='OBJE'")
-					->execute(array($xref, $tree_id))
-					->fetchOneColumn();
-			foreach ($old_linked_media as $media_id) {
-				$gedrec .= "\n1 OBJE @" . $media_id . "@";
-			}
-		}
+        // If the user has downloaded their GEDCOM data (containing media objects) and edited it
+        // using an application which does not support (and deletes) media objects, then add them
+        // back in.
+        if ($tree->getPreference('keep_media') && $xref) {
+            $old_linked_media =
+                Database::prepare("SELECT l_to FROM `##link` WHERE l_from=? AND l_file=? AND l_type='OBJE'")
+                    ->execute(array($xref, $tree_id))
+                    ->fetchOneColumn();
+            foreach ($old_linked_media as $media_id) {
+                $gedrec .= "\n1 OBJE @" . $media_id . "@";
+            }
+        }
 
-		switch ($type) {
-		case 'INDI':
-			// Convert inline media into media objects
-			$gedrec = self::convertInlineMedia($tree, $gedrec);
+        switch ($type) {
+        case 'INDI':
+            // Convert inline media into media objects
+            $gedrec = self::convertInlineMedia($tree, $gedrec);
 
-			$record = new Individual($xref, $gedrec, null, $tree);
-			if (preg_match('/\n1 RIN (.+)/', $gedrec, $match)) {
-				$rin = $match[1];
-			} else {
-				$rin = $xref;
-			}
-			Database::prepare(
-				"INSERT INTO `##individuals` (i_id, i_file, i_rin, i_sex, i_gedcom) VALUES (?, ?, ?, ?, ?)"
-			)->execute(array(
-				$xref, $tree_id, $rin, $record->getSex(), $gedrec,
-			));
-			// Update the cross-reference/index tables.
-			self::updatePlaces($xref, $tree_id, $gedrec);
-			self::updateDates($xref, $tree_id, $gedrec);
-			self::updateLinks($xref, $tree_id, $gedrec);
-			self::updateNames($xref, $tree_id, $record);
-			break;
-		case 'FAM':
-			// Convert inline media into media objects
-			$gedrec = self::convertInlineMedia($tree, $gedrec);
+            $record = new Individual($xref, $gedrec, null, $tree);
+            if (preg_match('/\n1 RIN (.+)/', $gedrec, $match)) {
+                $rin = $match[1];
+            } else {
+                $rin = $xref;
+            }
+            Database::prepare(
+                "INSERT INTO `##individuals` (i_id, i_file, i_rin, i_sex, i_gedcom) VALUES (?, ?, ?, ?, ?)"
+            )->execute(array(
+                $xref, $tree_id, $rin, $record->getSex(), $gedrec,
+            ));
+            // Update the cross-reference/index tables.
+            self::updatePlaces($xref, $tree_id, $gedrec);
+            self::updateDates($xref, $tree_id, $gedrec);
+            self::updateLinks($xref, $tree_id, $gedrec);
+            self::updateNames($xref, $tree_id, $record);
+            break;
+        case 'FAM':
+            // Convert inline media into media objects
+            $gedrec = self::convertInlineMedia($tree, $gedrec);
 
-			if (preg_match('/\n1 HUSB @(' . WT_REGEX_XREF . ')@/', $gedrec, $match)) {
-				$husb = $match[1];
-			} else {
-				$husb = '';
-			}
-			if (preg_match('/\n1 WIFE @(' . WT_REGEX_XREF . ')@/', $gedrec, $match)) {
-				$wife = $match[1];
-			} else {
-				$wife = '';
-			}
-			$nchi = preg_match_all('/\n1 CHIL @(' . WT_REGEX_XREF . ')@/', $gedrec, $match);
-			if (preg_match('/\n1 NCHI (\d+)/', $gedrec, $match)) {
-				$nchi = max($nchi, $match[1]);
-			}
-			Database::prepare(
-				"INSERT INTO `##families` (f_id, f_file, f_husb, f_wife, f_gedcom, f_numchil) VALUES (?, ?, ?, ?, ?, ?)"
-			)->execute(array(
-				$xref, $tree_id, $husb, $wife, $gedrec, $nchi,
-			));
-			// Update the cross-reference/index tables.
-			self::updatePlaces($xref, $tree_id, $gedrec);
-			self::updateDates($xref, $tree_id, $gedrec);
-			self::updateLinks($xref, $tree_id, $gedrec);
-			break;
-		case 'SOUR':
-			// Convert inline media into media objects
-			$gedrec = self::convertInlineMedia($tree, $gedrec);
+            if (preg_match('/\n1 HUSB @(' . WT_REGEX_XREF . ')@/', $gedrec, $match)) {
+                $husb = $match[1];
+            } else {
+                $husb = '';
+            }
+            if (preg_match('/\n1 WIFE @(' . WT_REGEX_XREF . ')@/', $gedrec, $match)) {
+                $wife = $match[1];
+            } else {
+                $wife = '';
+            }
+            $nchi = preg_match_all('/\n1 CHIL @(' . WT_REGEX_XREF . ')@/', $gedrec, $match);
+            if (preg_match('/\n1 NCHI (\d+)/', $gedrec, $match)) {
+                $nchi = max($nchi, $match[1]);
+            }
+            Database::prepare(
+                "INSERT INTO `##families` (f_id, f_file, f_husb, f_wife, f_gedcom, f_numchil) VALUES (?, ?, ?, ?, ?, ?)"
+            )->execute(array(
+                $xref, $tree_id, $husb, $wife, $gedrec, $nchi,
+            ));
+            // Update the cross-reference/index tables.
+            self::updatePlaces($xref, $tree_id, $gedrec);
+            self::updateDates($xref, $tree_id, $gedrec);
+            self::updateLinks($xref, $tree_id, $gedrec);
+            break;
+        case 'SOUR':
+            // Convert inline media into media objects
+            $gedrec = self::convertInlineMedia($tree, $gedrec);
 
-			$record = new Source($xref, $gedrec, null, $tree);
-			if (preg_match('/\n1 TITL (.+)/', $gedrec, $match)) {
-				$name = $match[1];
-			} elseif (preg_match('/\n1 ABBR (.+)/', $gedrec, $match)) {
-				$name = $match[1];
-			} else {
-				$name = $xref;
-			}
-			Database::prepare(
-				"INSERT INTO `##sources` (s_id, s_file, s_name, s_gedcom) VALUES (?, ?, LEFT(?, 255), ?)"
-			)->execute(array(
-				$xref, $tree_id, $name, $gedrec,
-			));
-			// Update the cross-reference/index tables.
-			self::updateLinks($xref, $tree_id, $gedrec);
-			self::updateNames($xref, $tree_id, $record);
-			break;
-		case 'REPO':
-			// Convert inline media into media objects
-			$gedrec = self::convertInlineMedia($tree, $gedrec);
+            $record = new Source($xref, $gedrec, null, $tree);
+            if (preg_match('/\n1 TITL (.+)/', $gedrec, $match)) {
+                $name = $match[1];
+            } elseif (preg_match('/\n1 ABBR (.+)/', $gedrec, $match)) {
+                $name = $match[1];
+            } else {
+                $name = $xref;
+            }
+            Database::prepare(
+                "INSERT INTO `##sources` (s_id, s_file, s_name, s_gedcom) VALUES (?, ?, LEFT(?, 255), ?)"
+            )->execute(array(
+                $xref, $tree_id, $name, $gedrec,
+            ));
+            // Update the cross-reference/index tables.
+            self::updateLinks($xref, $tree_id, $gedrec);
+            self::updateNames($xref, $tree_id, $record);
+            break;
+        case 'REPO':
+            // Convert inline media into media objects
+            $gedrec = self::convertInlineMedia($tree, $gedrec);
 
-			$record = new Repository($xref, $gedrec, null, $tree);
-			Database::prepare(
-				"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, 'REPO', ?)"
-			)->execute(array(
-				$xref, $tree_id, $gedrec,
-			));
-			// Update the cross-reference/index tables.
-			self::updateLinks($xref, $tree_id, $gedrec);
-			self::updateNames($xref, $tree_id, $record);
-			break;
-		case 'NOTE':
-			$record = new Note($xref, $gedrec, null, $tree);
-			Database::prepare(
-				"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, 'NOTE', ?)"
-			)->execute(array(
-				$xref, $tree_id, $gedrec,
-			));
-			// Update the cross-reference/index tables.
-			self::updateLinks($xref, $tree_id, $gedrec);
-			self::updateNames($xref, $tree_id, $record);
-			break;
-		case 'OBJE':
-			$record = new Media($xref, $gedrec, null, $tree);
-			Database::prepare(
-				"INSERT INTO `##media` (m_id, m_ext, m_type, m_titl, m_filename, m_file, m_gedcom) VALUES (?, LEFT(?, 6), LEFT(?, 60), LEFT(?, 255), left(?, 512), ?, ?)"
-			)->execute(array(
-				$xref, $record->extension(), $record->getMediaType(), $record->getTitle(), $record->getFilename(), $tree_id, $gedrec,
-			));
-			// Update the cross-reference/index tables.
-			self::updateLinks($xref, $tree_id, $gedrec);
-			self::updateNames($xref, $tree_id, $record);
-			break;
-		default: // HEAD, TRLR, SUBM, SUBN, and custom record types.
-			// Force HEAD records to have a creation date.
-			if ($type === 'HEAD' && strpos($gedrec, "\n1 DATE ") === false) {
-				$gedrec .= "\n1 DATE " . date('j M Y');
-			}
-			Database::prepare(
-				"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, LEFT(?, 15), ?)"
-			)->execute(array($xref, $tree_id, $type, $gedrec));
-			// Update the cross-reference/index tables.
-			self::updateLinks($xref, $tree_id, $gedrec);
-			break;
-		}
-	}
+            $record = new Repository($xref, $gedrec, null, $tree);
+            Database::prepare(
+                "INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, 'REPO', ?)"
+            )->execute(array(
+                $xref, $tree_id, $gedrec,
+            ));
+            // Update the cross-reference/index tables.
+            self::updateLinks($xref, $tree_id, $gedrec);
+            self::updateNames($xref, $tree_id, $record);
+            break;
+        case 'NOTE':
+            $record = new Note($xref, $gedrec, null, $tree);
+            Database::prepare(
+                "INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, 'NOTE', ?)"
+            )->execute(array(
+                $xref, $tree_id, $gedrec,
+            ));
+            // Update the cross-reference/index tables.
+            self::updateLinks($xref, $tree_id, $gedrec);
+            self::updateNames($xref, $tree_id, $record);
+            break;
+        case 'OBJE':
+            $record = new Media($xref, $gedrec, null, $tree);
+            Database::prepare(
+                "INSERT INTO `##media` (m_id, m_ext, m_type, m_titl, m_filename, m_file, m_gedcom) VALUES (?, LEFT(?, 6), LEFT(?, 60), LEFT(?, 255), left(?, 512), ?, ?)"
+            )->execute(array(
+                $xref, $record->extension(), $record->getMediaType(), $record->getTitle(), $record->getFilename(), $tree_id, $gedrec,
+            ));
+            // Update the cross-reference/index tables.
+            self::updateLinks($xref, $tree_id, $gedrec);
+            self::updateNames($xref, $tree_id, $record);
+            break;
+        default: // HEAD, TRLR, SUBM, SUBN, and custom record types.
+            // Force HEAD records to have a creation date.
+            if ($type === 'HEAD' && strpos($gedrec, "\n1 DATE ") === false) {
+                $gedrec .= "\n1 DATE " . date('j M Y');
+            }
+            Database::prepare(
+                "INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom) VALUES (?, ?, LEFT(?, 15), ?)"
+            )->execute(array($xref, $tree_id, $type, $gedrec));
+            // Update the cross-reference/index tables.
+            self::updateLinks($xref, $tree_id, $gedrec);
+            break;
+        }
+    }
 
-	/**
-	 * extract all places from the given record and insert them into the places table
-	 *
-	 * @param string $gid
-	 * @param int    $ged_id
-	 * @param string $gedrec
-	 */
-	public static function updatePlaces($gid, $ged_id, $gedrec) {
-		global $placecache;
+    /**
+     * extract all places from the given record and insert them into the places table
+     *
+     * @param string $gid
+     * @param int    $ged_id
+     * @param string $gedrec
+     */
+    public static function updatePlaces($gid, $ged_id, $gedrec) {
+        global $placecache;
 
-		if (!isset($placecache)) {
-			$placecache = array();
-		}
-		$personplace = array();
-		// import all place locations, but not control info such as
-		// 0 HEAD/1 PLAC or 0 _EVDEF/1 PLAC
-		$pt = preg_match_all("/^[2-9] PLAC (.+)/m", $gedrec, $match, PREG_SET_ORDER);
-		for ($i = 0; $i < $pt; $i++) {
-			$place    = trim($match[$i][1]);
-			$lowplace = I18N::strtolower($place);
-			//-- if we have already visited this place for this person then we don't need to again
-			if (isset($personplace[$lowplace])) {
-				continue;
-			}
-			$personplace[$lowplace] = 1;
-			$places                 = explode(',', $place);
-			//-- reverse the array to start at the highest level
-			$secalp    = array_reverse($places);
-			$parent_id = 0;
-			$search    = true;
+        if (!isset($placecache)) {
+            $placecache = array();
+        }
+        $personplace = array();
+        // import all place locations, but not control info such as
+        // 0 HEAD/1 PLAC or 0 _EVDEF/1 PLAC
+        $pt = preg_match_all("/^[2-9] PLAC (.+)/m", $gedrec, $match, PREG_SET_ORDER);
+        for ($i = 0; $i < $pt; $i++) {
+            $place    = trim($match[$i][1]);
+            $lowplace = I18N::strtolower($place);
+            //-- if we have already visited this place for this person then we don't need to again
+            if (isset($personplace[$lowplace])) {
+                continue;
+            }
+            $personplace[$lowplace] = 1;
+            $places                 = explode(',', $place);
+            //-- reverse the array to start at the highest level
+            $secalp    = array_reverse($places);
+            $parent_id = 0;
+            $search    = true;
 
-			foreach ($secalp as $place) {
-				$place = trim($place);
-				$key   = strtolower(mb_substr($place, 0, 150) . "_" . $parent_id);
-				//-- if this place has already been added then we don't need to add it again
-				if (isset($placecache[$key])) {
-					$parent_id = $placecache[$key];
-					if (!isset($personplace[$key])) {
-						$personplace[$key] = 1;
-						// Use INSERT IGNORE as a (temporary) fix for https://bugs.launchpad.net/webtrees/+bug/582226
-						// It ignores places that utf8_unicode_ci consider to be the same (i.e. accents).
-						// For example Québec and Quebec
-						// We need a better solution that attaches multiple names to single places
-						Database::prepare(
-							"INSERT IGNORE INTO `##placelinks` (pl_p_id, pl_gid, pl_file) VALUES (?, ?, ?)"
-						)->execute(array(
-							$parent_id, $gid, $ged_id,
-						));
-					}
-					continue;
-				}
+            foreach ($secalp as $place) {
+                $place = trim($place);
+                $key   = strtolower(mb_substr($place, 0, 150) . "_" . $parent_id);
+                //-- if this place has already been added then we don't need to add it again
+                if (isset($placecache[$key])) {
+                    $parent_id = $placecache[$key];
+                    if (!isset($personplace[$key])) {
+                        $personplace[$key] = 1;
+                        // Use INSERT IGNORE as a (temporary) fix for https://bugs.launchpad.net/webtrees/+bug/582226
+                        // It ignores places that utf8_unicode_ci consider to be the same (i.e. accents).
+                        // For example Québec and Quebec
+                        // We need a better solution that attaches multiple names to single places
+                        Database::prepare(
+                            "INSERT IGNORE INTO `##placelinks` (pl_p_id, pl_gid, pl_file) VALUES (?, ?, ?)"
+                        )->execute(array(
+                            $parent_id, $gid, $ged_id,
+                        ));
+                    }
+                    continue;
+                }
 
-				//-- only search the database while we are finding places in it
-				if ($search) {
-					//-- check if this place and level has already been added
-					$tmp = Database::prepare(
-						"SELECT p_id FROM `##places` WHERE p_file = ? AND p_parent_id = ? AND p_place = LEFT(?, 150)"
-					)->execute(array(
-						$ged_id, $parent_id, $place,
-					))->fetchOne();
-					if ($tmp) {
-						$p_id = $tmp;
-					} else {
-						$search = false;
-					}
-				}
+                //-- only search the database while we are finding places in it
+                if ($search) {
+                    //-- check if this place and level has already been added
+                    $tmp = Database::prepare(
+                        "SELECT p_id FROM `##places` WHERE p_file = ? AND p_parent_id = ? AND p_place = LEFT(?, 150)"
+                    )->execute(array(
+                        $ged_id, $parent_id, $place,
+                    ))->fetchOne();
+                    if ($tmp) {
+                        $p_id = $tmp;
+                    } else {
+                        $search = false;
+                    }
+                }
 
-				//-- if we are not searching then we have to insert the place into the db
-				if (!$search) {
-					$std_soundex = Soundex::russell($place);
-					$dm_soundex  = Soundex::daitchMokotoff($place);
-					Database::prepare(
-						"INSERT INTO `##places` (p_place, p_parent_id, p_file, p_std_soundex, p_dm_soundex) VALUES (LEFT(?, 150), ?, ?, ?, ?)"
-					)->execute(array(
-						$place, $parent_id, $ged_id, $std_soundex, $dm_soundex,
-					));
-					$p_id = Database::getInstance()->lastInsertId();
-				}
+                //-- if we are not searching then we have to insert the place into the db
+                if (!$search) {
+                    $std_soundex = Soundex::russell($place);
+                    $dm_soundex  = Soundex::daitchMokotoff($place);
+                    Database::prepare(
+                        "INSERT INTO `##places` (p_place, p_parent_id, p_file, p_std_soundex, p_dm_soundex) VALUES (LEFT(?, 150), ?, ?, ?, ?)"
+                    )->execute(array(
+                        $place, $parent_id, $ged_id, $std_soundex, $dm_soundex,
+                    ));
+                    $p_id = Database::getInstance()->lastInsertId();
+                }
 
-				Database::prepare(
-					"INSERT IGNORE INTO `##placelinks` (pl_p_id, pl_gid, pl_file) VALUES (?, ?, ?)"
-				)->execute(array(
-					$p_id, $gid, $ged_id,
-				));
-				//-- increment the level and assign the parent id for the next place level
-				$parent_id         = $p_id;
-				$placecache[$key]  = $p_id;
-				$personplace[$key] = 1;
-			}
-		}
-	}
+                Database::prepare(
+                    "INSERT IGNORE INTO `##placelinks` (pl_p_id, pl_gid, pl_file) VALUES (?, ?, ?)"
+                )->execute(array(
+                    $p_id, $gid, $ged_id,
+                ));
+                //-- increment the level and assign the parent id for the next place level
+                $parent_id         = $p_id;
+                $placecache[$key]  = $p_id;
+                $personplace[$key] = 1;
+            }
+        }
+    }
 
-	/**
-	 * Extract all the dates from the given record and insert them into the database.
-	 *
-	 * @param string $xref
-	 * @param int    $ged_id
-	 * @param string $gedrec
-	 */
-	public static function updateDates($xref, $ged_id, $gedrec) {
-		if (strpos($gedrec, '2 DATE ') && preg_match_all("/\n1 (\w+).*(?:\n[2-9].*)*(?:\n2 DATE (.+))(?:\n[2-9].*)*/", $gedrec, $matches, PREG_SET_ORDER)) {
-			foreach ($matches as $match) {
-				$fact = $match[1];
-				if (($fact == 'FACT' || $fact == 'EVEN') && preg_match("/\n2 TYPE ([A-Z]{3,5})/", $match[0], $tmatch)) {
-					$fact = $tmatch[1];
-				}
-				$date = new Date($match[2]);
-				Database::prepare(
-					"INSERT INTO `##dates` (d_day,d_month,d_mon,d_year,d_julianday1,d_julianday2,d_fact,d_gid,d_file,d_type) VALUES (?,?,?,?,?,?,?,?,?,?)"
-				)->execute(array(
-					$date->minimumDate()->d,
-					$date->minimumDate()->format('%O'),
-					$date->minimumDate()->m,
-					$date->minimumDate()->y,
-					$date->minimumDate()->minJD,
-					$date->minimumDate()->maxJD,
-					$fact,
-					$xref,
-					$ged_id,
-					$date->minimumDate()->format('%@'),
-				));
-				if ($date->minimumDate() !== $date->maximumDate()) {
-					Database::prepare(
-						"INSERT INTO `##dates` (d_day,d_month,d_mon,d_year,d_julianday1,d_julianday2,d_fact,d_gid,d_file,d_type) VALUES (?,?,?,?,?,?,?,?,?,?)"
-					)->execute(array(
-						$date->maximumDate()->d,
-						$date->maximumDate()->format('%O'),
-						$date->maximumDate()->m,
-						$date->maximumDate()->y,
-						$date->maximumDate()->minJD,
-						$date->maximumDate()->maxJD,
-						$fact,
-						$xref,
-						$ged_id,
-						$date->maximumDate()->format('%@'),
-					));
-				}
-			}
-		}
-	}
+    /**
+     * Extract all the dates from the given record and insert them into the database.
+     *
+     * @param string $xref
+     * @param int    $ged_id
+     * @param string $gedrec
+     */
+    public static function updateDates($xref, $ged_id, $gedrec) {
+        if (strpos($gedrec, '2 DATE ') && preg_match_all("/\n1 (\w+).*(?:\n[2-9].*)*(?:\n2 DATE (.+))(?:\n[2-9].*)*/", $gedrec, $matches, PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                $fact = $match[1];
+                if (($fact == 'FACT' || $fact == 'EVEN') && preg_match("/\n2 TYPE ([A-Z]{3,5})/", $match[0], $tmatch)) {
+                    $fact = $tmatch[1];
+                }
+                $date = new Date($match[2]);
+                Database::prepare(
+                    "INSERT INTO `##dates` (d_day,d_month,d_mon,d_year,d_julianday1,d_julianday2,d_fact,d_gid,d_file,d_type) VALUES (?,?,?,?,?,?,?,?,?,?)"
+                )->execute(array(
+                    $date->minimumDate()->d,
+                    $date->minimumDate()->format('%O'),
+                    $date->minimumDate()->m,
+                    $date->minimumDate()->y,
+                    $date->minimumDate()->minJD,
+                    $date->minimumDate()->maxJD,
+                    $fact,
+                    $xref,
+                    $ged_id,
+                    $date->minimumDate()->format('%@'),
+                ));
+                if ($date->minimumDate() !== $date->maximumDate()) {
+                    Database::prepare(
+                        "INSERT INTO `##dates` (d_day,d_month,d_mon,d_year,d_julianday1,d_julianday2,d_fact,d_gid,d_file,d_type) VALUES (?,?,?,?,?,?,?,?,?,?)"
+                    )->execute(array(
+                        $date->maximumDate()->d,
+                        $date->maximumDate()->format('%O'),
+                        $date->maximumDate()->m,
+                        $date->maximumDate()->y,
+                        $date->maximumDate()->minJD,
+                        $date->maximumDate()->maxJD,
+                        $fact,
+                        $xref,
+                        $ged_id,
+                        $date->maximumDate()->format('%@'),
+                    ));
+                }
+            }
+        }
+    }
 
-	/**
-	 * Extract all the links from the given record and insert them into the database
-	 *
-	 * @param string $xref
-	 * @param int    $ged_id
-	 * @param string $gedrec
-	 */
-	public static function updateLinks($xref, $ged_id, $gedrec) {
-		if (preg_match_all('/^\d+ (' . WT_REGEX_TAG . ') @(' . WT_REGEX_XREF . ')@/m', $gedrec, $matches, PREG_SET_ORDER)) {
-			$data = array();
-			foreach ($matches as $match) {
-				// Include each link once only.
-				if (!in_array($match[1] . $match[2], $data)) {
-					$data[] = $match[1] . $match[2];
-					// Ignore any errors, which may be caused by "duplicates" that differ on case/collation, e.g. "S1" and "s1"
-					try {
-						Database::prepare(
-							"INSERT INTO `##link` (l_from, l_to, l_type, l_file) VALUES (?, ?, ?, ?)"
-						)->execute(array(
-							$xref, $match[2], $match[1], $ged_id,
-						));
-					} catch (PDOException $e) {
-						// We could display a warning here....
-					}
-				}
-			}
-		}
-	}
+    /**
+     * Extract all the links from the given record and insert them into the database
+     *
+     * @param string $xref
+     * @param int    $ged_id
+     * @param string $gedrec
+     */
+    public static function updateLinks($xref, $ged_id, $gedrec) {
+        if (preg_match_all('/^\d+ (' . WT_REGEX_TAG . ') @(' . WT_REGEX_XREF . ')@/m', $gedrec, $matches, PREG_SET_ORDER)) {
+            $data = array();
+            foreach ($matches as $match) {
+                // Include each link once only.
+                if (!in_array($match[1] . $match[2], $data)) {
+                    $data[] = $match[1] . $match[2];
+                    // Ignore any errors, which may be caused by "duplicates" that differ on case/collation, e.g. "S1" and "s1"
+                    try {
+                        Database::prepare(
+                            "INSERT INTO `##link` (l_from, l_to, l_type, l_file) VALUES (?, ?, ?, ?)"
+                        )->execute(array(
+                            $xref, $match[2], $match[1], $ged_id,
+                        ));
+                    } catch (PDOException $e) {
+                        // We could display a warning here....
+                    }
+                }
+            }
+        }
+    }
 
-	/**
-	 * Extract all the names from the given record and insert them into the database.
-	 *
-	 * @param string       $xref
-	 * @param int          $ged_id
-	 * @param GedcomRecord $record
-	 */
-	public static function updateNames($xref, $ged_id, GedcomRecord $record) {
-		foreach ($record->getAllNames() as $n => $name) {
-			if ($record instanceof Individual) {
-				if ($name['givn'] === '@P.N.') {
-					$soundex_givn_std = null;
-					$soundex_givn_dm  = null;
-				} else {
-					$soundex_givn_std = Soundex::russell($name['givn']);
-					$soundex_givn_dm  = Soundex::daitchMokotoff($name['givn']);
-				}
-				if ($name['surn'] === '@N.N.') {
-					$soundex_surn_std = null;
-					$soundex_surn_dm  = null;
-				} else {
-					$soundex_surn_std = Soundex::russell($name['surname']);
-					$soundex_surn_dm  = Soundex::daitchMokotoff($name['surname']);
-				}
-				Database::prepare(
-					"INSERT INTO `##name` (n_file,n_id,n_num,n_type,n_sort,n_full,n_surname,n_surn,n_givn,n_soundex_givn_std,n_soundex_surn_std,n_soundex_givn_dm,n_soundex_surn_dm) VALUES (?, ?, ?, ?, LEFT(?, 255), LEFT(?, 255), LEFT(?, 255), LEFT(?, 255), ?, ?, ?, ?, ?)"
-				)->execute(array(
-					$ged_id, $xref, $n, $name['type'], $name['sort'], $name['fullNN'], $name['surname'], $name['surn'], $name['givn'], $soundex_givn_std, $soundex_surn_std, $soundex_givn_dm, $soundex_surn_dm,
-				));
-			} else {
-				Database::prepare(
-					"INSERT INTO `##name` (n_file,n_id,n_num,n_type,n_sort,n_full) VALUES (?, ?, ?, ?, LEFT(?, 255), LEFT(?, 255))"
-				)->execute(array(
-					$ged_id, $xref, $n, $name['type'], $name['sort'], $name['fullNN'],
-				));
-			}
-		}
-	}
+    /**
+     * Extract all the names from the given record and insert them into the database.
+     *
+     * @param string       $xref
+     * @param int          $ged_id
+     * @param GedcomRecord $record
+     */
+    public static function updateNames($xref, $ged_id, GedcomRecord $record) {
+        foreach ($record->getAllNames() as $n => $name) {
+            if ($record instanceof Individual) {
+                if ($name['givn'] === '@P.N.') {
+                    $soundex_givn_std = null;
+                    $soundex_givn_dm  = null;
+                } else {
+                    $soundex_givn_std = Soundex::russell($name['givn']);
+                    $soundex_givn_dm  = Soundex::daitchMokotoff($name['givn']);
+                }
+                if ($name['surn'] === '@N.N.') {
+                    $soundex_surn_std = null;
+                    $soundex_surn_dm  = null;
+                } else {
+                    $soundex_surn_std = Soundex::russell($name['surname']);
+                    $soundex_surn_dm  = Soundex::daitchMokotoff($name['surname']);
+                }
+                Database::prepare(
+                    "INSERT INTO `##name` (n_file,n_id,n_num,n_type,n_sort,n_full,n_surname,n_surn,n_givn,n_soundex_givn_std,n_soundex_surn_std,n_soundex_givn_dm,n_soundex_surn_dm) VALUES (?, ?, ?, ?, LEFT(?, 255), LEFT(?, 255), LEFT(?, 255), LEFT(?, 255), ?, ?, ?, ?, ?)"
+                )->execute(array(
+                    $ged_id, $xref, $n, $name['type'], $name['sort'], $name['fullNN'], $name['surname'], $name['surn'], $name['givn'], $soundex_givn_std, $soundex_surn_std, $soundex_givn_dm, $soundex_surn_dm,
+                ));
+            } else {
+                Database::prepare(
+                    "INSERT INTO `##name` (n_file,n_id,n_num,n_type,n_sort,n_full) VALUES (?, ?, ?, ?, LEFT(?, 255), LEFT(?, 255))"
+                )->execute(array(
+                    $ged_id, $xref, $n, $name['type'], $name['sort'], $name['fullNN'],
+                ));
+            }
+        }
+    }
 
-	/**
-	 * Extract inline media data, and convert to media objects.
-	 *
-	 * @param Tree   $tree
-	 * @param string $gedrec
-	 *
-	 * @return string
-	 */
-	public static function convertInlineMedia(Tree $tree, $gedrec) {
-		while (preg_match('/\n1 OBJE(?:\n[2-9].+)+/', $gedrec, $match)) {
-			$gedrec = str_replace($match[0], self::createMediaObject(1, $match[0], $tree), $gedrec);
-		}
-		while (preg_match('/\n2 OBJE(?:\n[3-9].+)+/', $gedrec, $match)) {
-			$gedrec = str_replace($match[0], self::createMediaObject(2, $match[0], $tree), $gedrec);
-		}
-		while (preg_match('/\n3 OBJE(?:\n[4-9].+)+/', $gedrec, $match)) {
-			$gedrec = str_replace($match[0], self::createMediaObject(3, $match[0], $tree), $gedrec);
-		}
+    /**
+     * Extract inline media data, and convert to media objects.
+     *
+     * @param Tree   $tree
+     * @param string $gedrec
+     *
+     * @return string
+     */
+    public static function convertInlineMedia(Tree $tree, $gedrec) {
+        while (preg_match('/\n1 OBJE(?:\n[2-9].+)+/', $gedrec, $match)) {
+            $gedrec = str_replace($match[0], self::createMediaObject(1, $match[0], $tree), $gedrec);
+        }
+        while (preg_match('/\n2 OBJE(?:\n[3-9].+)+/', $gedrec, $match)) {
+            $gedrec = str_replace($match[0], self::createMediaObject(2, $match[0], $tree), $gedrec);
+        }
+        while (preg_match('/\n3 OBJE(?:\n[4-9].+)+/', $gedrec, $match)) {
+            $gedrec = str_replace($match[0], self::createMediaObject(3, $match[0], $tree), $gedrec);
+        }
 
-		return $gedrec;
-	}
+        return $gedrec;
+    }
 
-	/**
-	 * Create a new media object, from inline media data.
-	 *
-	 * @param int    $level
-	 * @param string $gedrec
-	 * @param Tree   $tree
-	 *
-	 * @return string
-	 */
-	public static function createMediaObject($level, $gedrec, Tree $tree) {
-		if (preg_match('/\n\d FILE (.+)/', $gedrec, $file_match)) {
-			$file = $file_match[1];
-		} else {
-			$file = '';
-		}
+    /**
+     * Create a new media object, from inline media data.
+     *
+     * @param int    $level
+     * @param string $gedrec
+     * @param Tree   $tree
+     *
+     * @return string
+     */
+    public static function createMediaObject($level, $gedrec, Tree $tree) {
+        if (preg_match('/\n\d FILE (.+)/', $gedrec, $file_match)) {
+            $file = $file_match[1];
+        } else {
+            $file = '';
+        }
 
-		if (preg_match('/\n\d TITL (.+)/', $gedrec, $file_match)) {
-			$titl = $file_match[1];
-		} else {
-			$titl = '';
-		}
+        if (preg_match('/\n\d TITL (.+)/', $gedrec, $file_match)) {
+            $titl = $file_match[1];
+        } else {
+            $titl = '';
+        }
 
-		// Have we already created a media object with the same title/filename?
-		$xref = Database::prepare(
-			"SELECT m_id FROM `##media` WHERE m_filename = ? AND m_titl = ? AND m_file = ?"
-		)->execute(array(
-			$file, $titl, $tree->getTreeId(),
-		))->fetchOne();
+        // Have we already created a media object with the same title/filename?
+        $xref = Database::prepare(
+            "SELECT m_id FROM `##media` WHERE m_filename = ? AND m_titl = ? AND m_file = ?"
+        )->execute(array(
+            $file, $titl, $tree->getTreeId(),
+        ))->fetchOne();
 
-		if (!$xref) {
-			$xref = $tree->getNewXref('OBJE');
-			// renumber the lines
-			$gedrec = preg_replace_callback('/\n(\d+)/', function ($m) use ($level) {
-				return "\n" . ($m[1] - $level);
-			}, $gedrec);
-			// convert to an object
-			$gedrec = str_replace("\n0 OBJE\n", '0 @' . $xref . "@ OBJE\n", $gedrec);
-			// Fix Legacy GEDCOMS
-			$gedrec = preg_replace('/\n1 FORM (.+)\n1 FILE (.+)\n1 TITL (.+)/', "\n1 FILE $2\n2 FORM $1\n2 TITL $3", $gedrec);
-			// Fix FTB GEDCOMS
-			$gedrec = preg_replace('/\n1 FORM (.+)\n1 TITL (.+)\n1 FILE (.+)/', "\n1 FILE $3\n2 FORM $1\n2 TITL $2", $gedrec);
-			// Create new record
-			$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->getTreeId(), $gedrec,
-			));
-		}
+        if (!$xref) {
+            $xref = $tree->getNewXref('OBJE');
+            // renumber the lines
+            $gedrec = preg_replace_callback('/\n(\d+)/', function ($m) use ($level) {
+                return "\n" . ($m[1] - $level);
+            }, $gedrec);
+            // convert to an object
+            $gedrec = str_replace("\n0 OBJE\n", '0 @' . $xref . "@ OBJE\n", $gedrec);
+            // Fix Legacy GEDCOMS
+            $gedrec = preg_replace('/\n1 FORM (.+)\n1 FILE (.+)\n1 TITL (.+)/', "\n1 FILE $2\n2 FORM $1\n2 TITL $3", $gedrec);
+            // Fix FTB GEDCOMS
+            $gedrec = preg_replace('/\n1 FORM (.+)\n1 TITL (.+)\n1 FILE (.+)/', "\n1 FILE $3\n2 FORM $1\n2 TITL $2", $gedrec);
+            // Create new record
+            $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->getTreeId(), $gedrec,
+            ));
+        }
 
-		return "\n" . $level . ' OBJE @' . $xref . '@';
-	}
+        return "\n" . $level . ' OBJE @' . $xref . '@';
+    }
 
-	/**
-	 * Accept all pending changes for a specified record.
-	 *
-	 * @param string $xref
-	 * @param int    $ged_id
-	 */
-	public static function acceptAllChanges($xref, $ged_id) {
-		$changes = Database::prepare(
-			"SELECT change_id, gedcom_name, old_gedcom, new_gedcom" .
-			" FROM `##change` c" .
-			" JOIN `##gedcom` g USING (gedcom_id)" .
-			" WHERE c.status='pending' AND xref=? AND gedcom_id=?" .
-			" ORDER BY change_id"
-		)->execute(array($xref, $ged_id))->fetchAll();
-		foreach ($changes as $change) {
-			if (empty($change->new_gedcom)) {
-				// delete
-				self::updateRecord($change->old_gedcom, $ged_id, true);
-			} else {
-				// add/update
-				self::updateRecord($change->new_gedcom, $ged_id, false);
-			}
-			Database::prepare(
-				"UPDATE `##change`" .
-				" SET status='accepted'" .
-				" WHERE status='pending' AND xref=? AND gedcom_id=?"
-			)->execute(array($xref, $ged_id));
-			Log::addEditLog("Accepted change {$change->change_id} for {$xref} / {$change->gedcom_name} into database");
-		}
-	}
+    /**
+     * Accept all pending changes for a specified record.
+     *
+     * @param string $xref
+     * @param int    $ged_id
+     */
+    public static function acceptAllChanges($xref, $ged_id) {
+        $changes = Database::prepare(
+            "SELECT change_id, gedcom_name, old_gedcom, new_gedcom" .
+            " FROM `##change` c" .
+            " JOIN `##gedcom` g USING (gedcom_id)" .
+            " WHERE c.status='pending' AND xref=? AND gedcom_id=?" .
+            " ORDER BY change_id"
+        )->execute(array($xref, $ged_id))->fetchAll();
+        foreach ($changes as $change) {
+            if (empty($change->new_gedcom)) {
+                // delete
+                self::updateRecord($change->old_gedcom, $ged_id, true);
+            } else {
+                // add/update
+                self::updateRecord($change->new_gedcom, $ged_id, false);
+            }
+            Database::prepare(
+                "UPDATE `##change`" .
+                " SET status='accepted'" .
+                " WHERE status='pending' AND xref=? AND gedcom_id=?"
+            )->execute(array($xref, $ged_id));
+            Log::addEditLog("Accepted change {$change->change_id} for {$xref} / {$change->gedcom_name} into database");
+        }
+    }
 
-	/**
-	 * Accept all pending changes for a specified record.
-	 *
-	 * @param GedcomRecord $record
-	 */
-	public static function rejectAllChanges(GedcomRecord $record) {
-		Database::prepare(
-			"UPDATE `##change`" .
-			" SET status = 'rejected'" .
-			" WHERE status = 'pending' AND xref = :xref AND gedcom_id = :tree_id"
-		)->execute(array(
-			'xref'    => $record->getXref(),
-			'tree_id' => $record->getTree()->getTreeId(),
-		));
-	}
+    /**
+     * Accept all pending changes for a specified record.
+     *
+     * @param GedcomRecord $record
+     */
+    public static function rejectAllChanges(GedcomRecord $record) {
+        Database::prepare(
+            "UPDATE `##change`" .
+            " SET status = 'rejected'" .
+            " WHERE status = 'pending' AND xref = :xref AND gedcom_id = :tree_id"
+        )->execute(array(
+            'xref'    => $record->getXref(),
+            'tree_id' => $record->getTree()->getTreeId(),
+        ));
+    }
 
-	/**
-	 * update a record in the database
-	 *
-	 * @param string $gedrec
-	 * @param int    $ged_id
-	 * @param bool   $delete
-	 */
-	public static function updateRecord($gedrec, $ged_id, $delete) {
-		if (preg_match('/^0 @(' . WT_REGEX_XREF . ')@ (' . WT_REGEX_TAG . ')/', $gedrec, $match)) {
-			list(, $gid, $type) = $match;
-		} elseif (preg_match('/^0 (HEAD)(?:\n|$)/', $gedrec, $match)) {
-			// The HEAD record has no XREF.  Any others?
-			$gid  = $match[1];
-			$type = $match[1];
-		} else {
-			echo "ERROR: Invalid gedcom record.";
+    /**
+     * update a record in the database
+     *
+     * @param string $gedrec
+     * @param int    $ged_id
+     * @param bool   $delete
+     */
+    public static function updateRecord($gedrec, $ged_id, $delete) {
+        if (preg_match('/^0 @(' . WT_REGEX_XREF . ')@ (' . WT_REGEX_TAG . ')/', $gedrec, $match)) {
+            list(, $gid, $type) = $match;
+        } elseif (preg_match('/^0 (HEAD)(?:\n|$)/', $gedrec, $match)) {
+            // The HEAD record has no XREF.  Any others?
+            $gid  = $match[1];
+            $type = $match[1];
+        } else {
+            echo "ERROR: Invalid gedcom record.";
 
-			return;
-		}
+            return;
+        }
 
-		// TODO deleting unlinked places can be done more efficiently in a single query
-		$placeids =
-			Database::prepare("SELECT pl_p_id FROM `##placelinks` WHERE pl_gid=? AND pl_file=?")
-				->execute(array($gid, $ged_id))
-				->fetchOneColumn();
+        // TODO deleting unlinked places can be done more efficiently in a single query
+        $placeids =
+            Database::prepare("SELECT pl_p_id FROM `##placelinks` WHERE pl_gid=? AND pl_file=?")
+                ->execute(array($gid, $ged_id))
+                ->fetchOneColumn();
 
-		Database::prepare("DELETE FROM `##placelinks` WHERE pl_gid=? AND pl_file=?")->execute(array($gid, $ged_id));
-		Database::prepare("DELETE FROM `##dates`      WHERE d_gid =? AND d_file =?")->execute(array($gid, $ged_id));
+        Database::prepare("DELETE FROM `##placelinks` WHERE pl_gid=? AND pl_file=?")->execute(array($gid, $ged_id));
+        Database::prepare("DELETE FROM `##dates`      WHERE d_gid =? AND d_file =?")->execute(array($gid, $ged_id));
 
-		//-- delete any unlinked places
-		foreach ($placeids as $p_id) {
-			$num =
-				Database::prepare("SELECT count(pl_p_id) FROM `##placelinks` WHERE pl_p_id=? AND pl_file=?")
-					->execute(array($p_id, $ged_id))
-					->fetchOne();
-			if ($num == 0) {
-				Database::prepare("DELETE FROM `##places` WHERE p_id=? AND p_file=?")->execute(array($p_id, $ged_id));
-			}
-		}
+        //-- delete any unlinked places
+        foreach ($placeids as $p_id) {
+            $num =
+                Database::prepare("SELECT count(pl_p_id) FROM `##placelinks` WHERE pl_p_id=? AND pl_file=?")
+                    ->execute(array($p_id, $ged_id))
+                    ->fetchOne();
+            if ($num == 0) {
+                Database::prepare("DELETE FROM `##places` WHERE p_id=? AND p_file=?")->execute(array($p_id, $ged_id));
+            }
+        }
 
-		Database::prepare("DELETE FROM `##name` WHERE n_id=? AND n_file=?")->execute(array($gid, $ged_id));
-		Database::prepare("DELETE FROM `##link` WHERE l_from=? AND l_file=?")->execute(array($gid, $ged_id));
+        Database::prepare("DELETE FROM `##name` WHERE n_id=? AND n_file=?")->execute(array($gid, $ged_id));
+        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;
-		}
+        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;
+        }
 
-		if (!$delete) {
-			self::importRecord($gedrec, Tree::findById($ged_id), true);
-		}
-	}
+        if (!$delete) {
+            self::importRecord($gedrec, Tree::findById($ged_id), true);
+        }
+    }
 }

Switch Indentation +632 added lines, -632 removed lines

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

Braces +24 added lines, -12 removed lines

@@ -33,7 +33,8 @@ 
 /**
  * Class FunctionsImport - common functions
  */
-class FunctionsImport {
+class FunctionsImport
+{
 	/**
 	 * Tidy up a gedcom record on import, so that we can access it consistently/efficiently.
 	 *
@@ -42,7 +43,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function reformatRecord($rec, Tree $tree) {
+	public static function reformatRecord($rec, Tree $tree)
+	{
 		// Strip out UTF8 formatting characters
 		$rec = str_replace(array(WT_UTF8_BOM, WT_UTF8_LRM, WT_UTF8_RLM), '', $rec);
 
@@ -594,7 +596,8 @@ 
 	 * @param Tree   $tree   import the record into this tree
 	 * @param bool   $update whether or not this is an updated record that has been accepted
 	 */
-	public static function importRecord($gedrec, Tree $tree, $update) {
+	public static function importRecord($gedrec, Tree $tree, $update)
+	{
 		$tree_id = $tree->getTreeId();
 
 		// Escaped @ signs (only if importing from file)
@@ -762,7 +765,8 @@ 
 	 * @param int    $ged_id
 	 * @param string $gedrec
 	 */
-	public static function updatePlaces($gid, $ged_id, $gedrec) {
+	public static function updatePlaces($gid, $ged_id, $gedrec)
+	{
 		global $placecache;
 
 		if (!isset($placecache)) {
@@ -854,7 +858,8 @@ 
 	 * @param int    $ged_id
 	 * @param string $gedrec
 	 */
-	public static function updateDates($xref, $ged_id, $gedrec) {
+	public static function updateDates($xref, $ged_id, $gedrec)
+	{
 		if (strpos($gedrec, '2 DATE ') && preg_match_all("/\n1 (\w+).*(?:\n[2-9].*)*(?:\n2 DATE (.+))(?:\n[2-9].*)*/", $gedrec, $matches, PREG_SET_ORDER)) {
 			foreach ($matches as $match) {
 				$fact = $match[1];
@@ -903,7 +908,8 @@ 
 	 * @param int    $ged_id
 	 * @param string $gedrec
 	 */
-	public static function updateLinks($xref, $ged_id, $gedrec) {
+	public static function updateLinks($xref, $ged_id, $gedrec)
+	{
 		if (preg_match_all('/^\d+ (' . WT_REGEX_TAG . ') @(' . WT_REGEX_XREF . ')@/m', $gedrec, $matches, PREG_SET_ORDER)) {
 			$data = array();
 			foreach ($matches as $match) {
@@ -932,7 +938,8 @@ 
 	 * @param int          $ged_id
 	 * @param GedcomRecord $record
 	 */
-	public static function updateNames($xref, $ged_id, GedcomRecord $record) {
+	public static function updateNames($xref, $ged_id, GedcomRecord $record)
+	{
 		foreach ($record->getAllNames() as $n => $name) {
 			if ($record instanceof Individual) {
 				if ($name['givn'] === '@P.N.') {
@@ -972,7 +979,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function convertInlineMedia(Tree $tree, $gedrec) {
+	public static function convertInlineMedia(Tree $tree, $gedrec)
+	{
 		while (preg_match('/\n1 OBJE(?:\n[2-9].+)+/', $gedrec, $match)) {
 			$gedrec = str_replace($match[0], self::createMediaObject(1, $match[0], $tree), $gedrec);
 		}
@@ -995,7 +1003,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function createMediaObject($level, $gedrec, Tree $tree) {
+	public static function createMediaObject($level, $gedrec, Tree $tree)
+	{
 		if (preg_match('/\n\d FILE (.+)/', $gedrec, $file_match)) {
 			$file = $file_match[1];
 		} else {
@@ -1045,7 +1054,8 @@ 
 	 * @param string $xref
 	 * @param int    $ged_id
 	 */
-	public static function acceptAllChanges($xref, $ged_id) {
+	public static function acceptAllChanges($xref, $ged_id)
+	{
 		$changes = Database::prepare(
 			"SELECT change_id, gedcom_name, old_gedcom, new_gedcom" .
 			" FROM `##change` c" .
@@ -1075,7 +1085,8 @@ 
 	 *
 	 * @param GedcomRecord $record
 	 */
-	public static function rejectAllChanges(GedcomRecord $record) {
+	public static function rejectAllChanges(GedcomRecord $record)
+	{
 		Database::prepare(
 			"UPDATE `##change`" .
 			" SET status = 'rejected'" .
@@ -1093,7 +1104,8 @@ 
 	 * @param int    $ged_id
 	 * @param bool   $delete
 	 */
-	public static function updateRecord($gedrec, $ged_id, $delete) {
+	public static function updateRecord($gedrec, $ged_id, $delete)
+	{
 		if (preg_match('/^0 @(' . WT_REGEX_XREF . ')@ (' . WT_REGEX_TAG . ')/', $gedrec, $match)) {
 			list(, $gid, $type) = $match;
 		} elseif (preg_match('/^0 (HEAD)(?:\n|$)/', $gedrec, $match)) {

app/Functions/FunctionsPrintFacts.php

Indentation +1150 added lines, -1150 removed lines

@@ -41,136 +41,136 @@ 
  * Class FunctionsPrintFacts - common functions
  */
 class FunctionsPrintFacts {
-	/**
-	 * Print a fact record, for the individual/family/source/repository/etc. pages.
-	 *
-	 * Although a Fact has a parent object, we also need to know
-	 * the GedcomRecord for which we are printing it. For example,
-	 * we can show the death of X on the page of Y, or the marriage
-	 * of X+Y on the page of Z. We need to know both records to
-	 * calculate ages, relationships, etc.
-	 *
-	 * @param Fact $fact
-	 * @param GedcomRecord $record
-	 */
-	public static function printFact(Fact $fact, GedcomRecord $record) {
-		static $n_chil = 0, $n_gchi = 0;
-
-		$parent = $fact->getParent();
-
-		// Some facts don't get printed here ...
-		switch ($fact->getTag()) {
-		case 'NOTE':
-			self::printMainNotes($fact, 1);
-
-			return;
-		case 'SOUR':
-			self::printMainSources($fact, 1);
-
-			return;
-		case 'OBJE':
-			self::printMainMedia($fact, 1);
-
-			return;
-		case 'FAMC':
-		case 'FAMS':
-		case 'CHIL':
-		case 'HUSB':
-		case 'WIFE':
-			// These are internal links, not facts
-			return;
-		case '_WT_OBJE_SORT':
-			// These links are used internally to record the sort order.
-			return;
-		default:
-			// Hide unrecognized/custom tags?
-			if ($fact->getParent()->getTree()->getPreference('HIDE_GEDCOM_ERRORS') === '0' && !GedcomTag::isTag($fact->getTag())) {
-				return;
-			}
-			break;
-		}
-
-		// Who is this fact about? Need it to translate fact label correctly
-		if ($parent instanceof Family && $record instanceof Individual) {
-			// Family event
-			$label_person = $fact->getParent()->getSpouse($record);
-		} else {
-			// Individual event
-			$label_person = $parent;
-		}
-
-		// New or deleted facts need different styling
-		$styleadd = '';
-		if ($fact->isPendingAddition()) {
-			$styleadd = 'new';
-		}
-		if ($fact->isPendingDeletion()) {
-			$styleadd = 'old';
-		}
-
-		// Event of close relative
-		if (preg_match('/^_[A-Z_]{3,5}_[A-Z0-9]{4}$/', $fact->getTag())) {
-			$styleadd = trim($styleadd . ' rela');
-		}
-
-		// Event of close associates
-		if ($fact->getFactId() == 'asso') {
-			$styleadd = trim($styleadd . ' rela');
-		}
-
-		// historical facts
-		if ($fact->getFactId() == 'histo') {
-			$styleadd = trim($styleadd . ' histo');
-		}
-
-		// Does this fact have a type?
-		if (preg_match('/\n2 TYPE (.+)/', $fact->getGedcom(), $match)) {
-			$type = $match[1];
-		} else {
-			$type = '';
-		}
-
-		switch ($fact->getTag()) {
-		case 'EVEN':
-		case 'FACT':
-			if (GedcomTag::isTag($type)) {
-				// Some users (just Meliza?) use "1 EVEN/2 TYPE BIRT". Translate the TYPE.
-				$label = GedcomTag::getLabel($type, $label_person);
-				$type  = ''; // Do not print this again
-			} elseif ($type) {
-				// We don't have a translation for $type - but a custom translation might exist.
-				$label = I18N::translate(Filter::escapeHtml($type));
-				$type  = ''; // Do not print this again
-			} else {
-				// An unspecified fact/event
-				$label = $fact->getLabel();
-			}
-			break;
-		case 'MARR':
-			// This is a hack for a proprietory extension. Is it still used/needed?
-			$utype = strtoupper($type);
-			if ($utype == 'CIVIL' || $utype == 'PARTNERS' || $utype == 'RELIGIOUS') {
-				$label = GedcomTag::getLabel('MARR_' . $utype, $label_person);
-				$type  = ''; // Do not print this again
-			} else {
-				$label = $fact->getLabel();
-			}
-			break;
-		default:
-			// Normal fact/event
-			$label = $fact->getLabel();
-			break;
-		}
-
-		echo '<tr class="', $styleadd, '">';
-		echo '<td class="descriptionbox width20">';
-
-		if ($fact->getParent()->getTree()->getPreference('SHOW_FACT_ICONS')) {
-			echo Theme::theme()->icon($fact), ' ';
-		}
-
-		if ($fact->getFactId() != 'histo' && $fact->canEdit()) {
-			?>
+    /**
+     * Print a fact record, for the individual/family/source/repository/etc. pages.
+     *
+     * Although a Fact has a parent object, we also need to know
+     * the GedcomRecord for which we are printing it. For example,
+     * we can show the death of X on the page of Y, or the marriage
+     * of X+Y on the page of Z. We need to know both records to
+     * calculate ages, relationships, etc.
+     *
+     * @param Fact $fact
+     * @param GedcomRecord $record
+     */
+    public static function printFact(Fact $fact, GedcomRecord $record) {
+        static $n_chil = 0, $n_gchi = 0;
+
+        $parent = $fact->getParent();
+
+        // Some facts don't get printed here ...
+        switch ($fact->getTag()) {
+        case 'NOTE':
+            self::printMainNotes($fact, 1);
+
+            return;
+        case 'SOUR':
+            self::printMainSources($fact, 1);
+
+            return;
+        case 'OBJE':
+            self::printMainMedia($fact, 1);
+
+            return;
+        case 'FAMC':
+        case 'FAMS':
+        case 'CHIL':
+        case 'HUSB':
+        case 'WIFE':
+            // These are internal links, not facts
+            return;
+        case '_WT_OBJE_SORT':
+            // These links are used internally to record the sort order.
+            return;
+        default:
+            // Hide unrecognized/custom tags?
+            if ($fact->getParent()->getTree()->getPreference('HIDE_GEDCOM_ERRORS') === '0' && !GedcomTag::isTag($fact->getTag())) {
+                return;
+            }
+            break;
+        }
+
+        // Who is this fact about? Need it to translate fact label correctly
+        if ($parent instanceof Family && $record instanceof Individual) {
+            // Family event
+            $label_person = $fact->getParent()->getSpouse($record);
+        } else {
+            // Individual event
+            $label_person = $parent;
+        }
+
+        // New or deleted facts need different styling
+        $styleadd = '';
+        if ($fact->isPendingAddition()) {
+            $styleadd = 'new';
+        }
+        if ($fact->isPendingDeletion()) {
+            $styleadd = 'old';
+        }
+
+        // Event of close relative
+        if (preg_match('/^_[A-Z_]{3,5}_[A-Z0-9]{4}$/', $fact->getTag())) {
+            $styleadd = trim($styleadd . ' rela');
+        }
+
+        // Event of close associates
+        if ($fact->getFactId() == 'asso') {
+            $styleadd = trim($styleadd . ' rela');
+        }
+
+        // historical facts
+        if ($fact->getFactId() == 'histo') {
+            $styleadd = trim($styleadd . ' histo');
+        }
+
+        // Does this fact have a type?
+        if (preg_match('/\n2 TYPE (.+)/', $fact->getGedcom(), $match)) {
+            $type = $match[1];
+        } else {
+            $type = '';
+        }
+
+        switch ($fact->getTag()) {
+        case 'EVEN':
+        case 'FACT':
+            if (GedcomTag::isTag($type)) {
+                // Some users (just Meliza?) use "1 EVEN/2 TYPE BIRT". Translate the TYPE.
+                $label = GedcomTag::getLabel($type, $label_person);
+                $type  = ''; // Do not print this again
+            } elseif ($type) {
+                // We don't have a translation for $type - but a custom translation might exist.
+                $label = I18N::translate(Filter::escapeHtml($type));
+                $type  = ''; // Do not print this again
+            } else {
+                // An unspecified fact/event
+                $label = $fact->getLabel();
+            }
+            break;
+        case 'MARR':
+            // This is a hack for a proprietory extension. Is it still used/needed?
+            $utype = strtoupper($type);
+            if ($utype == 'CIVIL' || $utype == 'PARTNERS' || $utype == 'RELIGIOUS') {
+                $label = GedcomTag::getLabel('MARR_' . $utype, $label_person);
+                $type  = ''; // Do not print this again
+            } else {
+                $label = $fact->getLabel();
+            }
+            break;
+        default:
+            // Normal fact/event
+            $label = $fact->getLabel();
+            break;
+        }
+
+        echo '<tr class="', $styleadd, '">';
+        echo '<td class="descriptionbox width20">';
+
+        if ($fact->getParent()->getTree()->getPreference('SHOW_FACT_ICONS')) {
+            echo Theme::theme()->icon($fact), ' ';
+        }
+
+        if ($fact->getFactId() != 'histo' && $fact->canEdit()) {
+            ?>
 			<a
 				href="#"
 				title="<?php echo I18N::translate('Edit'); ?>"
@@ -203,1024 +203,1024 @@ 
 				</div>
 			</div>
 		<?php
-		} else {
-			echo $label;
-		}
-
-		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;
-		}
-
-		echo '</td><td class="optionbox ', $styleadd, ' wrap">';
-
-		// Event from another record?
-		if ($parent !== $record) {
-			if ($parent instanceof Family) {
-				foreach ($parent->getSpouses() as $spouse) {
-					if ($record !== $spouse) {
-						echo '<a href="', $spouse->getHtmlUrl(), '">', $spouse->getFullName(), '</a> — ';
-					}
-				}
-				echo '<a href="', $parent->getHtmlUrl(), '">', I18N::translate('View this family'), '</a><br>';
-			} elseif ($parent instanceof Individual) {
-				echo '<a href="', $parent->getHtmlUrl(), '">', $parent->getFullName(), '</a><br>';
-			}
-		}
-
-		// 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;
-			}
-				echo '</div>';
-				break;
-		case 'PUBL': // Publication details might contain URLs.
-			echo '<div class="field">', Filter::expandUrls($fact->getValue()), '</div>';
-			break;
-		case 'REPO':
-			if (preg_match('/^@(' . WT_REGEX_XREF . ')@$/', $fact->getValue(), $match)) {
-				self::printRepositoryRecord($match[1]);
-			} else {
-				echo '<div class="error">', Filter::escapeHtml($fact->getValue()), '</div>';
-			}
-			break;
-		case 'URL':
-		case '_URL':
-		case 'WWW':
-			echo '<div class="field"><a href="', Filter::escapeHtml($fact->getValue()), '">', Filter::escapeHtml($fact->getValue()), '</a></div>';
-			break;
-		case 'TEXT': // 0 SOUR / 1 TEXT
-			echo '<div class="field">', nl2br(Filter::escapeHtml($fact->getValue()), false), '</div>';
-			break;
-		default:
-			// Display the value for all other facts/events
-			switch ($fact->getValue()) {
-			case '':
-			// Nothing to display
-			break;
-			case 'N':
-			// Not valid GEDCOM
-			echo '<div class="field">', I18N::translate('No'), '</div>';
-			break;
-			case 'Y':
-			// Do not display "Yes".
-			break;
-			default:
-			if (preg_match('/^@(' . WT_REGEX_XREF . ')@$/', $fact->getValue(), $match)) {
-			$target = GedcomRecord::getInstance($match[1], $fact->getParent()->getTree());
-			if ($target) {
-				echo '<div><a href="', $target->getHtmlUrl(), '">', $target->getFullName(), '</a></div>';
-			} else {
-				echo '<div class="error">', Filter::escapeHtml($fact->getValue()), '</div>';
-			}
-			} else {
-			echo '<div class="field"><span dir="auto">', Filter::escapeHtml($fact->getValue()), '</span></div>';
-			}
-			break;
-			}
-				break;
-		}
-
-		// Print the type of this fact/event
-		if ($type) {
-			$utype = strtoupper($type);
-			// Events of close relatives, e.g. _MARR_CHIL
-			if (substr($fact->getTag(), 0, 6) == '_MARR_' && ($utype == 'CIVIL' || $utype == 'PARTNERS' || $utype == 'RELIGIOUS')) {
-				// Translate MARR/TYPE using the code that supports MARR_CIVIL, etc. tags
-				$type = GedcomTag::getLabel('MARR_' . $utype);
-			} else {
-				// Allow (custom) translations for other types
-				$type = I18N::translate($type);
-			}
-			echo GedcomTag::getLabelValue('TYPE', Filter::escapeHtml($type));
-		}
-
-		// Print the date of this fact/event
-		echo FunctionsPrint::formatFactDate($fact, $record, true, true);
-
-		// Print the place of this fact/event
-		echo '<div class="place">', FunctionsPrint::formatFactPlace($fact, true, true, true), '</div>';
-		// A blank line between the primary attributes (value, date, place) and the secondary ones
-		echo '<br>';
-
-		$addr = $fact->getAttribute('ADDR');
-		if ($addr) {
-			echo GedcomTag::getLabelValue('ADDR', $addr);
-		}
-
-		// Print the associates of this fact/event
-		if ($fact->getFactId() !== 'asso') {
-			echo self::formatAssociateRelationship($fact);
-		}
-
-		// Print any other "2 XXXX" attributes, in the order in which they appear.
-		preg_match_all('/\n2 (' . WT_REGEX_TAG . ') (.+)/', $fact->getGedcom(), $matches, PREG_SET_ORDER);
-		foreach ($matches as $match) {
-			switch ($match[1]) {
-			case 'DATE':
-			case 'TIME':
-			case 'AGE':
-			case 'PLAC':
-			case 'ADDR':
-			case 'ALIA':
-			case 'ASSO':
-			case '_ASSO':
-			case 'DESC':
-			case 'RELA':
-			case 'STAT':
-			case 'TEMP':
-			case 'TYPE':
-			case 'FAMS':
-			case 'CONT':
-				// These were already shown at the beginning
-				break;
-			case 'NOTE':
-			case 'OBJE':
-			case 'SOUR':
-				// These will be shown at the end
-				break;
-			case '_UID':
-			case 'RIN':
-				// These don't belong at level 2, so do not display them.
-				// They are only shown when editing.
-				break;
-			case 'EVEN': // 0 SOUR / 1 DATA / 2 EVEN / 3 DATE / 3 PLAC
-				$events = array();
-				foreach (preg_split('/ *, */', $match[2]) as $event) {
-					$events[] = GedcomTag::getLabel($event);
-				}
-				if (count($events) == 1) {
-					echo GedcomTag::getLabelValue('EVEN', $event);
-				} else {
-					echo GedcomTag::getLabelValue('EVEN', implode(I18N::$list_separator, $events));
-				}
-				if (preg_match('/\n3 DATE (.+)/', $fact->getGedcom(), $date_match)) {
-					$date = new Date($date_match[1]);
-					echo GedcomTag::getLabelValue('DATE', $date->display());
-				}
-				if (preg_match('/\n3 PLAC (.+)/', $fact->getGedcom(), $plac_match)) {
-					echo GedcomTag::getLabelValue('PLAC', $plac_match[1]);
-				}
-				break;
-			case 'FAMC': // 0 INDI / 1 ADOP / 2 FAMC / 3 ADOP
-				$family = Family::getInstance(str_replace('@', '', $match[2]), $fact->getParent()->getTree());
-				if ($family) {
-					echo GedcomTag::getLabelValue('FAM', '<a href="' . $family->getHtmlUrl() . '">' . $family->getFullName() . '</a>');
-					if (preg_match('/\n3 ADOP (HUSB|WIFE|BOTH)/', $fact->getGedcom(), $match)) {
-						echo GedcomTag::getLabelValue('ADOP', GedcomCodeAdop::getValue($match[1], $label_person));
-					}
-				} else {
-					echo GedcomTag::getLabelValue('FAM', '<span class="error">' . $match[2] . '</span>');
-				}
-				break;
-			case '_WT_USER':
-				$user = User::findByIdentifier($match[2]); // may not exist
-				if ($user) {
-					echo GedcomTag::getLabelValue('_WT_USER', $user->getRealNameHtml());
-				} else {
-					echo GedcomTag::getLabelValue('_WT_USER', Filter::escapeHtml($match[2]));
-				}
-				break;
-			case 'RESN':
-				switch ($match[2]) {
-				case 'none':
-				// Note: "2 RESN none" is not valid gedcom.
-				// However, webtrees privacy rules will interpret it as "show an otherwise private fact to public".
-				echo GedcomTag::getLabelValue('RESN', '<i class="icon-resn-none"></i> ' . I18N::translate('Show to visitors'));
-				break;
-				case 'privacy':
-				echo GedcomTag::getLabelValue('RESN', '<i class="icon-resn-privacy"></i> ' . I18N::translate('Show to members'));
-				break;
-				case 'confidential':
-				echo GedcomTag::getLabelValue('RESN', '<i class="icon-resn-confidential"></i> ' . I18N::translate('Show to managers'));
-				break;
-				case 'locked':
-				echo GedcomTag::getLabelValue('RESN', '<i class="icon-resn-locked"></i> ' . I18N::translate('Only managers can edit'));
-				break;
-				default:
-				echo GedcomTag::getLabelValue('RESN', Filter::escapeHtml($match[2]));
-				break;
-				}
-					break;
-			case 'CALN':
-				echo GedcomTag::getLabelValue('CALN', Filter::expandUrls($match[2]));
-				break;
-			case 'FORM': // 0 OBJE / 1 FILE / 2 FORM / 3 TYPE
-				echo GedcomTag::getLabelValue('FORM', $match[2]);
-				if (preg_match('/\n3 TYPE (.+)/', $fact->getGedcom(), $type_match)) {
-					echo GedcomTag::getLabelValue('TYPE', GedcomTag::getFileFormTypeValue($type_match[1]));
-				}
-				break;
-			case 'URL':
-			case '_URL':
-			case 'WWW':
-				$link = '<a href="' . Filter::escapeHtml($match[2]) . '">' . Filter::escapeHtml($match[2]) . '</a>';
-				echo GedcomTag::getLabelValue($fact->getTag() . ':' . $match[1], $link);
-				break;
-			default:
-				if ($fact->getParent()->getTree()->getPreference('HIDE_GEDCOM_ERRORS') === '1' || GedcomTag::isTag($match[1])) {
-					if (preg_match('/^@(' . WT_REGEX_XREF . ')@$/', $match[2], $xmatch)) {
-						// Links
-						$linked_record = GedcomRecord::getInstance($xmatch[1], $fact->getParent()->getTree());
-						if ($linked_record) {
-							$link = '<a href="' . $linked_record->getHtmlUrl() . '">' . $linked_record->getFullName() . '</a>';
-							echo GedcomTag::getLabelValue($fact->getTag() . ':' . $match[1], $link);
-						} else {
-							echo GedcomTag::getLabelValue($fact->getTag() . ':' . $match[1], Filter::escapeHtml($match[2]));
-						}
-					} else {
-						// Non links
-						echo GedcomTag::getLabelValue($fact->getTag() . ':' . $match[1], Filter::escapeHtml($match[2]));
-					}
-				}
-				break;
-			}
-		}
-		echo self::printFactSources($fact->getGedcom(), 2);
-		echo FunctionsPrint::printFactNotes($fact->getGedcom(), 2);
-		self::printMediaLinks($fact->getGedcom(), 2);
-		echo '</td></tr>';
-	}
-
-	/**
-	 * Print the associations from the associated individuals in $event to the individuals in $record
-	 *
-	 * @param Fact $event
-	 *
-	 * @return string
-	 */
-	private static function formatAssociateRelationship(Fact $event) {
-		$parent = $event->getParent();
-		// To whom is this record an assocate?
-		if ($parent instanceof Individual) {
-			// On an individual page, we just show links to the person
-			$associates = array($parent);
-		} elseif ($parent instanceof Family) {
-			// On a family page, we show links to both spouses
-			$associates = $parent->getSpouses();
-		} else {
-			// On other pages, it does not make sense to show associates
-			return '';
-		}
-
-		preg_match_all('/^1 ASSO @(' . WT_REGEX_XREF . ')@((\n[2-9].*)*)/', $event->getGedcom(), $amatches1, PREG_SET_ORDER);
-		preg_match_all('/\n2 _?ASSO @(' . WT_REGEX_XREF . ')@((\n[3-9].*)*)/', $event->getGedcom(), $amatches2, PREG_SET_ORDER);
-
-		$html = '';
-		// For each ASSO record
-		foreach (array_merge($amatches1, $amatches2) as $amatch) {
-			$person = Individual::getInstance($amatch[1], $event->getParent()->getTree());
-			if ($person && $person->canShowName()) {
-				// Is there a "RELA" tag
-				if (preg_match('/\n[23] RELA (.+)/', $amatch[2], $rmatch)) {
-					// Use the supplied relationship as a label
-					$label = GedcomCodeRela::getValue($rmatch[1], $person);
-				} else {
-					// Use a default label
-					$label = GedcomTag::getLabel('ASSO', $person);
-				}
-
-				$values = array('<a href="' . $person->getHtmlUrl() . '">' . $person->getFullName() . '</a>');
-				foreach ($associates as $associate) {
-					$relationship_name = Functions::getAssociateRelationshipName($associate, $person);
-					if (!$relationship_name) {
-						$relationship_name = GedcomTag::getLabel('RELA');
-					}
-
-					if ($parent instanceof Family) {
-						// For family ASSO records (e.g. MARR), identify the spouse with a sex icon
-						$relationship_name .= $associate->getSexImage();
-					}
-
-					$values[] = '<a href="relationship.php?pid1=' . $associate->getXref() . '&amp;pid2=' . $person->getXref() . '&amp;ged=' . $associate->getTree()->getNameUrl() . '" rel="nofollow">' . $relationship_name . '</a>';
-				}
-				$value = implode(' — ', $values);
-
-				// Use same markup as GedcomTag::getLabelValue()
-				$asso = I18N::translate('<span class="label">%1$s:</span> <span class="field" dir="auto">%2$s</span>', $label, $value);
-			} elseif (!$person && Auth::isEditor($event->getParent()->getTree())) {
-				$asso = GedcomTag::getLabelValue('ASSO', '<span class="error">' . $amatch[1] . '</span>');
-			} else {
-				$asso = '';
-			}
-			$html .= '<div class="fact_ASSO">' . $asso . '</div>';
-		}
-
-		return $html;
-	}
-
-	/**
-	 * print a repository record
-	 *
-	 * find and print repository information attached to a source
-	 *
-	 * @param string $xref the Gedcom Xref ID of the repository to print
-	 */
-	public static function printRepositoryRecord($xref) {
-		global $WT_TREE;
-
-		$repository = Repository::getInstance($xref, $WT_TREE);
-		if ($repository && $repository->canShow()) {
-			echo '<a class="field" href="', $repository->getHtmlUrl(), '">', $repository->getFullName(), '</a><br>';
-			echo '<br>';
-			echo FunctionsPrint::printFactNotes($repository->getGedcom(), 1);
-		}
-	}
-
-	/**
-	 * print a source linked to a fact (2 SOUR)
-	 *
-	 * this function is called by the FunctionsPrintFacts::print_fact function and other functions to
-	 * print any source information attached to the fact
-	 *
-	 * @param string $factrec The fact record to look for sources in
-	 * @param int $level The level to look for sources at
-	 *
-	 * @return string HTML text
-	 */
-	public static function printFactSources($factrec, $level) {
-		global $WT_TREE;
-
-		$data   = '';
-		$nlevel = $level + 1;
-
-		// Systems not using source records
-		// The old style is not supported when entering or editing sources, but may be found in imported trees.
-		// Also, the old style sources allow histo.* files to use tree independent source citations, which
-		// will display nicely when markdown is used.
-		$ct = preg_match_all('/' . $level . ' SOUR (.*)((?:\n\d CONT.*)*)/', $factrec, $match, PREG_SET_ORDER);
-		for ($j = 0; $j < $ct; $j++) {
-			if (strpos($match[$j][1], '@') === false) {
-				$source = Filter::escapeHtml($match[$j][1] . preg_replace('/\n\d CONT ?/', "\n", $match[$j][2]));
-				$data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $WT_TREE) . '</span></div>';
-			}
-		}
-		// Find source for each fact
-		$ct    = preg_match_all("/$level SOUR @(.*)@/", $factrec, $match, PREG_SET_ORDER);
-		$spos2 = 0;
-		for ($j = 0; $j < $ct; $j++) {
-			$sid    = $match[$j][1];
-			$source = Source::getInstance($sid, $WT_TREE);
-			if ($source) {
-				if ($source->canShow()) {
-					$spos1 = strpos($factrec, "$level SOUR @" . $sid . "@", $spos2);
-					$spos2 = strpos($factrec, "\n$level", $spos1);
-					if (!$spos2) {
-						$spos2 = strlen($factrec);
-					}
-					$srec = substr($factrec, $spos1, $spos2 - $spos1);
-					$lt   = preg_match_all("/$nlevel \w+/", $srec, $matches);
-					$data .= '<div class="fact_SOUR">';
-					$elementID = Uuid::uuid4();
-					if ($WT_TREE->getPreference('EXPAND_SOURCES')) {
-						$plusminus = 'icon-minus';
-					} else {
-						$plusminus = 'icon-plus';
-					}
-					if ($lt > 0) {
-						$data .= '<a href="#" onclick="return expand_layer(\'' . $elementID . '\');"><i id="' . $elementID . '_img" class="' . $plusminus . '"></i></a> ';
-					}
-					$data .= GedcomTag::getLabelValue('SOUR', '<a href="' . $source->getHtmlUrl() . '">' . $source->getFullName() . '</a>', null, 'span');
-					$data .= '</div>';
-
-					$data .= "<div id=\"$elementID\"";
-					if ($WT_TREE->getPreference('EXPAND_SOURCES')) {
-						$data .= ' style="display:block"';
-					}
-					$data .= ' class="source_citations">';
-					// PUBL
-					$publ = $source->getFirstFact('PUBL');
-					if ($publ) {
-						$data .= GedcomTag::getLabelValue('PUBL', $publ->getValue());
-					}
-					$data .= self::printSourceStructure(self::getSourceStructure($srec));
-					$data .= '<div class="indent">';
-					ob_start();
-					self::printMediaLinks($srec, $nlevel);
-					$data .= ob_get_clean();
-					$data .= FunctionsPrint::printFactNotes($srec, $nlevel, false);
-					$data .= '</div>';
-					$data .= '</div>';
-				} else {
-					// Here we could show that we do actually have sources for this data,
-					// but not the details. For example “Sources: ”.
-					// But not by default, based on user feedback.
-					// https://webtrees.net/index.php/en/forum/3-help-for-beta-and-svn-versions/27002-source-media-privacy-issue
-				}
-			} else {
-				$data .= GedcomTag::getLabelValue('SOUR', '<span class="error">' . $sid . '</span>');
-			}
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Print the links to media objects
-	 *
-	 * @param string $factrec
-	 * @param int $level
-	 */
-	public static function printMediaLinks($factrec, $level) {
-		global $WT_TREE;
-
-		$nlevel = $level + 1;
-		if (preg_match_all("/$level OBJE @(.*)@/", $factrec, $omatch, PREG_SET_ORDER) == 0) {
-			return;
-		}
-		$objectNum = 0;
-		while ($objectNum < count($omatch)) {
-			$media_id = $omatch[$objectNum][1];
-			$media    = Media::getInstance($media_id, $WT_TREE);
-			if ($media) {
-				if ($media->canShow()) {
-					if ($objectNum > 0) {
-						echo '<br class="media-separator" style="clear:both;">';
-					}
-					echo '<div class="media-display"><div class="media-display-image">';
-					echo $media->displayImage();
-					echo '</div>';
-					echo '<div class="media-display-title">';
-					echo '<a href="', $media->getHtmlUrl(), '">', $media->getFullName(), '</a>';
-					// NOTE: echo the notes of the media
-					echo '<p>';
-					echo FunctionsPrint::printFactNotes($media->getGedcom(), 1);
-					$ttype = preg_match("/" . ($nlevel + 1) . " TYPE (.*)/", $media->getGedcom(), $match);
-					if ($ttype > 0) {
-						$mediaType = GedcomTag::getFileFormTypeValue($match[1]);
-						echo '<p class="label">', I18N::translate('Type'), ': </span> <span class="field">', $mediaType, '</p>';
-					}
-					echo '</p>';
-					//-- print spouse name for marriage events
-					$ct = preg_match("/WT_SPOUSE: (.*)/", $factrec, $match);
-					if ($ct > 0) {
-						$spouse = Individual::getInstance($match[1], $media->getTree());
-						if ($spouse) {
-							echo '<a href="', $spouse->getHtmlUrl(), '">';
-							echo $spouse->getFullName();
-							echo '</a>';
-						}
-						$ct = preg_match("/WT_FAMILY_ID: (.*)/", $factrec, $match);
-						if ($ct > 0) {
-							$famid  = trim($match[1]);
-							$family = Family::getInstance($famid, $spouse->getTree());
-							if ($family) {
-								if ($spouse) {
-									echo " - ";
-								}
-								echo '<a href="', $family->getHtmlUrl(), '">', I18N::translate('View this family'), '</a>';
-							}
-						}
-					}
-					echo FunctionsPrint::printFactNotes($media->getGedcom(), $nlevel);
-					echo self::printFactSources($media->getGedcom(), $nlevel);
-					echo '</div>'; //close div "media-display-title"
-					echo '</div>'; //close div "media-display"
-				}
-			} elseif ($WT_TREE->getPreference('HIDE_GEDCOM_ERRORS') === '1') {
-				echo '<p class="ui-state-error">', $media_id, '</p>';
-			}
-			$objectNum++;
-		}
-	}
-
-	/**
-	 * Print a row for the sources tab on the individual page.
-	 *
-	 * @param Fact $fact
-	 * @param int $level
-	 */
-	public static function printMainSources(Fact $fact, $level) {
-		$factrec = $fact->getGedcom();
-		$fact_id = $fact->getFactId();
-		$parent  = $fact->getParent();
-		$pid     = $parent->getXref();
-
-		$nlevel = $level + 1;
-		if ($fact->isPendingAddition()) {
-			$styleadd = 'new';
-			$can_edit = $level == 1 && $fact->canEdit();
-		} elseif ($fact->isPendingDeletion()) {
-			$styleadd = 'old';
-			$can_edit = false;
-		} else {
-			$styleadd = '';
-			$can_edit = $level == 1 && $fact->canEdit();
-		}
-
-		// -- find source for each fact
-		$ct    = preg_match_all("/($level SOUR (.+))/", $factrec, $match, PREG_SET_ORDER);
-		$spos2 = 0;
-		for ($j = 0; $j < $ct; $j++) {
-			$sid   = trim($match[$j][2], '@');
-			$spos1 = strpos($factrec, $match[$j][1], $spos2);
-			$spos2 = strpos($factrec, "\n$level", $spos1);
-			if (!$spos2) {
-				$spos2 = strlen($factrec);
-			}
-			$srec   = substr($factrec, $spos1, $spos2 - $spos1);
-			$source = Source::getInstance($sid, $fact->getParent()->getTree());
-			// Allow access to "1 SOUR @non_existent_source@", so it can be corrected/deleted
-			if (!$source || $source->canShow()) {
-				if ($level > 1) {
-					echo '<tr class="row_sour2">';
-				} else {
-					echo '<tr>';
-				}
-				echo '<td class="descriptionbox';
-				if ($level > 1) {
-					echo ' rela';
-				}
-				echo ' ', $styleadd, ' width20">';
-				$factlines = explode("\n", $factrec); // 1 BIRT Y\n2 SOUR ...
-				$factwords = explode(" ", $factlines[0]); // 1 BIRT Y
-				$factname  = $factwords[1]; // BIRT
-				if ($factname == 'EVEN' || $factname == 'FACT') {
-					// Add ' EVEN' to provide sensible output for an event with an empty TYPE record
-					$ct = preg_match("/2 TYPE (.*)/", $factrec, $ematch);
-					if ($ct > 0) {
-						$factname = trim($ematch[1]);
-						echo $factname;
-					} else {
-						echo GedcomTag::getLabel($factname, $parent);
-					}
-				} elseif ($can_edit) {
-					echo "<a onclick=\"return edit_record('$pid', '$fact_id');\" href=\"#\" title=\"", I18N::translate('Edit'), '">';
-					if ($fact->getParent()->getTree()->getPreference('SHOW_FACT_ICONS')) {
-						if ($level == 1) {
-							echo '<i class="icon-source"></i> ';
-						}
-					}
-					echo GedcomTag::getLabel($factname, $parent), '</a>';
-					echo '<div class="editfacts">';
-					if (preg_match('/^@.+@$/', $match[$j][2])) {
-						// Inline sources can't be edited. Attempting to save one will convert it
-						// into a link, and delete it.
-						// e.g. "1 SOUR my source" becomes "1 SOUR @my source@" which does not exist.
-						echo "<div class=\"editlink\"><a class=\"editicon\" onclick=\"return edit_record('$pid', '$fact_id');\" href=\"#\" title=\"" . I18N::translate('Edit') . "\"><span class=\"link_text\">" . I18N::translate('Edit') . "</span></a></div>";
-						echo '<div class="copylink"><a class="copyicon" href="#" onclick="return copy_fact(\'', $pid, '\', \'', $fact_id, '\');" title="' . I18N::translate('Copy') . '"><span class="link_text">' . I18N::translate('Copy') . '</span></a></div>';
-					}
-					echo "<div class=\"deletelink\"><a class=\"deleteicon\" onclick=\"return delete_fact('" . I18N::translate('Are you sure you want to delete this fact?') . "', '$pid', '$fact_id');\" href=\"#\" title=\"" . I18N::translate('Delete') . "\"><span class=\"link_text\">" . I18N::translate('Delete') . "</span></a></div>";
-					echo '</div>';
-				} else {
-					echo GedcomTag::getLabel($factname, $parent);
-				}
-				echo '</td>';
-				echo '<td class="optionbox ', $styleadd, ' wrap">';
-				if ($source) {
-					echo '<a href="', $source->getHtmlUrl(), '">', $source->getFullName(), '</a>';
-					// PUBL
-					$publ = $source->getFirstFact('PUBL');
-					if ($publ) {
-						echo GedcomTag::getLabelValue('PUBL', $publ->getValue());
-					}
-					// 2 RESN tags. Note, there can be more than one, such as "privacy" and "locked"
-					if (preg_match_all("/\n2 RESN (.+)/", $factrec, $rmatches)) {
-						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;
-							}
-							echo '</span>';
-						}
-					}
-					$cs = preg_match("/$nlevel EVEN (.*)/", $srec, $cmatch);
-					if ($cs > 0) {
-						echo '<br><span class="label">', GedcomTag::getLabel('EVEN'), ' </span><span class="field">', $cmatch[1], '</span>';
-						$cs = preg_match("/" . ($nlevel + 1) . " ROLE (.*)/", $srec, $cmatch);
-						if ($cs > 0) {
-							echo '<br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="label">', GedcomTag::getLabel('ROLE'), ' </span><span class="field">', $cmatch[1], '</span>';
-						}
-					}
-					echo self::printSourceStructure(self::getSourceStructure($srec));
-					echo '<div class="indent">';
-					self::printMediaLinks($srec, $nlevel);
-					if ($nlevel == 2) {
-						self::printMediaLinks($source->getGedcom(), 1);
-					}
-					echo FunctionsPrint::printFactNotes($srec, $nlevel);
-					if ($nlevel == 2) {
-						echo FunctionsPrint::printFactNotes($source->getGedcom(), 1);
-					}
-					echo '</div>';
-				} else {
-					echo $sid;
-				}
-				echo '</td></tr>';
-			}
-		}
-	}
-
-	/**
-	 * Print SOUR structure
-	 *  This function prints the input array of SOUR sub-records built by the
-	 *  getSourceStructure() function.
-	 *
-	 * @param string[] $textSOUR
-	 *
-	 * @return string
-	 */
-	public static function printSourceStructure($textSOUR) {
-		global $WT_TREE;
-		$html = '';
-
-		if ($textSOUR['PAGE']) {
-			$html .= GedcomTag::getLabelValue('PAGE', Filter::expandUrls($textSOUR['PAGE']));
-		}
-
-		if ($textSOUR['EVEN']) {
-			$html .= GedcomTag::getLabelValue('EVEN', Filter::escapeHtml($textSOUR['EVEN']));
-			if ($textSOUR['ROLE']) {
-				$html .= GedcomTag::getLabelValue('ROLE', Filter::escapeHtml($textSOUR['ROLE']));
-			}
-		}
-
-		if ($textSOUR['DATE'] || count($textSOUR['TEXT'])) {
-			if ($textSOUR['DATE']) {
-				$date = new Date($textSOUR['DATE']);
-				$html .= GedcomTag::getLabelValue('DATA:DATE', $date->display());
-			}
-			foreach ($textSOUR['TEXT'] as $text) {
-				$html .= GedcomTag::getLabelValue('TEXT', Filter::formatText($text, $WT_TREE));
-			}
-		}
-
-		if ($textSOUR['QUAY'] != '') {
-			$html .= GedcomTag::getLabelValue('QUAY', GedcomCodeQuay::getValue($textSOUR['QUAY']));
-		}
-
-		return '<div class="indent">' . $html . '</div>';
-	}
-
-	/**
-	 * Extract SOUR structure from the incoming Source sub-record
-	 * The output array is defined as follows:
-	 *  $textSOUR['PAGE'] = Source citation
-	 *  $textSOUR['EVEN'] = Event type
-	 *  $textSOUR['ROLE'] = Role in event
-	 *  $textSOUR['DATA'] = place holder (no text in this sub-record)
-	 *  $textSOUR['DATE'] = Entry recording date
-	 *  $textSOUR['TEXT'] = (array) Text from source
-	 *  $textSOUR['QUAY'] = Certainty assessment
-	 *
-	 * @param string $srec
-	 *
-	 * @return string[]
-	 */
-	public static function getSourceStructure($srec) {
-		// Set up the output array
-		$textSOUR = array(
-			'PAGE' => '',
-			'EVEN' => '',
-			'ROLE' => '',
-			'DATA' => '',
-			'DATE' => '',
-			'TEXT' => array(),
-			'QUAY' => '',
-		);
-
-		if ($srec) {
-			$subrecords = explode("\n", $srec);
-			for ($i = 0; $i < count($subrecords); $i++) {
-				$tag  = substr($subrecords[$i], 2, 4);
-				$text = substr($subrecords[$i], 7);
-				$i++;
-				for (; $i < count($subrecords); $i++) {
-					$nextTag = substr($subrecords[$i], 2, 4);
-					if ($nextTag != 'CONT') {
-						$i--;
-						break;
-					}
-					if ($nextTag == 'CONT') {
-						$text .= "\n";
-					}
-					$text .= rtrim(substr($subrecords[$i], 7));
-				}
-				if ($tag == 'TEXT') {
-					$textSOUR[$tag][] = $text;
-				} else {
-					$textSOUR[$tag] = $text;
-				}
-			}
-		}
-
-		return $textSOUR;
-	}
-
-	/**
-	 * Print a row for the notes tab on the individual page.
-	 *
-	 * @param Fact $fact
-	 * @param int $level
-	 */
-	public static function printMainNotes(Fact $fact, $level) {
-		$factrec = $fact->getGedcom();
-		$fact_id = $fact->getFactId();
-		$parent  = $fact->getParent();
-		$pid     = $parent->getXref();
-
-		if ($fact->isPendingAddition()) {
-			$styleadd = ' new';
-			$can_edit = $level == 1 && $fact->canEdit();
-		} elseif ($fact->isPendingDeletion()) {
-			$styleadd = ' old';
-			$can_edit = false;
-		} else {
-			$styleadd = '';
-			$can_edit = $level == 1 && $fact->canEdit();
-		}
-
-		$ct = preg_match_all("/$level NOTE (.*)/", $factrec, $match, PREG_SET_ORDER);
-		for ($j = 0; $j < $ct; $j++) {
-			// Note object, or inline note?
-			if (preg_match("/$level NOTE @(.*)@/", $match[$j][0], $nmatch)) {
-				$note = Note::getInstance($nmatch[1], $fact->getParent()->getTree());
-				if ($note && !$note->canShow()) {
-					continue;
-				}
-			} else {
-				$note = null;
-			}
-
-			if ($level >= 2) {
-				echo '<tr class="row_note2"><td class="descriptionbox rela ', $styleadd, ' width20">';
-			} else {
-				echo '<tr><td class="descriptionbox ', $styleadd, ' width20">';
-			}
-			if ($can_edit) {
-				echo '<a onclick="return edit_record(\'', $pid, '\', \'', $fact_id, '\');" href="#" title="', I18N::translate('Edit'), '">';
-				if ($level < 2) {
-					if ($fact->getParent()->getTree()->getPreference('SHOW_FACT_ICONS')) {
-						echo '<i class="icon-note"></i> ';
-					}
-					if ($note) {
-						echo GedcomTag::getLabel('SHARED_NOTE');
-					} else {
-						echo GedcomTag::getLabel('NOTE');
-					}
-					echo '</a>';
-					echo '<div class="editfacts">';
-					echo "<div class=\"editlink\"><a class=\"editicon\" onclick=\"return edit_record('$pid', '$fact_id');\" href=\"#\" title=\"" . I18N::translate('Edit') . "\"><span class=\"link_text\">" . I18N::translate('Edit') . "</span></a></div>";
-					echo '<div class="copylink"><a class="copyicon" href="#" onclick="return copy_fact(\'', $pid, '\', \'', $fact_id, '\');" title="' . I18N::translate('Copy') . '"><span class="link_text">' . I18N::translate('Copy') . '</span></a></div>';
-					echo "<div class=\"deletelink\"><a class=\"deleteicon\" onclick=\"return delete_fact('" . I18N::translate('Are you sure you want to delete this fact?') . "', '$pid', '$fact_id');\" href=\"#\" title=\"" . I18N::translate('Delete') . "\"><span class=\"link_text\">" . I18N::translate('Delete') . "</span></a></div>";
-					if ($note) {
-						echo '<a class="icon-note" href="', $note->getHtmlUrl(), '" title="' . I18N::translate('View') . '"><span class="link_text">' . I18N::translate('View') . '</span></a>';
-					}
-					echo '</div>';
-				}
-			} else {
-				if ($level < 2) {
-					if ($fact->getParent()->getTree()->getPreference('SHOW_FACT_ICONS')) {
-						echo '<i class="icon-note"></i> ';
-					}
-					if ($note) {
-						echo GedcomTag::getLabel('SHARED_NOTE');
-					} else {
-						echo GedcomTag::getLabel('NOTE');
-					}
-				}
-				$factlines = explode("\n", $factrec); // 1 BIRT Y\n2 NOTE ...
-				$factwords = explode(" ", $factlines[0]); // 1 BIRT Y
-				$factname  = $factwords[1]; // BIRT
-				$parent    = GedcomRecord::getInstance($pid, $fact->getParent()->getTree());
-				if ($factname == 'EVEN' || $factname == 'FACT') {
-					// Add ' EVEN' to provide sensible output for an event with an empty TYPE record
-					$ct = preg_match("/2 TYPE (.*)/", $factrec, $ematch);
-					if ($ct > 0) {
-						$factname = trim($ematch[1]);
-						echo $factname;
-					} else {
-						echo GedcomTag::getLabel($factname, $parent);
-					}
-				} elseif ($factname != 'NOTE') {
-					// Note is already printed
-					echo GedcomTag::getLabel($factname, $parent);
-					if ($note) {
-						echo '<div class="editfacts"><a class="icon-note" href="', $note->getHtmlUrl(), '" title="' . I18N::translate('View') . '"><span class="link_text">' . I18N::translate('View') . '</span></a></div>';
-
-					}
-				}
-			}
-			echo '</td>';
-			if ($note) {
-				// Note objects
-				if (Module::getModuleByName('GEDFact_assistant')) {
-					// If Census assistant installed, allow it to format the note
-					$text = CensusAssistantModule::formatCensusNote($note);
-				} else {
-					$text = Filter::formatText($note->getNote(), $fact->getParent()->getTree());
-				}
-			} else {
-				// Inline notes
-				$nrec = Functions::getSubRecord($level, "$level NOTE", $factrec, $j + 1);
-				$text = $match[$j][1] . Functions::getCont($level + 1, $nrec);
-				$text = Filter::formatText($text, $fact->getParent()->getTree());
-			}
-
-			echo '<td class="optionbox', $styleadd, ' wrap">';
-			echo $text;
-
-			if (!empty($noterec)) {
-				echo self::printFactSources($noterec, 1);
-			}
-
-			// 2 RESN tags. Note, there can be more than one, such as "privacy" and "locked"
-			if (preg_match_all("/\n2 RESN (.+)/", $factrec, $matches)) {
-				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;
-					}
-					echo '</span>';
-				}
-			}
-			echo '</td></tr>';
-		}
-	}
-
-	/**
-	 * Print a row for the media tab on the individual page.
-	 *
-	 * @param Fact $fact
-	 * @param int $level
-	 */
-	public static function printMainMedia(Fact $fact, $level) {
-		$factrec = $fact->getGedcom();
-		$parent  = $fact->getParent();
-
-		if ($fact->isPendingAddition()) {
-			$styleadd = 'new';
-			$can_edit = $level == 1 && $fact->canEdit();
-		} elseif ($fact->isPendingDeletion()) {
-			$styleadd = 'old';
-			$can_edit = false;
-		} else {
-			$styleadd = '';
-			$can_edit = $level == 1 && $fact->canEdit();
-		}
-
-		// -- find source for each fact
-		preg_match_all('/(?:^|\n)' . $level . ' OBJE @(.*)@/', $factrec, $matches);
-		foreach ($matches[1] as $xref) {
-			$media = Media::getInstance($xref, $fact->getParent()->getTree());
-			// Allow access to "1 OBJE @non_existent_source@", so it can be corrected/deleted
-			if (!$media || $media->canShow()) {
-				if ($level > 1) {
-					echo '<tr class="row_obje2">';
-				} else {
-					echo '<tr>';
-				}
-				echo '<td class="descriptionbox';
-				if ($level > 1) {
-					echo ' rela';
-				}
-				echo ' ', $styleadd, ' width20">';
-				preg_match("/^\d (\w*)/", $factrec, $factname);
-				$factlines = explode("\n", $factrec); // 1 BIRT Y\n2 SOUR ...
-				$factwords = explode(" ", $factlines[0]); // 1 BIRT Y
-				$factname  = $factwords[1]; // BIRT
-				if ($factname == 'EVEN' || $factname == 'FACT') {
-					// Add ' EVEN' to provide sensible output for an event with an empty TYPE record
-					$ct = preg_match("/2 TYPE (.*)/", $factrec, $ematch);
-					if ($ct > 0) {
-						$factname = $ematch[1];
-						echo $factname;
-					} else {
-						echo GedcomTag::getLabel($factname, $parent);
-					}
-				} elseif ($can_edit) {
-					echo '<a onclick="window.open(\'addmedia.php?action=editmedia&amp;pid=', $media->getXref(), '\', \'_blank\', edit_window_specs); return false;" href="#" title="', I18N::translate('Edit'), '">';
-					echo GedcomTag::getLabel($factname, $parent), '</a>';
-					echo '<div class="editfacts">';
-					echo '<div class="editlink"><a class="editicon" onclick="window.open(\'addmedia.php?action=editmedia&amp;pid=', $media->getXref(), '\', \'_blank\', edit_window_specs); return false;" href="#" title="', I18N::translate('Edit'), '"><span class="link_text">', I18N::translate('Edit'), '</span></a></div>';
-					echo '<div class="copylink"><a class="copyicon" href="#" onclick="jQuery.post(\'action.php\',{action:\'copy-fact\', type:\'\', factgedcom:\'' . rawurlencode($factrec) . '\'},function(){location.reload();})" title="' . I18N::translate('Copy') . '"><span class="link_text">' . I18N::translate('Copy') . '</span></a></div>';
-					echo '<div class="deletelink"><a class="deleteicon" onclick="return delete_fact(\'', I18N::translate('Are you sure you want to delete this fact?'), '\', \'', $parent->getXref(), '\', \'', $fact->getFactId(), '\');" href="#" title="', I18N::translate('Delete'), '"><span class="link_text">', I18N::translate('Delete'), '</span></a></div>';
-					echo '</div>';
-				} else {
-					echo GedcomTag::getLabel($factname, $parent);
-				}
-				echo '</td>';
-				echo '<td class="optionbox ', $styleadd, ' wrap">';
-				if ($media) {
-					echo '<span class="field">';
-					echo $media->displayImage();
-					echo '<a href="' . $media->getHtmlUrl() . '">';
-					echo '<em>';
-					foreach ($media->getAllNames() as $name) {
-						if ($name['type'] != 'TITL') {
-							echo '<br>';
-						}
-						echo $name['full'];
-					}
-					echo '</em>';
-					echo '</a>';
-					echo '</span>';
-
-					echo GedcomTag::getLabelValue('FORM', $media->mimeType());
-					$imgsize = $media->getImageAttributes('main');
-					if (!empty($imgsize['WxH'])) {
-						echo GedcomTag::getLabelValue('__IMAGE_SIZE__', $imgsize['WxH']);
-					}
-					if ($media->getFilesizeraw() > 0) {
-						echo GedcomTag::getLabelValue('__FILE_SIZE__', $media->getFilesize());
-					}
-					$mediatype = $media->getMediaType();
-					if ($mediatype) {
-						echo GedcomTag::getLabelValue('TYPE', GedcomTag::getFileFormTypeValue($mediatype));
-					}
-
-					switch ($media->isPrimary()) {
-					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);
-				} else {
-					echo $xref;
-				}
-				echo '</td></tr>';
-			}
-		}
-	}
+        } else {
+            echo $label;
+        }
+
+        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;
+        }
+
+        echo '</td><td class="optionbox ', $styleadd, ' wrap">';
+
+        // Event from another record?
+        if ($parent !== $record) {
+            if ($parent instanceof Family) {
+                foreach ($parent->getSpouses() as $spouse) {
+                    if ($record !== $spouse) {
+                        echo '<a href="', $spouse->getHtmlUrl(), '">', $spouse->getFullName(), '</a> — ';
+                    }
+                }
+                echo '<a href="', $parent->getHtmlUrl(), '">', I18N::translate('View this family'), '</a><br>';
+            } elseif ($parent instanceof Individual) {
+                echo '<a href="', $parent->getHtmlUrl(), '">', $parent->getFullName(), '</a><br>';
+            }
+        }
+
+        // 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;
+            }
+                echo '</div>';
+                break;
+        case 'PUBL': // Publication details might contain URLs.
+            echo '<div class="field">', Filter::expandUrls($fact->getValue()), '</div>';
+            break;
+        case 'REPO':
+            if (preg_match('/^@(' . WT_REGEX_XREF . ')@$/', $fact->getValue(), $match)) {
+                self::printRepositoryRecord($match[1]);
+            } else {
+                echo '<div class="error">', Filter::escapeHtml($fact->getValue()), '</div>';
+            }
+            break;
+        case 'URL':
+        case '_URL':
+        case 'WWW':
+            echo '<div class="field"><a href="', Filter::escapeHtml($fact->getValue()), '">', Filter::escapeHtml($fact->getValue()), '</a></div>';
+            break;
+        case 'TEXT': // 0 SOUR / 1 TEXT
+            echo '<div class="field">', nl2br(Filter::escapeHtml($fact->getValue()), false), '</div>';
+            break;
+        default:
+            // Display the value for all other facts/events
+            switch ($fact->getValue()) {
+            case '':
+            // Nothing to display
+            break;
+            case 'N':
+            // Not valid GEDCOM
+            echo '<div class="field">', I18N::translate('No'), '</div>';
+            break;
+            case 'Y':
+            // Do not display "Yes".
+            break;
+            default:
+            if (preg_match('/^@(' . WT_REGEX_XREF . ')@$/', $fact->getValue(), $match)) {
+            $target = GedcomRecord::getInstance($match[1], $fact->getParent()->getTree());
+            if ($target) {
+                echo '<div><a href="', $target->getHtmlUrl(), '">', $target->getFullName(), '</a></div>';
+            } else {
+                echo '<div class="error">', Filter::escapeHtml($fact->getValue()), '</div>';
+            }
+            } else {
+            echo '<div class="field"><span dir="auto">', Filter::escapeHtml($fact->getValue()), '</span></div>';
+            }
+            break;
+            }
+                break;
+        }
+
+        // Print the type of this fact/event
+        if ($type) {
+            $utype = strtoupper($type);
+            // Events of close relatives, e.g. _MARR_CHIL
+            if (substr($fact->getTag(), 0, 6) == '_MARR_' && ($utype == 'CIVIL' || $utype == 'PARTNERS' || $utype == 'RELIGIOUS')) {
+                // Translate MARR/TYPE using the code that supports MARR_CIVIL, etc. tags
+                $type = GedcomTag::getLabel('MARR_' . $utype);
+            } else {
+                // Allow (custom) translations for other types
+                $type = I18N::translate($type);
+            }
+            echo GedcomTag::getLabelValue('TYPE', Filter::escapeHtml($type));
+        }
+
+        // Print the date of this fact/event
+        echo FunctionsPrint::formatFactDate($fact, $record, true, true);
+
+        // Print the place of this fact/event
+        echo '<div class="place">', FunctionsPrint::formatFactPlace($fact, true, true, true), '</div>';
+        // A blank line between the primary attributes (value, date, place) and the secondary ones
+        echo '<br>';
+
+        $addr = $fact->getAttribute('ADDR');
+        if ($addr) {
+            echo GedcomTag::getLabelValue('ADDR', $addr);
+        }
+
+        // Print the associates of this fact/event
+        if ($fact->getFactId() !== 'asso') {
+            echo self::formatAssociateRelationship($fact);
+        }
+
+        // Print any other "2 XXXX" attributes, in the order in which they appear.
+        preg_match_all('/\n2 (' . WT_REGEX_TAG . ') (.+)/', $fact->getGedcom(), $matches, PREG_SET_ORDER);
+        foreach ($matches as $match) {
+            switch ($match[1]) {
+            case 'DATE':
+            case 'TIME':
+            case 'AGE':
+            case 'PLAC':
+            case 'ADDR':
+            case 'ALIA':
+            case 'ASSO':
+            case '_ASSO':
+            case 'DESC':
+            case 'RELA':
+            case 'STAT':
+            case 'TEMP':
+            case 'TYPE':
+            case 'FAMS':
+            case 'CONT':
+                // These were already shown at the beginning
+                break;
+            case 'NOTE':
+            case 'OBJE':
+            case 'SOUR':
+                // These will be shown at the end
+                break;
+            case '_UID':
+            case 'RIN':
+                // These don't belong at level 2, so do not display them.
+                // They are only shown when editing.
+                break;
+            case 'EVEN': // 0 SOUR / 1 DATA / 2 EVEN / 3 DATE / 3 PLAC
+                $events = array();
+                foreach (preg_split('/ *, */', $match[2]) as $event) {
+                    $events[] = GedcomTag::getLabel($event);
+                }
+                if (count($events) == 1) {
+                    echo GedcomTag::getLabelValue('EVEN', $event);
+                } else {
+                    echo GedcomTag::getLabelValue('EVEN', implode(I18N::$list_separator, $events));
+                }
+                if (preg_match('/\n3 DATE (.+)/', $fact->getGedcom(), $date_match)) {
+                    $date = new Date($date_match[1]);
+                    echo GedcomTag::getLabelValue('DATE', $date->display());
+                }
+                if (preg_match('/\n3 PLAC (.+)/', $fact->getGedcom(), $plac_match)) {
+                    echo GedcomTag::getLabelValue('PLAC', $plac_match[1]);
+                }
+                break;
+            case 'FAMC': // 0 INDI / 1 ADOP / 2 FAMC / 3 ADOP
+                $family = Family::getInstance(str_replace('@', '', $match[2]), $fact->getParent()->getTree());
+                if ($family) {
+                    echo GedcomTag::getLabelValue('FAM', '<a href="' . $family->getHtmlUrl() . '">' . $family->getFullName() . '</a>');
+                    if (preg_match('/\n3 ADOP (HUSB|WIFE|BOTH)/', $fact->getGedcom(), $match)) {
+                        echo GedcomTag::getLabelValue('ADOP', GedcomCodeAdop::getValue($match[1], $label_person));
+                    }
+                } else {
+                    echo GedcomTag::getLabelValue('FAM', '<span class="error">' . $match[2] . '</span>');
+                }
+                break;
+            case '_WT_USER':
+                $user = User::findByIdentifier($match[2]); // may not exist
+                if ($user) {
+                    echo GedcomTag::getLabelValue('_WT_USER', $user->getRealNameHtml());
+                } else {
+                    echo GedcomTag::getLabelValue('_WT_USER', Filter::escapeHtml($match[2]));
+                }
+                break;
+            case 'RESN':
+                switch ($match[2]) {
+                case 'none':
+                // Note: "2 RESN none" is not valid gedcom.
+                // However, webtrees privacy rules will interpret it as "show an otherwise private fact to public".
+                echo GedcomTag::getLabelValue('RESN', '<i class="icon-resn-none"></i> ' . I18N::translate('Show to visitors'));
+                break;
+                case 'privacy':
+                echo GedcomTag::getLabelValue('RESN', '<i class="icon-resn-privacy"></i> ' . I18N::translate('Show to members'));
+                break;
+                case 'confidential':
+                echo GedcomTag::getLabelValue('RESN', '<i class="icon-resn-confidential"></i> ' . I18N::translate('Show to managers'));
+                break;
+                case 'locked':
+                echo GedcomTag::getLabelValue('RESN', '<i class="icon-resn-locked"></i> ' . I18N::translate('Only managers can edit'));
+                break;
+                default:
+                echo GedcomTag::getLabelValue('RESN', Filter::escapeHtml($match[2]));
+                break;
+                }
+                    break;
+            case 'CALN':
+                echo GedcomTag::getLabelValue('CALN', Filter::expandUrls($match[2]));
+                break;
+            case 'FORM': // 0 OBJE / 1 FILE / 2 FORM / 3 TYPE
+                echo GedcomTag::getLabelValue('FORM', $match[2]);
+                if (preg_match('/\n3 TYPE (.+)/', $fact->getGedcom(), $type_match)) {
+                    echo GedcomTag::getLabelValue('TYPE', GedcomTag::getFileFormTypeValue($type_match[1]));
+                }
+                break;
+            case 'URL':
+            case '_URL':
+            case 'WWW':
+                $link = '<a href="' . Filter::escapeHtml($match[2]) . '">' . Filter::escapeHtml($match[2]) . '</a>';
+                echo GedcomTag::getLabelValue($fact->getTag() . ':' . $match[1], $link);
+                break;
+            default:
+                if ($fact->getParent()->getTree()->getPreference('HIDE_GEDCOM_ERRORS') === '1' || GedcomTag::isTag($match[1])) {
+                    if (preg_match('/^@(' . WT_REGEX_XREF . ')@$/', $match[2], $xmatch)) {
+                        // Links
+                        $linked_record = GedcomRecord::getInstance($xmatch[1], $fact->getParent()->getTree());
+                        if ($linked_record) {
+                            $link = '<a href="' . $linked_record->getHtmlUrl() . '">' . $linked_record->getFullName() . '</a>';
+                            echo GedcomTag::getLabelValue($fact->getTag() . ':' . $match[1], $link);
+                        } else {
+                            echo GedcomTag::getLabelValue($fact->getTag() . ':' . $match[1], Filter::escapeHtml($match[2]));
+                        }
+                    } else {
+                        // Non links
+                        echo GedcomTag::getLabelValue($fact->getTag() . ':' . $match[1], Filter::escapeHtml($match[2]));
+                    }
+                }
+                break;
+            }
+        }
+        echo self::printFactSources($fact->getGedcom(), 2);
+        echo FunctionsPrint::printFactNotes($fact->getGedcom(), 2);
+        self::printMediaLinks($fact->getGedcom(), 2);
+        echo '</td></tr>';
+    }
+
+    /**
+     * Print the associations from the associated individuals in $event to the individuals in $record
+     *
+     * @param Fact $event
+     *
+     * @return string
+     */
+    private static function formatAssociateRelationship(Fact $event) {
+        $parent = $event->getParent();
+        // To whom is this record an assocate?
+        if ($parent instanceof Individual) {
+            // On an individual page, we just show links to the person
+            $associates = array($parent);
+        } elseif ($parent instanceof Family) {
+            // On a family page, we show links to both spouses
+            $associates = $parent->getSpouses();
+        } else {
+            // On other pages, it does not make sense to show associates
+            return '';
+        }
+
+        preg_match_all('/^1 ASSO @(' . WT_REGEX_XREF . ')@((\n[2-9].*)*)/', $event->getGedcom(), $amatches1, PREG_SET_ORDER);
+        preg_match_all('/\n2 _?ASSO @(' . WT_REGEX_XREF . ')@((\n[3-9].*)*)/', $event->getGedcom(), $amatches2, PREG_SET_ORDER);
+
+        $html = '';
+        // For each ASSO record
+        foreach (array_merge($amatches1, $amatches2) as $amatch) {
+            $person = Individual::getInstance($amatch[1], $event->getParent()->getTree());
+            if ($person && $person->canShowName()) {
+                // Is there a "RELA" tag
+                if (preg_match('/\n[23] RELA (.+)/', $amatch[2], $rmatch)) {
+                    // Use the supplied relationship as a label
+                    $label = GedcomCodeRela::getValue($rmatch[1], $person);
+                } else {
+                    // Use a default label
+                    $label = GedcomTag::getLabel('ASSO', $person);
+                }
+
+                $values = array('<a href="' . $person->getHtmlUrl() . '">' . $person->getFullName() . '</a>');
+                foreach ($associates as $associate) {
+                    $relationship_name = Functions::getAssociateRelationshipName($associate, $person);
+                    if (!$relationship_name) {
+                        $relationship_name = GedcomTag::getLabel('RELA');
+                    }
+
+                    if ($parent instanceof Family) {
+                        // For family ASSO records (e.g. MARR), identify the spouse with a sex icon
+                        $relationship_name .= $associate->getSexImage();
+                    }
+
+                    $values[] = '<a href="relationship.php?pid1=' . $associate->getXref() . '&amp;pid2=' . $person->getXref() . '&amp;ged=' . $associate->getTree()->getNameUrl() . '" rel="nofollow">' . $relationship_name . '</a>';
+                }
+                $value = implode(' — ', $values);
+
+                // Use same markup as GedcomTag::getLabelValue()
+                $asso = I18N::translate('<span class="label">%1$s:</span> <span class="field" dir="auto">%2$s</span>', $label, $value);
+            } elseif (!$person && Auth::isEditor($event->getParent()->getTree())) {
+                $asso = GedcomTag::getLabelValue('ASSO', '<span class="error">' . $amatch[1] . '</span>');
+            } else {
+                $asso = '';
+            }
+            $html .= '<div class="fact_ASSO">' . $asso . '</div>';
+        }
+
+        return $html;
+    }
+
+    /**
+     * print a repository record
+     *
+     * find and print repository information attached to a source
+     *
+     * @param string $xref the Gedcom Xref ID of the repository to print
+     */
+    public static function printRepositoryRecord($xref) {
+        global $WT_TREE;
+
+        $repository = Repository::getInstance($xref, $WT_TREE);
+        if ($repository && $repository->canShow()) {
+            echo '<a class="field" href="', $repository->getHtmlUrl(), '">', $repository->getFullName(), '</a><br>';
+            echo '<br>';
+            echo FunctionsPrint::printFactNotes($repository->getGedcom(), 1);
+        }
+    }
+
+    /**
+     * print a source linked to a fact (2 SOUR)
+     *
+     * this function is called by the FunctionsPrintFacts::print_fact function and other functions to
+     * print any source information attached to the fact
+     *
+     * @param string $factrec The fact record to look for sources in
+     * @param int $level The level to look for sources at
+     *
+     * @return string HTML text
+     */
+    public static function printFactSources($factrec, $level) {
+        global $WT_TREE;
+
+        $data   = '';
+        $nlevel = $level + 1;
+
+        // Systems not using source records
+        // The old style is not supported when entering or editing sources, but may be found in imported trees.
+        // Also, the old style sources allow histo.* files to use tree independent source citations, which
+        // will display nicely when markdown is used.
+        $ct = preg_match_all('/' . $level . ' SOUR (.*)((?:\n\d CONT.*)*)/', $factrec, $match, PREG_SET_ORDER);
+        for ($j = 0; $j < $ct; $j++) {
+            if (strpos($match[$j][1], '@') === false) {
+                $source = Filter::escapeHtml($match[$j][1] . preg_replace('/\n\d CONT ?/', "\n", $match[$j][2]));
+                $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $WT_TREE) . '</span></div>';
+            }
+        }
+        // Find source for each fact
+        $ct    = preg_match_all("/$level SOUR @(.*)@/", $factrec, $match, PREG_SET_ORDER);
+        $spos2 = 0;
+        for ($j = 0; $j < $ct; $j++) {
+            $sid    = $match[$j][1];
+            $source = Source::getInstance($sid, $WT_TREE);
+            if ($source) {
+                if ($source->canShow()) {
+                    $spos1 = strpos($factrec, "$level SOUR @" . $sid . "@", $spos2);
+                    $spos2 = strpos($factrec, "\n$level", $spos1);
+                    if (!$spos2) {
+                        $spos2 = strlen($factrec);
+                    }
+                    $srec = substr($factrec, $spos1, $spos2 - $spos1);
+                    $lt   = preg_match_all("/$nlevel \w+/", $srec, $matches);
+                    $data .= '<div class="fact_SOUR">';
+                    $elementID = Uuid::uuid4();
+                    if ($WT_TREE->getPreference('EXPAND_SOURCES')) {
+                        $plusminus = 'icon-minus';
+                    } else {
+                        $plusminus = 'icon-plus';
+                    }
+                    if ($lt > 0) {
+                        $data .= '<a href="#" onclick="return expand_layer(\'' . $elementID . '\');"><i id="' . $elementID . '_img" class="' . $plusminus . '"></i></a> ';
+                    }
+                    $data .= GedcomTag::getLabelValue('SOUR', '<a href="' . $source->getHtmlUrl() . '">' . $source->getFullName() . '</a>', null, 'span');
+                    $data .= '</div>';
+
+                    $data .= "<div id=\"$elementID\"";
+                    if ($WT_TREE->getPreference('EXPAND_SOURCES')) {
+                        $data .= ' style="display:block"';
+                    }
+                    $data .= ' class="source_citations">';
+                    // PUBL
+                    $publ = $source->getFirstFact('PUBL');
+                    if ($publ) {
+                        $data .= GedcomTag::getLabelValue('PUBL', $publ->getValue());
+                    }
+                    $data .= self::printSourceStructure(self::getSourceStructure($srec));
+                    $data .= '<div class="indent">';
+                    ob_start();
+                    self::printMediaLinks($srec, $nlevel);
+                    $data .= ob_get_clean();
+                    $data .= FunctionsPrint::printFactNotes($srec, $nlevel, false);
+                    $data .= '</div>';
+                    $data .= '</div>';
+                } else {
+                    // Here we could show that we do actually have sources for this data,
+                    // but not the details. For example “Sources: ”.
+                    // But not by default, based on user feedback.
+                    // https://webtrees.net/index.php/en/forum/3-help-for-beta-and-svn-versions/27002-source-media-privacy-issue
+                }
+            } else {
+                $data .= GedcomTag::getLabelValue('SOUR', '<span class="error">' . $sid . '</span>');
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Print the links to media objects
+     *
+     * @param string $factrec
+     * @param int $level
+     */
+    public static function printMediaLinks($factrec, $level) {
+        global $WT_TREE;
+
+        $nlevel = $level + 1;
+        if (preg_match_all("/$level OBJE @(.*)@/", $factrec, $omatch, PREG_SET_ORDER) == 0) {
+            return;
+        }
+        $objectNum = 0;
+        while ($objectNum < count($omatch)) {
+            $media_id = $omatch[$objectNum][1];
+            $media    = Media::getInstance($media_id, $WT_TREE);
+            if ($media) {
+                if ($media->canShow()) {
+                    if ($objectNum > 0) {
+                        echo '<br class="media-separator" style="clear:both;">';
+                    }
+                    echo '<div class="media-display"><div class="media-display-image">';
+                    echo $media->displayImage();
+                    echo '</div>';
+                    echo '<div class="media-display-title">';
+                    echo '<a href="', $media->getHtmlUrl(), '">', $media->getFullName(), '</a>';
+                    // NOTE: echo the notes of the media
+                    echo '<p>';
+                    echo FunctionsPrint::printFactNotes($media->getGedcom(), 1);
+                    $ttype = preg_match("/" . ($nlevel + 1) . " TYPE (.*)/", $media->getGedcom(), $match);
+                    if ($ttype > 0) {
+                        $mediaType = GedcomTag::getFileFormTypeValue($match[1]);
+                        echo '<p class="label">', I18N::translate('Type'), ': </span> <span class="field">', $mediaType, '</p>';
+                    }
+                    echo '</p>';
+                    //-- print spouse name for marriage events
+                    $ct = preg_match("/WT_SPOUSE: (.*)/", $factrec, $match);
+                    if ($ct > 0) {
+                        $spouse = Individual::getInstance($match[1], $media->getTree());
+                        if ($spouse) {
+                            echo '<a href="', $spouse->getHtmlUrl(), '">';
+                            echo $spouse->getFullName();
+                            echo '</a>';
+                        }
+                        $ct = preg_match("/WT_FAMILY_ID: (.*)/", $factrec, $match);
+                        if ($ct > 0) {
+                            $famid  = trim($match[1]);
+                            $family = Family::getInstance($famid, $spouse->getTree());
+                            if ($family) {
+                                if ($spouse) {
+                                    echo " - ";
+                                }
+                                echo '<a href="', $family->getHtmlUrl(), '">', I18N::translate('View this family'), '</a>';
+                            }
+                        }
+                    }
+                    echo FunctionsPrint::printFactNotes($media->getGedcom(), $nlevel);
+                    echo self::printFactSources($media->getGedcom(), $nlevel);
+                    echo '</div>'; //close div "media-display-title"
+                    echo '</div>'; //close div "media-display"
+                }
+            } elseif ($WT_TREE->getPreference('HIDE_GEDCOM_ERRORS') === '1') {
+                echo '<p class="ui-state-error">', $media_id, '</p>';
+            }
+            $objectNum++;
+        }
+    }
+
+    /**
+     * Print a row for the sources tab on the individual page.
+     *
+     * @param Fact $fact
+     * @param int $level
+     */
+    public static function printMainSources(Fact $fact, $level) {
+        $factrec = $fact->getGedcom();
+        $fact_id = $fact->getFactId();
+        $parent  = $fact->getParent();
+        $pid     = $parent->getXref();
+
+        $nlevel = $level + 1;
+        if ($fact->isPendingAddition()) {
+            $styleadd = 'new';
+            $can_edit = $level == 1 && $fact->canEdit();
+        } elseif ($fact->isPendingDeletion()) {
+            $styleadd = 'old';
+            $can_edit = false;
+        } else {
+            $styleadd = '';
+            $can_edit = $level == 1 && $fact->canEdit();
+        }
+
+        // -- find source for each fact
+        $ct    = preg_match_all("/($level SOUR (.+))/", $factrec, $match, PREG_SET_ORDER);
+        $spos2 = 0;
+        for ($j = 0; $j < $ct; $j++) {
+            $sid   = trim($match[$j][2], '@');
+            $spos1 = strpos($factrec, $match[$j][1], $spos2);
+            $spos2 = strpos($factrec, "\n$level", $spos1);
+            if (!$spos2) {
+                $spos2 = strlen($factrec);
+            }
+            $srec   = substr($factrec, $spos1, $spos2 - $spos1);
+            $source = Source::getInstance($sid, $fact->getParent()->getTree());
+            // Allow access to "1 SOUR @non_existent_source@", so it can be corrected/deleted
+            if (!$source || $source->canShow()) {
+                if ($level > 1) {
+                    echo '<tr class="row_sour2">';
+                } else {
+                    echo '<tr>';
+                }
+                echo '<td class="descriptionbox';
+                if ($level > 1) {
+                    echo ' rela';
+                }
+                echo ' ', $styleadd, ' width20">';
+                $factlines = explode("\n", $factrec); // 1 BIRT Y\n2 SOUR ...
+                $factwords = explode(" ", $factlines[0]); // 1 BIRT Y
+                $factname  = $factwords[1]; // BIRT
+                if ($factname == 'EVEN' || $factname == 'FACT') {
+                    // Add ' EVEN' to provide sensible output for an event with an empty TYPE record
+                    $ct = preg_match("/2 TYPE (.*)/", $factrec, $ematch);
+                    if ($ct > 0) {
+                        $factname = trim($ematch[1]);
+                        echo $factname;
+                    } else {
+                        echo GedcomTag::getLabel($factname, $parent);
+                    }
+                } elseif ($can_edit) {
+                    echo "<a onclick=\"return edit_record('$pid', '$fact_id');\" href=\"#\" title=\"", I18N::translate('Edit'), '">';
+                    if ($fact->getParent()->getTree()->getPreference('SHOW_FACT_ICONS')) {
+                        if ($level == 1) {
+                            echo '<i class="icon-source"></i> ';
+                        }
+                    }
+                    echo GedcomTag::getLabel($factname, $parent), '</a>';
+                    echo '<div class="editfacts">';
+                    if (preg_match('/^@.+@$/', $match[$j][2])) {
+                        // Inline sources can't be edited. Attempting to save one will convert it
+                        // into a link, and delete it.
+                        // e.g. "1 SOUR my source" becomes "1 SOUR @my source@" which does not exist.
+                        echo "<div class=\"editlink\"><a class=\"editicon\" onclick=\"return edit_record('$pid', '$fact_id');\" href=\"#\" title=\"" . I18N::translate('Edit') . "\"><span class=\"link_text\">" . I18N::translate('Edit') . "</span></a></div>";
+                        echo '<div class="copylink"><a class="copyicon" href="#" onclick="return copy_fact(\'', $pid, '\', \'', $fact_id, '\');" title="' . I18N::translate('Copy') . '"><span class="link_text">' . I18N::translate('Copy') . '</span></a></div>';
+                    }
+                    echo "<div class=\"deletelink\"><a class=\"deleteicon\" onclick=\"return delete_fact('" . I18N::translate('Are you sure you want to delete this fact?') . "', '$pid', '$fact_id');\" href=\"#\" title=\"" . I18N::translate('Delete') . "\"><span class=\"link_text\">" . I18N::translate('Delete') . "</span></a></div>";
+                    echo '</div>';
+                } else {
+                    echo GedcomTag::getLabel($factname, $parent);
+                }
+                echo '</td>';
+                echo '<td class="optionbox ', $styleadd, ' wrap">';
+                if ($source) {
+                    echo '<a href="', $source->getHtmlUrl(), '">', $source->getFullName(), '</a>';
+                    // PUBL
+                    $publ = $source->getFirstFact('PUBL');
+                    if ($publ) {
+                        echo GedcomTag::getLabelValue('PUBL', $publ->getValue());
+                    }
+                    // 2 RESN tags. Note, there can be more than one, such as "privacy" and "locked"
+                    if (preg_match_all("/\n2 RESN (.+)/", $factrec, $rmatches)) {
+                        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;
+                            }
+                            echo '</span>';
+                        }
+                    }
+                    $cs = preg_match("/$nlevel EVEN (.*)/", $srec, $cmatch);
+                    if ($cs > 0) {
+                        echo '<br><span class="label">', GedcomTag::getLabel('EVEN'), ' </span><span class="field">', $cmatch[1], '</span>';
+                        $cs = preg_match("/" . ($nlevel + 1) . " ROLE (.*)/", $srec, $cmatch);
+                        if ($cs > 0) {
+                            echo '<br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="label">', GedcomTag::getLabel('ROLE'), ' </span><span class="field">', $cmatch[1], '</span>';
+                        }
+                    }
+                    echo self::printSourceStructure(self::getSourceStructure($srec));
+                    echo '<div class="indent">';
+                    self::printMediaLinks($srec, $nlevel);
+                    if ($nlevel == 2) {
+                        self::printMediaLinks($source->getGedcom(), 1);
+                    }
+                    echo FunctionsPrint::printFactNotes($srec, $nlevel);
+                    if ($nlevel == 2) {
+                        echo FunctionsPrint::printFactNotes($source->getGedcom(), 1);
+                    }
+                    echo '</div>';
+                } else {
+                    echo $sid;
+                }
+                echo '</td></tr>';
+            }
+        }
+    }
+
+    /**
+     * Print SOUR structure
+     *  This function prints the input array of SOUR sub-records built by the
+     *  getSourceStructure() function.
+     *
+     * @param string[] $textSOUR
+     *
+     * @return string
+     */
+    public static function printSourceStructure($textSOUR) {
+        global $WT_TREE;
+        $html = '';
+
+        if ($textSOUR['PAGE']) {
+            $html .= GedcomTag::getLabelValue('PAGE', Filter::expandUrls($textSOUR['PAGE']));
+        }
+
+        if ($textSOUR['EVEN']) {
+            $html .= GedcomTag::getLabelValue('EVEN', Filter::escapeHtml($textSOUR['EVEN']));
+            if ($textSOUR['ROLE']) {
+                $html .= GedcomTag::getLabelValue('ROLE', Filter::escapeHtml($textSOUR['ROLE']));
+            }
+        }
+
+        if ($textSOUR['DATE'] || count($textSOUR['TEXT'])) {
+            if ($textSOUR['DATE']) {
+                $date = new Date($textSOUR['DATE']);
+                $html .= GedcomTag::getLabelValue('DATA:DATE', $date->display());
+            }
+            foreach ($textSOUR['TEXT'] as $text) {
+                $html .= GedcomTag::getLabelValue('TEXT', Filter::formatText($text, $WT_TREE));
+            }
+        }
+
+        if ($textSOUR['QUAY'] != '') {
+            $html .= GedcomTag::getLabelValue('QUAY', GedcomCodeQuay::getValue($textSOUR['QUAY']));
+        }
+
+        return '<div class="indent">' . $html . '</div>';
+    }
+
+    /**
+     * Extract SOUR structure from the incoming Source sub-record
+     * The output array is defined as follows:
+     *  $textSOUR['PAGE'] = Source citation
+     *  $textSOUR['EVEN'] = Event type
+     *  $textSOUR['ROLE'] = Role in event
+     *  $textSOUR['DATA'] = place holder (no text in this sub-record)
+     *  $textSOUR['DATE'] = Entry recording date
+     *  $textSOUR['TEXT'] = (array) Text from source
+     *  $textSOUR['QUAY'] = Certainty assessment
+     *
+     * @param string $srec
+     *
+     * @return string[]
+     */
+    public static function getSourceStructure($srec) {
+        // Set up the output array
+        $textSOUR = array(
+            'PAGE' => '',
+            'EVEN' => '',
+            'ROLE' => '',
+            'DATA' => '',
+            'DATE' => '',
+            'TEXT' => array(),
+            'QUAY' => '',
+        );
+
+        if ($srec) {
+            $subrecords = explode("\n", $srec);
+            for ($i = 0; $i < count($subrecords); $i++) {
+                $tag  = substr($subrecords[$i], 2, 4);
+                $text = substr($subrecords[$i], 7);
+                $i++;
+                for (; $i < count($subrecords); $i++) {
+                    $nextTag = substr($subrecords[$i], 2, 4);
+                    if ($nextTag != 'CONT') {
+                        $i--;
+                        break;
+                    }
+                    if ($nextTag == 'CONT') {
+                        $text .= "\n";
+                    }
+                    $text .= rtrim(substr($subrecords[$i], 7));
+                }
+                if ($tag == 'TEXT') {
+                    $textSOUR[$tag][] = $text;
+                } else {
+                    $textSOUR[$tag] = $text;
+                }
+            }
+        }
+
+        return $textSOUR;
+    }
+
+    /**
+     * Print a row for the notes tab on the individual page.
+     *
+     * @param Fact $fact
+     * @param int $level
+     */
+    public static function printMainNotes(Fact $fact, $level) {
+        $factrec = $fact->getGedcom();
+        $fact_id = $fact->getFactId();
+        $parent  = $fact->getParent();
+        $pid     = $parent->getXref();
+
+        if ($fact->isPendingAddition()) {
+            $styleadd = ' new';
+            $can_edit = $level == 1 && $fact->canEdit();
+        } elseif ($fact->isPendingDeletion()) {
+            $styleadd = ' old';
+            $can_edit = false;
+        } else {
+            $styleadd = '';
+            $can_edit = $level == 1 && $fact->canEdit();
+        }
+
+        $ct = preg_match_all("/$level NOTE (.*)/", $factrec, $match, PREG_SET_ORDER);
+        for ($j = 0; $j < $ct; $j++) {
+            // Note object, or inline note?
+            if (preg_match("/$level NOTE @(.*)@/", $match[$j][0], $nmatch)) {
+                $note = Note::getInstance($nmatch[1], $fact->getParent()->getTree());
+                if ($note && !$note->canShow()) {
+                    continue;
+                }
+            } else {
+                $note = null;
+            }
+
+            if ($level >= 2) {
+                echo '<tr class="row_note2"><td class="descriptionbox rela ', $styleadd, ' width20">';
+            } else {
+                echo '<tr><td class="descriptionbox ', $styleadd, ' width20">';
+            }
+            if ($can_edit) {
+                echo '<a onclick="return edit_record(\'', $pid, '\', \'', $fact_id, '\');" href="#" title="', I18N::translate('Edit'), '">';
+                if ($level < 2) {
+                    if ($fact->getParent()->getTree()->getPreference('SHOW_FACT_ICONS')) {
+                        echo '<i class="icon-note"></i> ';
+                    }
+                    if ($note) {
+                        echo GedcomTag::getLabel('SHARED_NOTE');
+                    } else {
+                        echo GedcomTag::getLabel('NOTE');
+                    }
+                    echo '</a>';
+                    echo '<div class="editfacts">';
+                    echo "<div class=\"editlink\"><a class=\"editicon\" onclick=\"return edit_record('$pid', '$fact_id');\" href=\"#\" title=\"" . I18N::translate('Edit') . "\"><span class=\"link_text\">" . I18N::translate('Edit') . "</span></a></div>";
+                    echo '<div class="copylink"><a class="copyicon" href="#" onclick="return copy_fact(\'', $pid, '\', \'', $fact_id, '\');" title="' . I18N::translate('Copy') . '"><span class="link_text">' . I18N::translate('Copy') . '</span></a></div>';
+                    echo "<div class=\"deletelink\"><a class=\"deleteicon\" onclick=\"return delete_fact('" . I18N::translate('Are you sure you want to delete this fact?') . "', '$pid', '$fact_id');\" href=\"#\" title=\"" . I18N::translate('Delete') . "\"><span class=\"link_text\">" . I18N::translate('Delete') . "</span></a></div>";
+                    if ($note) {
+                        echo '<a class="icon-note" href="', $note->getHtmlUrl(), '" title="' . I18N::translate('View') . '"><span class="link_text">' . I18N::translate('View') . '</span></a>';
+                    }
+                    echo '</div>';
+                }
+            } else {
+                if ($level < 2) {
+                    if ($fact->getParent()->getTree()->getPreference('SHOW_FACT_ICONS')) {
+                        echo '<i class="icon-note"></i> ';
+                    }
+                    if ($note) {
+                        echo GedcomTag::getLabel('SHARED_NOTE');
+                    } else {
+                        echo GedcomTag::getLabel('NOTE');
+                    }
+                }
+                $factlines = explode("\n", $factrec); // 1 BIRT Y\n2 NOTE ...
+                $factwords = explode(" ", $factlines[0]); // 1 BIRT Y
+                $factname  = $factwords[1]; // BIRT
+                $parent    = GedcomRecord::getInstance($pid, $fact->getParent()->getTree());
+                if ($factname == 'EVEN' || $factname == 'FACT') {
+                    // Add ' EVEN' to provide sensible output for an event with an empty TYPE record
+                    $ct = preg_match("/2 TYPE (.*)/", $factrec, $ematch);
+                    if ($ct > 0) {
+                        $factname = trim($ematch[1]);
+                        echo $factname;
+                    } else {
+                        echo GedcomTag::getLabel($factname, $parent);
+                    }
+                } elseif ($factname != 'NOTE') {
+                    // Note is already printed
+                    echo GedcomTag::getLabel($factname, $parent);
+                    if ($note) {
+                        echo '<div class="editfacts"><a class="icon-note" href="', $note->getHtmlUrl(), '" title="' . I18N::translate('View') . '"><span class="link_text">' . I18N::translate('View') . '</span></a></div>';
+
+                    }
+                }
+            }
+            echo '</td>';
+            if ($note) {
+                // Note objects
+                if (Module::getModuleByName('GEDFact_assistant')) {
+                    // If Census assistant installed, allow it to format the note
+                    $text = CensusAssistantModule::formatCensusNote($note);
+                } else {
+                    $text = Filter::formatText($note->getNote(), $fact->getParent()->getTree());
+                }
+            } else {
+                // Inline notes
+                $nrec = Functions::getSubRecord($level, "$level NOTE", $factrec, $j + 1);
+                $text = $match[$j][1] . Functions::getCont($level + 1, $nrec);
+                $text = Filter::formatText($text, $fact->getParent()->getTree());
+            }
+
+            echo '<td class="optionbox', $styleadd, ' wrap">';
+            echo $text;
+
+            if (!empty($noterec)) {
+                echo self::printFactSources($noterec, 1);
+            }
+
+            // 2 RESN tags. Note, there can be more than one, such as "privacy" and "locked"
+            if (preg_match_all("/\n2 RESN (.+)/", $factrec, $matches)) {
+                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;
+                    }
+                    echo '</span>';
+                }
+            }
+            echo '</td></tr>';
+        }
+    }
+
+    /**
+     * Print a row for the media tab on the individual page.
+     *
+     * @param Fact $fact
+     * @param int $level
+     */
+    public static function printMainMedia(Fact $fact, $level) {
+        $factrec = $fact->getGedcom();
+        $parent  = $fact->getParent();
+
+        if ($fact->isPendingAddition()) {
+            $styleadd = 'new';
+            $can_edit = $level == 1 && $fact->canEdit();
+        } elseif ($fact->isPendingDeletion()) {
+            $styleadd = 'old';
+            $can_edit = false;
+        } else {
+            $styleadd = '';
+            $can_edit = $level == 1 && $fact->canEdit();
+        }
+
+        // -- find source for each fact
+        preg_match_all('/(?:^|\n)' . $level . ' OBJE @(.*)@/', $factrec, $matches);
+        foreach ($matches[1] as $xref) {
+            $media = Media::getInstance($xref, $fact->getParent()->getTree());
+            // Allow access to "1 OBJE @non_existent_source@", so it can be corrected/deleted
+            if (!$media || $media->canShow()) {
+                if ($level > 1) {
+                    echo '<tr class="row_obje2">';
+                } else {
+                    echo '<tr>';
+                }
+                echo '<td class="descriptionbox';
+                if ($level > 1) {
+                    echo ' rela';
+                }
+                echo ' ', $styleadd, ' width20">';
+                preg_match("/^\d (\w*)/", $factrec, $factname);
+                $factlines = explode("\n", $factrec); // 1 BIRT Y\n2 SOUR ...
+                $factwords = explode(" ", $factlines[0]); // 1 BIRT Y
+                $factname  = $factwords[1]; // BIRT
+                if ($factname == 'EVEN' || $factname == 'FACT') {
+                    // Add ' EVEN' to provide sensible output for an event with an empty TYPE record
+                    $ct = preg_match("/2 TYPE (.*)/", $factrec, $ematch);
+                    if ($ct > 0) {
+                        $factname = $ematch[1];
+                        echo $factname;
+                    } else {
+                        echo GedcomTag::getLabel($factname, $parent);
+                    }
+                } elseif ($can_edit) {
+                    echo '<a onclick="window.open(\'addmedia.php?action=editmedia&amp;pid=', $media->getXref(), '\', \'_blank\', edit_window_specs); return false;" href="#" title="', I18N::translate('Edit'), '">';
+                    echo GedcomTag::getLabel($factname, $parent), '</a>';
+                    echo '<div class="editfacts">';
+                    echo '<div class="editlink"><a class="editicon" onclick="window.open(\'addmedia.php?action=editmedia&amp;pid=', $media->getXref(), '\', \'_blank\', edit_window_specs); return false;" href="#" title="', I18N::translate('Edit'), '"><span class="link_text">', I18N::translate('Edit'), '</span></a></div>';
+                    echo '<div class="copylink"><a class="copyicon" href="#" onclick="jQuery.post(\'action.php\',{action:\'copy-fact\', type:\'\', factgedcom:\'' . rawurlencode($factrec) . '\'},function(){location.reload();})" title="' . I18N::translate('Copy') . '"><span class="link_text">' . I18N::translate('Copy') . '</span></a></div>';
+                    echo '<div class="deletelink"><a class="deleteicon" onclick="return delete_fact(\'', I18N::translate('Are you sure you want to delete this fact?'), '\', \'', $parent->getXref(), '\', \'', $fact->getFactId(), '\');" href="#" title="', I18N::translate('Delete'), '"><span class="link_text">', I18N::translate('Delete'), '</span></a></div>';
+                    echo '</div>';
+                } else {
+                    echo GedcomTag::getLabel($factname, $parent);
+                }
+                echo '</td>';
+                echo '<td class="optionbox ', $styleadd, ' wrap">';
+                if ($media) {
+                    echo '<span class="field">';
+                    echo $media->displayImage();
+                    echo '<a href="' . $media->getHtmlUrl() . '">';
+                    echo '<em>';
+                    foreach ($media->getAllNames() as $name) {
+                        if ($name['type'] != 'TITL') {
+                            echo '<br>';
+                        }
+                        echo $name['full'];
+                    }
+                    echo '</em>';
+                    echo '</a>';
+                    echo '</span>';
+
+                    echo GedcomTag::getLabelValue('FORM', $media->mimeType());
+                    $imgsize = $media->getImageAttributes('main');
+                    if (!empty($imgsize['WxH'])) {
+                        echo GedcomTag::getLabelValue('__IMAGE_SIZE__', $imgsize['WxH']);
+                    }
+                    if ($media->getFilesizeraw() > 0) {
+                        echo GedcomTag::getLabelValue('__FILE_SIZE__', $media->getFilesize());
+                    }
+                    $mediatype = $media->getMediaType();
+                    if ($mediatype) {
+                        echo GedcomTag::getLabelValue('TYPE', GedcomTag::getFileFormTypeValue($mediatype));
+                    }
+
+                    switch ($media->isPrimary()) {
+                    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);
+                } else {
+                    echo $xref;
+                }
+                echo '</td></tr>';
+            }
+        }
+    }
 }

Switch Indentation +306 added lines, -306 removed lines

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

Braces +22 added lines, -11 removed lines

@@ -40,7 +40,8 @@ 
 /**
  * Class FunctionsPrintFacts - common functions
  */
-class FunctionsPrintFacts {
+class FunctionsPrintFacts
+{
 	/**
 	 * Print a fact record, for the individual/family/source/repository/etc. pages.
 	 *
@@ -53,7 +54,8 @@ 
 	 * @param Fact $fact
 	 * @param GedcomRecord $record
 	 */
-	public static function printFact(Fact $fact, GedcomRecord $record) {
+	public static function printFact(Fact $fact, GedcomRecord $record)
+	{
 		static $n_chil = 0, $n_gchi = 0;
 
 		$parent = $fact->getParent();
@@ -494,7 +496,8 @@ 
 	 *
 	 * @return string
 	 */
-	private static function formatAssociateRelationship(Fact $event) {
+	private static function formatAssociateRelationship(Fact $event)
+	{
 		$parent = $event->getParent();
 		// To whom is this record an assocate?
 		if ($parent instanceof Individual) {
@@ -561,7 +564,8 @@ 
 	 *
 	 * @param string $xref the Gedcom Xref ID of the repository to print
 	 */
-	public static function printRepositoryRecord($xref) {
+	public static function printRepositoryRecord($xref)
+	{
 		global $WT_TREE;
 
 		$repository = Repository::getInstance($xref, $WT_TREE);
@@ -583,7 +587,8 @@ 
 	 *
 	 * @return string HTML text
 	 */
-	public static function printFactSources($factrec, $level) {
+	public static function printFactSources($factrec, $level)
+	{
 		global $WT_TREE;
 
 		$data   = '';
@@ -666,7 +671,8 @@ 
 	 * @param string $factrec
 	 * @param int $level
 	 */
-	public static function printMediaLinks($factrec, $level) {
+	public static function printMediaLinks($factrec, $level)
+	{
 		global $WT_TREE;
 
 		$nlevel = $level + 1;
@@ -735,7 +741,8 @@ 
 	 * @param Fact $fact
 	 * @param int $level
 	 */
-	public static function printMainSources(Fact $fact, $level) {
+	public static function printMainSources(Fact $fact, $level)
+	{
 		$factrec = $fact->getGedcom();
 		$fact_id = $fact->getFactId();
 		$parent  = $fact->getParent();
@@ -881,7 +888,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function printSourceStructure($textSOUR) {
+	public static function printSourceStructure($textSOUR)
+	{
 		global $WT_TREE;
 		$html = '';
 
@@ -928,7 +936,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public static function getSourceStructure($srec) {
+	public static function getSourceStructure($srec)
+	{
 		// Set up the output array
 		$textSOUR = array(
 			'PAGE' => '',
@@ -974,7 +983,8 @@ 
 	 * @param Fact $fact
 	 * @param int $level
 	 */
-	public static function printMainNotes(Fact $fact, $level) {
+	public static function printMainNotes(Fact $fact, $level)
+	{
 		$factrec = $fact->getGedcom();
 		$fact_id = $fact->getFactId();
 		$parent  = $fact->getParent();
@@ -1121,7 +1131,8 @@ 
 	 * @param Fact $fact
 	 * @param int $level
 	 */
-	public static function printMainMedia(Fact $fact, $level) {
+	public static function printMainMedia(Fact $fact, $level)
+	{
 		$factrec = $fact->getGedcom();
 		$parent  = $fact->getParent();
 

app/Functions/FunctionsMedia.php

Indentation +68 added lines, -68 removed lines

@@ -21,77 +21,77 @@
  * Class FunctionsMedia - common functions
  */
 class FunctionsMedia {
-	/**
-	 * Convert raw values from php.ini file into bytes
-	 *
-	 * @param string $val
-	 *
-	 * @return int
-	 */
-	public static function sizeToBytes($val) {
-		if (!$val) {
-			// no value was passed in, assume no limit and return -1
-			$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;
-		}
-	}
+    /**
+     * Convert raw values from php.ini file into bytes
+     *
+     * @param string $val
+     *
+     * @return int
+     */
+    public static function sizeToBytes($val) {
+        if (!$val) {
+            // no value was passed in, assume no limit and return -1
+            $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;
+        }
+    }
 
-	/**
-	 * Determine whether there is enough memory to load a particular image.
-	 *
-	 * @param string $serverFilename
-	 *
-	 * @return bool
-	 */
-	public static function hasMemoryForImage($serverFilename) {
-		// find out how much total memory this script can access
-		$memoryAvailable = self::sizeToBytes(ini_get('memory_limit'));
-		// if memory is unlimited, it will return -1 and we don’t need to worry about it
-		if ($memoryAvailable == -1) {
-			return true;
-		}
+    /**
+     * Determine whether there is enough memory to load a particular image.
+     *
+     * @param string $serverFilename
+     *
+     * @return bool
+     */
+    public static function hasMemoryForImage($serverFilename) {
+        // find out how much total memory this script can access
+        $memoryAvailable = self::sizeToBytes(ini_get('memory_limit'));
+        // if memory is unlimited, it will return -1 and we don’t need to worry about it
+        if ($memoryAvailable == -1) {
+            return true;
+        }
 
-		// find out how much memory we are already using
-		$memoryUsed = memory_get_usage();
+        // find out how much memory we are already using
+        $memoryUsed = memory_get_usage();
 
-		try {
-			$imgsize = getimagesize($serverFilename);
-		} catch (\ErrorException $ex) {
-			// Not an image, or not a valid image?
-			$imgsize = false;
-		}
+        try {
+            $imgsize = getimagesize($serverFilename);
+        } catch (\ErrorException $ex) {
+            // Not an image, or not a valid image?
+            $imgsize = false;
+        }
 
-		// find out how much memory this image needs for processing, probably only works for jpegs
-		// from comments on http://www.php.net/imagecreatefromjpeg
-		if ($imgsize && isset($imgsize['bits']) && (isset($imgsize['channels']))) {
-			$memoryNeeded = round(($imgsize[0] * $imgsize[1] * $imgsize['bits'] * $imgsize['channels'] / 8 + pow(2, 16)) * 1.65);
-			$memorySpare  = $memoryAvailable - $memoryUsed - $memoryNeeded;
-			if ($memorySpare > 0) {
-				// we have enough memory to load this file
-				return true;
-			} else {
-				// not enough memory to load this file
-				$image_info = sprintf('%.2fKB, %d × %d %d bits %d channels', filesize($serverFilename) / 1024, $imgsize[0], $imgsize[1], $imgsize['bits'], $imgsize['channels']);
-				Log::addMediaLog('Cannot create thumbnail ' . $serverFilename . ' (' . $image_info . ') memory avail: ' . $memoryAvailable . ' used: ' . $memoryUsed . ' needed: ' . $memoryNeeded . ' spare: ' . $memorySpare);
+        // find out how much memory this image needs for processing, probably only works for jpegs
+        // from comments on http://www.php.net/imagecreatefromjpeg
+        if ($imgsize && isset($imgsize['bits']) && (isset($imgsize['channels']))) {
+            $memoryNeeded = round(($imgsize[0] * $imgsize[1] * $imgsize['bits'] * $imgsize['channels'] / 8 + pow(2, 16)) * 1.65);
+            $memorySpare  = $memoryAvailable - $memoryUsed - $memoryNeeded;
+            if ($memorySpare > 0) {
+                // we have enough memory to load this file
+                return true;
+            } else {
+                // not enough memory to load this file
+                $image_info = sprintf('%.2fKB, %d × %d %d bits %d channels', filesize($serverFilename) / 1024, $imgsize[0], $imgsize[1], $imgsize['bits'], $imgsize['channels']);
+                Log::addMediaLog('Cannot create thumbnail ' . $serverFilename . ' (' . $image_info . ') memory avail: ' . $memoryAvailable . ' used: ' . $memoryUsed . ' needed: ' . $memoryNeeded . ' spare: ' . $memorySpare);
 
-				return false;
-			}
-		} else {
-			// assume there is enough memory
-			// TODO find out how to check memory needs for gif and png
-			return true;
-		}
-	}
+                return false;
+            }
+        } else {
+            // assume there is enough memory
+            // TODO find out how to check memory needs for gif and png
+            return true;
+        }
+    }
 }

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;
 		}
 	}
 

Braces +6 added lines, -3 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * Class FunctionsMedia - common functions
  */
-class FunctionsMedia {
+class FunctionsMedia
+{
 	/**
 	 * Convert raw values from php.ini file into bytes
 	 *
@@ -28,7 +29,8 @@ 
 	 *
 	 * @return int
 	 */
-	public static function sizeToBytes($val) {
+	public static function sizeToBytes($val)
+	{
 		if (!$val) {
 			// no value was passed in, assume no limit and return -1
 			$val = -1;
@@ -55,7 +57,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function hasMemoryForImage($serverFilename) {
+	public static function hasMemoryForImage($serverFilename)
+	{
 		// find out how much total memory this script can access
 		$memoryAvailable = self::sizeToBytes(ini_get('memory_limit'));
 		// if memory is unlimited, it will return -1 and we don’t need to worry about it

app/Functions/FunctionsRtl.php

Indentation +1135 added lines, -1135 removed lines

@@ -21,1140 +21,1140 @@
  * RTL Functions for use in the PDF/HTML reports
  */
 class FunctionsRtl {
-	const OPEN_PARENTHESES = '([{';
+    const OPEN_PARENTHESES = '([{';
 
-	const CLOSE_PARENTHESES = ')]}';
-
-	const NUMBERS = '0123456789';
-
-	const NUMBER_PREFIX = '+-'; // Treat these like numbers when at beginning or end of numeric strings
-
-	const NUMBER_PUNCTUATION = '- ,.:/'; // Treat these like numbers when inside numeric strings
-
-	const PUNCTUATION = ',.:;?!';
-
-	/** @var string Were we previously processing LTR or RTL. */
-	private static $previousState;
-
-	/** @var string Are we currently processing LTR or RTL. */
-	private static $currentState;
-
-	/** @var string Text waiting to be processed. */
-	private static $waitingText;
-
-	/** @var string LTR text. */
-	private static $startLTR;
-
-	/** @var string LTR text. */
-	private static $endLTR;
-
-	/** @var string RTL text. */
-	private static $startRTL;
-
-	/** @var string RTL text. */
-	private static $endRTL;
-
-	/** @var int Offset into the text. */
-	private static $lenStart;
-
-	/** @var int Offset into the text. */
-	private static $lenEnd;
-
-	/** @var int Offset into the text. */
-	private static $posSpanStart;
-
-	/**
-	 * This function strips ‎ and ‏ from the input string. It should be used for all
-	 * text that has been passed through the PrintReady() function before that text is stored
-	 * in the database. The database should NEVER contain these characters.
-	 *
-	 * @param  string $inputText The string from which the ‎ and ‏ characters should be stripped
-	 *
-	 * @return string The input string, with ‎ and ‏ stripped
-	 */
-	public static function stripLrmRlm($inputText) {
-		return str_replace(array(WT_UTF8_LRM, WT_UTF8_RLM, WT_UTF8_LRO, WT_UTF8_RLO, WT_UTF8_LRE, WT_UTF8_RLE, WT_UTF8_PDF, "‎", "‏", "‎", "‏"), "", $inputText);
-	}
-
-	/**
-	 * This function encapsulates all texts in the input with <span dir='xxx'> and </span>
-	 * according to the directionality specified.
-	 *
-	 * @param string $inputText Raw input
-	 * @param string $direction Directionality (LTR, BOTH, RTL) default BOTH
-	 * @param string $class Additional text to insert into output <span dir="xxx"> (such as 'class="yyy"')
-	 *
-	 * @return string The string with all texts encapsulated as required
-	 */
-	public static function spanLtrRtl($inputText, $direction = 'BOTH', $class = '') {
-		if ($inputText == '') {
-			// Nothing to do
-			return '';
-		}
-
-		$workingText = str_replace("\n", '<br>', $inputText);
-		$workingText = str_replace(array('<span class="starredname"><br>', '<span<br>class="starredname">'), '<br><span class="starredname">', $workingText); // Reposition some incorrectly placed line breaks
-		$workingText = self::stripLrmRlm($workingText); // Get rid of any existing UTF8 control codes
-
-		// $nothing  = '&zwnj;'; // Zero Width Non-Joiner  (not sure whether this is still needed to work around a TCPDF bug)
-		$nothing = '';
-
-		self::$startLTR = '<LTR>'; // This will become '<span dir="ltr">' at the end
-		self::$endLTR   = '</LTR>'; // This will become '</span>' at the end
-		self::$startRTL = '<RTL>'; // This will become '<span dir="rtl">' at the end
-		self::$endRTL   = '</RTL>'; // This will become '</span>' at the end
-		self::$lenStart = strlen(self::$startLTR); // RTL version MUST have same length
-		self::$lenEnd   = strlen(self::$endLTR); // RTL version MUST have same length
-
-		self::$previousState = '';
-		self::$currentState  = strtoupper(I18N::direction());
-		$numberState         = false; // Set when we're inside a numeric string
-		$result              = '';
-		self::$waitingText   = '';
-		$openParDirection    = array();
-
-		self::beginCurrentSpan($result);
-
-		while ($workingText != '') {
-			$charArray     = self::getChar($workingText, 0); // Get the next ASCII or UTF-8 character
-			$currentLetter = $charArray['letter'];
-			$currentLen    = $charArray['length'];
-
-			$openParIndex  = strpos(self::OPEN_PARENTHESES, $currentLetter); // Which opening parenthesis is this?
-			$closeParIndex = strpos(self::CLOSE_PARENTHESES, $currentLetter); // Which closing parenthesis is this?
-
-			switch ($currentLetter) {
-			case '<':
-				// Assume this '<' starts an HTML element
-				$endPos = strpos($workingText, '>'); // look for the terminating '>'
-				if ($endPos === false) {
-					$endPos = 0;
-				}
-				$currentLen += $endPos;
-				$element = substr($workingText, 0, $currentLen);
-				$temp    = strtolower(substr($element, 0, 3));
-				if (strlen($element) < 7 && $temp == '<br') {
-					if ($numberState) {
-						$numberState = false;
-						if (self::$currentState == 'RTL') {
-							self::$waitingText .= WT_UTF8_PDF;
-						}
-					}
-					self::breakCurrentSpan($result);
-				} elseif (self::$waitingText == '') {
-					$result .= $element;
-				} else {
-					self::$waitingText .= $element;
-				}
-				$workingText = substr($workingText, $currentLen);
-				break;
-			case '&':
-				// Assume this '&' starts an HTML entity
-				$endPos = strpos($workingText, ';'); // look for the terminating ';'
-				if ($endPos === false) {
-					$endPos = 0;
-				}
-				$currentLen += $endPos;
-				$entity = substr($workingText, 0, $currentLen);
-				if (strtolower($entity) == '&nbsp;') {
-					$entity .= '&nbsp;'; // Ensure consistent case for this entity
-				}
-				if (self::$waitingText == '') {
-					$result .= $entity;
-				} else {
-					self::$waitingText .= $entity;
-				}
-				$workingText = substr($workingText, $currentLen);
-				break;
-			case '{':
-				if (substr($workingText, 1, 1) == '{') {
-					// Assume this '{{' starts a TCPDF directive
-					$endPos = strpos($workingText, '}}'); // look for the terminating '}}'
-					if ($endPos === false) {
-						$endPos = 0;
-					}
-					$currentLen        = $endPos + 2;
-					$directive         = substr($workingText, 0, $currentLen);
-					$workingText       = substr($workingText, $currentLen);
-					$result            = $result . self::$waitingText . $directive;
-					self::$waitingText = '';
-					break;
-				}
-			default:
-				// Look for strings of numbers with optional leading or trailing + or -
-				// and with optional embedded numeric punctuation
-				if ($numberState) {
-					// If we're inside a numeric string, look for reasons to end it
-					$offset    = 0; // Be sure to look at the current character first
-					$charArray = self::getChar($workingText . "\n", $offset);
-					if (strpos(self::NUMBERS, $charArray['letter']) === false) {
-						// This is not a digit. Is it numeric punctuation?
-						if (substr($workingText . "\n", $offset, 6) == '&nbsp;') {
-							$offset += 6; // This could be numeric punctuation
-						} elseif (strpos(self::NUMBER_PUNCTUATION, $charArray['letter']) !== false) {
-							$offset += $charArray['length']; // This could be numeric punctuation
-						}
-						// If the next character is a digit, the current character is numeric punctuation
-						$charArray = self::getChar($workingText . "\n", $offset);
-						if (strpos(self::NUMBERS, $charArray['letter']) === false) {
-							// This is not a digit. End the run of digits and punctuation.
-							$numberState = false;
-							if (self::$currentState == 'RTL') {
-								if (strpos(self::NUMBER_PREFIX, $currentLetter) === false) {
-									$currentLetter = WT_UTF8_PDF . $currentLetter;
-								} else {
-									$currentLetter = $currentLetter . WT_UTF8_PDF; // Include a trailing + or - in the run
-								}
-							}
-						}
-					}
-				} else {
-					// If we're outside a numeric string, look for reasons to start it
-					if (strpos(self::NUMBER_PREFIX, $currentLetter) !== false) {
-						// This might be a number lead-in
-						$offset   = $currentLen;
-						$nextChar = substr($workingText . "\n", $offset, 1);
-						if (strpos(self::NUMBERS, $nextChar) !== false) {
-							$numberState = true; // We found a digit: the lead-in is therefore numeric
-							if (self::$currentState == 'RTL') {
-								$currentLetter = WT_UTF8_LRE . $currentLetter;
-							}
-						}
-					} elseif (strpos(self::NUMBERS, $currentLetter) !== false) {
-						$numberState = true; // The current letter is a digit
-						if (self::$currentState == 'RTL') {
-							$currentLetter = WT_UTF8_LRE . $currentLetter;
-						}
-					}
-				}
-
-				// Determine the directionality of the current UTF-8 character
-				$newState = self::$currentState;
-				while (true) {
-					if (I18N::scriptDirection(I18N::textScript($currentLetter)) === 'rtl') {
-						if (self::$currentState == '') {
-							$newState = 'RTL';
-							break;
-						}
-
-						if (self::$currentState == 'RTL') {
-							break;
-						}
-						// Switch to RTL only if this isn't a solitary RTL letter
-						$tempText = substr($workingText, $currentLen);
-						while ($tempText != '') {
-							$nextCharArray = self::getChar($tempText, 0);
-							$nextLetter    = $nextCharArray['letter'];
-							$nextLen       = $nextCharArray['length'];
-							$tempText      = substr($tempText, $nextLen);
-
-							if (I18N::scriptDirection(I18N::textScript($nextLetter)) === 'rtl') {
-								$newState = 'RTL';
-								break 2;
-							}
-
-							if (strpos(self::PUNCTUATION, $nextLetter) !== false || strpos(self::OPEN_PARENTHESES, $nextLetter) !== false) {
-								$newState = 'RTL';
-								break 2;
-							}
-
-							if ($nextLetter === ' ') {
-								break;
-							}
-							$nextLetter .= substr($tempText . "\n", 0, 5);
-							if ($nextLetter === '&nbsp;') {
-								break;
-							}
-						}
-						// This is a solitary RTL letter : wrap it in UTF8 control codes to force LTR directionality
-						$currentLetter = WT_UTF8_LRO . $currentLetter . WT_UTF8_PDF;
-						$newState      = 'LTR';
-						break;
-					}
-					if (($currentLen != 1) || ($currentLetter >= 'A' && $currentLetter <= 'Z') || ($currentLetter >= 'a' && $currentLetter <= 'z')) {
-						// Since it’s neither Hebrew nor Arabic, this UTF-8 character or ASCII letter must be LTR
-						$newState = 'LTR';
-						break;
-					}
-					if ($closeParIndex !== false) {
-						// This closing parenthesis has to inherit the matching opening parenthesis' directionality
-						if (!empty($openParDirection[$closeParIndex]) && $openParDirection[$closeParIndex] != '?') {
-							$newState = $openParDirection[$closeParIndex];
-						}
-						$openParDirection[$closeParIndex] = '';
-						break;
-					}
-					if ($openParIndex !== false) {
-						// Opening parentheses always inherit the following directionality
-						self::$waitingText .= $currentLetter;
-						$workingText = substr($workingText, $currentLen);
-						while (true) {
-							if ($workingText === '') {
-								break;
-							}
-							if (substr($workingText, 0, 1) === ' ') {
-								// Spaces following this left parenthesis inherit the following directionality too
-								self::$waitingText .= ' ';
-								$workingText = substr($workingText, 1);
-								continue;
-							}
-							if (substr($workingText, 0, 6) === '&nbsp;') {
-								// Spaces following this left parenthesis inherit the following directionality too
-								self::$waitingText .= '&nbsp;';
-								$workingText = substr($workingText, 6);
-								continue;
-							}
-							break;
-						}
-						$openParDirection[$openParIndex] = '?';
-						break 2; // double break because we're waiting for more information
-					}
-
-					// We have a digit or a "normal" special character.
-					//
-					// When this character is not at the start of the input string, it inherits the preceding directionality;
-					// at the start of the input string, it assumes the following directionality.
-					//
-					// Exceptions to this rule will be handled later during final clean-up.
-					//
-					self::$waitingText .= $currentLetter;
-					$workingText = substr($workingText, $currentLen);
-					if (self::$currentState != '') {
-						$result .= self::$waitingText;
-						self::$waitingText = '';
-					}
-					break 2; // double break because we're waiting for more information
-				}
-				if ($newState != self::$currentState) {
-					// A direction change has occurred
-					self::finishCurrentSpan($result, false);
-					self::$previousState = self::$currentState;
-					self::$currentState  = $newState;
-					self::beginCurrentSpan($result);
-				}
-				self::$waitingText .= $currentLetter;
-				$workingText = substr($workingText, $currentLen);
-				$result .= self::$waitingText;
-				self::$waitingText = '';
-
-				foreach ($openParDirection as $index => $value) {
-					// Since we now know the proper direction, remember it for all waiting opening parentheses
-					if ($value === '?') {
-						$openParDirection[$index] = self::$currentState;
-					}
-				}
-
-				break;
-			}
-		}
-
-		// We're done. Finish last <span> if necessary
-		if ($numberState) {
-			if (self::$waitingText === '') {
-				if (self::$currentState === 'RTL') {
-					$result .= WT_UTF8_PDF;
-				}
-			} else {
-				if (self::$currentState === 'RTL') {
-					self::$waitingText .= WT_UTF8_PDF;
-				}
-			}
-		}
-		self::finishCurrentSpan($result, true);
-
-		// Get rid of any waiting text
-		if (self::$waitingText != '') {
-			if (I18N::direction() === 'rtl' && self::$currentState === 'LTR') {
-				$result .= self::$startRTL;
-				$result .= self::$waitingText;
-				$result .= self::$endRTL;
-			} else {
-				$result .= self::$startLTR;
-				$result .= self::$waitingText;
-				$result .= self::$endLTR;
-			}
-			self::$waitingText = '';
-		}
-
-		// Lastly, do some more cleanups
-
-		// Move leading RTL numeric strings to following LTR text
-		// (this happens when the page direction is RTL and the original text begins with a number and is followed by LTR text)
-		while (substr($result, 0, self::$lenStart + 3) === self::$startRTL . WT_UTF8_LRE) {
-			$spanEnd = strpos($result, self::$endRTL . self::$startLTR);
-			if ($spanEnd === false) {
-				break;
-			}
-			$textSpan = self::stripLrmRlm(substr($result, self::$lenStart + 3, $spanEnd - self::$lenStart - 3));
-			if (I18N::scriptDirection(I18N::textScript($textSpan)) === 'rtl') {
-				break;
-			}
-			$result = self::$startLTR . substr($result, self::$lenStart, $spanEnd - self::$lenStart) . substr($result, $spanEnd + self::$lenStart + self::$lenEnd);
-			break;
-		}
-
-		// On RTL pages, put trailing "." in RTL numeric strings into its own RTL span
-		if (I18N::direction() === 'rtl') {
-			$result = str_replace(WT_UTF8_PDF . '.' . self::$endRTL, WT_UTF8_PDF . self::$endRTL . self::$startRTL . '.' . self::$endRTL, $result);
-		}
-
-		// Trim trailing blanks preceding <br> in LTR text
-		while (self::$previousState != 'RTL') {
-			if (strpos($result, ' <LTRbr>') !== false) {
-				$result = str_replace(' <LTRbr>', '<LTRbr>', $result);
-				continue;
-			}
-			if (strpos($result, '&nbsp;<LTRbr>') !== false) {
-				$result = str_replace('&nbsp;<LTRbr>', '<LTRbr>', $result);
-				continue;
-			}
-			if (strpos($result, ' <br>') !== false) {
-				$result = str_replace(' <br>', '<br>', $result);
-				continue;
-			}
-			if (strpos($result, '&nbsp;<br>') !== false) {
-				$result = str_replace('&nbsp;<br>', '<br>', $result);
-				continue;
-			}
-			break; // Neither space nor &nbsp; : we're done
-		}
-
-		// Trim trailing blanks preceding <br> in RTL text
-		while (true) {
-			if (strpos($result, ' <RTLbr>') !== false) {
-				$result = str_replace(' <RTLbr>', '<RTLbr>', $result);
-				continue;
-			}
-			if (strpos($result, '&nbsp;<RTLbr>') !== false) {
-				$result = str_replace('&nbsp;<RTLbr>', '<RTLbr>', $result);
-				continue;
-			}
-			break; // Neither space nor &nbsp; : we're done
-		}
-
-		// Convert '<LTRbr>' and '<RTLbr /'
-		$result = str_replace(array('<LTRbr>', '<RTLbr>'), array(self::$endLTR . '<br>' . self::$startLTR, self::$endRTL . '<br>' . self::$startRTL), $result);
-
-		// Include leading indeterminate directional text in whatever follows
-		if (substr($result . "\n", 0, self::$lenStart) != self::$startLTR && substr($result . "\n", 0, self::$lenStart) != self::$startRTL && substr($result . "\n", 0, 6) != '<br>') {
-			$leadingText = '';
-			while (true) {
-				if ($result == '') {
-					$result = $leadingText;
-					break;
-				}
-				if (substr($result . "\n", 0, self::$lenStart) != self::$startLTR && substr($result . "\n", 0, self::$lenStart) != self::$startRTL) {
-					$leadingText .= substr($result, 0, 1);
-					$result = substr($result, 1);
-					continue;
-				}
-				$result = substr($result, 0, self::$lenStart) . $leadingText . substr($result, self::$lenStart);
-				break;
-			}
-		}
-
-		// Include solitary "-" and "+" in surrounding RTL text
-		$result = str_replace(array(self::$endRTL . self::$startLTR . '-' . self::$endLTR . self::$startRTL, self::$endRTL . self::$startLTR . '-' . self::$endLTR . self::$startRTL), array('-', '+'), $result);
-
-		// Remove empty spans
-		$result = str_replace(array(self::$startLTR . self::$endLTR, self::$startRTL . self::$endRTL), '', $result);
-
-		// 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;
-		}
-		$result = str_replace(array(self::$startLTR, self::$endLTR, self::$startRTL, self::$endRTL), array($sLTR, $eLTR, $sRTL, $eRTL), $result);
-
-		return $result;
-	}
-
-	/**
-	 * Wrap words that have an asterisk suffix in <u> and </u> tags.
-	 * This should underline starred names to show the preferred name.
-	 *
-	 * @param string $textSpan
-	 * @param string $direction
-	 *
-	 * @return string
-	 */
-	public static function starredName($textSpan, $direction) {
-		// To avoid a TCPDF bug that mixes up the word order, insert those <u> and </u> tags
-		// only when page and span directions are identical.
-		if ($direction === strtoupper(I18N::direction())) {
-			while (true) {
-				$starPos = strpos($textSpan, '*');
-				if ($starPos === false) {
-					break;
-				}
-				$trailingText = substr($textSpan, $starPos + 1);
-				$textSpan     = substr($textSpan, 0, $starPos);
-				$wordStart    = strrpos($textSpan, ' '); // Find the start of the word
-				if ($wordStart !== false) {
-					$leadingText = substr($textSpan, 0, $wordStart + 1);
-					$wordText    = substr($textSpan, $wordStart + 1);
-				} else {
-					$leadingText = '';
-					$wordText    = $textSpan;
-				}
-				$textSpan = $leadingText . '<u>' . $wordText . '</u>' . $trailingText;
-			}
-			$textSpan = preg_replace('~<span class="starredname">(.*)</span>~', '<u>\1</u>', $textSpan);
-			// The &nbsp; is a work-around for a TCPDF bug eating blanks.
-			$textSpan = str_replace(array(' <u>', '</u> '), array('&nbsp;<u>', '</u>&nbsp;'), $textSpan);
-		} else {
-			// Text and page directions differ:  remove the <span> and </span>
-			$textSpan = preg_replace('~(.*)\*~', '\1', $textSpan);
-			$textSpan = preg_replace('~<span class="starredname">(.*)</span>~', '\1', $textSpan);
-		}
-
-		return $textSpan;
-	}
-
-	/**
-	 * Get the next character from an input string
-	 *
-	 * @param string $text
-	 * @param string $offset
-	 *
-	 * @return array
-	 */
-	public static function getChar($text, $offset) {
-
-		if ($text == '') {
-			return array('letter' => '', 'length' => 0);
-		}
-
-		$char   = substr($text, $offset, 1);
-		$length = 1;
-		if ((ord($char) & 0xE0) == 0xC0) {
-			$length = 2;
-		}
-		if ((ord($char) & 0xF0) == 0xE0) {
-			$length = 3;
-		}
-		if ((ord($char) & 0xF8) == 0xF0) {
-			$length = 4;
-		}
-		$letter = substr($text, $offset, $length);
-
-		return array('letter' => $letter, 'length' => $length);
-	}
-
-	/**
-	 * Insert <br> into current span
-	 *
-	 * @param string $result
-	 */
-	public static function breakCurrentSpan(&$result) {
-		// Interrupt the current span, insert that <br>, and then continue the current span
-		$result .= self::$waitingText;
-		self::$waitingText = '';
-
-		$breakString = '<' . self::$currentState . 'br>';
-		$result .= $breakString;
-
-		return;
-	}
-
-	/**
-	 * Begin current span
-	 *
-	 * @param string $result
-	 */
-	public static function beginCurrentSpan(&$result) {
-		if (self::$currentState == 'LTR') {
-			$result .= self::$startLTR;
-		}
-		if (self::$currentState == 'RTL') {
-			$result .= self::$startRTL;
-		}
-
-		self::$posSpanStart = strlen($result);
-	}
-
-	/**
-	 * Finish current span
-	 *
-	 * @param string $result
-	 * @param bool $theEnd
-	 */
-	public static function finishCurrentSpan(&$result, $theEnd = false) {
-		$textSpan = substr($result, self::$posSpanStart);
-		$result   = substr($result, 0, self::$posSpanStart);
-
-		// Get rid of empty spans, so that our check for presence of RTL will work
-		$result = str_replace(array(self::$startLTR . self::$endLTR, self::$startRTL . self::$endRTL), '', $result);
-
-		// Look for numeric strings that are times (hh:mm:ss). These have to be separated from surrounding numbers.
-		$tempResult = '';
-		while ($textSpan != '') {
-			$posColon = strpos($textSpan, ':');
-			if ($posColon === false) {
-				break;
-			} // No more possible time strings
-			$posLRE = strpos($textSpan, WT_UTF8_LRE);
-			if ($posLRE === false) {
-				break;
-			} // No more numeric strings
-			$posPDF = strpos($textSpan, WT_UTF8_PDF, $posLRE);
-			if ($posPDF === false) {
-				break;
-			} // No more numeric strings
-
-			$tempResult .= substr($textSpan, 0, $posLRE + 3); // Copy everything preceding the numeric string
-			$numericString = substr($textSpan, $posLRE + 3, $posPDF - $posLRE); // Separate the entire numeric string
-			$textSpan      = substr($textSpan, $posPDF + 3);
-			$posColon      = strpos($numericString, ':');
-			if ($posColon === false) {
-				// Nothing that looks like a time here
-				$tempResult .= $numericString;
-				continue;
-			}
-			$posBlank = strpos($numericString . ' ', ' ');
-			$posNbsp  = strpos($numericString . '&nbsp;', '&nbsp;');
-			if ($posBlank < $posNbsp) {
-				$posSeparator    = $posBlank;
-				$lengthSeparator = 1;
-			} else {
-				$posSeparator    = $posNbsp;
-				$lengthSeparator = 6;
-			}
-			if ($posColon > $posSeparator) {
-				// We have a time string preceded by a blank: Exclude that blank from the numeric string
-				$tempResult .= substr($numericString, 0, $posSeparator);
-				$tempResult .= WT_UTF8_PDF;
-				$tempResult .= substr($numericString, $posSeparator, $lengthSeparator);
-				$tempResult .= WT_UTF8_LRE;
-				$numericString = substr($numericString, $posSeparator + $lengthSeparator);
-			}
-
-			$posBlank = strpos($numericString, ' ');
-			$posNbsp  = strpos($numericString, '&nbsp;');
-			if ($posBlank === false && $posNbsp === false) {
-				// The time string isn't followed by a blank
-				$textSpan = $numericString . $textSpan;
-				continue;
-			}
-
-			// We have a time string followed by a blank: Exclude that blank from the numeric string
-			if ($posBlank === false) {
-				$posSeparator    = $posNbsp;
-				$lengthSeparator = 6;
-			} elseif ($posNbsp === false) {
-				$posSeparator    = $posBlank;
-				$lengthSeparator = 1;
-			} elseif ($posBlank < $posNbsp) {
-				$posSeparator    = $posBlank;
-				$lengthSeparator = 1;
-			} else {
-				$posSeparator    = $posNbsp;
-				$lengthSeparator = 6;
-			}
-			$tempResult .= substr($numericString, 0, $posSeparator);
-			$tempResult .= WT_UTF8_PDF;
-			$tempResult .= substr($numericString, $posSeparator, $lengthSeparator);
-			$posSeparator += $lengthSeparator;
-			$numericString = substr($numericString, $posSeparator);
-			$textSpan      = WT_UTF8_LRE . $numericString . $textSpan;
-		}
-		$textSpan       = $tempResult . $textSpan;
-		$trailingBlanks = '';
-		$trailingBreaks = '';
-
-		/* ****************************** LTR text handling ******************************** */
-
-		if (self::$currentState === 'LTR') {
-			// Move trailing numeric strings to the following RTL text. Include any blanks preceding or following the numeric text too.
-			if (I18N::direction() === 'rtl' && self::$previousState === 'RTL' && !$theEnd) {
-				$trailingString = '';
-				$savedSpan      = $textSpan;
-				while ($textSpan !== '') {
-					// Look for trailing spaces and tentatively move them
-					if (substr($textSpan, -1) === ' ') {
-						$trailingString = ' ' . $trailingString;
-						$textSpan       = substr($textSpan, 0, -1);
-						continue;
-					}
-					if (substr($textSpan, -6) === '&nbsp;') {
-						$trailingString = '&nbsp;' . $trailingString;
-						$textSpan       = substr($textSpan, 0, -1);
-						continue;
-					}
-					if (substr($textSpan, -3) !== WT_UTF8_PDF) {
-						// There is no trailing numeric string
-						$textSpan = $savedSpan;
-						break;
-					}
-
-					// We have a numeric string
-					$posStartNumber = strrpos($textSpan, WT_UTF8_LRE);
-					if ($posStartNumber === false) {
-						$posStartNumber = 0;
-					}
-					$trailingString = substr($textSpan, $posStartNumber, strlen($textSpan) - $posStartNumber) . $trailingString;
-					$textSpan       = substr($textSpan, 0, $posStartNumber);
-
-					// Look for more spaces and move them too
-					while ($textSpan != '') {
-						if (substr($textSpan, -1) == ' ') {
-							$trailingString = ' ' . $trailingString;
-							$textSpan       = substr($textSpan, 0, -1);
-							continue;
-						}
-						if (substr($textSpan, -6) == '&nbsp;') {
-							$trailingString = '&nbsp;' . $trailingString;
-							$textSpan       = substr($textSpan, 0, -1);
-							continue;
-						}
-						break;
-					}
-
-					self::$waitingText = $trailingString . self::$waitingText;
-					break;
-				}
-			}
-
-			$savedSpan = $textSpan;
-			// Move any trailing <br>, optionally preceded or followed by blanks, outside this LTR span
-			while ($textSpan != '') {
-				if (substr($textSpan, -1) == ' ') {
-					$trailingBlanks = ' ' . $trailingBlanks;
-					$textSpan       = substr($textSpan, 0, -1);
-					continue;
-				}
-				if (substr('......' . $textSpan, -6) == '&nbsp;') {
-					$trailingBlanks = '&nbsp;' . $trailingBlanks;
-					$textSpan       = substr($textSpan, 0, -6);
-					continue;
-				}
-				break;
-			}
-			while (substr($textSpan, -9) == '<LTRbr>') {
-				$trailingBreaks = '<br>' . $trailingBreaks; // Plain <br> because it’s outside a span
-				$textSpan       = substr($textSpan, 0, -9);
-			}
-			if ($trailingBreaks != '') {
-				while ($textSpan != '') {
-					if (substr($textSpan, -1) == ' ') {
-						$trailingBreaks = ' ' . $trailingBreaks;
-						$textSpan       = substr($textSpan, 0, -1);
-						continue;
-					}
-					if (substr('......' . $textSpan, -6) == '&nbsp;') {
-						$trailingBreaks = '&nbsp;' . $trailingBreaks;
-						$textSpan       = substr($textSpan, 0, -6);
-						continue;
-					}
-					break;
-				}
-				self::$waitingText = $trailingBlanks . self::$waitingText; // Put those trailing blanks inside the following span
-			} else {
-				$textSpan = $savedSpan;
-			}
-
-			$trailingBlanks      = '';
-			$trailingPunctuation = '';
-			$trailingID          = '';
-			$trailingSeparator   = '';
-			$leadingSeparator    = '';
-			while (I18N::direction() === 'rtl') {
-				if (strpos($result, self::$startRTL) !== false) {
-					// Remove trailing blanks for inclusion in a separate LTR span
-					while ($textSpan != '') {
-						if (substr($textSpan, -1) === ' ') {
-							$trailingBlanks = ' ' . $trailingBlanks;
-							$textSpan       = substr($textSpan, 0, -1);
-							continue;
-						}
-						if (substr($textSpan, -6) === '&nbsp;') {
-							$trailingBlanks = '&nbsp;' . $trailingBlanks;
-							$textSpan       = substr($textSpan, 0, -1);
-							continue;
-						}
-						break;
-					}
-
-					// Remove trailing punctuation for inclusion in a separate LTR span
-					if ($textSpan == '') {
-						$trailingChar = "\n";
-					} else {
-						$trailingChar = substr($textSpan, -1);
-					}
-					if (strpos(self::PUNCTUATION, $trailingChar) !== false) {
-						$trailingPunctuation = $trailingChar;
-						$textSpan            = substr($textSpan, 0, -1);
-					}
-				}
-
-				// Remove trailing ID numbers that look like "(xnnn)" for inclusion in a separate LTR span
-				while (true) {
-					if (substr($textSpan, -1) != ')') {
-						break;
-					} // There is no trailing ')'
-					$posLeftParen = strrpos($textSpan, '(');
-					if ($posLeftParen === false) {
-						break;
-					} // There is no leading '('
-					$temp = self::stripLrmRlm(substr($textSpan, $posLeftParen)); // Get rid of UTF8 control codes
-
-					// If the parenthesized text doesn't look like an ID number,
-					// we don't want to touch it.
-					// This check won’t work if somebody uses ID numbers with an unusual format.
-					$offset    = 1;
-					$charArray = self::getChar($temp, $offset); // Get 1st character of parenthesized text
-					if (strpos(self::NUMBERS, $charArray['letter']) !== false) {
-						break;
-					}
-					$offset += $charArray['length']; // Point at 2nd character of parenthesized text
-					if (strpos(self::NUMBERS, substr($temp, $offset, 1)) === false) {
-						break;
-					}
-					// 1st character of parenthesized text is alpha, 2nd character is a digit; last has to be a digit too
-					if (strpos(self::NUMBERS, substr($temp, -2, 1)) === false) {
-						break;
-					}
-
-					$trailingID = substr($textSpan, $posLeftParen);
-					$textSpan   = substr($textSpan, 0, $posLeftParen);
-					break;
-				}
-
-				// Look for " - " or blank preceding the ID number and remove it for inclusion in a separate LTR span
-				if ($trailingID != '') {
-					while ($textSpan != '') {
-						if (substr($textSpan, -1) == ' ') {
-							$trailingSeparator = ' ' . $trailingSeparator;
-							$textSpan          = substr($textSpan, 0, -1);
-							continue;
-						}
-						if (substr($textSpan, -6) == '&nbsp;') {
-							$trailingSeparator = '&nbsp;' . $trailingSeparator;
-							$textSpan          = substr($textSpan, 0, -6);
-							continue;
-						}
-						if (substr($textSpan, -1) == '-') {
-							$trailingSeparator = '-' . $trailingSeparator;
-							$textSpan          = substr($textSpan, 0, -1);
-							continue;
-						}
-						break;
-					}
-				}
-
-				// Look for " - " preceding the text and remove it for inclusion in a separate LTR span
-				$foundSeparator = false;
-				$savedSpan      = $textSpan;
-				while ($textSpan != '') {
-					if (substr($textSpan, 0, 1) == ' ') {
-						$leadingSeparator = ' ' . $leadingSeparator;
-						$textSpan         = substr($textSpan, 1);
-						continue;
-					}
-					if (substr($textSpan, 0, 6) == '&nbsp;') {
-						$leadingSeparator = '&nbsp;' . $leadingSeparator;
-						$textSpan         = substr($textSpan, 6);
-						continue;
-					}
-					if (substr($textSpan, 0, 1) == '-') {
-						$leadingSeparator = '-' . $leadingSeparator;
-						$textSpan         = substr($textSpan, 1);
-						$foundSeparator   = true;
-						continue;
-					}
-					break;
-				}
-				if (!$foundSeparator) {
-					$textSpan         = $savedSpan;
-					$leadingSeparator = '';
-				}
-				break;
-			}
-
-			// We're done: finish the span
-			$textSpan = self::starredName($textSpan, 'LTR'); // Wrap starred name in <u> and </u> tags
-			while (true) {
-				// Remove blanks that precede <LTRbr>
-				if (strpos($textSpan, ' <LTRbr>') !== false) {
-					$textSpan = str_replace(' <LTRbr>', '<LTRbr>', $textSpan);
-					continue;
-				}
-				if (strpos($textSpan, '&nbsp;<LTRbr>') !== false) {
-					$textSpan = str_replace('&nbsp;<LTRbr>', '<LTRbr>', $textSpan);
-					continue;
-				}
-				break;
-			}
-			if ($leadingSeparator != '') {
-				$result = $result . self::$startLTR . $leadingSeparator . self::$endLTR;
-			}
-			$result = $result . $textSpan . self::$endLTR;
-			if ($trailingSeparator != '') {
-				$result = $result . self::$startLTR . $trailingSeparator . self::$endLTR;
-			}
-			if ($trailingID != '') {
-				$result = $result . self::$startLTR . $trailingID . self::$endLTR;
-			}
-			if ($trailingPunctuation != '') {
-				$result = $result . self::$startLTR . $trailingPunctuation . self::$endLTR;
-			}
-			if ($trailingBlanks != '') {
-				$result = $result . self::$startLTR . $trailingBlanks . self::$endLTR;
-			}
-		}
-
-		/* ****************************** RTL text handling ******************************** */
-
-		if (self::$currentState == 'RTL') {
-			$savedSpan = $textSpan;
-
-			// Move any trailing <br>, optionally followed by blanks, outside this RTL span
-			while ($textSpan != '') {
-				if (substr($textSpan, -1) == ' ') {
-					$trailingBlanks = ' ' . $trailingBlanks;
-					$textSpan       = substr($textSpan, 0, -1);
-					continue;
-				}
-				if (substr('......' . $textSpan, -6) == '&nbsp;') {
-					$trailingBlanks = '&nbsp;' . $trailingBlanks;
-					$textSpan       = substr($textSpan, 0, -6);
-					continue;
-				}
-				break;
-			}
-			while (substr($textSpan, -9) == '<RTLbr>') {
-				$trailingBreaks = '<br>' . $trailingBreaks; // Plain <br> because it’s outside a span
-				$textSpan       = substr($textSpan, 0, -9);
-			}
-			if ($trailingBreaks != '') {
-				self::$waitingText = $trailingBlanks . self::$waitingText; // Put those trailing blanks inside the following span
-			} else {
-				$textSpan = $savedSpan;
-			}
-
-			// Move trailing numeric strings to the following LTR text. Include any blanks preceding or following the numeric text too.
-			if (!$theEnd && I18N::direction() !== 'rtl') {
-				$trailingString = '';
-				$savedSpan      = $textSpan;
-				while ($textSpan != '') {
-					// Look for trailing spaces and tentatively move them
-					if (substr($textSpan, -1) === ' ') {
-						$trailingString = ' ' . $trailingString;
-						$textSpan       = substr($textSpan, 0, -1);
-						continue;
-					}
-					if (substr($textSpan, -6) === '&nbsp;') {
-						$trailingString = '&nbsp;' . $trailingString;
-						$textSpan       = substr($textSpan, 0, -1);
-						continue;
-					}
-					if (substr($textSpan, -3) !== WT_UTF8_PDF) {
-						// There is no trailing numeric string
-						$textSpan = $savedSpan;
-						break;
-					}
-
-					// We have a numeric string
-					$posStartNumber = strrpos($textSpan, WT_UTF8_LRE);
-					if ($posStartNumber === false) {
-						$posStartNumber = 0;
-					}
-					$trailingString = substr($textSpan, $posStartNumber, strlen($textSpan) - $posStartNumber) . $trailingString;
-					$textSpan       = substr($textSpan, 0, $posStartNumber);
-
-					// Look for more spaces and move them too
-					while ($textSpan != '') {
-						if (substr($textSpan, -1) == ' ') {
-							$trailingString = ' ' . $trailingString;
-							$textSpan       = substr($textSpan, 0, -1);
-							continue;
-						}
-						if (substr($textSpan, -6) == '&nbsp;') {
-							$trailingString = '&nbsp;' . $trailingString;
-							$textSpan       = substr($textSpan, 0, -1);
-							continue;
-						}
-						break;
-					}
-
-					self::$waitingText = $trailingString . self::$waitingText;
-					break;
-				}
-			}
-
-			// Trailing " - " needs to be prefixed to the following span
-			if (!$theEnd && substr('...' . $textSpan, -3) == ' - ') {
-				$textSpan          = substr($textSpan, 0, -3);
-				self::$waitingText = ' - ' . self::$waitingText;
-			}
-
-			while (I18N::direction() === 'rtl') {
-				// Look for " - " preceding <RTLbr> and relocate it to the front of the string
-				$posDashString = strpos($textSpan, ' - <RTLbr>');
-				if ($posDashString === false) {
-					break;
-				}
-				$posStringStart = strrpos(substr($textSpan, 0, $posDashString), '<RTLbr>');
-				if ($posStringStart === false) {
-					$posStringStart = 0;
-				} else {
-					$posStringStart += 9;
-				} // Point to the first char following the last <RTLbr>
-
-				$textSpan = substr($textSpan, 0, $posStringStart) . ' - ' . substr($textSpan, $posStringStart, $posDashString - $posStringStart) . substr($textSpan, $posDashString + 3);
-			}
-
-			// Strip leading spaces from the RTL text
-			$countLeadingSpaces = 0;
-			while ($textSpan != '') {
-				if (substr($textSpan, 0, 1) == ' ') {
-					$countLeadingSpaces++;
-					$textSpan = substr($textSpan, 1);
-					continue;
-				}
-				if (substr($textSpan, 0, 6) == '&nbsp;') {
-					$countLeadingSpaces++;
-					$textSpan = substr($textSpan, 6);
-					continue;
-				}
-				break;
-			}
-
-			// Strip trailing spaces from the RTL text
-			$countTrailingSpaces = 0;
-			while ($textSpan != '') {
-				if (substr($textSpan, -1) == ' ') {
-					$countTrailingSpaces++;
-					$textSpan = substr($textSpan, 0, -1);
-					continue;
-				}
-				if (substr($textSpan, -6) == '&nbsp;') {
-					$countTrailingSpaces++;
-					$textSpan = substr($textSpan, 0, -6);
-					continue;
-				}
-				break;
-			}
-
-			// Look for trailing " -", reverse it, and relocate it to the front of the string
-			if (substr($textSpan, -2) === ' -') {
-				$posDashString  = strlen($textSpan) - 2;
-				$posStringStart = strrpos(substr($textSpan, 0, $posDashString), '<RTLbr>');
-				if ($posStringStart === false) {
-					$posStringStart = 0;
-				} else {
-					$posStringStart += 9;
-				} // Point to the first char following the last <RTLbr>
-
-				$textSpan = substr($textSpan, 0, $posStringStart) . '- ' . substr($textSpan, $posStringStart, $posDashString - $posStringStart) . substr($textSpan, $posDashString + 2);
-			}
-
-			if ($countLeadingSpaces != 0) {
-				$newLength = strlen($textSpan) + $countLeadingSpaces;
-				$textSpan  = str_pad($textSpan, $newLength, ' ', (I18N::direction() === 'rtl' ? STR_PAD_LEFT : STR_PAD_RIGHT));
-			}
-			if ($countTrailingSpaces != 0) {
-				if (I18N::direction() === 'ltr') {
-					if ($trailingBreaks === '') {
-						// Move trailing RTL spaces to front of following LTR span
-						$newLength         = strlen(self::$waitingText) + $countTrailingSpaces;
-						self::$waitingText = str_pad(self::$waitingText, $newLength, ' ', STR_PAD_LEFT);
-					}
-				} else {
-					$newLength = strlen($textSpan) + $countTrailingSpaces;
-					$textSpan  = str_pad($textSpan, $newLength, ' ', STR_PAD_RIGHT);
-				}
-			}
-
-			// We're done: finish the span
-			$textSpan = self::starredName($textSpan, 'RTL'); // Wrap starred name in <u> and </u> tags
-			$result   = $result . $textSpan . self::$endRTL;
-		}
-
-		if (self::$currentState != 'LTR' && self::$currentState != 'RTL') {
-			$result = $result . $textSpan;
-		}
-
-		$result .= $trailingBreaks; // Get rid of any waiting <br>
-
-		return;
-	}
-
-	/**
-	 * Wrap text, similar to the PHP wordwrap() function.
-	 *
-	 * @param string $string
-	 * @param int $width
-	 * @param string $sep
-	 * @param bool $cut
-	 *
-	 * @return string
-	 */
-	public static function utf8WordWrap($string, $width = 75, $sep = "\n", $cut = false) {
-		$out = '';
-		while ($string) {
-			if (mb_strlen($string) <= $width) {
-				// Do not wrap any text that is less than the output area.
-				$out .= $string;
-				$string = '';
-			} else {
-				$sub1 = mb_substr($string, 0, $width + 1);
-				if (mb_substr($string, mb_strlen($sub1) - 1, 1) == ' ') {
-					// include words that end by a space immediately after the area.
-					$sub = $sub1;
-				} else {
-					$sub = mb_substr($string, 0, $width);
-				}
-				$spacepos = strrpos($sub, ' ');
-				if ($spacepos === false) {
-					// No space on line?
-					if ($cut) {
-						$out .= $sub . $sep;
-						$string = mb_substr($string, mb_strlen($sub));
-					} else {
-						$spacepos = strpos($string, ' ');
-						if ($spacepos === false) {
-							$out .= $string;
-							$string = '';
-						} else {
-							$out .= substr($string, 0, $spacepos) . $sep;
-							$string = substr($string, $spacepos + 1);
-						}
-					}
-				} else {
-					// Split at space;
-					$out .= substr($string, 0, $spacepos) . $sep;
-					$string = substr($string, $spacepos + 1);
-				}
-			}
-		}
-
-		return $out;
-	}
+    const CLOSE_PARENTHESES = ')]}';
+
+    const NUMBERS = '0123456789';
+
+    const NUMBER_PREFIX = '+-'; // Treat these like numbers when at beginning or end of numeric strings
+
+    const NUMBER_PUNCTUATION = '- ,.:/'; // Treat these like numbers when inside numeric strings
+
+    const PUNCTUATION = ',.:;?!';
+
+    /** @var string Were we previously processing LTR or RTL. */
+    private static $previousState;
+
+    /** @var string Are we currently processing LTR or RTL. */
+    private static $currentState;
+
+    /** @var string Text waiting to be processed. */
+    private static $waitingText;
+
+    /** @var string LTR text. */
+    private static $startLTR;
+
+    /** @var string LTR text. */
+    private static $endLTR;
+
+    /** @var string RTL text. */
+    private static $startRTL;
+
+    /** @var string RTL text. */
+    private static $endRTL;
+
+    /** @var int Offset into the text. */
+    private static $lenStart;
+
+    /** @var int Offset into the text. */
+    private static $lenEnd;
+
+    /** @var int Offset into the text. */
+    private static $posSpanStart;
+
+    /**
+     * This function strips &lrm; and &rlm; from the input string. It should be used for all
+     * text that has been passed through the PrintReady() function before that text is stored
+     * in the database. The database should NEVER contain these characters.
+     *
+     * @param  string $inputText The string from which the &lrm; and &rlm; characters should be stripped
+     *
+     * @return string The input string, with &lrm; and &rlm; stripped
+     */
+    public static function stripLrmRlm($inputText) {
+        return str_replace(array(WT_UTF8_LRM, WT_UTF8_RLM, WT_UTF8_LRO, WT_UTF8_RLO, WT_UTF8_LRE, WT_UTF8_RLE, WT_UTF8_PDF, "&lrm;", "&rlm;", "&LRM;", "&RLM;"), "", $inputText);
+    }
+
+    /**
+     * This function encapsulates all texts in the input with <span dir='xxx'> and </span>
+     * according to the directionality specified.
+     *
+     * @param string $inputText Raw input
+     * @param string $direction Directionality (LTR, BOTH, RTL) default BOTH
+     * @param string $class Additional text to insert into output <span dir="xxx"> (such as 'class="yyy"')
+     *
+     * @return string The string with all texts encapsulated as required
+     */
+    public static function spanLtrRtl($inputText, $direction = 'BOTH', $class = '') {
+        if ($inputText == '') {
+            // Nothing to do
+            return '';
+        }
+
+        $workingText = str_replace("\n", '<br>', $inputText);
+        $workingText = str_replace(array('<span class="starredname"><br>', '<span<br>class="starredname">'), '<br><span class="starredname">', $workingText); // Reposition some incorrectly placed line breaks
+        $workingText = self::stripLrmRlm($workingText); // Get rid of any existing UTF8 control codes
+
+        // $nothing  = '&zwnj;'; // Zero Width Non-Joiner  (not sure whether this is still needed to work around a TCPDF bug)
+        $nothing = '';
+
+        self::$startLTR = '<LTR>'; // This will become '<span dir="ltr">' at the end
+        self::$endLTR   = '</LTR>'; // This will become '</span>' at the end
+        self::$startRTL = '<RTL>'; // This will become '<span dir="rtl">' at the end
+        self::$endRTL   = '</RTL>'; // This will become '</span>' at the end
+        self::$lenStart = strlen(self::$startLTR); // RTL version MUST have same length
+        self::$lenEnd   = strlen(self::$endLTR); // RTL version MUST have same length
+
+        self::$previousState = '';
+        self::$currentState  = strtoupper(I18N::direction());
+        $numberState         = false; // Set when we're inside a numeric string
+        $result              = '';
+        self::$waitingText   = '';
+        $openParDirection    = array();
+
+        self::beginCurrentSpan($result);
+
+        while ($workingText != '') {
+            $charArray     = self::getChar($workingText, 0); // Get the next ASCII or UTF-8 character
+            $currentLetter = $charArray['letter'];
+            $currentLen    = $charArray['length'];
+
+            $openParIndex  = strpos(self::OPEN_PARENTHESES, $currentLetter); // Which opening parenthesis is this?
+            $closeParIndex = strpos(self::CLOSE_PARENTHESES, $currentLetter); // Which closing parenthesis is this?
+
+            switch ($currentLetter) {
+            case '<':
+                // Assume this '<' starts an HTML element
+                $endPos = strpos($workingText, '>'); // look for the terminating '>'
+                if ($endPos === false) {
+                    $endPos = 0;
+                }
+                $currentLen += $endPos;
+                $element = substr($workingText, 0, $currentLen);
+                $temp    = strtolower(substr($element, 0, 3));
+                if (strlen($element) < 7 && $temp == '<br') {
+                    if ($numberState) {
+                        $numberState = false;
+                        if (self::$currentState == 'RTL') {
+                            self::$waitingText .= WT_UTF8_PDF;
+                        }
+                    }
+                    self::breakCurrentSpan($result);
+                } elseif (self::$waitingText == '') {
+                    $result .= $element;
+                } else {
+                    self::$waitingText .= $element;
+                }
+                $workingText = substr($workingText, $currentLen);
+                break;
+            case '&':
+                // Assume this '&' starts an HTML entity
+                $endPos = strpos($workingText, ';'); // look for the terminating ';'
+                if ($endPos === false) {
+                    $endPos = 0;
+                }
+                $currentLen += $endPos;
+                $entity = substr($workingText, 0, $currentLen);
+                if (strtolower($entity) == '&nbsp;') {
+                    $entity .= '&nbsp;'; // Ensure consistent case for this entity
+                }
+                if (self::$waitingText == '') {
+                    $result .= $entity;
+                } else {
+                    self::$waitingText .= $entity;
+                }
+                $workingText = substr($workingText, $currentLen);
+                break;
+            case '{':
+                if (substr($workingText, 1, 1) == '{') {
+                    // Assume this '{{' starts a TCPDF directive
+                    $endPos = strpos($workingText, '}}'); // look for the terminating '}}'
+                    if ($endPos === false) {
+                        $endPos = 0;
+                    }
+                    $currentLen        = $endPos + 2;
+                    $directive         = substr($workingText, 0, $currentLen);
+                    $workingText       = substr($workingText, $currentLen);
+                    $result            = $result . self::$waitingText . $directive;
+                    self::$waitingText = '';
+                    break;
+                }
+            default:
+                // Look for strings of numbers with optional leading or trailing + or -
+                // and with optional embedded numeric punctuation
+                if ($numberState) {
+                    // If we're inside a numeric string, look for reasons to end it
+                    $offset    = 0; // Be sure to look at the current character first
+                    $charArray = self::getChar($workingText . "\n", $offset);
+                    if (strpos(self::NUMBERS, $charArray['letter']) === false) {
+                        // This is not a digit. Is it numeric punctuation?
+                        if (substr($workingText . "\n", $offset, 6) == '&nbsp;') {
+                            $offset += 6; // This could be numeric punctuation
+                        } elseif (strpos(self::NUMBER_PUNCTUATION, $charArray['letter']) !== false) {
+                            $offset += $charArray['length']; // This could be numeric punctuation
+                        }
+                        // If the next character is a digit, the current character is numeric punctuation
+                        $charArray = self::getChar($workingText . "\n", $offset);
+                        if (strpos(self::NUMBERS, $charArray['letter']) === false) {
+                            // This is not a digit. End the run of digits and punctuation.
+                            $numberState = false;
+                            if (self::$currentState == 'RTL') {
+                                if (strpos(self::NUMBER_PREFIX, $currentLetter) === false) {
+                                    $currentLetter = WT_UTF8_PDF . $currentLetter;
+                                } else {
+                                    $currentLetter = $currentLetter . WT_UTF8_PDF; // Include a trailing + or - in the run
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    // If we're outside a numeric string, look for reasons to start it
+                    if (strpos(self::NUMBER_PREFIX, $currentLetter) !== false) {
+                        // This might be a number lead-in
+                        $offset   = $currentLen;
+                        $nextChar = substr($workingText . "\n", $offset, 1);
+                        if (strpos(self::NUMBERS, $nextChar) !== false) {
+                            $numberState = true; // We found a digit: the lead-in is therefore numeric
+                            if (self::$currentState == 'RTL') {
+                                $currentLetter = WT_UTF8_LRE . $currentLetter;
+                            }
+                        }
+                    } elseif (strpos(self::NUMBERS, $currentLetter) !== false) {
+                        $numberState = true; // The current letter is a digit
+                        if (self::$currentState == 'RTL') {
+                            $currentLetter = WT_UTF8_LRE . $currentLetter;
+                        }
+                    }
+                }
+
+                // Determine the directionality of the current UTF-8 character
+                $newState = self::$currentState;
+                while (true) {
+                    if (I18N::scriptDirection(I18N::textScript($currentLetter)) === 'rtl') {
+                        if (self::$currentState == '') {
+                            $newState = 'RTL';
+                            break;
+                        }
+
+                        if (self::$currentState == 'RTL') {
+                            break;
+                        }
+                        // Switch to RTL only if this isn't a solitary RTL letter
+                        $tempText = substr($workingText, $currentLen);
+                        while ($tempText != '') {
+                            $nextCharArray = self::getChar($tempText, 0);
+                            $nextLetter    = $nextCharArray['letter'];
+                            $nextLen       = $nextCharArray['length'];
+                            $tempText      = substr($tempText, $nextLen);
+
+                            if (I18N::scriptDirection(I18N::textScript($nextLetter)) === 'rtl') {
+                                $newState = 'RTL';
+                                break 2;
+                            }
+
+                            if (strpos(self::PUNCTUATION, $nextLetter) !== false || strpos(self::OPEN_PARENTHESES, $nextLetter) !== false) {
+                                $newState = 'RTL';
+                                break 2;
+                            }
+
+                            if ($nextLetter === ' ') {
+                                break;
+                            }
+                            $nextLetter .= substr($tempText . "\n", 0, 5);
+                            if ($nextLetter === '&nbsp;') {
+                                break;
+                            }
+                        }
+                        // This is a solitary RTL letter : wrap it in UTF8 control codes to force LTR directionality
+                        $currentLetter = WT_UTF8_LRO . $currentLetter . WT_UTF8_PDF;
+                        $newState      = 'LTR';
+                        break;
+                    }
+                    if (($currentLen != 1) || ($currentLetter >= 'A' && $currentLetter <= 'Z') || ($currentLetter >= 'a' && $currentLetter <= 'z')) {
+                        // Since it’s neither Hebrew nor Arabic, this UTF-8 character or ASCII letter must be LTR
+                        $newState = 'LTR';
+                        break;
+                    }
+                    if ($closeParIndex !== false) {
+                        // This closing parenthesis has to inherit the matching opening parenthesis' directionality
+                        if (!empty($openParDirection[$closeParIndex]) && $openParDirection[$closeParIndex] != '?') {
+                            $newState = $openParDirection[$closeParIndex];
+                        }
+                        $openParDirection[$closeParIndex] = '';
+                        break;
+                    }
+                    if ($openParIndex !== false) {
+                        // Opening parentheses always inherit the following directionality
+                        self::$waitingText .= $currentLetter;
+                        $workingText = substr($workingText, $currentLen);
+                        while (true) {
+                            if ($workingText === '') {
+                                break;
+                            }
+                            if (substr($workingText, 0, 1) === ' ') {
+                                // Spaces following this left parenthesis inherit the following directionality too
+                                self::$waitingText .= ' ';
+                                $workingText = substr($workingText, 1);
+                                continue;
+                            }
+                            if (substr($workingText, 0, 6) === '&nbsp;') {
+                                // Spaces following this left parenthesis inherit the following directionality too
+                                self::$waitingText .= '&nbsp;';
+                                $workingText = substr($workingText, 6);
+                                continue;
+                            }
+                            break;
+                        }
+                        $openParDirection[$openParIndex] = '?';
+                        break 2; // double break because we're waiting for more information
+                    }
+
+                    // We have a digit or a "normal" special character.
+                    //
+                    // When this character is not at the start of the input string, it inherits the preceding directionality;
+                    // at the start of the input string, it assumes the following directionality.
+                    //
+                    // Exceptions to this rule will be handled later during final clean-up.
+                    //
+                    self::$waitingText .= $currentLetter;
+                    $workingText = substr($workingText, $currentLen);
+                    if (self::$currentState != '') {
+                        $result .= self::$waitingText;
+                        self::$waitingText = '';
+                    }
+                    break 2; // double break because we're waiting for more information
+                }
+                if ($newState != self::$currentState) {
+                    // A direction change has occurred
+                    self::finishCurrentSpan($result, false);
+                    self::$previousState = self::$currentState;
+                    self::$currentState  = $newState;
+                    self::beginCurrentSpan($result);
+                }
+                self::$waitingText .= $currentLetter;
+                $workingText = substr($workingText, $currentLen);
+                $result .= self::$waitingText;
+                self::$waitingText = '';
+
+                foreach ($openParDirection as $index => $value) {
+                    // Since we now know the proper direction, remember it for all waiting opening parentheses
+                    if ($value === '?') {
+                        $openParDirection[$index] = self::$currentState;
+                    }
+                }
+
+                break;
+            }
+        }
+
+        // We're done. Finish last <span> if necessary
+        if ($numberState) {
+            if (self::$waitingText === '') {
+                if (self::$currentState === 'RTL') {
+                    $result .= WT_UTF8_PDF;
+                }
+            } else {
+                if (self::$currentState === 'RTL') {
+                    self::$waitingText .= WT_UTF8_PDF;
+                }
+            }
+        }
+        self::finishCurrentSpan($result, true);
+
+        // Get rid of any waiting text
+        if (self::$waitingText != '') {
+            if (I18N::direction() === 'rtl' && self::$currentState === 'LTR') {
+                $result .= self::$startRTL;
+                $result .= self::$waitingText;
+                $result .= self::$endRTL;
+            } else {
+                $result .= self::$startLTR;
+                $result .= self::$waitingText;
+                $result .= self::$endLTR;
+            }
+            self::$waitingText = '';
+        }
+
+        // Lastly, do some more cleanups
+
+        // Move leading RTL numeric strings to following LTR text
+        // (this happens when the page direction is RTL and the original text begins with a number and is followed by LTR text)
+        while (substr($result, 0, self::$lenStart + 3) === self::$startRTL . WT_UTF8_LRE) {
+            $spanEnd = strpos($result, self::$endRTL . self::$startLTR);
+            if ($spanEnd === false) {
+                break;
+            }
+            $textSpan = self::stripLrmRlm(substr($result, self::$lenStart + 3, $spanEnd - self::$lenStart - 3));
+            if (I18N::scriptDirection(I18N::textScript($textSpan)) === 'rtl') {
+                break;
+            }
+            $result = self::$startLTR . substr($result, self::$lenStart, $spanEnd - self::$lenStart) . substr($result, $spanEnd + self::$lenStart + self::$lenEnd);
+            break;
+        }
+
+        // On RTL pages, put trailing "." in RTL numeric strings into its own RTL span
+        if (I18N::direction() === 'rtl') {
+            $result = str_replace(WT_UTF8_PDF . '.' . self::$endRTL, WT_UTF8_PDF . self::$endRTL . self::$startRTL . '.' . self::$endRTL, $result);
+        }
+
+        // Trim trailing blanks preceding <br> in LTR text
+        while (self::$previousState != 'RTL') {
+            if (strpos($result, ' <LTRbr>') !== false) {
+                $result = str_replace(' <LTRbr>', '<LTRbr>', $result);
+                continue;
+            }
+            if (strpos($result, '&nbsp;<LTRbr>') !== false) {
+                $result = str_replace('&nbsp;<LTRbr>', '<LTRbr>', $result);
+                continue;
+            }
+            if (strpos($result, ' <br>') !== false) {
+                $result = str_replace(' <br>', '<br>', $result);
+                continue;
+            }
+            if (strpos($result, '&nbsp;<br>') !== false) {
+                $result = str_replace('&nbsp;<br>', '<br>', $result);
+                continue;
+            }
+            break; // Neither space nor &nbsp; : we're done
+        }
+
+        // Trim trailing blanks preceding <br> in RTL text
+        while (true) {
+            if (strpos($result, ' <RTLbr>') !== false) {
+                $result = str_replace(' <RTLbr>', '<RTLbr>', $result);
+                continue;
+            }
+            if (strpos($result, '&nbsp;<RTLbr>') !== false) {
+                $result = str_replace('&nbsp;<RTLbr>', '<RTLbr>', $result);
+                continue;
+            }
+            break; // Neither space nor &nbsp; : we're done
+        }
+
+        // Convert '<LTRbr>' and '<RTLbr /'
+        $result = str_replace(array('<LTRbr>', '<RTLbr>'), array(self::$endLTR . '<br>' . self::$startLTR, self::$endRTL . '<br>' . self::$startRTL), $result);
+
+        // Include leading indeterminate directional text in whatever follows
+        if (substr($result . "\n", 0, self::$lenStart) != self::$startLTR && substr($result . "\n", 0, self::$lenStart) != self::$startRTL && substr($result . "\n", 0, 6) != '<br>') {
+            $leadingText = '';
+            while (true) {
+                if ($result == '') {
+                    $result = $leadingText;
+                    break;
+                }
+                if (substr($result . "\n", 0, self::$lenStart) != self::$startLTR && substr($result . "\n", 0, self::$lenStart) != self::$startRTL) {
+                    $leadingText .= substr($result, 0, 1);
+                    $result = substr($result, 1);
+                    continue;
+                }
+                $result = substr($result, 0, self::$lenStart) . $leadingText . substr($result, self::$lenStart);
+                break;
+            }
+        }
+
+        // Include solitary "-" and "+" in surrounding RTL text
+        $result = str_replace(array(self::$endRTL . self::$startLTR . '-' . self::$endLTR . self::$startRTL, self::$endRTL . self::$startLTR . '-' . self::$endLTR . self::$startRTL), array('-', '+'), $result);
+
+        // Remove empty spans
+        $result = str_replace(array(self::$startLTR . self::$endLTR, self::$startRTL . self::$endRTL), '', $result);
+
+        // 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;
+        }
+        $result = str_replace(array(self::$startLTR, self::$endLTR, self::$startRTL, self::$endRTL), array($sLTR, $eLTR, $sRTL, $eRTL), $result);
+
+        return $result;
+    }
+
+    /**
+     * Wrap words that have an asterisk suffix in <u> and </u> tags.
+     * This should underline starred names to show the preferred name.
+     *
+     * @param string $textSpan
+     * @param string $direction
+     *
+     * @return string
+     */
+    public static function starredName($textSpan, $direction) {
+        // To avoid a TCPDF bug that mixes up the word order, insert those <u> and </u> tags
+        // only when page and span directions are identical.
+        if ($direction === strtoupper(I18N::direction())) {
+            while (true) {
+                $starPos = strpos($textSpan, '*');
+                if ($starPos === false) {
+                    break;
+                }
+                $trailingText = substr($textSpan, $starPos + 1);
+                $textSpan     = substr($textSpan, 0, $starPos);
+                $wordStart    = strrpos($textSpan, ' '); // Find the start of the word
+                if ($wordStart !== false) {
+                    $leadingText = substr($textSpan, 0, $wordStart + 1);
+                    $wordText    = substr($textSpan, $wordStart + 1);
+                } else {
+                    $leadingText = '';
+                    $wordText    = $textSpan;
+                }
+                $textSpan = $leadingText . '<u>' . $wordText . '</u>' . $trailingText;
+            }
+            $textSpan = preg_replace('~<span class="starredname">(.*)</span>~', '<u>\1</u>', $textSpan);
+            // The &nbsp; is a work-around for a TCPDF bug eating blanks.
+            $textSpan = str_replace(array(' <u>', '</u> '), array('&nbsp;<u>', '</u>&nbsp;'), $textSpan);
+        } else {
+            // Text and page directions differ:  remove the <span> and </span>
+            $textSpan = preg_replace('~(.*)\*~', '\1', $textSpan);
+            $textSpan = preg_replace('~<span class="starredname">(.*)</span>~', '\1', $textSpan);
+        }
+
+        return $textSpan;
+    }
+
+    /**
+     * Get the next character from an input string
+     *
+     * @param string $text
+     * @param string $offset
+     *
+     * @return array
+     */
+    public static function getChar($text, $offset) {
+
+        if ($text == '') {
+            return array('letter' => '', 'length' => 0);
+        }
+
+        $char   = substr($text, $offset, 1);
+        $length = 1;
+        if ((ord($char) & 0xE0) == 0xC0) {
+            $length = 2;
+        }
+        if ((ord($char) & 0xF0) == 0xE0) {
+            $length = 3;
+        }
+        if ((ord($char) & 0xF8) == 0xF0) {
+            $length = 4;
+        }
+        $letter = substr($text, $offset, $length);
+
+        return array('letter' => $letter, 'length' => $length);
+    }
+
+    /**
+     * Insert <br> into current span
+     *
+     * @param string $result
+     */
+    public static function breakCurrentSpan(&$result) {
+        // Interrupt the current span, insert that <br>, and then continue the current span
+        $result .= self::$waitingText;
+        self::$waitingText = '';
+
+        $breakString = '<' . self::$currentState . 'br>';
+        $result .= $breakString;
+
+        return;
+    }
+
+    /**
+     * Begin current span
+     *
+     * @param string $result
+     */
+    public static function beginCurrentSpan(&$result) {
+        if (self::$currentState == 'LTR') {
+            $result .= self::$startLTR;
+        }
+        if (self::$currentState == 'RTL') {
+            $result .= self::$startRTL;
+        }
+
+        self::$posSpanStart = strlen($result);
+    }
+
+    /**
+     * Finish current span
+     *
+     * @param string $result
+     * @param bool $theEnd
+     */
+    public static function finishCurrentSpan(&$result, $theEnd = false) {
+        $textSpan = substr($result, self::$posSpanStart);
+        $result   = substr($result, 0, self::$posSpanStart);
+
+        // Get rid of empty spans, so that our check for presence of RTL will work
+        $result = str_replace(array(self::$startLTR . self::$endLTR, self::$startRTL . self::$endRTL), '', $result);
+
+        // Look for numeric strings that are times (hh:mm:ss). These have to be separated from surrounding numbers.
+        $tempResult = '';
+        while ($textSpan != '') {
+            $posColon = strpos($textSpan, ':');
+            if ($posColon === false) {
+                break;
+            } // No more possible time strings
+            $posLRE = strpos($textSpan, WT_UTF8_LRE);
+            if ($posLRE === false) {
+                break;
+            } // No more numeric strings
+            $posPDF = strpos($textSpan, WT_UTF8_PDF, $posLRE);
+            if ($posPDF === false) {
+                break;
+            } // No more numeric strings
+
+            $tempResult .= substr($textSpan, 0, $posLRE + 3); // Copy everything preceding the numeric string
+            $numericString = substr($textSpan, $posLRE + 3, $posPDF - $posLRE); // Separate the entire numeric string
+            $textSpan      = substr($textSpan, $posPDF + 3);
+            $posColon      = strpos($numericString, ':');
+            if ($posColon === false) {
+                // Nothing that looks like a time here
+                $tempResult .= $numericString;
+                continue;
+            }
+            $posBlank = strpos($numericString . ' ', ' ');
+            $posNbsp  = strpos($numericString . '&nbsp;', '&nbsp;');
+            if ($posBlank < $posNbsp) {
+                $posSeparator    = $posBlank;
+                $lengthSeparator = 1;
+            } else {
+                $posSeparator    = $posNbsp;
+                $lengthSeparator = 6;
+            }
+            if ($posColon > $posSeparator) {
+                // We have a time string preceded by a blank: Exclude that blank from the numeric string
+                $tempResult .= substr($numericString, 0, $posSeparator);
+                $tempResult .= WT_UTF8_PDF;
+                $tempResult .= substr($numericString, $posSeparator, $lengthSeparator);
+                $tempResult .= WT_UTF8_LRE;
+                $numericString = substr($numericString, $posSeparator + $lengthSeparator);
+            }
+
+            $posBlank = strpos($numericString, ' ');
+            $posNbsp  = strpos($numericString, '&nbsp;');
+            if ($posBlank === false && $posNbsp === false) {
+                // The time string isn't followed by a blank
+                $textSpan = $numericString . $textSpan;
+                continue;
+            }
+
+            // We have a time string followed by a blank: Exclude that blank from the numeric string
+            if ($posBlank === false) {
+                $posSeparator    = $posNbsp;
+                $lengthSeparator = 6;
+            } elseif ($posNbsp === false) {
+                $posSeparator    = $posBlank;
+                $lengthSeparator = 1;
+            } elseif ($posBlank < $posNbsp) {
+                $posSeparator    = $posBlank;
+                $lengthSeparator = 1;
+            } else {
+                $posSeparator    = $posNbsp;
+                $lengthSeparator = 6;
+            }
+            $tempResult .= substr($numericString, 0, $posSeparator);
+            $tempResult .= WT_UTF8_PDF;
+            $tempResult .= substr($numericString, $posSeparator, $lengthSeparator);
+            $posSeparator += $lengthSeparator;
+            $numericString = substr($numericString, $posSeparator);
+            $textSpan      = WT_UTF8_LRE . $numericString . $textSpan;
+        }
+        $textSpan       = $tempResult . $textSpan;
+        $trailingBlanks = '';
+        $trailingBreaks = '';
+
+        /* ****************************** LTR text handling ******************************** */
+
+        if (self::$currentState === 'LTR') {
+            // Move trailing numeric strings to the following RTL text. Include any blanks preceding or following the numeric text too.
+            if (I18N::direction() === 'rtl' && self::$previousState === 'RTL' && !$theEnd) {
+                $trailingString = '';
+                $savedSpan      = $textSpan;
+                while ($textSpan !== '') {
+                    // Look for trailing spaces and tentatively move them
+                    if (substr($textSpan, -1) === ' ') {
+                        $trailingString = ' ' . $trailingString;
+                        $textSpan       = substr($textSpan, 0, -1);
+                        continue;
+                    }
+                    if (substr($textSpan, -6) === '&nbsp;') {
+                        $trailingString = '&nbsp;' . $trailingString;
+                        $textSpan       = substr($textSpan, 0, -1);
+                        continue;
+                    }
+                    if (substr($textSpan, -3) !== WT_UTF8_PDF) {
+                        // There is no trailing numeric string
+                        $textSpan = $savedSpan;
+                        break;
+                    }
+
+                    // We have a numeric string
+                    $posStartNumber = strrpos($textSpan, WT_UTF8_LRE);
+                    if ($posStartNumber === false) {
+                        $posStartNumber = 0;
+                    }
+                    $trailingString = substr($textSpan, $posStartNumber, strlen($textSpan) - $posStartNumber) . $trailingString;
+                    $textSpan       = substr($textSpan, 0, $posStartNumber);
+
+                    // Look for more spaces and move them too
+                    while ($textSpan != '') {
+                        if (substr($textSpan, -1) == ' ') {
+                            $trailingString = ' ' . $trailingString;
+                            $textSpan       = substr($textSpan, 0, -1);
+                            continue;
+                        }
+                        if (substr($textSpan, -6) == '&nbsp;') {
+                            $trailingString = '&nbsp;' . $trailingString;
+                            $textSpan       = substr($textSpan, 0, -1);
+                            continue;
+                        }
+                        break;
+                    }
+
+                    self::$waitingText = $trailingString . self::$waitingText;
+                    break;
+                }
+            }
+
+            $savedSpan = $textSpan;
+            // Move any trailing <br>, optionally preceded or followed by blanks, outside this LTR span
+            while ($textSpan != '') {
+                if (substr($textSpan, -1) == ' ') {
+                    $trailingBlanks = ' ' . $trailingBlanks;
+                    $textSpan       = substr($textSpan, 0, -1);
+                    continue;
+                }
+                if (substr('......' . $textSpan, -6) == '&nbsp;') {
+                    $trailingBlanks = '&nbsp;' . $trailingBlanks;
+                    $textSpan       = substr($textSpan, 0, -6);
+                    continue;
+                }
+                break;
+            }
+            while (substr($textSpan, -9) == '<LTRbr>') {
+                $trailingBreaks = '<br>' . $trailingBreaks; // Plain <br> because it’s outside a span
+                $textSpan       = substr($textSpan, 0, -9);
+            }
+            if ($trailingBreaks != '') {
+                while ($textSpan != '') {
+                    if (substr($textSpan, -1) == ' ') {
+                        $trailingBreaks = ' ' . $trailingBreaks;
+                        $textSpan       = substr($textSpan, 0, -1);
+                        continue;
+                    }
+                    if (substr('......' . $textSpan, -6) == '&nbsp;') {
+                        $trailingBreaks = '&nbsp;' . $trailingBreaks;
+                        $textSpan       = substr($textSpan, 0, -6);
+                        continue;
+                    }
+                    break;
+                }
+                self::$waitingText = $trailingBlanks . self::$waitingText; // Put those trailing blanks inside the following span
+            } else {
+                $textSpan = $savedSpan;
+            }
+
+            $trailingBlanks      = '';
+            $trailingPunctuation = '';
+            $trailingID          = '';
+            $trailingSeparator   = '';
+            $leadingSeparator    = '';
+            while (I18N::direction() === 'rtl') {
+                if (strpos($result, self::$startRTL) !== false) {
+                    // Remove trailing blanks for inclusion in a separate LTR span
+                    while ($textSpan != '') {
+                        if (substr($textSpan, -1) === ' ') {
+                            $trailingBlanks = ' ' . $trailingBlanks;
+                            $textSpan       = substr($textSpan, 0, -1);
+                            continue;
+                        }
+                        if (substr($textSpan, -6) === '&nbsp;') {
+                            $trailingBlanks = '&nbsp;' . $trailingBlanks;
+                            $textSpan       = substr($textSpan, 0, -1);
+                            continue;
+                        }
+                        break;
+                    }
+
+                    // Remove trailing punctuation for inclusion in a separate LTR span
+                    if ($textSpan == '') {
+                        $trailingChar = "\n";
+                    } else {
+                        $trailingChar = substr($textSpan, -1);
+                    }
+                    if (strpos(self::PUNCTUATION, $trailingChar) !== false) {
+                        $trailingPunctuation = $trailingChar;
+                        $textSpan            = substr($textSpan, 0, -1);
+                    }
+                }
+
+                // Remove trailing ID numbers that look like "(xnnn)" for inclusion in a separate LTR span
+                while (true) {
+                    if (substr($textSpan, -1) != ')') {
+                        break;
+                    } // There is no trailing ')'
+                    $posLeftParen = strrpos($textSpan, '(');
+                    if ($posLeftParen === false) {
+                        break;
+                    } // There is no leading '('
+                    $temp = self::stripLrmRlm(substr($textSpan, $posLeftParen)); // Get rid of UTF8 control codes
+
+                    // If the parenthesized text doesn't look like an ID number,
+                    // we don't want to touch it.
+                    // This check won’t work if somebody uses ID numbers with an unusual format.
+                    $offset    = 1;
+                    $charArray = self::getChar($temp, $offset); // Get 1st character of parenthesized text
+                    if (strpos(self::NUMBERS, $charArray['letter']) !== false) {
+                        break;
+                    }
+                    $offset += $charArray['length']; // Point at 2nd character of parenthesized text
+                    if (strpos(self::NUMBERS, substr($temp, $offset, 1)) === false) {
+                        break;
+                    }
+                    // 1st character of parenthesized text is alpha, 2nd character is a digit; last has to be a digit too
+                    if (strpos(self::NUMBERS, substr($temp, -2, 1)) === false) {
+                        break;
+                    }
+
+                    $trailingID = substr($textSpan, $posLeftParen);
+                    $textSpan   = substr($textSpan, 0, $posLeftParen);
+                    break;
+                }
+
+                // Look for " - " or blank preceding the ID number and remove it for inclusion in a separate LTR span
+                if ($trailingID != '') {
+                    while ($textSpan != '') {
+                        if (substr($textSpan, -1) == ' ') {
+                            $trailingSeparator = ' ' . $trailingSeparator;
+                            $textSpan          = substr($textSpan, 0, -1);
+                            continue;
+                        }
+                        if (substr($textSpan, -6) == '&nbsp;') {
+                            $trailingSeparator = '&nbsp;' . $trailingSeparator;
+                            $textSpan          = substr($textSpan, 0, -6);
+                            continue;
+                        }
+                        if (substr($textSpan, -1) == '-') {
+                            $trailingSeparator = '-' . $trailingSeparator;
+                            $textSpan          = substr($textSpan, 0, -1);
+                            continue;
+                        }
+                        break;
+                    }
+                }
+
+                // Look for " - " preceding the text and remove it for inclusion in a separate LTR span
+                $foundSeparator = false;
+                $savedSpan      = $textSpan;
+                while ($textSpan != '') {
+                    if (substr($textSpan, 0, 1) == ' ') {
+                        $leadingSeparator = ' ' . $leadingSeparator;
+                        $textSpan         = substr($textSpan, 1);
+                        continue;
+                    }
+                    if (substr($textSpan, 0, 6) == '&nbsp;') {
+                        $leadingSeparator = '&nbsp;' . $leadingSeparator;
+                        $textSpan         = substr($textSpan, 6);
+                        continue;
+                    }
+                    if (substr($textSpan, 0, 1) == '-') {
+                        $leadingSeparator = '-' . $leadingSeparator;
+                        $textSpan         = substr($textSpan, 1);
+                        $foundSeparator   = true;
+                        continue;
+                    }
+                    break;
+                }
+                if (!$foundSeparator) {
+                    $textSpan         = $savedSpan;
+                    $leadingSeparator = '';
+                }
+                break;
+            }
+
+            // We're done: finish the span
+            $textSpan = self::starredName($textSpan, 'LTR'); // Wrap starred name in <u> and </u> tags
+            while (true) {
+                // Remove blanks that precede <LTRbr>
+                if (strpos($textSpan, ' <LTRbr>') !== false) {
+                    $textSpan = str_replace(' <LTRbr>', '<LTRbr>', $textSpan);
+                    continue;
+                }
+                if (strpos($textSpan, '&nbsp;<LTRbr>') !== false) {
+                    $textSpan = str_replace('&nbsp;<LTRbr>', '<LTRbr>', $textSpan);
+                    continue;
+                }
+                break;
+            }
+            if ($leadingSeparator != '') {
+                $result = $result . self::$startLTR . $leadingSeparator . self::$endLTR;
+            }
+            $result = $result . $textSpan . self::$endLTR;
+            if ($trailingSeparator != '') {
+                $result = $result . self::$startLTR . $trailingSeparator . self::$endLTR;
+            }
+            if ($trailingID != '') {
+                $result = $result . self::$startLTR . $trailingID . self::$endLTR;
+            }
+            if ($trailingPunctuation != '') {
+                $result = $result . self::$startLTR . $trailingPunctuation . self::$endLTR;
+            }
+            if ($trailingBlanks != '') {
+                $result = $result . self::$startLTR . $trailingBlanks . self::$endLTR;
+            }
+        }
+
+        /* ****************************** RTL text handling ******************************** */
+
+        if (self::$currentState == 'RTL') {
+            $savedSpan = $textSpan;
+
+            // Move any trailing <br>, optionally followed by blanks, outside this RTL span
+            while ($textSpan != '') {
+                if (substr($textSpan, -1) == ' ') {
+                    $trailingBlanks = ' ' . $trailingBlanks;
+                    $textSpan       = substr($textSpan, 0, -1);
+                    continue;
+                }
+                if (substr('......' . $textSpan, -6) == '&nbsp;') {
+                    $trailingBlanks = '&nbsp;' . $trailingBlanks;
+                    $textSpan       = substr($textSpan, 0, -6);
+                    continue;
+                }
+                break;
+            }
+            while (substr($textSpan, -9) == '<RTLbr>') {
+                $trailingBreaks = '<br>' . $trailingBreaks; // Plain <br> because it’s outside a span
+                $textSpan       = substr($textSpan, 0, -9);
+            }
+            if ($trailingBreaks != '') {
+                self::$waitingText = $trailingBlanks . self::$waitingText; // Put those trailing blanks inside the following span
+            } else {
+                $textSpan = $savedSpan;
+            }
+
+            // Move trailing numeric strings to the following LTR text. Include any blanks preceding or following the numeric text too.
+            if (!$theEnd && I18N::direction() !== 'rtl') {
+                $trailingString = '';
+                $savedSpan      = $textSpan;
+                while ($textSpan != '') {
+                    // Look for trailing spaces and tentatively move them
+                    if (substr($textSpan, -1) === ' ') {
+                        $trailingString = ' ' . $trailingString;
+                        $textSpan       = substr($textSpan, 0, -1);
+                        continue;
+                    }
+                    if (substr($textSpan, -6) === '&nbsp;') {
+                        $trailingString = '&nbsp;' . $trailingString;
+                        $textSpan       = substr($textSpan, 0, -1);
+                        continue;
+                    }
+                    if (substr($textSpan, -3) !== WT_UTF8_PDF) {
+                        // There is no trailing numeric string
+                        $textSpan = $savedSpan;
+                        break;
+                    }
+
+                    // We have a numeric string
+                    $posStartNumber = strrpos($textSpan, WT_UTF8_LRE);
+                    if ($posStartNumber === false) {
+                        $posStartNumber = 0;
+                    }
+                    $trailingString = substr($textSpan, $posStartNumber, strlen($textSpan) - $posStartNumber) . $trailingString;
+                    $textSpan       = substr($textSpan, 0, $posStartNumber);
+
+                    // Look for more spaces and move them too
+                    while ($textSpan != '') {
+                        if (substr($textSpan, -1) == ' ') {
+                            $trailingString = ' ' . $trailingString;
+                            $textSpan       = substr($textSpan, 0, -1);
+                            continue;
+                        }
+                        if (substr($textSpan, -6) == '&nbsp;') {
+                            $trailingString = '&nbsp;' . $trailingString;
+                            $textSpan       = substr($textSpan, 0, -1);
+                            continue;
+                        }
+                        break;
+                    }
+
+                    self::$waitingText = $trailingString . self::$waitingText;
+                    break;
+                }
+            }
+
+            // Trailing " - " needs to be prefixed to the following span
+            if (!$theEnd && substr('...' . $textSpan, -3) == ' - ') {
+                $textSpan          = substr($textSpan, 0, -3);
+                self::$waitingText = ' - ' . self::$waitingText;
+            }
+
+            while (I18N::direction() === 'rtl') {
+                // Look for " - " preceding <RTLbr> and relocate it to the front of the string
+                $posDashString = strpos($textSpan, ' - <RTLbr>');
+                if ($posDashString === false) {
+                    break;
+                }
+                $posStringStart = strrpos(substr($textSpan, 0, $posDashString), '<RTLbr>');
+                if ($posStringStart === false) {
+                    $posStringStart = 0;
+                } else {
+                    $posStringStart += 9;
+                } // Point to the first char following the last <RTLbr>
+
+                $textSpan = substr($textSpan, 0, $posStringStart) . ' - ' . substr($textSpan, $posStringStart, $posDashString - $posStringStart) . substr($textSpan, $posDashString + 3);
+            }
+
+            // Strip leading spaces from the RTL text
+            $countLeadingSpaces = 0;
+            while ($textSpan != '') {
+                if (substr($textSpan, 0, 1) == ' ') {
+                    $countLeadingSpaces++;
+                    $textSpan = substr($textSpan, 1);
+                    continue;
+                }
+                if (substr($textSpan, 0, 6) == '&nbsp;') {
+                    $countLeadingSpaces++;
+                    $textSpan = substr($textSpan, 6);
+                    continue;
+                }
+                break;
+            }
+
+            // Strip trailing spaces from the RTL text
+            $countTrailingSpaces = 0;
+            while ($textSpan != '') {
+                if (substr($textSpan, -1) == ' ') {
+                    $countTrailingSpaces++;
+                    $textSpan = substr($textSpan, 0, -1);
+                    continue;
+                }
+                if (substr($textSpan, -6) == '&nbsp;') {
+                    $countTrailingSpaces++;
+                    $textSpan = substr($textSpan, 0, -6);
+                    continue;
+                }
+                break;
+            }
+
+            // Look for trailing " -", reverse it, and relocate it to the front of the string
+            if (substr($textSpan, -2) === ' -') {
+                $posDashString  = strlen($textSpan) - 2;
+                $posStringStart = strrpos(substr($textSpan, 0, $posDashString), '<RTLbr>');
+                if ($posStringStart === false) {
+                    $posStringStart = 0;
+                } else {
+                    $posStringStart += 9;
+                } // Point to the first char following the last <RTLbr>
+
+                $textSpan = substr($textSpan, 0, $posStringStart) . '- ' . substr($textSpan, $posStringStart, $posDashString - $posStringStart) . substr($textSpan, $posDashString + 2);
+            }
+
+            if ($countLeadingSpaces != 0) {
+                $newLength = strlen($textSpan) + $countLeadingSpaces;
+                $textSpan  = str_pad($textSpan, $newLength, ' ', (I18N::direction() === 'rtl' ? STR_PAD_LEFT : STR_PAD_RIGHT));
+            }
+            if ($countTrailingSpaces != 0) {
+                if (I18N::direction() === 'ltr') {
+                    if ($trailingBreaks === '') {
+                        // Move trailing RTL spaces to front of following LTR span
+                        $newLength         = strlen(self::$waitingText) + $countTrailingSpaces;
+                        self::$waitingText = str_pad(self::$waitingText, $newLength, ' ', STR_PAD_LEFT);
+                    }
+                } else {
+                    $newLength = strlen($textSpan) + $countTrailingSpaces;
+                    $textSpan  = str_pad($textSpan, $newLength, ' ', STR_PAD_RIGHT);
+                }
+            }
+
+            // We're done: finish the span
+            $textSpan = self::starredName($textSpan, 'RTL'); // Wrap starred name in <u> and </u> tags
+            $result   = $result . $textSpan . self::$endRTL;
+        }
+
+        if (self::$currentState != 'LTR' && self::$currentState != 'RTL') {
+            $result = $result . $textSpan;
+        }
+
+        $result .= $trailingBreaks; // Get rid of any waiting <br>
+
+        return;
+    }
+
+    /**
+     * Wrap text, similar to the PHP wordwrap() function.
+     *
+     * @param string $string
+     * @param int $width
+     * @param string $sep
+     * @param bool $cut
+     *
+     * @return string
+     */
+    public static function utf8WordWrap($string, $width = 75, $sep = "\n", $cut = false) {
+        $out = '';
+        while ($string) {
+            if (mb_strlen($string) <= $width) {
+                // Do not wrap any text that is less than the output area.
+                $out .= $string;
+                $string = '';
+            } else {
+                $sub1 = mb_substr($string, 0, $width + 1);
+                if (mb_substr($string, mb_strlen($sub1) - 1, 1) == ' ') {
+                    // include words that end by a space immediately after the area.
+                    $sub = $sub1;
+                } else {
+                    $sub = mb_substr($string, 0, $width);
+                }
+                $spacepos = strrpos($sub, ' ');
+                if ($spacepos === false) {
+                    // No space on line?
+                    if ($cut) {
+                        $out .= $sub . $sep;
+                        $string = mb_substr($string, mb_strlen($sub));
+                    } else {
+                        $spacepos = strpos($string, ' ');
+                        if ($spacepos === false) {
+                            $out .= $string;
+                            $string = '';
+                        } else {
+                            $out .= substr($string, 0, $spacepos) . $sep;
+                            $string = substr($string, $spacepos + 1);
+                        }
+                    }
+                } else {
+                    // Split at space;
+                    $out .= substr($string, 0, $spacepos) . $sep;
+                    $string = substr($string, $spacepos + 1);
+                }
+            }
+        }
+
+        return $out;
+    }
 }

Switch Indentation +249 added lines, -249 removed lines

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

Braces +18 added lines, -9 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * RTL Functions for use in the PDF/HTML reports
  */
-class FunctionsRtl {
+class FunctionsRtl
+{
 	const OPEN_PARENTHESES = '([{';
 
 	const CLOSE_PARENTHESES = ')]}';
@@ -72,7 +73,8 @@ 
 	 *
 	 * @return string The input string, with ‎ and ‏ stripped
 	 */
-	public static function stripLrmRlm($inputText) {
+	public static function stripLrmRlm($inputText)
+	{
 		return str_replace(array(WT_UTF8_LRM, WT_UTF8_RLM, WT_UTF8_LRO, WT_UTF8_RLO, WT_UTF8_LRE, WT_UTF8_RLE, WT_UTF8_PDF, "‎", "‏", "‎", "‏"), "", $inputText);
 	}
 
@@ -86,7 +88,8 @@ 
 	 *
 	 * @return string The string with all texts encapsulated as required
 	 */
-	public static function spanLtrRtl($inputText, $direction = 'BOTH', $class = '') {
+	public static function spanLtrRtl($inputText, $direction = 'BOTH', $class = '')
+	{
 		if ($inputText == '') {
 			// Nothing to do
 			return '';
@@ -504,7 +507,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function starredName($textSpan, $direction) {
+	public static function starredName($textSpan, $direction)
+	{
 		// To avoid a TCPDF bug that mixes up the word order, insert those <u> and </u> tags
 		// only when page and span directions are identical.
 		if ($direction === strtoupper(I18N::direction())) {
@@ -545,7 +549,8 @@ 
 	 *
 	 * @return array
 	 */
-	public static function getChar($text, $offset) {
+	public static function getChar($text, $offset)
+	{
 
 		if ($text == '') {
 			return array('letter' => '', 'length' => 0);
@@ -572,7 +577,8 @@ 
 	 *
 	 * @param string $result
 	 */
-	public static function breakCurrentSpan(&$result) {
+	public static function breakCurrentSpan(&$result)
+	{
 		// Interrupt the current span, insert that <br>, and then continue the current span
 		$result .= self::$waitingText;
 		self::$waitingText = '';
@@ -588,7 +594,8 @@ 
 	 *
 	 * @param string $result
 	 */
-	public static function beginCurrentSpan(&$result) {
+	public static function beginCurrentSpan(&$result)
+	{
 		if (self::$currentState == 'LTR') {
 			$result .= self::$startLTR;
 		}
@@ -605,7 +612,8 @@ 
 	 * @param string $result
 	 * @param bool $theEnd
 	 */
-	public static function finishCurrentSpan(&$result, $theEnd = false) {
+	public static function finishCurrentSpan(&$result, $theEnd = false)
+	{
 		$textSpan = substr($result, self::$posSpanStart);
 		$result   = substr($result, 0, self::$posSpanStart);
 
@@ -1116,7 +1124,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function utf8WordWrap($string, $width = 75, $sep = "\n", $cut = false) {
+	public static function utf8WordWrap($string, $width = 75, $sep = "\n", $cut = false)
+	{
 		$out = '';
 		while ($string) {
 			if (mb_strlen($string) <= $width) {

app/Functions/FunctionsPrint.php

Indentation +750 added lines, -750 removed lines

@@ -40,607 +40,607 @@ 
  * Class FunctionsPrint - common functions
  */
 class FunctionsPrint {
-	/**
-	 * print the information for an individual chart box
-	 *
-	 * find and print a given individuals information for a pedigree chart
-	 *
-	 * @param Individual $person The person to print
-	 * @param int $show_full The style to print the box in, 0 for smaller boxes, 1 for larger boxes
-	 */
-	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;
-		}
-	}
-
-	/**
-	 * print a note record
-	 *
-	 * @param string $text
-	 * @param int $nlevel the level of the note record
-	 * @param string $nrec the note record to print
-	 * @param bool $textOnly Don't print the "Note: " introduction
-	 *
-	 * @return string
-	 */
-	public static function printNoteRecord($text, $nlevel, $nrec, $textOnly = false) {
-		global $WT_TREE;
-
-		$text .= Functions::getCont($nlevel, $nrec);
-
-		// Check if shared note (we have already checked that it exists)
-		if (preg_match('/^0 @(' . WT_REGEX_XREF . ')@ NOTE/', $nrec, $match)) {
-			$note  = Note::getInstance($match[1], $WT_TREE);
-			$label = 'SHARED_NOTE';
-			// If Census assistant installed, allow it to format the note
-			if (Module::getModuleByName('GEDFact_assistant')) {
-				$html = CensusAssistantModule::formatCensusNote($note);
-			} else {
-				$html = Filter::formatText($note->getNote(), $WT_TREE);
-			}
-		} else {
-			$note  = null;
-			$label = 'NOTE';
-			$html  = Filter::formatText($text, $WT_TREE);
-		}
-
-		if ($textOnly) {
-			return strip_tags($text);
-		}
-
-		if (strpos($text, "\n") === false) {
-			// A one-line note? strip the block-level tags, so it displays inline
-			return GedcomTag::getLabelValue($label, strip_tags($html, '<a><strong><em>'));
-		} elseif ($WT_TREE->getPreference('EXPAND_NOTES')) {
-			// A multi-line note, and we're expanding notes by default
-			return GedcomTag::getLabelValue($label, $html);
-		} else {
-			// A multi-line note, with an expand/collapse option
-			$element_id = Uuid::uuid4();
-			// NOTE: class "note-details" is (currently) used only by some third-party themes
-			if ($note) {
-				$first_line = '<a href="' . $note->getHtmlUrl() . '">' . $note->getFullName() . '</a>';
-			} else {
-				list($text) = explode("\n", strip_tags($html));
-				$first_line = strlen($text) > 100 ? mb_substr($text, 0, 100) . I18N::translate('…') : $text;
-			}
-
-			return
-				'<div class="fact_NOTE"><span class="label">' .
-				'<a href="#" onclick="expand_layer(\'' . $element_id . '\'); return false;"><i id="' . $element_id . '_img" class="icon-plus"></i></a> ' . GedcomTag::getLabel($label) . ':</span> ' . '<span id="' . $element_id . '-alt">' . $first_line . '</span>' .
-				'</div>' .
-				'<div class="note-details" id="' . $element_id . '" style="display:none">' . $html . '</div>';
-		}
-	}
-
-	/**
-	 * Print all of the notes in this fact record
-	 *
-	 * @param string $factrec The factrecord to print the notes from
-	 * @param int $level The level of the factrecord
-	 * @param bool $textOnly Don't print the "Note: " introduction
-	 *
-	 * @return string HTML
-	 */
-	public static function printFactNotes($factrec, $level, $textOnly = false) {
-		global $WT_TREE;
-
-		$data          = '';
-		$previous_spos = 0;
-		$nlevel        = $level + 1;
-		$ct            = preg_match_all("/$level NOTE (.*)/", $factrec, $match, PREG_SET_ORDER);
-		for ($j = 0; $j < $ct; $j++) {
-			$spos1 = strpos($factrec, $match[$j][0], $previous_spos);
-			$spos2 = strpos($factrec . "\n$level", "\n$level", $spos1 + 1);
-			if (!$spos2) {
-				$spos2 = strlen($factrec);
-			}
-			$previous_spos = $spos2;
-			$nrec          = substr($factrec, $spos1, $spos2 - $spos1);
-			if (!isset($match[$j][1])) {
-				$match[$j][1] = '';
-			}
-			if (!preg_match('/@(.*)@/', $match[$j][1], $nmatch)) {
-				$data .= self::printNoteRecord($match[$j][1], $nlevel, $nrec, $textOnly);
-			} else {
-				$note = Note::getInstance($nmatch[1], $WT_TREE);
-				if ($note) {
-					if ($note->canShow()) {
-						$noterec = $note->getGedcom();
-						$nt      = preg_match("/0 @$nmatch[1]@ NOTE (.*)/", $noterec, $n1match);
-						$data .= self::printNoteRecord(($nt > 0) ? $n1match[1] : "", 1, $noterec, $textOnly);
-						if (!$textOnly) {
-							if (strpos($noterec, '1 SOUR') !== false) {
-								$data .= FunctionsPrintFacts::printFactSources($noterec, 1);
-							}
-						}
-					}
-				} else {
-					$data = '<div class="fact_NOTE"><span class="label">' . I18N::translate('Note') . '</span>: <span class="field error">' . $nmatch[1] . '</span></div>';
-				}
-			}
-			if (!$textOnly) {
-				if (strpos($factrec, "$nlevel SOUR") !== false) {
-					$data .= "<div class=\"indent\">";
-					$data .= FunctionsPrintFacts::printFactSources($nrec, $nlevel);
-					$data .= "</div>";
-				}
-			}
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Print a link for a popup help window.
-	 *
-	 * @param string $help_topic
-	 * @param string $module
-	 *
-	 * @return string
-	 */
-	public static function helpLink($help_topic, $module = '') {
-		return '<span class="icon-help" onclick="helpDialog(\'' . $help_topic . '\',\'' . $module . '\'); return false;">&nbsp;</span>';
-	}
-
-	/**
-	 * Print an external help link to the wiki site.
-	 *
-	 * @deprecated - nothing should be so complicated that it needs lengthy instructions!
-	 *
-	 * @param string $topic
-	 *
-	 * @return string
-	 */
-	public static function wikiHelpLink($topic) {
-		return '<a class="help icon-wiki" href="' . WT_WEBTREES_WIKI . $topic . '" title="' . I18N::translate('webtrees wiki') . '"></a>';
-	}
-
-	/**
-	 * When a user has searched for text, highlight any matches in
-	 * the displayed string.
-	 *
-	 * @param string $string
-	 *
-	 * @return string
-	 */
-	public static function highlightSearchHits($string) {
-		global $controller;
-
-		if ($controller instanceof SearchController && $controller->query) {
-			// TODO: when a search contains multiple words, we search independently.
-			// e.g. searching for "FOO BAR" will find records containing both FOO and BAR.
-			// However, we only highlight the original search string, not the search terms.
-			// The controller needs to provide its "query_terms" array.
-			$regex = array();
-			foreach (array($controller->query) as $search_term) {
-				$regex[] = preg_quote($search_term, '/');
-			}
-			// Match these strings, provided they do not occur inside HTML tags
-			$regex = '(' . implode('|', $regex) . ')(?![^<]*>)';
-
-			return preg_replace('/' . $regex . '/i', '<span class="search_hit">$1</span>', $string);
-		} else {
-			return $string;
-		}
-	}
-
-	/**
-	 * Format age of parents in HTML
-	 *
-	 * @param Individual $person child
-	 * @param Date $birth_date
-	 *
-	 * @return string HTML
-	 */
-	public static function formatParentsAges(Individual $person, Date $birth_date) {
-		$html     = '';
-		$families = $person->getChildFamilies();
-		// Multiple sets of parents (e.g. adoption) cause complications, so ignore.
-		if ($birth_date->isOK() && count($families) == 1) {
-			$family = current($families);
-			foreach ($family->getSpouses() as $parent) {
-				if ($parent->getBirthDate()->isOK()) {
-					$sex      = $parent->getSexImage();
-					$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;
-					}
-				}
-			}
-			if ($html) {
-				$html = '<span class="age">' . $html . '</span>';
-			}
-		}
-
-		return $html;
-	}
-
-	/**
-	 * Print fact DATE/TIME
-	 *
-	 * @param Fact $event event containing the date/age
-	 * @param GedcomRecord $record the person (or couple) whose ages should be printed
-	 * @param bool $anchor option to print a link to calendar
-	 * @param bool $time option to print TIME value
-	 *
-	 * @return string
-	 */
-	public static function formatFactDate(Fact $event, GedcomRecord $record, $anchor, $time) {
-		global $pid;
-
-		$factrec = $event->getGedcom();
-		$html    = '';
-		// Recorded age
-		if (preg_match('/\n2 AGE (.+)/', $factrec, $match)) {
-			$fact_age = $match[1];
-		} else {
-			$fact_age = '';
-		}
-		if (preg_match('/\n2 HUSB\n3 AGE (.+)/', $factrec, $match)) {
-			$husb_age = $match[1];
-		} else {
-			$husb_age = '';
-		}
-		if (preg_match('/\n2 WIFE\n3 AGE (.+)/', $factrec, $match)) {
-			$wife_age = $match[1];
-		} else {
-			$wife_age = '';
-		}
-
-		// Calculated age
-		$fact = $event->getTag();
-		if (preg_match('/\n2 DATE (.+)/', $factrec, $match)) {
-			$date = new Date($match[1]);
-			$html .= ' ' . $date->display($anchor);
-			// time
-			if ($time && preg_match('/\n3 TIME (.+)/', $factrec, $match)) {
-				$html .= ' – <span class="date">' . $match[1] . '</span>';
-			}
-			if ($record instanceof Individual) {
-				if ($fact === 'BIRT' && $record->getTree()->getPreference('SHOW_PARENTS_AGE')) {
-					// age of parents at child birth
-					$html .= self::formatParentsAges($record, $date);
-				} elseif ($fact !== 'BIRT' && $fact !== 'CHAN' && $fact !== '_TODO') {
-					// age at event
-					$birth_date = $record->getBirthDate();
-					// Can't use getDeathDate(), as this also gives BURI/CREM events, which
-					// wouldn't give the correct "days after death" result for people with
-					// no DEAT.
-					$death_event = $record->getFirstFact('DEAT');
-					if ($death_event) {
-						$death_date = $death_event->getDate();
-					} else {
-						$death_date = new Date('');
-					}
-					$ageText = '';
-					if ((Date::compare($date, $death_date) <= 0 || !$record->isDead()) || $fact == 'DEAT') {
-						// Before death, print age
-						$age = Date::getAgeGedcom($birth_date, $date);
-						// Only show calculated age if it differs from recorded age
-						if ($age != '') {
-							if (
-								$fact_age != '' && $fact_age != $age ||
-								$fact_age == '' && $husb_age == '' && $wife_age == '' ||
-								$husb_age != '' && $record->getSex() == 'M' && $husb_age != $age ||
-								$wife_age != '' && $record->getSex() == 'F' && $wife_age != $age
-							) {
-								if ($age != "0d") {
-									$ageText = '(' . I18N::translate('Age') . ' ' . FunctionsDate::getAgeAtEvent($age) . ')';
-								}
-							}
-						}
-					}
-					if ($fact != 'DEAT' && Date::compare($date, $death_date) >= 0) {
-						// After death, print time since death
-						$age = FunctionsDate::getAgeAtEvent(Date::getAgeGedcom($death_date, $date));
-						if ($age != '') {
-							if (Date::getAgeGedcom($death_date, $date) == "0d") {
-								$ageText = '(' . I18N::translate('on the date of death') . ')';
-							} else {
-								$ageText = '(' . $age . ' ' . I18N::translate('after death') . ')';
-								// Family events which occur after death are probably errors
-								if ($event->getParent() instanceof Family) {
-									$ageText .= '<i class="icon-warning"></i>';
-								}
-							}
-						}
-					}
-					if ($ageText) {
-						$html .= ' <span class="age">' . $ageText . '</span>';
-					}
-				}
-			} elseif ($record instanceof Family) {
-				$indi = Individual::getInstance($pid, $record->getTree());
-				if ($indi) {
-					$birth_date = $indi->getBirthDate();
-					$death_date = $indi->getDeathDate();
-					$ageText    = '';
-					if (Date::compare($date, $death_date) <= 0) {
-						$age = Date::getAgeGedcom($birth_date, $date);
-						// Only show calculated age if it differs from recorded age
-						if ($age != '' && $age > 0) {
-							if (
-								$fact_age != '' && $fact_age != $age ||
-								$fact_age == '' && $husb_age == '' && $wife_age == '' ||
-								$husb_age != '' && $indi->getSex() == 'M' && $husb_age != $age ||
-								$wife_age != '' && $indi->getSex() == 'F' && $wife_age != $age
-							) {
-								$ageText = '(' . I18N::translate('Age') . ' ' . FunctionsDate::getAgeAtEvent($age) . ')';
-							}
-						}
-					}
-					if ($ageText) {
-						$html .= ' <span class="age">' . $ageText . '</span>';
-					}
-				}
-			}
-		} elseif (strpos($factrec, "\n2 PLAC ") === false && in_array($fact, Config::emptyFacts())) {
-			// There is no DATE.  If there is also no PLAC, then print "yes"
-			$html .= I18N::translate('yes');
-		}
-		// print gedcom ages
-		foreach (array(GedcomTag::getLabel('AGE') => $fact_age, GedcomTag::getLabel('HUSB') => $husb_age, GedcomTag::getLabel('WIFE') => $wife_age) as $label => $age) {
-			if ($age != '') {
-				$html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>';
-			}
-		}
-
-		return $html;
-	}
-
-	/**
-	 * print fact PLACe TEMPle STATus
-	 *
-	 * @param Fact $event gedcom fact record
-	 * @param bool $anchor to print a link to placelist
-	 * @param bool $sub_records to print place subrecords
-	 * @param bool $lds to print LDS TEMPle and STATus
-	 *
-	 * @return string HTML
-	 */
-	public static function formatFactPlace(Fact $event, $anchor = false, $sub_records = false, $lds = false) {
-		if ($anchor) {
-			// Show the full place name, for facts/events tab
-			$html = '<a href="' . $event->getPlace()->getURL() . '">' . $event->getPlace()->getFullName() . '</a>';
-		} else {
-			// Abbreviate the place name, for chart boxes
-			return $event->getPlace()->getShortName();
-		}
-
-		if ($sub_records) {
-			$placerec = Functions::getSubRecord(2, '2 PLAC', $event->getGedcom());
-			if (!empty($placerec)) {
-				if (preg_match_all('/\n3 (?:_HEB|ROMN) (.+)/', $placerec, $matches)) {
-					foreach ($matches[1] as $match) {
-						$wt_place = new Place($match, $event->getParent()->getTree());
-						$html .= ' - ' . $wt_place->getFullName();
-					}
-				}
-				$map_lati = "";
-				$cts      = preg_match('/\d LATI (.*)/', $placerec, $match);
-				if ($cts > 0) {
-					$map_lati = $match[1];
-					$html .= '<br><span class="label">' . GedcomTag::getLabel('LATI') . ': </span>' . $map_lati;
-				}
-				$map_long = '';
-				$cts      = preg_match('/\d LONG (.*)/', $placerec, $match);
-				if ($cts > 0) {
-					$map_long = $match[1];
-					$html .= ' <span class="label">' . GedcomTag::getLabel('LONG') . ': </span>' . $map_long;
-				}
-				if ($map_lati && $map_long) {
-					$map_lati = trim(strtr($map_lati, "NSEW,�", " - -. ")); // S5,6789 ==> -5.6789
-					$map_long = trim(strtr($map_long, "NSEW,�", " - -. ")); // E3.456� ==> 3.456
-					$html .= ' <a rel="nofollow" href="https://maps.google.com/maps?q=' . $map_lati . ',' . $map_long . '" class="icon-googlemaps" title="' . I18N::translate('Google Maps™') . '"></a>';
-					$html .= ' <a rel="nofollow" href="https://www.bing.com/maps/?lvl=15&cp=' . $map_lati . '~' . $map_long . '" class="icon-bing" title="' . I18N::translate('Bing Maps™') . '"></a>';
-					$html .= ' <a rel="nofollow" href="https://www.openstreetmap.org/#map=15/' . $map_lati . '/' . $map_long . '" class="icon-osm" title="' . I18N::translate('OpenStreetMap™') . '"></a>';
-				}
-				if (preg_match('/\d NOTE (.*)/', $placerec, $match)) {
-					$html .= '<br>' . self::printFactNotes($placerec, 3);
-				}
-			}
-		}
-		if ($lds) {
-			if (preg_match('/2 TEMP (.*)/', $event->getGedcom(), $match)) {
-				$html .= '<br>' . I18N::translate('LDS temple') . ': ' . GedcomCodeTemp::templeName($match[1]);
-			}
-			if (preg_match('/2 STAT (.*)/', $event->getGedcom(), $match)) {
-				$html .= '<br>' . I18N::translate('Status') . ': ' . GedcomCodeStat::statusName($match[1]);
-				if (preg_match('/3 DATE (.*)/', $event->getGedcom(), $match)) {
-					$date = new Date($match[1]);
-					$html .= ', ' . GedcomTag::getLabel('STAT:DATE') . ': ' . $date->display();
-				}
-			}
-		}
-
-		return $html;
-	}
-
-	/**
-	 * Check for facts that may exist only once for a certain record type.
-	 * If the fact already exists in the second array, delete it from the first one.
-	 *
-	 * @param string[] $uniquefacts
-	 * @param Fact[] $recfacts
-	 * @param string $type
-	 *
-	 * @return string[]
-	 */
-	public static function checkFactUnique($uniquefacts, $recfacts, $type) {
-		foreach ($recfacts as $factarray) {
-			$fact = false;
-			if (is_object($factarray)) {
-				$fact = $factarray->getTag();
-			} else {
-				if ($type === 'SOUR' || $type === 'REPO') {
-					$factrec = $factarray[0];
-				}
-				if ($type === 'FAM' || $type === 'INDI') {
-					$factrec = $factarray[1];
-				}
-
-				$ft = preg_match("/1 (\w+)(.*)/", $factrec, $match);
-				if ($ft > 0) {
-					$fact = trim($match[1]);
-				}
-			}
-			if ($fact !== false) {
-				$key = array_search($fact, $uniquefacts);
-				if ($key !== false) {
-					unset($uniquefacts[$key]);
-				}
-			}
-		}
-
-		return $uniquefacts;
-	}
-
-	/**
-	 * Print a new fact box on details pages
-	 *
-	 * @param string $id the id of the person, family, source etc the fact will be added to
-	 * @param array $usedfacts an array of facts already used in this record
-	 * @param string $type the type of record INDI, FAM, SOUR etc
-	 */
-	public static function printAddNewFact($id, $usedfacts, $type) {
-		global $WT_TREE;
-
-		// -- Add from clipboard
-		if (is_array(Session::get('clipboard'))) {
-			$newRow = true;
-			foreach (array_reverse(Session::get('clipboard'), true) as $fact_id => $fact) {
-				if ($fact["type"] == $type || $fact["type"] == 'all') {
-					if ($newRow) {
-						$newRow = false;
-						echo '<tr class="noprint"><td class="descriptionbox">';
-						echo I18N::translate('Add from clipboard'), '</td>';
-						echo '<td class="optionbox wrap"><form method="get" name="newFromClipboard" action="?" onsubmit="return false;">';
-						echo '<select id="newClipboardFact">';
-					}
-					echo '<option value="', Filter::escapeHtml($fact_id), '">', GedcomTag::getLabel($fact['fact']);
-					// TODO use the event class to store/parse the clipboard events
-					if (preg_match('/^2 DATE (.+)/m', $fact['factrec'], $match)) {
-						$tmp = new Date($match[1]);
-						echo '; ', $tmp->minimumDate()->format('%Y');
-					}
-					if (preg_match('/^2 PLAC ([^,\n]+)/m', $fact['factrec'], $match)) {
-						echo '; ', $match[1];
-					}
-					echo '</option>';
-				}
-			}
-			if (!$newRow) {
-				echo '</select>';
-				echo '&nbsp;&nbsp;<input type="button" value="', /* I18N: A button label. */ I18N::translate('add'), "\" onclick=\"return paste_fact('$id', '#newClipboardFact');\"> ";
-				echo '</form></td></tr>', "\n";
-			}
-		}
-
-		// -- 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;
-		}
-		$addfacts            = array_merge(self::checkFactUnique($uniquefacts, $usedfacts, $type), $addfacts);
-		$quickfacts          = array_intersect($quickfacts, $addfacts);
-		$translated_addfacts = array();
-		foreach ($addfacts as $addfact) {
-			$translated_addfacts[$addfact] = GedcomTag::getLabel($addfact);
-		}
-		uasort($translated_addfacts, function ($x, $y) {
-			return I18N::strcasecmp(I18N::translate($x), I18N::translate($y));
-		});
-		echo '<tr class="noprint"><td class="descriptionbox">';
-		echo I18N::translate('Fact or event');
-		echo '</td>';
-		echo '<td class="optionbox wrap">';
-		echo '<form method="get" name="newfactform" action="?" onsubmit="return false;">';
-		echo '<select id="newfact" name="newfact">';
-		echo '<option value="" disabled selected>' . I18N::translate('&lt;select&gt;') . '</option>';
-		foreach ($translated_addfacts as $fact => $fact_name) {
-			echo '<option value="', $fact, '">', $fact_name, '</option>';
-		}
-		if ($type == 'INDI' || $type == 'FAM') {
-			echo '<option value="FACT">', I18N::translate('Custom fact'), '</option>';
-			echo '<option value="EVEN">', I18N::translate('Custom event'), '</option>';
-		}
-		echo '</select>';
-		echo '<input type="button" value="', /* I18N: A button label. */ I18N::translate('add'), '" onclick="add_record(\'' . $id . '\', \'newfact\');">';
-		echo '<span class="quickfacts">';
-		foreach ($quickfacts as $fact) {
-			echo '<a href="#" onclick="add_new_record(\'' . $id . '\', \'' . $fact . '\');return false;">', GedcomTag::getLabel($fact), '</a>';
-		}
-		echo '</span></form>';
-		echo '</td></tr>';
-	}
-
-	/**
-	 * javascript declaration for calendar popup
-	 */
-	public static function initializeCalendarPopup() {
-		global $controller;
-
-		$controller->addInlineJavascript('
+    /**
+     * print the information for an individual chart box
+     *
+     * find and print a given individuals information for a pedigree chart
+     *
+     * @param Individual $person The person to print
+     * @param int $show_full The style to print the box in, 0 for smaller boxes, 1 for larger boxes
+     */
+    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;
+        }
+    }
+
+    /**
+     * print a note record
+     *
+     * @param string $text
+     * @param int $nlevel the level of the note record
+     * @param string $nrec the note record to print
+     * @param bool $textOnly Don't print the "Note: " introduction
+     *
+     * @return string
+     */
+    public static function printNoteRecord($text, $nlevel, $nrec, $textOnly = false) {
+        global $WT_TREE;
+
+        $text .= Functions::getCont($nlevel, $nrec);
+
+        // Check if shared note (we have already checked that it exists)
+        if (preg_match('/^0 @(' . WT_REGEX_XREF . ')@ NOTE/', $nrec, $match)) {
+            $note  = Note::getInstance($match[1], $WT_TREE);
+            $label = 'SHARED_NOTE';
+            // If Census assistant installed, allow it to format the note
+            if (Module::getModuleByName('GEDFact_assistant')) {
+                $html = CensusAssistantModule::formatCensusNote($note);
+            } else {
+                $html = Filter::formatText($note->getNote(), $WT_TREE);
+            }
+        } else {
+            $note  = null;
+            $label = 'NOTE';
+            $html  = Filter::formatText($text, $WT_TREE);
+        }
+
+        if ($textOnly) {
+            return strip_tags($text);
+        }
+
+        if (strpos($text, "\n") === false) {
+            // A one-line note? strip the block-level tags, so it displays inline
+            return GedcomTag::getLabelValue($label, strip_tags($html, '<a><strong><em>'));
+        } elseif ($WT_TREE->getPreference('EXPAND_NOTES')) {
+            // A multi-line note, and we're expanding notes by default
+            return GedcomTag::getLabelValue($label, $html);
+        } else {
+            // A multi-line note, with an expand/collapse option
+            $element_id = Uuid::uuid4();
+            // NOTE: class "note-details" is (currently) used only by some third-party themes
+            if ($note) {
+                $first_line = '<a href="' . $note->getHtmlUrl() . '">' . $note->getFullName() . '</a>';
+            } else {
+                list($text) = explode("\n", strip_tags($html));
+                $first_line = strlen($text) > 100 ? mb_substr($text, 0, 100) . I18N::translate('…') : $text;
+            }
+
+            return
+                '<div class="fact_NOTE"><span class="label">' .
+                '<a href="#" onclick="expand_layer(\'' . $element_id . '\'); return false;"><i id="' . $element_id . '_img" class="icon-plus"></i></a> ' . GedcomTag::getLabel($label) . ':</span> ' . '<span id="' . $element_id . '-alt">' . $first_line . '</span>' .
+                '</div>' .
+                '<div class="note-details" id="' . $element_id . '" style="display:none">' . $html . '</div>';
+        }
+    }
+
+    /**
+     * Print all of the notes in this fact record
+     *
+     * @param string $factrec The factrecord to print the notes from
+     * @param int $level The level of the factrecord
+     * @param bool $textOnly Don't print the "Note: " introduction
+     *
+     * @return string HTML
+     */
+    public static function printFactNotes($factrec, $level, $textOnly = false) {
+        global $WT_TREE;
+
+        $data          = '';
+        $previous_spos = 0;
+        $nlevel        = $level + 1;
+        $ct            = preg_match_all("/$level NOTE (.*)/", $factrec, $match, PREG_SET_ORDER);
+        for ($j = 0; $j < $ct; $j++) {
+            $spos1 = strpos($factrec, $match[$j][0], $previous_spos);
+            $spos2 = strpos($factrec . "\n$level", "\n$level", $spos1 + 1);
+            if (!$spos2) {
+                $spos2 = strlen($factrec);
+            }
+            $previous_spos = $spos2;
+            $nrec          = substr($factrec, $spos1, $spos2 - $spos1);
+            if (!isset($match[$j][1])) {
+                $match[$j][1] = '';
+            }
+            if (!preg_match('/@(.*)@/', $match[$j][1], $nmatch)) {
+                $data .= self::printNoteRecord($match[$j][1], $nlevel, $nrec, $textOnly);
+            } else {
+                $note = Note::getInstance($nmatch[1], $WT_TREE);
+                if ($note) {
+                    if ($note->canShow()) {
+                        $noterec = $note->getGedcom();
+                        $nt      = preg_match("/0 @$nmatch[1]@ NOTE (.*)/", $noterec, $n1match);
+                        $data .= self::printNoteRecord(($nt > 0) ? $n1match[1] : "", 1, $noterec, $textOnly);
+                        if (!$textOnly) {
+                            if (strpos($noterec, '1 SOUR') !== false) {
+                                $data .= FunctionsPrintFacts::printFactSources($noterec, 1);
+                            }
+                        }
+                    }
+                } else {
+                    $data = '<div class="fact_NOTE"><span class="label">' . I18N::translate('Note') . '</span>: <span class="field error">' . $nmatch[1] . '</span></div>';
+                }
+            }
+            if (!$textOnly) {
+                if (strpos($factrec, "$nlevel SOUR") !== false) {
+                    $data .= "<div class=\"indent\">";
+                    $data .= FunctionsPrintFacts::printFactSources($nrec, $nlevel);
+                    $data .= "</div>";
+                }
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Print a link for a popup help window.
+     *
+     * @param string $help_topic
+     * @param string $module
+     *
+     * @return string
+     */
+    public static function helpLink($help_topic, $module = '') {
+        return '<span class="icon-help" onclick="helpDialog(\'' . $help_topic . '\',\'' . $module . '\'); return false;">&nbsp;</span>';
+    }
+
+    /**
+     * Print an external help link to the wiki site.
+     *
+     * @deprecated - nothing should be so complicated that it needs lengthy instructions!
+     *
+     * @param string $topic
+     *
+     * @return string
+     */
+    public static function wikiHelpLink($topic) {
+        return '<a class="help icon-wiki" href="' . WT_WEBTREES_WIKI . $topic . '" title="' . I18N::translate('webtrees wiki') . '"></a>';
+    }
+
+    /**
+     * When a user has searched for text, highlight any matches in
+     * the displayed string.
+     *
+     * @param string $string
+     *
+     * @return string
+     */
+    public static function highlightSearchHits($string) {
+        global $controller;
+
+        if ($controller instanceof SearchController && $controller->query) {
+            // TODO: when a search contains multiple words, we search independently.
+            // e.g. searching for "FOO BAR" will find records containing both FOO and BAR.
+            // However, we only highlight the original search string, not the search terms.
+            // The controller needs to provide its "query_terms" array.
+            $regex = array();
+            foreach (array($controller->query) as $search_term) {
+                $regex[] = preg_quote($search_term, '/');
+            }
+            // Match these strings, provided they do not occur inside HTML tags
+            $regex = '(' . implode('|', $regex) . ')(?![^<]*>)';
+
+            return preg_replace('/' . $regex . '/i', '<span class="search_hit">$1</span>', $string);
+        } else {
+            return $string;
+        }
+    }
+
+    /**
+     * Format age of parents in HTML
+     *
+     * @param Individual $person child
+     * @param Date $birth_date
+     *
+     * @return string HTML
+     */
+    public static function formatParentsAges(Individual $person, Date $birth_date) {
+        $html     = '';
+        $families = $person->getChildFamilies();
+        // Multiple sets of parents (e.g. adoption) cause complications, so ignore.
+        if ($birth_date->isOK() && count($families) == 1) {
+            $family = current($families);
+            foreach ($family->getSpouses() as $parent) {
+                if ($parent->getBirthDate()->isOK()) {
+                    $sex      = $parent->getSexImage();
+                    $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;
+                    }
+                }
+            }
+            if ($html) {
+                $html = '<span class="age">' . $html . '</span>';
+            }
+        }
+
+        return $html;
+    }
+
+    /**
+     * Print fact DATE/TIME
+     *
+     * @param Fact $event event containing the date/age
+     * @param GedcomRecord $record the person (or couple) whose ages should be printed
+     * @param bool $anchor option to print a link to calendar
+     * @param bool $time option to print TIME value
+     *
+     * @return string
+     */
+    public static function formatFactDate(Fact $event, GedcomRecord $record, $anchor, $time) {
+        global $pid;
+
+        $factrec = $event->getGedcom();
+        $html    = '';
+        // Recorded age
+        if (preg_match('/\n2 AGE (.+)/', $factrec, $match)) {
+            $fact_age = $match[1];
+        } else {
+            $fact_age = '';
+        }
+        if (preg_match('/\n2 HUSB\n3 AGE (.+)/', $factrec, $match)) {
+            $husb_age = $match[1];
+        } else {
+            $husb_age = '';
+        }
+        if (preg_match('/\n2 WIFE\n3 AGE (.+)/', $factrec, $match)) {
+            $wife_age = $match[1];
+        } else {
+            $wife_age = '';
+        }
+
+        // Calculated age
+        $fact = $event->getTag();
+        if (preg_match('/\n2 DATE (.+)/', $factrec, $match)) {
+            $date = new Date($match[1]);
+            $html .= ' ' . $date->display($anchor);
+            // time
+            if ($time && preg_match('/\n3 TIME (.+)/', $factrec, $match)) {
+                $html .= ' – <span class="date">' . $match[1] . '</span>';
+            }
+            if ($record instanceof Individual) {
+                if ($fact === 'BIRT' && $record->getTree()->getPreference('SHOW_PARENTS_AGE')) {
+                    // age of parents at child birth
+                    $html .= self::formatParentsAges($record, $date);
+                } elseif ($fact !== 'BIRT' && $fact !== 'CHAN' && $fact !== '_TODO') {
+                    // age at event
+                    $birth_date = $record->getBirthDate();
+                    // Can't use getDeathDate(), as this also gives BURI/CREM events, which
+                    // wouldn't give the correct "days after death" result for people with
+                    // no DEAT.
+                    $death_event = $record->getFirstFact('DEAT');
+                    if ($death_event) {
+                        $death_date = $death_event->getDate();
+                    } else {
+                        $death_date = new Date('');
+                    }
+                    $ageText = '';
+                    if ((Date::compare($date, $death_date) <= 0 || !$record->isDead()) || $fact == 'DEAT') {
+                        // Before death, print age
+                        $age = Date::getAgeGedcom($birth_date, $date);
+                        // Only show calculated age if it differs from recorded age
+                        if ($age != '') {
+                            if (
+                                $fact_age != '' && $fact_age != $age ||
+                                $fact_age == '' && $husb_age == '' && $wife_age == '' ||
+                                $husb_age != '' && $record->getSex() == 'M' && $husb_age != $age ||
+                                $wife_age != '' && $record->getSex() == 'F' && $wife_age != $age
+                            ) {
+                                if ($age != "0d") {
+                                    $ageText = '(' . I18N::translate('Age') . ' ' . FunctionsDate::getAgeAtEvent($age) . ')';
+                                }
+                            }
+                        }
+                    }
+                    if ($fact != 'DEAT' && Date::compare($date, $death_date) >= 0) {
+                        // After death, print time since death
+                        $age = FunctionsDate::getAgeAtEvent(Date::getAgeGedcom($death_date, $date));
+                        if ($age != '') {
+                            if (Date::getAgeGedcom($death_date, $date) == "0d") {
+                                $ageText = '(' . I18N::translate('on the date of death') . ')';
+                            } else {
+                                $ageText = '(' . $age . ' ' . I18N::translate('after death') . ')';
+                                // Family events which occur after death are probably errors
+                                if ($event->getParent() instanceof Family) {
+                                    $ageText .= '<i class="icon-warning"></i>';
+                                }
+                            }
+                        }
+                    }
+                    if ($ageText) {
+                        $html .= ' <span class="age">' . $ageText . '</span>';
+                    }
+                }
+            } elseif ($record instanceof Family) {
+                $indi = Individual::getInstance($pid, $record->getTree());
+                if ($indi) {
+                    $birth_date = $indi->getBirthDate();
+                    $death_date = $indi->getDeathDate();
+                    $ageText    = '';
+                    if (Date::compare($date, $death_date) <= 0) {
+                        $age = Date::getAgeGedcom($birth_date, $date);
+                        // Only show calculated age if it differs from recorded age
+                        if ($age != '' && $age > 0) {
+                            if (
+                                $fact_age != '' && $fact_age != $age ||
+                                $fact_age == '' && $husb_age == '' && $wife_age == '' ||
+                                $husb_age != '' && $indi->getSex() == 'M' && $husb_age != $age ||
+                                $wife_age != '' && $indi->getSex() == 'F' && $wife_age != $age
+                            ) {
+                                $ageText = '(' . I18N::translate('Age') . ' ' . FunctionsDate::getAgeAtEvent($age) . ')';
+                            }
+                        }
+                    }
+                    if ($ageText) {
+                        $html .= ' <span class="age">' . $ageText . '</span>';
+                    }
+                }
+            }
+        } elseif (strpos($factrec, "\n2 PLAC ") === false && in_array($fact, Config::emptyFacts())) {
+            // There is no DATE.  If there is also no PLAC, then print "yes"
+            $html .= I18N::translate('yes');
+        }
+        // print gedcom ages
+        foreach (array(GedcomTag::getLabel('AGE') => $fact_age, GedcomTag::getLabel('HUSB') => $husb_age, GedcomTag::getLabel('WIFE') => $wife_age) as $label => $age) {
+            if ($age != '') {
+                $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>';
+            }
+        }
+
+        return $html;
+    }
+
+    /**
+     * print fact PLACe TEMPle STATus
+     *
+     * @param Fact $event gedcom fact record
+     * @param bool $anchor to print a link to placelist
+     * @param bool $sub_records to print place subrecords
+     * @param bool $lds to print LDS TEMPle and STATus
+     *
+     * @return string HTML
+     */
+    public static function formatFactPlace(Fact $event, $anchor = false, $sub_records = false, $lds = false) {
+        if ($anchor) {
+            // Show the full place name, for facts/events tab
+            $html = '<a href="' . $event->getPlace()->getURL() . '">' . $event->getPlace()->getFullName() . '</a>';
+        } else {
+            // Abbreviate the place name, for chart boxes
+            return $event->getPlace()->getShortName();
+        }
+
+        if ($sub_records) {
+            $placerec = Functions::getSubRecord(2, '2 PLAC', $event->getGedcom());
+            if (!empty($placerec)) {
+                if (preg_match_all('/\n3 (?:_HEB|ROMN) (.+)/', $placerec, $matches)) {
+                    foreach ($matches[1] as $match) {
+                        $wt_place = new Place($match, $event->getParent()->getTree());
+                        $html .= ' - ' . $wt_place->getFullName();
+                    }
+                }
+                $map_lati = "";
+                $cts      = preg_match('/\d LATI (.*)/', $placerec, $match);
+                if ($cts > 0) {
+                    $map_lati = $match[1];
+                    $html .= '<br><span class="label">' . GedcomTag::getLabel('LATI') . ': </span>' . $map_lati;
+                }
+                $map_long = '';
+                $cts      = preg_match('/\d LONG (.*)/', $placerec, $match);
+                if ($cts > 0) {
+                    $map_long = $match[1];
+                    $html .= ' <span class="label">' . GedcomTag::getLabel('LONG') . ': </span>' . $map_long;
+                }
+                if ($map_lati && $map_long) {
+                    $map_lati = trim(strtr($map_lati, "NSEW,�", " - -. ")); // S5,6789 ==> -5.6789
+                    $map_long = trim(strtr($map_long, "NSEW,�", " - -. ")); // E3.456� ==> 3.456
+                    $html .= ' <a rel="nofollow" href="https://maps.google.com/maps?q=' . $map_lati . ',' . $map_long . '" class="icon-googlemaps" title="' . I18N::translate('Google Maps™') . '"></a>';
+                    $html .= ' <a rel="nofollow" href="https://www.bing.com/maps/?lvl=15&cp=' . $map_lati . '~' . $map_long . '" class="icon-bing" title="' . I18N::translate('Bing Maps™') . '"></a>';
+                    $html .= ' <a rel="nofollow" href="https://www.openstreetmap.org/#map=15/' . $map_lati . '/' . $map_long . '" class="icon-osm" title="' . I18N::translate('OpenStreetMap™') . '"></a>';
+                }
+                if (preg_match('/\d NOTE (.*)/', $placerec, $match)) {
+                    $html .= '<br>' . self::printFactNotes($placerec, 3);
+                }
+            }
+        }
+        if ($lds) {
+            if (preg_match('/2 TEMP (.*)/', $event->getGedcom(), $match)) {
+                $html .= '<br>' . I18N::translate('LDS temple') . ': ' . GedcomCodeTemp::templeName($match[1]);
+            }
+            if (preg_match('/2 STAT (.*)/', $event->getGedcom(), $match)) {
+                $html .= '<br>' . I18N::translate('Status') . ': ' . GedcomCodeStat::statusName($match[1]);
+                if (preg_match('/3 DATE (.*)/', $event->getGedcom(), $match)) {
+                    $date = new Date($match[1]);
+                    $html .= ', ' . GedcomTag::getLabel('STAT:DATE') . ': ' . $date->display();
+                }
+            }
+        }
+
+        return $html;
+    }
+
+    /**
+     * Check for facts that may exist only once for a certain record type.
+     * If the fact already exists in the second array, delete it from the first one.
+     *
+     * @param string[] $uniquefacts
+     * @param Fact[] $recfacts
+     * @param string $type
+     *
+     * @return string[]
+     */
+    public static function checkFactUnique($uniquefacts, $recfacts, $type) {
+        foreach ($recfacts as $factarray) {
+            $fact = false;
+            if (is_object($factarray)) {
+                $fact = $factarray->getTag();
+            } else {
+                if ($type === 'SOUR' || $type === 'REPO') {
+                    $factrec = $factarray[0];
+                }
+                if ($type === 'FAM' || $type === 'INDI') {
+                    $factrec = $factarray[1];
+                }
+
+                $ft = preg_match("/1 (\w+)(.*)/", $factrec, $match);
+                if ($ft > 0) {
+                    $fact = trim($match[1]);
+                }
+            }
+            if ($fact !== false) {
+                $key = array_search($fact, $uniquefacts);
+                if ($key !== false) {
+                    unset($uniquefacts[$key]);
+                }
+            }
+        }
+
+        return $uniquefacts;
+    }
+
+    /**
+     * Print a new fact box on details pages
+     *
+     * @param string $id the id of the person, family, source etc the fact will be added to
+     * @param array $usedfacts an array of facts already used in this record
+     * @param string $type the type of record INDI, FAM, SOUR etc
+     */
+    public static function printAddNewFact($id, $usedfacts, $type) {
+        global $WT_TREE;
+
+        // -- Add from clipboard
+        if (is_array(Session::get('clipboard'))) {
+            $newRow = true;
+            foreach (array_reverse(Session::get('clipboard'), true) as $fact_id => $fact) {
+                if ($fact["type"] == $type || $fact["type"] == 'all') {
+                    if ($newRow) {
+                        $newRow = false;
+                        echo '<tr class="noprint"><td class="descriptionbox">';
+                        echo I18N::translate('Add from clipboard'), '</td>';
+                        echo '<td class="optionbox wrap"><form method="get" name="newFromClipboard" action="?" onsubmit="return false;">';
+                        echo '<select id="newClipboardFact">';
+                    }
+                    echo '<option value="', Filter::escapeHtml($fact_id), '">', GedcomTag::getLabel($fact['fact']);
+                    // TODO use the event class to store/parse the clipboard events
+                    if (preg_match('/^2 DATE (.+)/m', $fact['factrec'], $match)) {
+                        $tmp = new Date($match[1]);
+                        echo '; ', $tmp->minimumDate()->format('%Y');
+                    }
+                    if (preg_match('/^2 PLAC ([^,\n]+)/m', $fact['factrec'], $match)) {
+                        echo '; ', $match[1];
+                    }
+                    echo '</option>';
+                }
+            }
+            if (!$newRow) {
+                echo '</select>';
+                echo '&nbsp;&nbsp;<input type="button" value="', /* I18N: A button label. */ I18N::translate('add'), "\" onclick=\"return paste_fact('$id', '#newClipboardFact');\"> ";
+                echo '</form></td></tr>', "\n";
+            }
+        }
+
+        // -- 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;
+        }
+        $addfacts            = array_merge(self::checkFactUnique($uniquefacts, $usedfacts, $type), $addfacts);
+        $quickfacts          = array_intersect($quickfacts, $addfacts);
+        $translated_addfacts = array();
+        foreach ($addfacts as $addfact) {
+            $translated_addfacts[$addfact] = GedcomTag::getLabel($addfact);
+        }
+        uasort($translated_addfacts, function ($x, $y) {
+            return I18N::strcasecmp(I18N::translate($x), I18N::translate($y));
+        });
+        echo '<tr class="noprint"><td class="descriptionbox">';
+        echo I18N::translate('Fact or event');
+        echo '</td>';
+        echo '<td class="optionbox wrap">';
+        echo '<form method="get" name="newfactform" action="?" onsubmit="return false;">';
+        echo '<select id="newfact" name="newfact">';
+        echo '<option value="" disabled selected>' . I18N::translate('&lt;select&gt;') . '</option>';
+        foreach ($translated_addfacts as $fact => $fact_name) {
+            echo '<option value="', $fact, '">', $fact_name, '</option>';
+        }
+        if ($type == 'INDI' || $type == 'FAM') {
+            echo '<option value="FACT">', I18N::translate('Custom fact'), '</option>';
+            echo '<option value="EVEN">', I18N::translate('Custom event'), '</option>';
+        }
+        echo '</select>';
+        echo '<input type="button" value="', /* I18N: A button label. */ I18N::translate('add'), '" onclick="add_record(\'' . $id . '\', \'newfact\');">';
+        echo '<span class="quickfacts">';
+        foreach ($quickfacts as $fact) {
+            echo '<a href="#" onclick="add_new_record(\'' . $id . '\', \'' . $fact . '\');return false;">', GedcomTag::getLabel($fact), '</a>';
+        }
+        echo '</span></form>';
+        echo '</td></tr>';
+    }
+
+    /**
+     * javascript declaration for calendar popup
+     */
+    public static function initializeCalendarPopup() {
+        global $controller;
+
+        $controller->addInlineJavascript('
 			cal_setMonthNames(
 				"' . I18N::translateContext('NOMINATIVE', 'January') . '",
 				"' . I18N::translateContext('NOMINATIVE', 'February') . '",
@@ -666,153 +666,153 @@ 
 			)
 			cal_setWeekStart(' . I18N::firstDay() . ');
 		');
-	}
-
-	/**
-	 * HTML link to find an individual.
-	 *
-	 * @param string $element_id
-	 * @param string $indiname
-	 * @param Tree $tree
-	 *
-	 * @return string
-	 */
-	public static function printFindIndividualLink($element_id, $indiname = '', $tree = null) {
-		global $WT_TREE;
-
-		if ($tree === null) {
-			$tree = $WT_TREE;
-		}
-
-		return '<a href="#" onclick="findIndi(document.getElementById(\'' . $element_id . '\'), document.getElementById(\'' . $indiname . '\'), \'' . $tree->getNameHtml() . '\'); return false;" class="icon-button_indi" title="' . I18N::translate('Find an individual') . '"></a>';
-	}
-
-	/**
-	 * HTML link to find a place.
-	 *
-	 * @param string $element_id
-	 *
-	 * @return string
-	 */
-	public static function printFindPlaceLink($element_id) {
-		return '<a href="#" onclick="findPlace(document.getElementById(\'' . $element_id . '\'), WT_GEDCOM); return false;" class="icon-button_place" title="' . I18N::translate('Find a place') . '"></a>';
-	}
-
-	/**
-	 * HTML link to find a family.
-	 *
-	 * @param string $element_id
-	 *
-	 * @return string
-	 */
-	public static function printFindFamilyLink($element_id) {
-		return '<a href="#" onclick="findFamily(document.getElementById(\'' . $element_id . '\'), WT_GEDCOM); return false;" class="icon-button_family" title="' . I18N::translate('Find a family') . '"></a>';
-	}
-
-	/**
-	 * HTML link to open the special character window.
-	 *
-	 * @param string $element_id
-	 *
-	 * @return string
-	 */
-	public static function printSpecialCharacterLink($element_id) {
-		return '<span onclick="findSpecialChar(document.getElementById(\'' . $element_id . '\')); if (window.updatewholename) { updatewholename(); } return false;" class="icon-button_keyboard" title="' . I18N::translate('Find a special character') . '"></span>';
-	}
-
-	/**
-	 * HTML element to insert a value from a list.
-	 *
-	 * @param string $element_id
-	 * @param string[] $choices
-	 */
-	public static function printAutoPasteLink($element_id, $choices) {
-		echo '<small>';
-		foreach ($choices as $choice) {
-			echo '<span onclick="document.getElementById(\'', $element_id, '\').value=';
-			echo '\'', $choice, '\';';
-			echo " return false;\">", $choice, '</span> ';
-		}
-		echo '</small>';
-	}
-
-	/**
-	 * HTML link to find a source.
-	 *
-	 * @param string $element_id
-	 * @param string $sourcename
-	 *
-	 * @return string
-	 */
-	public static function printFindSourceLink($element_id, $sourcename = '') {
-		return '<a href="#" onclick="findSource(document.getElementById(\'' . $element_id . '\'), document.getElementById(\'' . $sourcename . '\'), WT_GEDCOM); return false;" class="icon-button_source" title="' . I18N::translate('Find a source') . '"></a>';
-	}
-
-	/**
-	 * HTML link to find a note.
-	 *
-	 * @param string $element_id
-	 * @param string $notename
-	 *
-	 * @return string
-	 */
-	public static function printFindNoteLink($element_id, $notename = '') {
-		return '<a href="#" onclick="findnote(document.getElementById(\'' . $element_id . '\'), document.getElementById(\'' . $notename . '\'), \'WT_GEDCOM\'); return false;" class="icon-button_find" title="' . I18N::translate('Find a shared note') . '"></a>';
-	}
-
-	/**
-	 * HTML link to find a repository.
-	 *
-	 * @param string $element_id
-	 *
-	 * @return string
-	 */
-	public static function printFindRepositoryLink($element_id) {
-		return '<a href="#" onclick="findRepository(document.getElementById(\'' . $element_id . '\'), WT_GEDCOM); return false;" class="icon-button_repository" title="' . I18N::translate('Find a repository') . '"></a>';
-	}
-
-	/**
-	 * HTML link to find a media object.
-	 *
-	 * @param string $element_id
-	 * @param string $choose
-	 *
-	 * @return string
-	 */
-	public static function printFindMediaLink($element_id, $choose = '') {
-		return '<a href="#" onclick="findMedia(document.getElementById(\'' . $element_id . '\'), \'' . $choose . '\', WT_GEDCOM); return false;" class="icon-button_media" title="' . I18N::translate('Find a media object') . '"></a>';
-	}
-
-	/**
-	 * HTML link to find a fact.
-	 *
-	 * @param string $element_id
-	 *
-	 * @return string
-	 */
-	public static function printFindFactLink($element_id) {
-		return '<a href="#" onclick="findFact(document.getElementById(\'' . $element_id . '\'), WT_GEDCOM); return false;" class="icon-button_find_facts" title="' . I18N::translate('Find a fact or event') . '"></a>';
-	}
-
-	/**
-	 * Summary of LDS ordinances.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return string
-	 */
-	public static function getLdsSummary(Individual $individual) {
-		$BAPL = $individual->getFacts('BAPL') ? 'B' : '_';
-		$ENDL = $individual->getFacts('ENDL') ? 'E' : '_';
-		$SLGC = $individual->getFacts('SLGC') ? 'C' : '_';
-		$SLGS = '_';
-
-		foreach ($individual->getSpouseFamilies() as $family) {
-			if ($family->getFacts('SLGS')) {
-				$SLGS = '';
-			}
-		}
-
-		return $BAPL . $ENDL . $SLGS . $SLGC;
-	}
+    }
+
+    /**
+     * HTML link to find an individual.
+     *
+     * @param string $element_id
+     * @param string $indiname
+     * @param Tree $tree
+     *
+     * @return string
+     */
+    public static function printFindIndividualLink($element_id, $indiname = '', $tree = null) {
+        global $WT_TREE;
+
+        if ($tree === null) {
+            $tree = $WT_TREE;
+        }
+
+        return '<a href="#" onclick="findIndi(document.getElementById(\'' . $element_id . '\'), document.getElementById(\'' . $indiname . '\'), \'' . $tree->getNameHtml() . '\'); return false;" class="icon-button_indi" title="' . I18N::translate('Find an individual') . '"></a>';
+    }
+
+    /**
+     * HTML link to find a place.
+     *
+     * @param string $element_id
+     *
+     * @return string
+     */
+    public static function printFindPlaceLink($element_id) {
+        return '<a href="#" onclick="findPlace(document.getElementById(\'' . $element_id . '\'), WT_GEDCOM); return false;" class="icon-button_place" title="' . I18N::translate('Find a place') . '"></a>';
+    }
+
+    /**
+     * HTML link to find a family.
+     *
+     * @param string $element_id
+     *
+     * @return string
+     */
+    public static function printFindFamilyLink($element_id) {
+        return '<a href="#" onclick="findFamily(document.getElementById(\'' . $element_id . '\'), WT_GEDCOM); return false;" class="icon-button_family" title="' . I18N::translate('Find a family') . '"></a>';
+    }
+
+    /**
+     * HTML link to open the special character window.
+     *
+     * @param string $element_id
+     *
+     * @return string
+     */
+    public static function printSpecialCharacterLink($element_id) {
+        return '<span onclick="findSpecialChar(document.getElementById(\'' . $element_id . '\')); if (window.updatewholename) { updatewholename(); } return false;" class="icon-button_keyboard" title="' . I18N::translate('Find a special character') . '"></span>';
+    }
+
+    /**
+     * HTML element to insert a value from a list.
+     *
+     * @param string $element_id
+     * @param string[] $choices
+     */
+    public static function printAutoPasteLink($element_id, $choices) {
+        echo '<small>';
+        foreach ($choices as $choice) {
+            echo '<span onclick="document.getElementById(\'', $element_id, '\').value=';
+            echo '\'', $choice, '\';';
+            echo " return false;\">", $choice, '</span> ';
+        }
+        echo '</small>';
+    }
+
+    /**
+     * HTML link to find a source.
+     *
+     * @param string $element_id
+     * @param string $sourcename
+     *
+     * @return string
+     */
+    public static function printFindSourceLink($element_id, $sourcename = '') {
+        return '<a href="#" onclick="findSource(document.getElementById(\'' . $element_id . '\'), document.getElementById(\'' . $sourcename . '\'), WT_GEDCOM); return false;" class="icon-button_source" title="' . I18N::translate('Find a source') . '"></a>';
+    }
+
+    /**
+     * HTML link to find a note.
+     *
+     * @param string $element_id
+     * @param string $notename
+     *
+     * @return string
+     */
+    public static function printFindNoteLink($element_id, $notename = '') {
+        return '<a href="#" onclick="findnote(document.getElementById(\'' . $element_id . '\'), document.getElementById(\'' . $notename . '\'), \'WT_GEDCOM\'); return false;" class="icon-button_find" title="' . I18N::translate('Find a shared note') . '"></a>';
+    }
+
+    /**
+     * HTML link to find a repository.
+     *
+     * @param string $element_id
+     *
+     * @return string
+     */
+    public static function printFindRepositoryLink($element_id) {
+        return '<a href="#" onclick="findRepository(document.getElementById(\'' . $element_id . '\'), WT_GEDCOM); return false;" class="icon-button_repository" title="' . I18N::translate('Find a repository') . '"></a>';
+    }
+
+    /**
+     * HTML link to find a media object.
+     *
+     * @param string $element_id
+     * @param string $choose
+     *
+     * @return string
+     */
+    public static function printFindMediaLink($element_id, $choose = '') {
+        return '<a href="#" onclick="findMedia(document.getElementById(\'' . $element_id . '\'), \'' . $choose . '\', WT_GEDCOM); return false;" class="icon-button_media" title="' . I18N::translate('Find a media object') . '"></a>';
+    }
+
+    /**
+     * HTML link to find a fact.
+     *
+     * @param string $element_id
+     *
+     * @return string
+     */
+    public static function printFindFactLink($element_id) {
+        return '<a href="#" onclick="findFact(document.getElementById(\'' . $element_id . '\'), WT_GEDCOM); return false;" class="icon-button_find_facts" title="' . I18N::translate('Find a fact or event') . '"></a>';
+    }
+
+    /**
+     * Summary of LDS ordinances.
+     *
+     * @param Individual $individual
+     *
+     * @return string
+     */
+    public static function getLdsSummary(Individual $individual) {
+        $BAPL = $individual->getFacts('BAPL') ? 'B' : '_';
+        $ENDL = $individual->getFacts('ENDL') ? 'E' : '_';
+        $SLGC = $individual->getFacts('SLGC') ? 'C' : '_';
+        $SLGS = '_';
+
+        foreach ($individual->getSpouseFamilies() as $family) {
+            if ($family->getFacts('SLGS')) {
+                $SLGS = '';
+            }
+        }
+
+        return $BAPL . $ENDL . $SLGS . $SLGC;
+    }
 }

Switch Indentation +60 added lines, -60 removed lines

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

Braces +48 added lines, -24 removed lines

@@ -39,7 +39,8 @@ 
 /**
  * Class FunctionsPrint - common functions
  */
-class FunctionsPrint {
+class FunctionsPrint
+{
 	/**
 	 * print the information for an individual chart box
 	 *
@@ -48,7 +49,8 @@ 
 	 * @param Individual $person The person to print
 	 * @param int $show_full The style to print the box in, 0 for smaller boxes, 1 for larger boxes
 	 */
-	public static function printPedigreePerson(Individual $person = null, $show_full = 1) {
+	public static function printPedigreePerson(Individual $person = null, $show_full = 1)
+	{
 
 		switch ($show_full) {
 		case 0:
@@ -78,7 +80,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function printNoteRecord($text, $nlevel, $nrec, $textOnly = false) {
+	public static function printNoteRecord($text, $nlevel, $nrec, $textOnly = false)
+	{
 		global $WT_TREE;
 
 		$text .= Functions::getCont($nlevel, $nrec);
@@ -137,7 +140,8 @@ 
 	 *
 	 * @return string HTML
 	 */
-	public static function printFactNotes($factrec, $level, $textOnly = false) {
+	public static function printFactNotes($factrec, $level, $textOnly = false)
+	{
 		global $WT_TREE;
 
 		$data          = '';
@@ -194,7 +198,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function helpLink($help_topic, $module = '') {
+	public static function helpLink($help_topic, $module = '')
+	{
 		return '<span class="icon-help" onclick="helpDialog(\'' . $help_topic . '\',\'' . $module . '\'); return false;">&nbsp;</span>';
 	}
 
@@ -207,7 +212,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function wikiHelpLink($topic) {
+	public static function wikiHelpLink($topic)
+	{
 		return '<a class="help icon-wiki" href="' . WT_WEBTREES_WIKI . $topic . '" title="' . I18N::translate('webtrees wiki') . '"></a>';
 	}
 
@@ -219,7 +225,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function highlightSearchHits($string) {
+	public static function highlightSearchHits($string)
+	{
 		global $controller;
 
 		if ($controller instanceof SearchController && $controller->query) {
@@ -248,7 +255,8 @@ 
 	 *
 	 * @return string HTML
 	 */
-	public static function formatParentsAges(Individual $person, Date $birth_date) {
+	public static function formatParentsAges(Individual $person, Date $birth_date)
+	{
 		$html     = '';
 		$families = $person->getChildFamilies();
 		// Multiple sets of parents (e.g. adoption) cause complications, so ignore.
@@ -300,7 +308,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function formatFactDate(Fact $event, GedcomRecord $record, $anchor, $time) {
+	public static function formatFactDate(Fact $event, GedcomRecord $record, $anchor, $time)
+	{
 		global $pid;
 
 		$factrec = $event->getGedcom();
@@ -433,7 +442,8 @@ 
 	 *
 	 * @return string HTML
 	 */
-	public static function formatFactPlace(Fact $event, $anchor = false, $sub_records = false, $lds = false) {
+	public static function formatFactPlace(Fact $event, $anchor = false, $sub_records = false, $lds = false)
+	{
 		if ($anchor) {
 			// Show the full place name, for facts/events tab
 			$html = '<a href="' . $event->getPlace()->getURL() . '">' . $event->getPlace()->getFullName() . '</a>';
@@ -501,7 +511,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public static function checkFactUnique($uniquefacts, $recfacts, $type) {
+	public static function checkFactUnique($uniquefacts, $recfacts, $type)
+	{
 		foreach ($recfacts as $factarray) {
 			$fact = false;
 			if (is_object($factarray)) {
@@ -537,7 +548,8 @@ 
 	 * @param array $usedfacts an array of facts already used in this record
 	 * @param string $type the type of record INDI, FAM, SOUR etc
 	 */
-	public static function printAddNewFact($id, $usedfacts, $type) {
+	public static function printAddNewFact($id, $usedfacts, $type)
+	{
 		global $WT_TREE;
 
 		// -- Add from clipboard
@@ -637,7 +649,8 @@ 
 	/**
 	 * javascript declaration for calendar popup
 	 */
-	public static function initializeCalendarPopup() {
+	public static function initializeCalendarPopup()
+	{
 		global $controller;
 
 		$controller->addInlineJavascript('
@@ -677,7 +690,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function printFindIndividualLink($element_id, $indiname = '', $tree = null) {
+	public static function printFindIndividualLink($element_id, $indiname = '', $tree = null)
+	{
 		global $WT_TREE;
 
 		if ($tree === null) {
@@ -694,7 +708,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function printFindPlaceLink($element_id) {
+	public static function printFindPlaceLink($element_id)
+	{
 		return '<a href="#" onclick="findPlace(document.getElementById(\'' . $element_id . '\'), WT_GEDCOM); return false;" class="icon-button_place" title="' . I18N::translate('Find a place') . '"></a>';
 	}
 
@@ -705,7 +720,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function printFindFamilyLink($element_id) {
+	public static function printFindFamilyLink($element_id)
+	{
 		return '<a href="#" onclick="findFamily(document.getElementById(\'' . $element_id . '\'), WT_GEDCOM); return false;" class="icon-button_family" title="' . I18N::translate('Find a family') . '"></a>';
 	}
 
@@ -716,7 +732,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function printSpecialCharacterLink($element_id) {
+	public static function printSpecialCharacterLink($element_id)
+	{
 		return '<span onclick="findSpecialChar(document.getElementById(\'' . $element_id . '\')); if (window.updatewholename) { updatewholename(); } return false;" class="icon-button_keyboard" title="' . I18N::translate('Find a special character') . '"></span>';
 	}
 
@@ -726,7 +743,8 @@ 
 	 * @param string $element_id
 	 * @param string[] $choices
 	 */
-	public static function printAutoPasteLink($element_id, $choices) {
+	public static function printAutoPasteLink($element_id, $choices)
+	{
 		echo '<small>';
 		foreach ($choices as $choice) {
 			echo '<span onclick="document.getElementById(\'', $element_id, '\').value=';
@@ -744,7 +762,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function printFindSourceLink($element_id, $sourcename = '') {
+	public static function printFindSourceLink($element_id, $sourcename = '')
+	{
 		return '<a href="#" onclick="findSource(document.getElementById(\'' . $element_id . '\'), document.getElementById(\'' . $sourcename . '\'), WT_GEDCOM); return false;" class="icon-button_source" title="' . I18N::translate('Find a source') . '"></a>';
 	}
 
@@ -756,7 +775,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function printFindNoteLink($element_id, $notename = '') {
+	public static function printFindNoteLink($element_id, $notename = '')
+	{
 		return '<a href="#" onclick="findnote(document.getElementById(\'' . $element_id . '\'), document.getElementById(\'' . $notename . '\'), \'WT_GEDCOM\'); return false;" class="icon-button_find" title="' . I18N::translate('Find a shared note') . '"></a>';
 	}
 
@@ -767,7 +787,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function printFindRepositoryLink($element_id) {
+	public static function printFindRepositoryLink($element_id)
+	{
 		return '<a href="#" onclick="findRepository(document.getElementById(\'' . $element_id . '\'), WT_GEDCOM); return false;" class="icon-button_repository" title="' . I18N::translate('Find a repository') . '"></a>';
 	}
 
@@ -779,7 +800,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function printFindMediaLink($element_id, $choose = '') {
+	public static function printFindMediaLink($element_id, $choose = '')
+	{
 		return '<a href="#" onclick="findMedia(document.getElementById(\'' . $element_id . '\'), \'' . $choose . '\', WT_GEDCOM); return false;" class="icon-button_media" title="' . I18N::translate('Find a media object') . '"></a>';
 	}
 
@@ -790,7 +812,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function printFindFactLink($element_id) {
+	public static function printFindFactLink($element_id)
+	{
 		return '<a href="#" onclick="findFact(document.getElementById(\'' . $element_id . '\'), WT_GEDCOM); return false;" class="icon-button_find_facts" title="' . I18N::translate('Find a fact or event') . '"></a>';
 	}
 
@@ -801,7 +824,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getLdsSummary(Individual $individual) {
+	public static function getLdsSummary(Individual $individual)
+	{
 		$BAPL = $individual->getFacts('BAPL') ? 'B' : '_';
 		$ENDL = $individual->getFacts('ENDL') ? 'E' : '_';
 		$SLGC = $individual->getFacts('SLGC') ? 'C' : '_';

app/Functions/FunctionsEdit.php

Indentation +1733 added lines, -1733 removed lines

@@ -53,953 +53,953 @@ 
  * Class FunctionsEdit - common functions
  */
 class FunctionsEdit {
-	/**
-	 * Create a <select> control for a form.
-	 *
-	 * @param string $name
-	 * @param string[] $values
-	 * @param string|null $empty
-	 * @param string $selected
-	 * @param string $extra
-	 *
-	 * @return string
-	 */
-	public static function selectEditControl($name, $values, $empty, $selected, $extra = '') {
-		if (is_null($empty)) {
-			$html = '';
-		} else {
-			if (empty($selected)) {
-				$html = '<option value="" selected>' . Filter::escapeHtml($empty) . '</option>';
-			} else {
-				$html = '<option value="">' . Filter::escapeHtml($empty) . '</option>';
-			}
-		}
-		// A completely empty list would be invalid, and break various things
-		if (empty($values) && empty($html)) {
-			$html = '<option value=""></option>';
-		}
-		foreach ($values as $key => $value) {
-			// PHP array keys are cast to integers!  Cast them back
-			if ((string) $key === (string) $selected) {
-				$html .= '<option value="' . Filter::escapeHtml($key) . '" selected dir="auto">' . Filter::escapeHtml($value) . '</option>';
-			} else {
-				$html .= '<option value="' . Filter::escapeHtml($key) . '" dir="auto">' . Filter::escapeHtml($value) . '</option>';
-			}
-		}
-		if (substr($name, -2) === '[]') {
-			// id attribute is not used for arrays
-			return '<select name="' . $name . '" ' . $extra . '>' . $html . '</select>';
-		} else {
-			return '<select id="' . $name . '" name="' . $name . '" ' . $extra . '>' . $html . '</select>';
-		}
-	}
-
-	/**
-	 * Create a set of radio buttons for a form
-	 *
-	 * @param string $name The ID for the form element
-	 * @param string[] $values Array of value=>display items
-	 * @param string $selected The currently selected item
-	 * @param string $extra Additional markup for the label
-	 *
-	 * @return string
-	 */
-	public static function radioButtons($name, $values, $selected, $extra = '') {
-		$html = '';
-		foreach ($values as $key => $value) {
-			$html .=
-				'<label ' . $extra . '>' .
-				'<input type="radio" name="' . $name . '" value="' . Filter::escapeHtml($key) . '"';
-			// PHP array keys are cast to integers!  Cast them back
-			if ((string) $key === (string) $selected) {
-				$html .= ' checked';
-			}
-			$html .= '>' . Filter::escapeHtml($value) . '</label>';
-		}
-
-		return $html;
-	}
-
-	/**
-	 * Print an edit control for a Yes/No field
-	 *
-	 * @param string $name
-	 * @param bool $selected
-	 * @param string $extra
-	 *
-	 * @return string
-	 */
-	public static function editFieldYesNo($name, $selected = false, $extra = '') {
-		return self::radioButtons(
-			$name, array(I18N::translate('no'), I18N::translate('yes')), $selected, $extra
-		);
-	}
-
-	/**
-	 * Print an edit control for a checkbox.
-	 *
-	 * @param string $name
-	 * @param bool $is_checked
-	 * @param string $extra
-	 *
-	 * @return string
-	 */
-	public static function checkbox($name, $is_checked = false, $extra = '') {
-		return '<input type="checkbox" name="' . $name . '" value="1" ' . ($is_checked ? 'checked ' : '') . $extra . '>';
-	}
-
-	/**
-	 * Print an edit control for a checkbox, with a hidden field to store one of the two states.
-	 * By default, a checkbox is either set, or not sent.
-	 * This function gives us a three options, set, unset or not sent.
-	 * Useful for dynamically generated forms where we don't know what elements are present.
-	 *
-	 * @param string $name
-	 * @param int $is_checked 0 or 1
-	 * @param string $extra
-	 *
-	 * @return string
-	 */
-	public static function twoStateCheckbox($name, $is_checked = 0, $extra = '') {
-		return
-			'<input type="hidden" id="' . $name . '" name="' . $name . '" value="' . ($is_checked ? 1 : 0) . '">' .
-			'<input type="checkbox" name="' . $name . '-GUI-ONLY" value="1"' .
-			($is_checked ? ' checked' : '') .
-			' onclick="document.getElementById(\'' . $name . '\').value=(this.checked?1:0);" ' . $extra . '>';
-	}
-
-	/**
-	 * Function edit_language_checkboxes
-	 *
-	 * @param string $parameter_name
-	 * @param array $accepted_languages
-	 *
-	 * @return string
-	 */
-	public static function editLanguageCheckboxes($parameter_name, $accepted_languages) {
-		$html = '';
-		foreach (I18N::activeLocales() as $locale) {
-			$html .= '<div class="checkbox">';
-			$html .= '<label title="' . $locale->languageTag() . '">';
-			$html .= '<input type="checkbox" name="' . $parameter_name . '[]" value="' . $locale->languageTag() . '"';
-			$html .= in_array($locale->languageTag(), $accepted_languages) ? ' checked>' : '>';
-			$html .= $locale->endonym();
-			$html .= '</label>';
-			$html .= '</div>';
-		}
-
-		return $html;
-	}
-
-	/**
-	 * Print an edit control for access level.
-	 *
-	 * @param string $name
-	 * @param string $selected
-	 * @param string $extra
-	 *
-	 * @return string
-	 */
-	public static function editFieldAccessLevel($name, $selected = '', $extra = '') {
-		$ACCESS_LEVEL = array(
-			Auth::PRIV_PRIVATE => I18N::translate('Show to visitors'),
-			Auth::PRIV_USER    => I18N::translate('Show to members'),
-			Auth::PRIV_NONE    => I18N::translate('Show to managers'),
-			Auth::PRIV_HIDE    => I18N::translate('Hide from everyone'),
-		);
-
-		return self::selectEditControl($name, $ACCESS_LEVEL, null, $selected, $extra);
-	}
-
-	/**
-	 * Print an edit control for a RESN field.
-	 *
-	 * @param string $name
-	 * @param string $selected
-	 * @param string $extra
-	 *
-	 * @return string
-	 */
-	public static function editFieldRestriction($name, $selected = '', $extra = '') {
-		$RESN = array(
-			''             => '',
-			'none'         => I18N::translate('Show to visitors'), // Not valid GEDCOM, but very useful
-			'privacy'      => I18N::translate('Show to members'),
-			'confidential' => I18N::translate('Show to managers'),
-			'locked'       => I18N::translate('Only managers can edit'),
-		);
-
-		return self::selectEditControl($name, $RESN, null, $selected, $extra);
-	}
-
-	/**
-	 * Print an edit control for a contact method field.
-	 *
-	 * @param string $name
-	 * @param string $selected
-	 * @param string $extra
-	 *
-	 * @return string
-	 */
-	public static function editFieldContact($name, $selected = '', $extra = '') {
-		// Different ways to contact the users
-		$CONTACT_METHODS = array(
-			'messaging'  => I18N::translate('Internal messaging'),
-			'messaging2' => I18N::translate('Internal messaging with emails'),
-			'messaging3' => I18N::translate('webtrees sends emails with no storage'),
-			'mailto'     => I18N::translate('Mailto link'),
-			'none'       => I18N::translate('No contact'),
-		);
-
-		return self::selectEditControl($name, $CONTACT_METHODS, null, $selected, $extra);
-	}
-
-	/**
-	 * Print an edit control for a language field.
-	 *
-	 * @param string $name
-	 * @param string $selected
-	 * @param string $extra
-	 *
-	 * @return string
-	 */
-	public static function editFieldLanguage($name, $selected = '', $extra = '') {
-		$languages = array();
-		foreach (I18N::activeLocales() as $locale) {
-			$languages[$locale->languageTag()] = $locale->endonym();
-		}
-
-		return self::selectEditControl($name, $languages, null, $selected, $extra);
-	}
-
-	/**
-	 * Print an edit control for a range of integers.
-	 *
-	 * @param string $name
-	 * @param string $selected
-	 * @param int $min
-	 * @param int $max
-	 * @param string $extra
-	 *
-	 * @return string
-	 */
-	public static function editFieldInteger($name, $selected = '', $min, $max, $extra = '') {
-		$array = array();
-		for ($i = $min; $i <= $max; ++$i) {
-			$array[$i] = I18N::number($i);
-		}
-
-		return self::selectEditControl($name, $array, null, $selected, $extra);
-	}
-
-	/**
-	 * Print an edit control for a username.
-	 *
-	 * @param string $name
-	 * @param string $selected
-	 * @param string $extra
-	 *
-	 * @return string
-	 */
-	public static function editFieldUsername($name, $selected = '', $extra = '') {
-		$users = array();
-		foreach (User::all() as $user) {
-			$users[$user->getUserName()] = $user->getRealName() . ' - ' . $user->getUserName();
-		}
-		// The currently selected user may not exist
-		if ($selected && !array_key_exists($selected, $users)) {
-			$users[$selected] = $selected;
-		}
-
-		return self::selectEditControl($name, $users, '-', $selected, $extra);
-	}
-
-	/**
-	 * Print an edit control for a ADOP field.
-	 *
-	 * @param string          $name
-	 * @param string          $selected
-	 * @param string          $extra
-	 * @param Individual|null $individual
-	 *
-	 * @return string
-	 */
-	public static function editFieldAdoption($name, $selected = '', $extra = '', Individual $individual = null) {
-		return self::selectEditControl($name, GedcomCodeAdop::getValues($individual), null, $selected, $extra);
-	}
-
-	/**
-	 * Print an edit control for a PEDI field.
-	 *
-	 * @param string          $name
-	 * @param string          $selected
-	 * @param string          $extra
-	 * @param Individual|null $individual
-	 *
-	 * @return string
-	 */
-	public static function editFieldPedigree($name, $selected = '', $extra = '', Individual $individual = null) {
-		return self::selectEditControl($name, GedcomCodePedi::getValues($individual), '', $selected, $extra);
-	}
-
-	/**
-	 * Print an edit control for a NAME TYPE field.
-	 *
-	 * @param string          $name
-	 * @param string          $selected
-	 * @param string          $extra
-	 * @param Individual|null $individual
-	 *
-	 * @return string
-	 */
-	public static function editFieldNameType($name, $selected = '', $extra = '', Individual $individual = null) {
-		return self::selectEditControl($name, GedcomCodeName::getValues($individual), '', $selected, $extra);
-	}
-
-	/**
-	 * Print an edit control for a RELA field.
-	 *
-	 * @param string $name
-	 * @param string $selected
-	 * @param string $extra
-	 *
-	 * @return string
-	 */
-	public static function editFieldRelationship($name, $selected = '', $extra = '') {
-		$rela_codes = GedcomCodeRela::getValues();
-		// The user is allowed to specify values that aren't in the list.
-		if (!array_key_exists($selected, $rela_codes)) {
-			$rela_codes[$selected] = I18N::translate($selected);
-		}
-
-		return self::selectEditControl($name, $rela_codes, '', $selected, $extra);
-	}
-
-	/**
-	 * Remove all links from $gedrec to $xref, and any sub-tags.
-	 *
-	 * @param string $gedrec
-	 * @param string $xref
-	 *
-	 * @return string
-	 */
-	public static function removeLinks($gedrec, $xref) {
-		$gedrec = preg_replace('/\n1 ' . WT_REGEX_TAG . ' @' . $xref . '@(\n[2-9].*)*/', '', $gedrec);
-		$gedrec = preg_replace('/\n2 ' . WT_REGEX_TAG . ' @' . $xref . '@(\n[3-9].*)*/', '', $gedrec);
-		$gedrec = preg_replace('/\n3 ' . WT_REGEX_TAG . ' @' . $xref . '@(\n[4-9].*)*/', '', $gedrec);
-		$gedrec = preg_replace('/\n4 ' . WT_REGEX_TAG . ' @' . $xref . '@(\n[5-9].*)*/', '', $gedrec);
-		$gedrec = preg_replace('/\n5 ' . WT_REGEX_TAG . ' @' . $xref . '@(\n[6-9].*)*/', '', $gedrec);
-
-		return $gedrec;
-	}
-
-	/**
-	 * Generates javascript code for calendar popup in user’s language.
-	 *
-	 * @param string $id
-	 *
-	 * @return string
-	 */
-	public static function printCalendarPopup($id) {
-		return
-			' <a href="#" onclick="cal_toggleDate(\'caldiv' . $id . '\', \'' . $id . '\'); return false;" class="icon-button_calendar" title="' . I18N::translate('Select a date') . '"></a>' .
-			'<div id="caldiv' . $id . '" style="position:absolute;visibility:hidden;background-color:white;z-index:1000;"></div>';
-	}
-
-	/**
-	 * An HTML link to create a new media object.
-	 *
-	 * @param string $element_id
-	 *
-	 * @return string
-	 */
-	public static function printAddNewMediaLink($element_id) {
-		return '<a href="#" onclick="pastefield=document.getElementById(\'' . $element_id . '\'); window.open(\'addmedia.php?action=showmediaform\', \'_blank\', edit_window_specs); return false;" class="icon-button_addmedia" title="' . I18N::translate('Create a media object') . '"></a>';
-	}
-
-	/**
-	 * An HTML link to create a new repository.
-	 *
-	 * @param string $element_id
-	 *
-	 * @return string
-	 */
-	public static function printAddNewRepositoryLink($element_id) {
-		return '<a href="#" onclick="addnewrepository(document.getElementById(\'' . $element_id . '\')); return false;" class="icon-button_addrepository" title="' . I18N::translate('Create a repository') . '"></a>';
-	}
-
-	/**
-	 * An HTML link to create a new note.
-	 *
-	 * @param string $element_id
-	 *
-	 * @return string
-	 */
-	public static function printAddNewNoteLink($element_id) {
-		return '<a href="#" onclick="addnewnote(document.getElementById(\'' . $element_id . '\')); return false;" class="icon-button_addnote" title="' . I18N::translate('Create a shared note') . '"></a>';
-	}
-
-	/**
-	 * An HTML link to edit a note.
-	 *
-	 * @param string $note_id
-	 *
-	 * @return string
-	 */
-	public static function printEditNoteLink($note_id) {
-		return '<a href="#" onclick="edit_note(\'' . $note_id . '\'); return false;" class="icon-button_note" title="' . I18N::translate('Edit the shared note') . '"></a>';
-	}
-
-	/**
-	 * An HTML link to create a new source.
-	 *
-	 * @param string $element_id
-	 *
-	 * @return string
-	 */
-	public static function printAddNewSourceLink($element_id) {
-		return '<a href="#" onclick="addnewsource(document.getElementById(\'' . $element_id . '\')); return false;" class="icon-button_addsource" title="' . I18N::translate('Create a source') . '"></a>';
-	}
-
-	/**
-	 * add a new tag input field
-	 *
-	 * called for each fact to be edited on a form.
-	 * Fact level=0 means a new empty form : data are POSTed by name
-	 * else data are POSTed using arrays :
-	 * glevels[] : tag level
-	 *  islink[] : tag is a link
-	 *     tag[] : tag name
-	 *    text[] : tag value
-	 *
-	 * @param string $tag fact record to edit (eg 2 DATE xxxxx)
-	 * @param string $upperlevel optional upper level tag (eg BIRT)
-	 * @param string $label An optional label to echo instead of the default
-	 * @param string $extra optional text to display after the input field
-	 * @param Individual $person For male/female translations
-	 *
-	 * @return string
-	 */
-	public static function addSimpleTag($tag, $upperlevel = '', $label = '', $extra = null, Individual $person = null) {
-		global $tags, $main_fact, $xref, $bdm, $action, $WT_TREE;
-
-		// Keep track of SOUR fields, so we can reference them in subsequent PAGE fields.
-		static $source_element_id;
-
-		$subnamefacts = array('NPFX', 'GIVN', 'SPFX', 'SURN', 'NSFX', '_MARNM_SURN');
-		preg_match('/^(?:(\d+) (' . WT_REGEX_TAG . ') ?(.*))/', $tag, $match);
-		list(, $level, $fact, $value) = $match;
-		$level                        = (int) $level;
-
-		// element name : used to POST data
-		if ($level === 0) {
-			if ($upperlevel) {
-				$element_name = $upperlevel . '_' . $fact;
-			} else {
-				$element_name = $fact;
-			}
-		} else {
-			$element_name = 'text[]';
-		}
-		if ($level === 1) {
-			$main_fact = $fact;
-		}
-
-		// element id : used by javascript functions
-		if ($level === 0) {
-			$element_id = $fact;
-		} else {
-			$element_id = $fact . Uuid::uuid4();
-		}
-		if ($upperlevel) {
-			$element_id = $upperlevel . '_' . $fact . Uuid::uuid4();
-		}
-
-		// field value
-		$islink = (substr($value, 0, 1) === '@' && substr($value, 0, 2) !== '@#');
-		if ($islink) {
-			$value = trim(substr($tag, strlen($fact) + 3), '@');
-		} else {
-			$value = (string) substr($tag, strlen($fact) + 3);
-		}
-		if ($fact === 'REPO' || $fact === 'SOUR' || $fact === 'OBJE' || $fact === 'FAMC') {
-			$islink = true;
-		}
-
-		if ($fact === 'SHARED_NOTE_EDIT' || $fact === 'SHARED_NOTE') {
-			$islink = true;
-			$fact   = 'NOTE';
-		}
-
-		// label
-		echo '<tr id="', $element_id, '_tr"';
-		if ($fact === 'DATA' || $fact === 'MAP' || ($fact === 'LATI' || $fact === 'LONG') && $value === '') {
-			echo ' style="display:none;"';
-		}
-		echo '>';
-
-		if (in_array($fact, $subnamefacts) || $fact === 'LATI' || $fact === 'LONG') {
-			echo '<td class="optionbox wrap width25">';
-		} else {
-			echo '<td class="descriptionbox wrap width25">';
-		}
-
-		// tag name
-		if ($label) {
-			echo $label;
-		} elseif ($upperlevel) {
-			echo GedcomTag::getLabel($upperlevel . ':' . $fact);
-		} else {
-			echo GedcomTag::getLabel($fact);
-		}
-
-		// If using GEDFact-assistant window
-		if ($action === 'addnewnote_assisted') {
-			// Do not print on GEDFact Assistant window
-		} else {
-			// Not all facts have help text.
-			switch ($fact) {
-			case 'NAME':
-				if ($upperlevel !== 'REPO' && $upperlevel !== 'UNKNOWN') {
-					echo FunctionsPrint::helpLink($fact);
-				}
-				break;
-			case 'DATE':
-			case 'PLAC':
-			case 'RESN':
-			case 'ROMN':
-			case 'SURN':
-			case '_HEB':
-				echo FunctionsPrint::helpLink($fact);
-				break;
-			}
-		}
-		// tag level
-		if ($level > 0) {
-			echo '<input type="hidden" name="glevels[]" value="', $level, '">';
-			echo '<input type="hidden" name="islink[]" value="', $islink, '">';
-			echo '<input type="hidden" name="tag[]" value="', $fact, '">';
-		}
-		echo '</td>';
-
-		// value
-		echo '<td class="optionbox wrap">';
-
-		// retrieve linked NOTE
-		if ($fact === 'NOTE' && $islink) {
-			$note1 = Note::getInstance($value, $WT_TREE);
-			if ($note1) {
-				$noterec = $note1->getGedcom();
-				preg_match('/' . $value . '/i', $noterec, $notematch);
-				$value = $notematch[0];
-			}
-		}
-
-		// Show names for spouses in MARR/HUSB/AGE and MARR/WIFE/AGE
-		if ($fact === 'HUSB' || $fact === 'WIFE') {
-			$family = Family::getInstance($xref, $WT_TREE);
-			if ($family) {
-				$spouse_link = $family->getFirstFact($fact);
-				if ($spouse_link) {
-					$spouse = $spouse_link->getTarget();
-					if ($spouse) {
-						echo $spouse->getFullName();
-					}
-				}
-			}
-		}
-
-		if (in_array($fact, Config::emptyFacts()) && ($value === '' || $value === 'Y' || $value === 'y')) {
-			echo '<input type="hidden" id="', $element_id, '" name="', $element_name, '" value="', $value, '">';
-			if ($level <= 1) {
-				echo '<input type="checkbox" ';
-				if ($value) {
-					echo 'checked';
-				}
-				echo ' onclick="document.getElementById(\'' . $element_id . '\').value = (this.checked) ? \'Y\' : \'\';">';
-				echo I18N::translate('yes');
-			}
-
-			if ($fact === 'CENS' && $value === 'Y') {
-				echo self::censusDateSelector(WT_LOCALE, $xref);
-				if (Module::getModuleByName('GEDFact_assistant') && GedcomRecord::getInstance($xref, $WT_TREE) instanceof Individual) {
-					echo
-						'<div></div><a href="#" style="display: none;" id="assistant-link" onclick="return activateCensusAssistant();">' .
-						I18N::translate('Create a shared note using the census assistant') .
-						'</a></div>';
-				}
-			}
-
-		} elseif ($fact === 'TEMP') {
-			echo self::selectEditControl($element_name, GedcomCodeTemp::templeNames(), I18N::translate('No temple - living ordinance'), $value);
-		} elseif ($fact === 'ADOP') {
-			echo self::editFieldAdoption($element_name, $value, '', $person);
-		} elseif ($fact === 'PEDI') {
-			echo self::editFieldPedigree($element_name, $value, '', $person);
-		} elseif ($fact === 'STAT') {
-			echo self::selectEditControl($element_name, GedcomCodeStat::statusNames($upperlevel), '', $value);
-		} elseif ($fact === 'RELA') {
-			echo self::editFieldRelationship($element_name, strtolower($value));
-		} elseif ($fact === 'QUAY') {
-			echo self::selectEditControl($element_name, GedcomCodeQuay::getValues(), '', $value);
-		} elseif ($fact === '_WT_USER') {
-			echo self::editFieldUsername($element_name, $value);
-		} elseif ($fact === 'RESN') {
-			echo self::editFieldRestriction($element_name, $value);
-		} elseif ($fact === '_PRIM') {
-			echo '<select id="', $element_id, '" name="', $element_name, '" >';
-			echo '<option value=""></option>';
-			echo '<option value="Y" ';
-			if ($value === 'Y') {
-				echo ' selected';
-			}
-			echo '>', /* I18N: option in list box “always use this image” */
-			I18N::translate('always'), '</option>';
-			echo '<option value="N" ';
-			if ($value === 'N') {
-				echo 'selected';
-			}
-			echo '>', /* I18N: option in list box “never use this image” */
-			I18N::translate('never'), '</option>';
-			echo '</select>';
-			echo '<p class="small text-muted">', I18N::translate('Use this image for charts and on the individual’s page.'), '</p>';
-		} elseif ($fact === 'SEX') {
-			echo '<select id="', $element_id, '" name="', $element_name, '"><option value="M" ';
-			if ($value === 'M') {
-				echo 'selected';
-			}
-			echo '>', I18N::translate('Male'), '</option><option value="F" ';
-			if ($value === 'F') {
-				echo 'selected';
-			}
-			echo '>', I18N::translate('Female'), '</option><option value="U" ';
-			if ($value === 'U' || empty($value)) {
-				echo 'selected';
-			}
-			echo '>', I18N::translateContext('unknown gender', 'Unknown'), '</option></select>';
-		} elseif ($fact === 'TYPE' && $level === 3) {
-			//-- Build the selector for the Media 'TYPE' Fact
-			echo '<select name="text[]"><option selected value="" ></option>';
-			$selectedValue = strtolower($value);
-			if (!array_key_exists($selectedValue, GedcomTag::getFileFormTypes())) {
-				echo '<option selected value="', Filter::escapeHtml($value), '" >', Filter::escapeHtml($value), '</option>';
-			}
-			foreach (GedcomTag::getFileFormTypes() as $typeName => $typeValue) {
-				echo '<option value="', $typeName, '" ';
-				if ($selectedValue === $typeName) {
-					echo 'selected';
-				}
-				echo '>', $typeValue, '</option>';
-			}
-			echo '</select>';
-		} elseif (($fact === 'NAME' && $upperlevel !== 'REPO' && $upperlevel !== 'UNKNOWN') || $fact === '_MARNM') {
-			// Populated in javascript from sub-tags
-			echo '<input type="hidden" id="', $element_id, '" name="', $element_name, '" onchange="updateTextName(\'', $element_id, '\');" value="', Filter::escapeHtml($value), '" class="', $fact, '">';
-			echo '<span id="', $element_id, '_display" dir="auto">', Filter::escapeHtml($value), '</span>';
-			echo ' <a href="#edit_name" onclick="convertHidden(\'', $element_id, '\'); return false;" class="icon-edit_indi" title="' . I18N::translate('Edit the name') . '"></a>';
-		} else {
-			// textarea
-			if ($fact === 'TEXT' || $fact === 'ADDR' || ($fact === 'NOTE' && !$islink)) {
-				echo '<textarea id="', $element_id, '" name="', $element_name, '" dir="auto">', Filter::escapeHtml($value), '</textarea><br>';
-			} else {
-				// text
-				// If using GEDFact-assistant window
-				if ($action === 'addnewnote_assisted') {
-					echo '<input type="text" id="', $element_id, '" name="', $element_name, '" value="', Filter::escapeHtml($value), '" style="width:4.1em;" dir="ltr"';
-				} else {
-					echo '<input type="text" id="', $element_id, '" name="', $element_name, '" value="', Filter::escapeHtml($value), '" dir="ltr"';
-				}
-				echo ' class="', $fact, '"';
-				if (in_array($fact, $subnamefacts)) {
-					echo ' onblur="updatewholename();" onkeyup="updatewholename();"';
-				}
-
-				// Extra markup for specific fact types
-				switch ($fact) {
-				case 'ALIA':
-				case 'ASSO':
-				case '_ASSO':
-					echo ' data-autocomplete-type="ASSO" data-autocomplete-extra="input.DATE"';
-					break;
-				case 'DATE':
-					echo ' onblur="valid_date(this);" onmouseout="valid_date(this);"';
-					break;
-				case 'GIVN':
-					echo ' autofocus data-autocomplete-type="GIVN"';
-					break;
-				case 'LATI':
-					echo ' onblur="valid_lati_long(this, \'N\', \'S\');" onmouseout="valid_lati_long(this, \'N\', \'S\');"';
-					break;
-				case 'LONG':
-					echo ' onblur="valid_lati_long(this, \'E\', \'W\');" onmouseout="valid_lati_long(this, \'E\', \'W\');"';
-					break;
-				case 'NOTE':
-					// Shared notes. Inline notes are handled elsewhere.
-					echo ' data-autocomplete-type="NOTE"';
-					break;
-				case 'OBJE':
-					echo ' data-autocomplete-type="OBJE"';
-					break;
-				case 'PAGE':
-					echo ' data-autocomplete-type="PAGE" data-autocomplete-extra="#' . $source_element_id . '"';
-					break;
-				case 'PLAC':
-					echo ' data-autocomplete-type="PLAC"';
-					break;
-				case 'REPO':
-					echo ' data-autocomplete-type="REPO"';
-					break;
-				case 'SOUR':
-					$source_element_id = $element_id;
-					echo ' data-autocomplete-type="SOUR"';
-					break;
-				case 'SURN':
-				case '_MARNM_SURN':
-					echo ' data-autocomplete-type="SURN"';
-					break;
-				case 'TIME':
-					echo ' pattern="([0-1][0-9]|2[0-3]):[0-5][0-9](:[0-5][0-9])?" dir="ltr" placeholder="' . /* I18N: Examples of valid time formats (hours:minutes:seconds) */
-						I18N::translate('hh:mm or hh:mm:ss') . '"';
-					break;
-				}
-				echo '>';
-			}
-
-			$tmp_array = array('TYPE', 'TIME', 'NOTE', 'SOUR', 'REPO', 'OBJE', 'ASSO', '_ASSO', 'AGE');
-
-			// split PLAC
-			if ($fact === 'PLAC') {
-				echo '<div id="', $element_id, '_pop" style="display: inline;">';
-				echo FunctionsPrint::printSpecialCharacterLink($element_id), ' ', FunctionsPrint::printFindPlaceLink($element_id);
-				echo '<span  onclick="jQuery(\'tr[id^=', $upperlevel, '_LATI],tr[id^=', $upperlevel, '_LONG],tr[id^=LATI],tr[id^=LONG]\').toggle(\'fast\'); return false;" class="icon-target" title="', GedcomTag::getLabel('LATI'), ' / ', GedcomTag::getLabel('LONG'), '"></span>';
-				echo '</div>';
-				if (Module::getModuleByName('places_assistant')) {
-					\PlacesAssistantModule::setup_place_subfields($element_id);
-					\PlacesAssistantModule::print_place_subfields($element_id);
-				}
-			} elseif (!in_array($fact, $tmp_array)) {
-				echo FunctionsPrint::printSpecialCharacterLink($element_id);
-			}
-		}
-		// MARRiage TYPE : hide text field and show a selection list
-		if ($fact === 'TYPE' && $level === 2 && $tags[0] === 'MARR') {
-			echo '<script>';
-			echo 'document.getElementById(\'', $element_id, '\').style.display=\'none\'';
-			echo '</script>';
-			echo '<select id="', $element_id, '_sel" onchange="document.getElementById(\'', $element_id, '\').value=this.value;" >';
-			foreach (array('Unknown', 'Civil', 'Religious', 'Partners') as $key) {
-				if ($key === 'Unknown') {
-					echo '<option value="" ';
-				} else {
-					echo '<option value="', $key, '" ';
-				}
-				$a = strtolower($key);
-				$b = strtolower($value);
-				if ($b !== '' && strpos($a, $b) !== false || strpos($b, $a) !== false) {
-					echo 'selected';
-				}
-				echo '>', GedcomTag::getLabel('MARR_' . strtoupper($key)), '</option>';
-			}
-			echo '</select>';
-		} elseif ($fact === 'TYPE' && $level === 0) {
-			// NAME TYPE : hide text field and show a selection list
-			$onchange = 'onchange="document.getElementById(\'' . $element_id . '\').value=this.value;"';
-			echo self::editFieldNameType($element_name, $value, $onchange, $person);
-			echo '<script>document.getElementById("', $element_id, '").style.display="none";</script>';
-		}
-
-		// popup links
-		switch ($fact) {
-		case 'DATE':
-			echo self::printCalendarPopup($element_id);
-			break;
-		case 'FAMC':
-		case 'FAMS':
-			echo FunctionsPrint::printFindFamilyLink($element_id);
-			break;
-		case 'ALIA':
-		case 'ASSO':
-		case '_ASSO':
-			echo FunctionsPrint::printFindIndividualLink($element_id, $element_id . '_description');
-			break;
-		case 'FILE':
-			FunctionsPrint::printFindMediaLink($element_id, '0file');
-			break;
-		case 'SOUR':
-			echo FunctionsPrint::printFindSourceLink($element_id, $element_id . '_description'), ' ', self::printAddNewSourceLink($element_id);
-			//-- checkboxes to apply '1 SOUR' to BIRT/MARR/DEAT as '2 SOUR'
-			if ($level === 1) {
-				echo '<br>';
-				switch ($WT_TREE->getPreference('PREFER_LEVEL2_SOURCES')) {
-				case '2': // records
-				$level1_checked = 'checked';
-				$level2_checked = '';
-				break;
-				case '1': // facts
-				$level1_checked = '';
-				$level2_checked = 'checked';
-				break;
-				case '0': // none
-				default:
-				$level1_checked = '';
-				$level2_checked = '';
-				break;
-				}
-					if (strpos($bdm, 'B') !== false) {
-						echo ' <label><input type="checkbox" name="SOUR_INDI" ', $level1_checked, ' value="1">', I18N::translate('Individual'), '</label>';
-						if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
-							foreach ($matches[1] as $match) {
-								if (!in_array($match, explode('|', WT_EVENTS_DEAT))) {
-									echo ' <label><input type="checkbox" name="SOUR_', $match, '" ', $level2_checked, ' value="1">', GedcomTag::getLabel($match), '</label>';
-								}
-							}
-						}
-					}
-					if (strpos($bdm, 'D') !== false) {
-						if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
-							foreach ($matches[1] as $match) {
-								if (in_array($match, explode('|', WT_EVENTS_DEAT))) {
-									echo ' <label><input type="checkbox" name="SOUR_', $match, '"', $level2_checked, ' value="1">', GedcomTag::getLabel($match), '</label>';
-								}
-							}
-						}
-					}
-					if (strpos($bdm, 'M') !== false) {
-						echo ' <label><input type="checkbox" name="SOUR_FAM" ', $level1_checked, ' value="1">', I18N::translate('Family'), '</label>';
-						if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('QUICK_REQUIRED_FAMFACTS'), $matches)) {
-							foreach ($matches[1] as $match) {
-								echo ' <label><input type="checkbox" name="SOUR_', $match, '"', $level2_checked, ' value="1">', GedcomTag::getLabel($match), '</label>';
-							}
-						}
-					}
-				}
-				break;
-		case 'REPO':
-			echo FunctionsPrint::printFindRepositoryLink($element_id), ' ', self::printAddNewRepositoryLink($element_id);
-			break;
-		case 'NOTE':
-			// Shared Notes Icons ========================================
-			if ($islink) {
-				// Print regular Shared Note icons ---------------------------
-				echo ' ', FunctionsPrint::printFindNoteLink($element_id, $element_id . '_description'), ' ', self::printAddNewNoteLink($element_id);
-				if ($value) {
-					echo ' ', self::printEditNoteLink($value);
-				}
-			}
-			break;
-		case 'OBJE':
-			echo FunctionsPrint::printFindMediaLink($element_id, '1media');
-			if (!$value) {
-				echo ' ', self::printAddNewMediaLink($element_id);
-				$value = 'new';
-			}
-			break;
-		}
-
-		echo '<div id="' . $element_id . '_description">';
-
-		// current value
-		if ($fact === 'DATE') {
-			$date = new Date($value);
-			echo $date->display();
-		}
-		if (($fact === 'ASSO' || $fact === '_ASSO') && $value === '') {
-			if ($level === 1) {
-				echo '<p class="small text-muted">' . I18N::translate('An associate is another individual who was involved with this individual, such as a friend or an employer.') . '</p>';
-			} else {
-				echo '<p class="small text-muted">' . I18N::translate('An associate is another individual who was involved with this fact or event, such as a witness or a priest.') . '</p>';
-			}
-		}
-
-		if ($value && $value !== 'new' && $islink) {
-			switch ($fact) {
-			case 'ALIA':
-			case 'ASSO':
-			case '_ASSO':
-				$tmp = Individual::getInstance($value, $WT_TREE);
-				if ($tmp) {
-					echo ' ', $tmp->getFullName();
-				}
-				break;
-			case 'SOUR':
-				$tmp = Source::getInstance($value, $WT_TREE);
-				if ($tmp) {
-					echo ' ', $tmp->getFullName();
-				}
-				break;
-			case 'NOTE':
-				$tmp = Note::getInstance($value, $WT_TREE);
-				if ($tmp) {
-					echo ' ', $tmp->getFullName();
-				}
-				break;
-			case 'OBJE':
-				$tmp = Media::getInstance($value, $WT_TREE);
-				if ($tmp) {
-					echo ' ', $tmp->getFullName();
-				}
-				break;
-			case 'REPO':
-				$tmp = Repository::getInstance($value, $WT_TREE);
-				if ($tmp) {
-					echo ' ', $tmp->getFullName();
-				}
-				break;
-			}
-		}
-
-		// pastable values
-		if ($fact === 'FORM' && $upperlevel === 'OBJE') {
-			FunctionsPrint::printAutoPasteLink($element_id, Config::fileFormats());
-		}
-		echo '</div>', $extra, '</td></tr>';
-
-		return $element_id;
-	}
-
-	/**
-	 * Genearate a <select> element, with the dates/places of all known censuses
-	 *
-	 *
-	 * @param string $locale - Sort the censuses for this locale
-	 * @param string $xref   - The individual for whom we are adding a census
-	 */
-	public static function censusDateSelector($locale, $xref) {
-		global $controller;
-
-		// Show more likely census details at the top of the list.
-		switch (WT_LOCALE) {
-		case 'cs':
-			$census_places = array(new CensusOfCzechRepublic);
-			break;
-		case 'en-AU':
-		case 'en-GB':
-			$census_places = array(new CensusOfEngland, new CensusOfWales, new CensusOfScotland);
-			break;
-		case 'en-US':
-			$census_places = array(new CensusOfUnitedStates);
-			break;
-		case 'fr':
-		case 'fr-CA':
-			$census_places = array(new CensusOfFrance);
-			break;
-		case 'da':
-			$census_places = array(new CensusOfDenmark);
-			break;
-		case 'de':
-			$census_places = array(new CensusOfDeutschland);
-			break;
-		default:
-			$census_places = array();
-			break;
-		}
-		foreach (Census::allCensusPlaces() as $census_place) {
-			if (!in_array($census_place, $census_places)) {
-				$census_places[] = $census_place;
-			}
-		}
-
-		$controller->addInlineJavascript('
+    /**
+     * Create a <select> control for a form.
+     *
+     * @param string $name
+     * @param string[] $values
+     * @param string|null $empty
+     * @param string $selected
+     * @param string $extra
+     *
+     * @return string
+     */
+    public static function selectEditControl($name, $values, $empty, $selected, $extra = '') {
+        if (is_null($empty)) {
+            $html = '';
+        } else {
+            if (empty($selected)) {
+                $html = '<option value="" selected>' . Filter::escapeHtml($empty) . '</option>';
+            } else {
+                $html = '<option value="">' . Filter::escapeHtml($empty) . '</option>';
+            }
+        }
+        // A completely empty list would be invalid, and break various things
+        if (empty($values) && empty($html)) {
+            $html = '<option value=""></option>';
+        }
+        foreach ($values as $key => $value) {
+            // PHP array keys are cast to integers!  Cast them back
+            if ((string) $key === (string) $selected) {
+                $html .= '<option value="' . Filter::escapeHtml($key) . '" selected dir="auto">' . Filter::escapeHtml($value) . '</option>';
+            } else {
+                $html .= '<option value="' . Filter::escapeHtml($key) . '" dir="auto">' . Filter::escapeHtml($value) . '</option>';
+            }
+        }
+        if (substr($name, -2) === '[]') {
+            // id attribute is not used for arrays
+            return '<select name="' . $name . '" ' . $extra . '>' . $html . '</select>';
+        } else {
+            return '<select id="' . $name . '" name="' . $name . '" ' . $extra . '>' . $html . '</select>';
+        }
+    }
+
+    /**
+     * Create a set of radio buttons for a form
+     *
+     * @param string $name The ID for the form element
+     * @param string[] $values Array of value=>display items
+     * @param string $selected The currently selected item
+     * @param string $extra Additional markup for the label
+     *
+     * @return string
+     */
+    public static function radioButtons($name, $values, $selected, $extra = '') {
+        $html = '';
+        foreach ($values as $key => $value) {
+            $html .=
+                '<label ' . $extra . '>' .
+                '<input type="radio" name="' . $name . '" value="' . Filter::escapeHtml($key) . '"';
+            // PHP array keys are cast to integers!  Cast them back
+            if ((string) $key === (string) $selected) {
+                $html .= ' checked';
+            }
+            $html .= '>' . Filter::escapeHtml($value) . '</label>';
+        }
+
+        return $html;
+    }
+
+    /**
+     * Print an edit control for a Yes/No field
+     *
+     * @param string $name
+     * @param bool $selected
+     * @param string $extra
+     *
+     * @return string
+     */
+    public static function editFieldYesNo($name, $selected = false, $extra = '') {
+        return self::radioButtons(
+            $name, array(I18N::translate('no'), I18N::translate('yes')), $selected, $extra
+        );
+    }
+
+    /**
+     * Print an edit control for a checkbox.
+     *
+     * @param string $name
+     * @param bool $is_checked
+     * @param string $extra
+     *
+     * @return string
+     */
+    public static function checkbox($name, $is_checked = false, $extra = '') {
+        return '<input type="checkbox" name="' . $name . '" value="1" ' . ($is_checked ? 'checked ' : '') . $extra . '>';
+    }
+
+    /**
+     * Print an edit control for a checkbox, with a hidden field to store one of the two states.
+     * By default, a checkbox is either set, or not sent.
+     * This function gives us a three options, set, unset or not sent.
+     * Useful for dynamically generated forms where we don't know what elements are present.
+     *
+     * @param string $name
+     * @param int $is_checked 0 or 1
+     * @param string $extra
+     *
+     * @return string
+     */
+    public static function twoStateCheckbox($name, $is_checked = 0, $extra = '') {
+        return
+            '<input type="hidden" id="' . $name . '" name="' . $name . '" value="' . ($is_checked ? 1 : 0) . '">' .
+            '<input type="checkbox" name="' . $name . '-GUI-ONLY" value="1"' .
+            ($is_checked ? ' checked' : '') .
+            ' onclick="document.getElementById(\'' . $name . '\').value=(this.checked?1:0);" ' . $extra . '>';
+    }
+
+    /**
+     * Function edit_language_checkboxes
+     *
+     * @param string $parameter_name
+     * @param array $accepted_languages
+     *
+     * @return string
+     */
+    public static function editLanguageCheckboxes($parameter_name, $accepted_languages) {
+        $html = '';
+        foreach (I18N::activeLocales() as $locale) {
+            $html .= '<div class="checkbox">';
+            $html .= '<label title="' . $locale->languageTag() . '">';
+            $html .= '<input type="checkbox" name="' . $parameter_name . '[]" value="' . $locale->languageTag() . '"';
+            $html .= in_array($locale->languageTag(), $accepted_languages) ? ' checked>' : '>';
+            $html .= $locale->endonym();
+            $html .= '</label>';
+            $html .= '</div>';
+        }
+
+        return $html;
+    }
+
+    /**
+     * Print an edit control for access level.
+     *
+     * @param string $name
+     * @param string $selected
+     * @param string $extra
+     *
+     * @return string
+     */
+    public static function editFieldAccessLevel($name, $selected = '', $extra = '') {
+        $ACCESS_LEVEL = array(
+            Auth::PRIV_PRIVATE => I18N::translate('Show to visitors'),
+            Auth::PRIV_USER    => I18N::translate('Show to members'),
+            Auth::PRIV_NONE    => I18N::translate('Show to managers'),
+            Auth::PRIV_HIDE    => I18N::translate('Hide from everyone'),
+        );
+
+        return self::selectEditControl($name, $ACCESS_LEVEL, null, $selected, $extra);
+    }
+
+    /**
+     * Print an edit control for a RESN field.
+     *
+     * @param string $name
+     * @param string $selected
+     * @param string $extra
+     *
+     * @return string
+     */
+    public static function editFieldRestriction($name, $selected = '', $extra = '') {
+        $RESN = array(
+            ''             => '',
+            'none'         => I18N::translate('Show to visitors'), // Not valid GEDCOM, but very useful
+            'privacy'      => I18N::translate('Show to members'),
+            'confidential' => I18N::translate('Show to managers'),
+            'locked'       => I18N::translate('Only managers can edit'),
+        );
+
+        return self::selectEditControl($name, $RESN, null, $selected, $extra);
+    }
+
+    /**
+     * Print an edit control for a contact method field.
+     *
+     * @param string $name
+     * @param string $selected
+     * @param string $extra
+     *
+     * @return string
+     */
+    public static function editFieldContact($name, $selected = '', $extra = '') {
+        // Different ways to contact the users
+        $CONTACT_METHODS = array(
+            'messaging'  => I18N::translate('Internal messaging'),
+            'messaging2' => I18N::translate('Internal messaging with emails'),
+            'messaging3' => I18N::translate('webtrees sends emails with no storage'),
+            'mailto'     => I18N::translate('Mailto link'),
+            'none'       => I18N::translate('No contact'),
+        );
+
+        return self::selectEditControl($name, $CONTACT_METHODS, null, $selected, $extra);
+    }
+
+    /**
+     * Print an edit control for a language field.
+     *
+     * @param string $name
+     * @param string $selected
+     * @param string $extra
+     *
+     * @return string
+     */
+    public static function editFieldLanguage($name, $selected = '', $extra = '') {
+        $languages = array();
+        foreach (I18N::activeLocales() as $locale) {
+            $languages[$locale->languageTag()] = $locale->endonym();
+        }
+
+        return self::selectEditControl($name, $languages, null, $selected, $extra);
+    }
+
+    /**
+     * Print an edit control for a range of integers.
+     *
+     * @param string $name
+     * @param string $selected
+     * @param int $min
+     * @param int $max
+     * @param string $extra
+     *
+     * @return string
+     */
+    public static function editFieldInteger($name, $selected = '', $min, $max, $extra = '') {
+        $array = array();
+        for ($i = $min; $i <= $max; ++$i) {
+            $array[$i] = I18N::number($i);
+        }
+
+        return self::selectEditControl($name, $array, null, $selected, $extra);
+    }
+
+    /**
+     * Print an edit control for a username.
+     *
+     * @param string $name
+     * @param string $selected
+     * @param string $extra
+     *
+     * @return string
+     */
+    public static function editFieldUsername($name, $selected = '', $extra = '') {
+        $users = array();
+        foreach (User::all() as $user) {
+            $users[$user->getUserName()] = $user->getRealName() . ' - ' . $user->getUserName();
+        }
+        // The currently selected user may not exist
+        if ($selected && !array_key_exists($selected, $users)) {
+            $users[$selected] = $selected;
+        }
+
+        return self::selectEditControl($name, $users, '-', $selected, $extra);
+    }
+
+    /**
+     * Print an edit control for a ADOP field.
+     *
+     * @param string          $name
+     * @param string          $selected
+     * @param string          $extra
+     * @param Individual|null $individual
+     *
+     * @return string
+     */
+    public static function editFieldAdoption($name, $selected = '', $extra = '', Individual $individual = null) {
+        return self::selectEditControl($name, GedcomCodeAdop::getValues($individual), null, $selected, $extra);
+    }
+
+    /**
+     * Print an edit control for a PEDI field.
+     *
+     * @param string          $name
+     * @param string          $selected
+     * @param string          $extra
+     * @param Individual|null $individual
+     *
+     * @return string
+     */
+    public static function editFieldPedigree($name, $selected = '', $extra = '', Individual $individual = null) {
+        return self::selectEditControl($name, GedcomCodePedi::getValues($individual), '', $selected, $extra);
+    }
+
+    /**
+     * Print an edit control for a NAME TYPE field.
+     *
+     * @param string          $name
+     * @param string          $selected
+     * @param string          $extra
+     * @param Individual|null $individual
+     *
+     * @return string
+     */
+    public static function editFieldNameType($name, $selected = '', $extra = '', Individual $individual = null) {
+        return self::selectEditControl($name, GedcomCodeName::getValues($individual), '', $selected, $extra);
+    }
+
+    /**
+     * Print an edit control for a RELA field.
+     *
+     * @param string $name
+     * @param string $selected
+     * @param string $extra
+     *
+     * @return string
+     */
+    public static function editFieldRelationship($name, $selected = '', $extra = '') {
+        $rela_codes = GedcomCodeRela::getValues();
+        // The user is allowed to specify values that aren't in the list.
+        if (!array_key_exists($selected, $rela_codes)) {
+            $rela_codes[$selected] = I18N::translate($selected);
+        }
+
+        return self::selectEditControl($name, $rela_codes, '', $selected, $extra);
+    }
+
+    /**
+     * Remove all links from $gedrec to $xref, and any sub-tags.
+     *
+     * @param string $gedrec
+     * @param string $xref
+     *
+     * @return string
+     */
+    public static function removeLinks($gedrec, $xref) {
+        $gedrec = preg_replace('/\n1 ' . WT_REGEX_TAG . ' @' . $xref . '@(\n[2-9].*)*/', '', $gedrec);
+        $gedrec = preg_replace('/\n2 ' . WT_REGEX_TAG . ' @' . $xref . '@(\n[3-9].*)*/', '', $gedrec);
+        $gedrec = preg_replace('/\n3 ' . WT_REGEX_TAG . ' @' . $xref . '@(\n[4-9].*)*/', '', $gedrec);
+        $gedrec = preg_replace('/\n4 ' . WT_REGEX_TAG . ' @' . $xref . '@(\n[5-9].*)*/', '', $gedrec);
+        $gedrec = preg_replace('/\n5 ' . WT_REGEX_TAG . ' @' . $xref . '@(\n[6-9].*)*/', '', $gedrec);
+
+        return $gedrec;
+    }
+
+    /**
+     * Generates javascript code for calendar popup in user’s language.
+     *
+     * @param string $id
+     *
+     * @return string
+     */
+    public static function printCalendarPopup($id) {
+        return
+            ' <a href="#" onclick="cal_toggleDate(\'caldiv' . $id . '\', \'' . $id . '\'); return false;" class="icon-button_calendar" title="' . I18N::translate('Select a date') . '"></a>' .
+            '<div id="caldiv' . $id . '" style="position:absolute;visibility:hidden;background-color:white;z-index:1000;"></div>';
+    }
+
+    /**
+     * An HTML link to create a new media object.
+     *
+     * @param string $element_id
+     *
+     * @return string
+     */
+    public static function printAddNewMediaLink($element_id) {
+        return '<a href="#" onclick="pastefield=document.getElementById(\'' . $element_id . '\'); window.open(\'addmedia.php?action=showmediaform\', \'_blank\', edit_window_specs); return false;" class="icon-button_addmedia" title="' . I18N::translate('Create a media object') . '"></a>';
+    }
+
+    /**
+     * An HTML link to create a new repository.
+     *
+     * @param string $element_id
+     *
+     * @return string
+     */
+    public static function printAddNewRepositoryLink($element_id) {
+        return '<a href="#" onclick="addnewrepository(document.getElementById(\'' . $element_id . '\')); return false;" class="icon-button_addrepository" title="' . I18N::translate('Create a repository') . '"></a>';
+    }
+
+    /**
+     * An HTML link to create a new note.
+     *
+     * @param string $element_id
+     *
+     * @return string
+     */
+    public static function printAddNewNoteLink($element_id) {
+        return '<a href="#" onclick="addnewnote(document.getElementById(\'' . $element_id . '\')); return false;" class="icon-button_addnote" title="' . I18N::translate('Create a shared note') . '"></a>';
+    }
+
+    /**
+     * An HTML link to edit a note.
+     *
+     * @param string $note_id
+     *
+     * @return string
+     */
+    public static function printEditNoteLink($note_id) {
+        return '<a href="#" onclick="edit_note(\'' . $note_id . '\'); return false;" class="icon-button_note" title="' . I18N::translate('Edit the shared note') . '"></a>';
+    }
+
+    /**
+     * An HTML link to create a new source.
+     *
+     * @param string $element_id
+     *
+     * @return string
+     */
+    public static function printAddNewSourceLink($element_id) {
+        return '<a href="#" onclick="addnewsource(document.getElementById(\'' . $element_id . '\')); return false;" class="icon-button_addsource" title="' . I18N::translate('Create a source') . '"></a>';
+    }
+
+    /**
+     * add a new tag input field
+     *
+     * called for each fact to be edited on a form.
+     * Fact level=0 means a new empty form : data are POSTed by name
+     * else data are POSTed using arrays :
+     * glevels[] : tag level
+     *  islink[] : tag is a link
+     *     tag[] : tag name
+     *    text[] : tag value
+     *
+     * @param string $tag fact record to edit (eg 2 DATE xxxxx)
+     * @param string $upperlevel optional upper level tag (eg BIRT)
+     * @param string $label An optional label to echo instead of the default
+     * @param string $extra optional text to display after the input field
+     * @param Individual $person For male/female translations
+     *
+     * @return string
+     */
+    public static function addSimpleTag($tag, $upperlevel = '', $label = '', $extra = null, Individual $person = null) {
+        global $tags, $main_fact, $xref, $bdm, $action, $WT_TREE;
+
+        // Keep track of SOUR fields, so we can reference them in subsequent PAGE fields.
+        static $source_element_id;
+
+        $subnamefacts = array('NPFX', 'GIVN', 'SPFX', 'SURN', 'NSFX', '_MARNM_SURN');
+        preg_match('/^(?:(\d+) (' . WT_REGEX_TAG . ') ?(.*))/', $tag, $match);
+        list(, $level, $fact, $value) = $match;
+        $level                        = (int) $level;
+
+        // element name : used to POST data
+        if ($level === 0) {
+            if ($upperlevel) {
+                $element_name = $upperlevel . '_' . $fact;
+            } else {
+                $element_name = $fact;
+            }
+        } else {
+            $element_name = 'text[]';
+        }
+        if ($level === 1) {
+            $main_fact = $fact;
+        }
+
+        // element id : used by javascript functions
+        if ($level === 0) {
+            $element_id = $fact;
+        } else {
+            $element_id = $fact . Uuid::uuid4();
+        }
+        if ($upperlevel) {
+            $element_id = $upperlevel . '_' . $fact . Uuid::uuid4();
+        }
+
+        // field value
+        $islink = (substr($value, 0, 1) === '@' && substr($value, 0, 2) !== '@#');
+        if ($islink) {
+            $value = trim(substr($tag, strlen($fact) + 3), '@');
+        } else {
+            $value = (string) substr($tag, strlen($fact) + 3);
+        }
+        if ($fact === 'REPO' || $fact === 'SOUR' || $fact === 'OBJE' || $fact === 'FAMC') {
+            $islink = true;
+        }
+
+        if ($fact === 'SHARED_NOTE_EDIT' || $fact === 'SHARED_NOTE') {
+            $islink = true;
+            $fact   = 'NOTE';
+        }
+
+        // label
+        echo '<tr id="', $element_id, '_tr"';
+        if ($fact === 'DATA' || $fact === 'MAP' || ($fact === 'LATI' || $fact === 'LONG') && $value === '') {
+            echo ' style="display:none;"';
+        }
+        echo '>';
+
+        if (in_array($fact, $subnamefacts) || $fact === 'LATI' || $fact === 'LONG') {
+            echo '<td class="optionbox wrap width25">';
+        } else {
+            echo '<td class="descriptionbox wrap width25">';
+        }
+
+        // tag name
+        if ($label) {
+            echo $label;
+        } elseif ($upperlevel) {
+            echo GedcomTag::getLabel($upperlevel . ':' . $fact);
+        } else {
+            echo GedcomTag::getLabel($fact);
+        }
+
+        // If using GEDFact-assistant window
+        if ($action === 'addnewnote_assisted') {
+            // Do not print on GEDFact Assistant window
+        } else {
+            // Not all facts have help text.
+            switch ($fact) {
+            case 'NAME':
+                if ($upperlevel !== 'REPO' && $upperlevel !== 'UNKNOWN') {
+                    echo FunctionsPrint::helpLink($fact);
+                }
+                break;
+            case 'DATE':
+            case 'PLAC':
+            case 'RESN':
+            case 'ROMN':
+            case 'SURN':
+            case '_HEB':
+                echo FunctionsPrint::helpLink($fact);
+                break;
+            }
+        }
+        // tag level
+        if ($level > 0) {
+            echo '<input type="hidden" name="glevels[]" value="', $level, '">';
+            echo '<input type="hidden" name="islink[]" value="', $islink, '">';
+            echo '<input type="hidden" name="tag[]" value="', $fact, '">';
+        }
+        echo '</td>';
+
+        // value
+        echo '<td class="optionbox wrap">';
+
+        // retrieve linked NOTE
+        if ($fact === 'NOTE' && $islink) {
+            $note1 = Note::getInstance($value, $WT_TREE);
+            if ($note1) {
+                $noterec = $note1->getGedcom();
+                preg_match('/' . $value . '/i', $noterec, $notematch);
+                $value = $notematch[0];
+            }
+        }
+
+        // Show names for spouses in MARR/HUSB/AGE and MARR/WIFE/AGE
+        if ($fact === 'HUSB' || $fact === 'WIFE') {
+            $family = Family::getInstance($xref, $WT_TREE);
+            if ($family) {
+                $spouse_link = $family->getFirstFact($fact);
+                if ($spouse_link) {
+                    $spouse = $spouse_link->getTarget();
+                    if ($spouse) {
+                        echo $spouse->getFullName();
+                    }
+                }
+            }
+        }
+
+        if (in_array($fact, Config::emptyFacts()) && ($value === '' || $value === 'Y' || $value === 'y')) {
+            echo '<input type="hidden" id="', $element_id, '" name="', $element_name, '" value="', $value, '">';
+            if ($level <= 1) {
+                echo '<input type="checkbox" ';
+                if ($value) {
+                    echo 'checked';
+                }
+                echo ' onclick="document.getElementById(\'' . $element_id . '\').value = (this.checked) ? \'Y\' : \'\';">';
+                echo I18N::translate('yes');
+            }
+
+            if ($fact === 'CENS' && $value === 'Y') {
+                echo self::censusDateSelector(WT_LOCALE, $xref);
+                if (Module::getModuleByName('GEDFact_assistant') && GedcomRecord::getInstance($xref, $WT_TREE) instanceof Individual) {
+                    echo
+                        '<div></div><a href="#" style="display: none;" id="assistant-link" onclick="return activateCensusAssistant();">' .
+                        I18N::translate('Create a shared note using the census assistant') .
+                        '</a></div>';
+                }
+            }
+
+        } elseif ($fact === 'TEMP') {
+            echo self::selectEditControl($element_name, GedcomCodeTemp::templeNames(), I18N::translate('No temple - living ordinance'), $value);
+        } elseif ($fact === 'ADOP') {
+            echo self::editFieldAdoption($element_name, $value, '', $person);
+        } elseif ($fact === 'PEDI') {
+            echo self::editFieldPedigree($element_name, $value, '', $person);
+        } elseif ($fact === 'STAT') {
+            echo self::selectEditControl($element_name, GedcomCodeStat::statusNames($upperlevel), '', $value);
+        } elseif ($fact === 'RELA') {
+            echo self::editFieldRelationship($element_name, strtolower($value));
+        } elseif ($fact === 'QUAY') {
+            echo self::selectEditControl($element_name, GedcomCodeQuay::getValues(), '', $value);
+        } elseif ($fact === '_WT_USER') {
+            echo self::editFieldUsername($element_name, $value);
+        } elseif ($fact === 'RESN') {
+            echo self::editFieldRestriction($element_name, $value);
+        } elseif ($fact === '_PRIM') {
+            echo '<select id="', $element_id, '" name="', $element_name, '" >';
+            echo '<option value=""></option>';
+            echo '<option value="Y" ';
+            if ($value === 'Y') {
+                echo ' selected';
+            }
+            echo '>', /* I18N: option in list box “always use this image” */
+            I18N::translate('always'), '</option>';
+            echo '<option value="N" ';
+            if ($value === 'N') {
+                echo 'selected';
+            }
+            echo '>', /* I18N: option in list box “never use this image” */
+            I18N::translate('never'), '</option>';
+            echo '</select>';
+            echo '<p class="small text-muted">', I18N::translate('Use this image for charts and on the individual’s page.'), '</p>';
+        } elseif ($fact === 'SEX') {
+            echo '<select id="', $element_id, '" name="', $element_name, '"><option value="M" ';
+            if ($value === 'M') {
+                echo 'selected';
+            }
+            echo '>', I18N::translate('Male'), '</option><option value="F" ';
+            if ($value === 'F') {
+                echo 'selected';
+            }
+            echo '>', I18N::translate('Female'), '</option><option value="U" ';
+            if ($value === 'U' || empty($value)) {
+                echo 'selected';
+            }
+            echo '>', I18N::translateContext('unknown gender', 'Unknown'), '</option></select>';
+        } elseif ($fact === 'TYPE' && $level === 3) {
+            //-- Build the selector for the Media 'TYPE' Fact
+            echo '<select name="text[]"><option selected value="" ></option>';
+            $selectedValue = strtolower($value);
+            if (!array_key_exists($selectedValue, GedcomTag::getFileFormTypes())) {
+                echo '<option selected value="', Filter::escapeHtml($value), '" >', Filter::escapeHtml($value), '</option>';
+            }
+            foreach (GedcomTag::getFileFormTypes() as $typeName => $typeValue) {
+                echo '<option value="', $typeName, '" ';
+                if ($selectedValue === $typeName) {
+                    echo 'selected';
+                }
+                echo '>', $typeValue, '</option>';
+            }
+            echo '</select>';
+        } elseif (($fact === 'NAME' && $upperlevel !== 'REPO' && $upperlevel !== 'UNKNOWN') || $fact === '_MARNM') {
+            // Populated in javascript from sub-tags
+            echo '<input type="hidden" id="', $element_id, '" name="', $element_name, '" onchange="updateTextName(\'', $element_id, '\');" value="', Filter::escapeHtml($value), '" class="', $fact, '">';
+            echo '<span id="', $element_id, '_display" dir="auto">', Filter::escapeHtml($value), '</span>';
+            echo ' <a href="#edit_name" onclick="convertHidden(\'', $element_id, '\'); return false;" class="icon-edit_indi" title="' . I18N::translate('Edit the name') . '"></a>';
+        } else {
+            // textarea
+            if ($fact === 'TEXT' || $fact === 'ADDR' || ($fact === 'NOTE' && !$islink)) {
+                echo '<textarea id="', $element_id, '" name="', $element_name, '" dir="auto">', Filter::escapeHtml($value), '</textarea><br>';
+            } else {
+                // text
+                // If using GEDFact-assistant window
+                if ($action === 'addnewnote_assisted') {
+                    echo '<input type="text" id="', $element_id, '" name="', $element_name, '" value="', Filter::escapeHtml($value), '" style="width:4.1em;" dir="ltr"';
+                } else {
+                    echo '<input type="text" id="', $element_id, '" name="', $element_name, '" value="', Filter::escapeHtml($value), '" dir="ltr"';
+                }
+                echo ' class="', $fact, '"';
+                if (in_array($fact, $subnamefacts)) {
+                    echo ' onblur="updatewholename();" onkeyup="updatewholename();"';
+                }
+
+                // Extra markup for specific fact types
+                switch ($fact) {
+                case 'ALIA':
+                case 'ASSO':
+                case '_ASSO':
+                    echo ' data-autocomplete-type="ASSO" data-autocomplete-extra="input.DATE"';
+                    break;
+                case 'DATE':
+                    echo ' onblur="valid_date(this);" onmouseout="valid_date(this);"';
+                    break;
+                case 'GIVN':
+                    echo ' autofocus data-autocomplete-type="GIVN"';
+                    break;
+                case 'LATI':
+                    echo ' onblur="valid_lati_long(this, \'N\', \'S\');" onmouseout="valid_lati_long(this, \'N\', \'S\');"';
+                    break;
+                case 'LONG':
+                    echo ' onblur="valid_lati_long(this, \'E\', \'W\');" onmouseout="valid_lati_long(this, \'E\', \'W\');"';
+                    break;
+                case 'NOTE':
+                    // Shared notes. Inline notes are handled elsewhere.
+                    echo ' data-autocomplete-type="NOTE"';
+                    break;
+                case 'OBJE':
+                    echo ' data-autocomplete-type="OBJE"';
+                    break;
+                case 'PAGE':
+                    echo ' data-autocomplete-type="PAGE" data-autocomplete-extra="#' . $source_element_id . '"';
+                    break;
+                case 'PLAC':
+                    echo ' data-autocomplete-type="PLAC"';
+                    break;
+                case 'REPO':
+                    echo ' data-autocomplete-type="REPO"';
+                    break;
+                case 'SOUR':
+                    $source_element_id = $element_id;
+                    echo ' data-autocomplete-type="SOUR"';
+                    break;
+                case 'SURN':
+                case '_MARNM_SURN':
+                    echo ' data-autocomplete-type="SURN"';
+                    break;
+                case 'TIME':
+                    echo ' pattern="([0-1][0-9]|2[0-3]):[0-5][0-9](:[0-5][0-9])?" dir="ltr" placeholder="' . /* I18N: Examples of valid time formats (hours:minutes:seconds) */
+                        I18N::translate('hh:mm or hh:mm:ss') . '"';
+                    break;
+                }
+                echo '>';
+            }
+
+            $tmp_array = array('TYPE', 'TIME', 'NOTE', 'SOUR', 'REPO', 'OBJE', 'ASSO', '_ASSO', 'AGE');
+
+            // split PLAC
+            if ($fact === 'PLAC') {
+                echo '<div id="', $element_id, '_pop" style="display: inline;">';
+                echo FunctionsPrint::printSpecialCharacterLink($element_id), ' ', FunctionsPrint::printFindPlaceLink($element_id);
+                echo '<span  onclick="jQuery(\'tr[id^=', $upperlevel, '_LATI],tr[id^=', $upperlevel, '_LONG],tr[id^=LATI],tr[id^=LONG]\').toggle(\'fast\'); return false;" class="icon-target" title="', GedcomTag::getLabel('LATI'), ' / ', GedcomTag::getLabel('LONG'), '"></span>';
+                echo '</div>';
+                if (Module::getModuleByName('places_assistant')) {
+                    \PlacesAssistantModule::setup_place_subfields($element_id);
+                    \PlacesAssistantModule::print_place_subfields($element_id);
+                }
+            } elseif (!in_array($fact, $tmp_array)) {
+                echo FunctionsPrint::printSpecialCharacterLink($element_id);
+            }
+        }
+        // MARRiage TYPE : hide text field and show a selection list
+        if ($fact === 'TYPE' && $level === 2 && $tags[0] === 'MARR') {
+            echo '<script>';
+            echo 'document.getElementById(\'', $element_id, '\').style.display=\'none\'';
+            echo '</script>';
+            echo '<select id="', $element_id, '_sel" onchange="document.getElementById(\'', $element_id, '\').value=this.value;" >';
+            foreach (array('Unknown', 'Civil', 'Religious', 'Partners') as $key) {
+                if ($key === 'Unknown') {
+                    echo '<option value="" ';
+                } else {
+                    echo '<option value="', $key, '" ';
+                }
+                $a = strtolower($key);
+                $b = strtolower($value);
+                if ($b !== '' && strpos($a, $b) !== false || strpos($b, $a) !== false) {
+                    echo 'selected';
+                }
+                echo '>', GedcomTag::getLabel('MARR_' . strtoupper($key)), '</option>';
+            }
+            echo '</select>';
+        } elseif ($fact === 'TYPE' && $level === 0) {
+            // NAME TYPE : hide text field and show a selection list
+            $onchange = 'onchange="document.getElementById(\'' . $element_id . '\').value=this.value;"';
+            echo self::editFieldNameType($element_name, $value, $onchange, $person);
+            echo '<script>document.getElementById("', $element_id, '").style.display="none";</script>';
+        }
+
+        // popup links
+        switch ($fact) {
+        case 'DATE':
+            echo self::printCalendarPopup($element_id);
+            break;
+        case 'FAMC':
+        case 'FAMS':
+            echo FunctionsPrint::printFindFamilyLink($element_id);
+            break;
+        case 'ALIA':
+        case 'ASSO':
+        case '_ASSO':
+            echo FunctionsPrint::printFindIndividualLink($element_id, $element_id . '_description');
+            break;
+        case 'FILE':
+            FunctionsPrint::printFindMediaLink($element_id, '0file');
+            break;
+        case 'SOUR':
+            echo FunctionsPrint::printFindSourceLink($element_id, $element_id . '_description'), ' ', self::printAddNewSourceLink($element_id);
+            //-- checkboxes to apply '1 SOUR' to BIRT/MARR/DEAT as '2 SOUR'
+            if ($level === 1) {
+                echo '<br>';
+                switch ($WT_TREE->getPreference('PREFER_LEVEL2_SOURCES')) {
+                case '2': // records
+                $level1_checked = 'checked';
+                $level2_checked = '';
+                break;
+                case '1': // facts
+                $level1_checked = '';
+                $level2_checked = 'checked';
+                break;
+                case '0': // none
+                default:
+                $level1_checked = '';
+                $level2_checked = '';
+                break;
+                }
+                    if (strpos($bdm, 'B') !== false) {
+                        echo ' <label><input type="checkbox" name="SOUR_INDI" ', $level1_checked, ' value="1">', I18N::translate('Individual'), '</label>';
+                        if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
+                            foreach ($matches[1] as $match) {
+                                if (!in_array($match, explode('|', WT_EVENTS_DEAT))) {
+                                    echo ' <label><input type="checkbox" name="SOUR_', $match, '" ', $level2_checked, ' value="1">', GedcomTag::getLabel($match), '</label>';
+                                }
+                            }
+                        }
+                    }
+                    if (strpos($bdm, 'D') !== false) {
+                        if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
+                            foreach ($matches[1] as $match) {
+                                if (in_array($match, explode('|', WT_EVENTS_DEAT))) {
+                                    echo ' <label><input type="checkbox" name="SOUR_', $match, '"', $level2_checked, ' value="1">', GedcomTag::getLabel($match), '</label>';
+                                }
+                            }
+                        }
+                    }
+                    if (strpos($bdm, 'M') !== false) {
+                        echo ' <label><input type="checkbox" name="SOUR_FAM" ', $level1_checked, ' value="1">', I18N::translate('Family'), '</label>';
+                        if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('QUICK_REQUIRED_FAMFACTS'), $matches)) {
+                            foreach ($matches[1] as $match) {
+                                echo ' <label><input type="checkbox" name="SOUR_', $match, '"', $level2_checked, ' value="1">', GedcomTag::getLabel($match), '</label>';
+                            }
+                        }
+                    }
+                }
+                break;
+        case 'REPO':
+            echo FunctionsPrint::printFindRepositoryLink($element_id), ' ', self::printAddNewRepositoryLink($element_id);
+            break;
+        case 'NOTE':
+            // Shared Notes Icons ========================================
+            if ($islink) {
+                // Print regular Shared Note icons ---------------------------
+                echo ' ', FunctionsPrint::printFindNoteLink($element_id, $element_id . '_description'), ' ', self::printAddNewNoteLink($element_id);
+                if ($value) {
+                    echo ' ', self::printEditNoteLink($value);
+                }
+            }
+            break;
+        case 'OBJE':
+            echo FunctionsPrint::printFindMediaLink($element_id, '1media');
+            if (!$value) {
+                echo ' ', self::printAddNewMediaLink($element_id);
+                $value = 'new';
+            }
+            break;
+        }
+
+        echo '<div id="' . $element_id . '_description">';
+
+        // current value
+        if ($fact === 'DATE') {
+            $date = new Date($value);
+            echo $date->display();
+        }
+        if (($fact === 'ASSO' || $fact === '_ASSO') && $value === '') {
+            if ($level === 1) {
+                echo '<p class="small text-muted">' . I18N::translate('An associate is another individual who was involved with this individual, such as a friend or an employer.') . '</p>';
+            } else {
+                echo '<p class="small text-muted">' . I18N::translate('An associate is another individual who was involved with this fact or event, such as a witness or a priest.') . '</p>';
+            }
+        }
+
+        if ($value && $value !== 'new' && $islink) {
+            switch ($fact) {
+            case 'ALIA':
+            case 'ASSO':
+            case '_ASSO':
+                $tmp = Individual::getInstance($value, $WT_TREE);
+                if ($tmp) {
+                    echo ' ', $tmp->getFullName();
+                }
+                break;
+            case 'SOUR':
+                $tmp = Source::getInstance($value, $WT_TREE);
+                if ($tmp) {
+                    echo ' ', $tmp->getFullName();
+                }
+                break;
+            case 'NOTE':
+                $tmp = Note::getInstance($value, $WT_TREE);
+                if ($tmp) {
+                    echo ' ', $tmp->getFullName();
+                }
+                break;
+            case 'OBJE':
+                $tmp = Media::getInstance($value, $WT_TREE);
+                if ($tmp) {
+                    echo ' ', $tmp->getFullName();
+                }
+                break;
+            case 'REPO':
+                $tmp = Repository::getInstance($value, $WT_TREE);
+                if ($tmp) {
+                    echo ' ', $tmp->getFullName();
+                }
+                break;
+            }
+        }
+
+        // pastable values
+        if ($fact === 'FORM' && $upperlevel === 'OBJE') {
+            FunctionsPrint::printAutoPasteLink($element_id, Config::fileFormats());
+        }
+        echo '</div>', $extra, '</td></tr>';
+
+        return $element_id;
+    }
+
+    /**
+     * Genearate a <select> element, with the dates/places of all known censuses
+     *
+     *
+     * @param string $locale - Sort the censuses for this locale
+     * @param string $xref   - The individual for whom we are adding a census
+     */
+    public static function censusDateSelector($locale, $xref) {
+        global $controller;
+
+        // Show more likely census details at the top of the list.
+        switch (WT_LOCALE) {
+        case 'cs':
+            $census_places = array(new CensusOfCzechRepublic);
+            break;
+        case 'en-AU':
+        case 'en-GB':
+            $census_places = array(new CensusOfEngland, new CensusOfWales, new CensusOfScotland);
+            break;
+        case 'en-US':
+            $census_places = array(new CensusOfUnitedStates);
+            break;
+        case 'fr':
+        case 'fr-CA':
+            $census_places = array(new CensusOfFrance);
+            break;
+        case 'da':
+            $census_places = array(new CensusOfDenmark);
+            break;
+        case 'de':
+            $census_places = array(new CensusOfDeutschland);
+            break;
+        default:
+            $census_places = array();
+            break;
+        }
+        foreach (Census::allCensusPlaces() as $census_place) {
+            if (!in_array($census_place, $census_places)) {
+                $census_places[] = $census_place;
+            }
+        }
+
+        $controller->addInlineJavascript('
 				function selectCensus(el) {
 					var option = jQuery(":selected", el);
 					jQuery("input.DATE", jQuery(el).closest("table")).val(option.val());
@@ -1025,790 +1025,790 @@ 
 				}
 			');
 
-		$options = '<option value="">' . I18N::translate('Census date') . '</option>';
-
-		foreach ($census_places as $census_place) {
-			$options .= '<option value=""></option>';
-			foreach ($census_place->allCensusDates() as $census) {
-				$date            = new Date($census->censusDate());
-				$year            = $date->minimumDate()->format('%Y');
-				$place_hierarchy = explode(', ', $census->censusPlace());
-				$options .= '<option value="' . $census->censusDate() . '" data-place="' . $census->censusPlace() . '" data-census="' . get_class($census) . '">' . $place_hierarchy[0] . ' ' . $year . '</option>';
-			}
-		}
-
-		return
-			'<input type="hidden" id="pid_array" name="pid_array" value="">' .
-			'<select class="census-assistant-selector" onchange="selectCensus(this);">' . $options . '</select>';
-	}
-
-	/**
-	 * Prints collapsable fields to add ASSO/RELA, SOUR, OBJE, etc.
-	 *
-	 * @param string $tag
-	 * @param int $level
-	 * @param string $parent_tag
-	 */
-	public static function printAddLayer($tag, $level = 2, $parent_tag = '') {
-		global $WT_TREE;
-
-		switch ($tag) {
-		case 'SOUR':
-			echo '<a href="#" onclick="return expand_layer(\'newsource\');"><i id="newsource_img" class="icon-plus"></i> ', I18N::translate('Add a source citation'), '</a>';
-			echo '<br>';
-			echo '<div id="newsource" style="display: none;">';
-			echo '<table class="facts_table">';
-			// 2 SOUR
-			self::addSimpleTag($level . ' SOUR @');
-			// 3 PAGE
-			self::addSimpleTag(($level + 1) . ' PAGE');
-			// 3 DATA
-			self::addSimpleTag(($level + 1) . ' DATA');
-			// 4 TEXT
-			self::addSimpleTag(($level + 2) . ' TEXT');
-			if ($WT_TREE->getPreference('FULL_SOURCES')) {
-				// 4 DATE
-				self::addSimpleTag(($level + 2) . ' DATE', '', GedcomTag::getLabel('DATA:DATE'));
-				// 3 QUAY
-				self::addSimpleTag(($level + 1) . ' QUAY');
-			}
-			// 3 OBJE
-			self::addSimpleTag(($level + 1) . ' OBJE');
-			// 3 SHARED_NOTE
-			self::addSimpleTag(($level + 1) . ' SHARED_NOTE');
-			echo '</table></div>';
-			break;
-
-		case 'ASSO':
-		case 'ASSO2':
-			//-- Add a new ASSOciate
-			if ($tag === 'ASSO') {
-				echo "<a href=\"#\" onclick=\"return expand_layer('newasso');\"><i id=\"newasso_img\" class=\"icon-plus\"></i> ", I18N::translate('Add an associate'), '</a>';
-				echo '<br>';
-				echo '<div id="newasso" style="display: none;">';
-			} else {
-				echo "<a href=\"#\" onclick=\"return expand_layer('newasso2');\"><i id=\"newasso2_img\" class=\"icon-plus\"></i> ", I18N::translate('Add an associate'), '</a>';
-				echo '<br>';
-				echo '<div id="newasso2" style="display: none;">';
-			}
-			echo '<table class="facts_table">';
-			// 2 ASSO
-			self::addSimpleTag($level . ' _ASSO @');
-			// 3 RELA
-			self::addSimpleTag(($level + 1) . ' RELA');
-			// 3 NOTE
-			self::addSimpleTag(($level + 1) . ' NOTE');
-			// 3 SHARED_NOTE
-			self::addSimpleTag(($level + 1) . ' SHARED_NOTE');
-			echo '</table></div>';
-			break;
-
-		case 'NOTE':
-			//-- Retrieve existing note or add new note to fact
-			echo "<a href=\"#\" onclick=\"return expand_layer('newnote');\"><i id=\"newnote_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a note'), '</a>';
-			echo '<br>';
-			echo '<div id="newnote" style="display: none;">';
-			echo '<table class="facts_table">';
-			// 2 NOTE
-			self::addSimpleTag($level . ' NOTE');
-			echo '</table></div>';
-			break;
-
-		case 'SHARED_NOTE':
-			echo "<a href=\"#\" onclick=\"return expand_layer('newshared_note');\"><i id=\"newshared_note_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a shared note'), '</a>';
-			echo '<br>';
-			echo '<div id="newshared_note" style="display: none;">';
-			echo '<table class="facts_table">';
-			// 2 SHARED NOTE
-			self::addSimpleTag($level . ' SHARED_NOTE', $parent_tag);
-			echo '</table></div>';
-			break;
-
-		case 'OBJE':
-			if ($WT_TREE->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($WT_TREE)) {
-				echo "<a href=\"#\" onclick=\"return expand_layer('newobje');\"><i id=\"newobje_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a media object'), '</a>';
-				echo '<br>';
-				echo '<div id="newobje" style="display: none;">';
-				echo '<table class="facts_table">';
-				self::addSimpleTag($level . ' OBJE');
-				echo '</table></div>';
-			}
-			break;
-
-		case 'RESN':
-			echo "<a href=\"#\" onclick=\"return expand_layer('newresn');\"><i id=\"newresn_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a restriction'), '</a>';
-			echo '<br>';
-			echo '<div id="newresn" style="display: none;">';
-			echo '<table class="facts_table">';
-			// 2 RESN
-			self::addSimpleTag($level . ' RESN');
-			echo '</table></div>';
-			break;
-		}
-	}
-
-	/**
-	 * Add some empty tags to create a new fact.
-	 *
-	 * @param string $fact
-	 */
-	public static function addSimpleTags($fact) {
-		global $WT_TREE;
-
-		// For new individuals, these facts default to "Y"
-		if ($fact === 'MARR') {
-			self::addSimpleTag('0 ' . $fact . ' Y');
-		} else {
-			self::addSimpleTag('0 ' . $fact);
-		}
-
-		if (!in_array($fact, Config::nonDateFacts())) {
-			self::addSimpleTag('0 DATE', $fact, GedcomTag::getLabel($fact . ':DATE'));
-		}
-
-		if (!in_array($fact, Config::nonPlaceFacts())) {
-			self::addSimpleTag('0 PLAC', $fact, GedcomTag::getLabel($fact . ':PLAC'));
-
-			if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('ADVANCED_PLAC_FACTS'), $match)) {
-				foreach ($match[1] as $tag) {
-					self::addSimpleTag('0 ' . $tag, $fact, GedcomTag::getLabel($fact . ':PLAC:' . $tag));
-				}
-			}
-			self::addSimpleTag('0 MAP', $fact);
-			self::addSimpleTag('0 LATI', $fact);
-			self::addSimpleTag('0 LONG', $fact);
-		}
-	}
-
-	/**
-	 * Assemble the pieces of a newly created record into gedcom
-	 *
-	 * @return string
-	 */
-	public static function addNewName() {
-		global $WT_TREE;
-
-		$gedrec = "\n1 NAME " . Filter::post('NAME');
-
-		$tags = array('NPFX', 'GIVN', 'SPFX', 'SURN', 'NSFX');
-
-		if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('ADVANCED_NAME_FACTS'), $match)) {
-			$tags = array_merge($tags, $match[1]);
-		}
-
-		// Paternal and Polish and Lithuanian surname traditions can also create a _MARNM
-		$SURNAME_TRADITION = $WT_TREE->getPreference('SURNAME_TRADITION');
-		if ($SURNAME_TRADITION === 'paternal' || $SURNAME_TRADITION === 'polish' || $SURNAME_TRADITION === 'lithuanian') {
-			$tags[] = '_MARNM';
-		}
-
-		foreach (array_unique($tags) as $tag) {
-			$TAG = Filter::post($tag);
-			if ($TAG) {
-				$gedrec .= "\n2 {$tag} {$TAG}";
-			}
-		}
-
-		return $gedrec;
-	}
-
-	/**
-	 * Create a form to add a sex record.
-	 *
-	 * @return string
-	 */
-	public static function addNewSex() {
-		switch (Filter::post('SEX', '[MF]', 'U')) {
-		case 'M':
-			return "\n1 SEX M";
-		case 'F':
-			return "\n1 SEX F";
-		default:
-			return "\n1 SEX U";
-		}
-	}
-
-	/**
-	 * Create a form to add a new fact.
-	 *
-	 * @param string $fact
-	 *
-	 * @return string
-	 */
-	public static function addNewFact($fact) {
-		global $WT_TREE;
-
-		$FACT = Filter::post($fact);
-		$DATE = Filter::post($fact . '_DATE');
-		$PLAC = Filter::post($fact . '_PLAC');
-		if ($DATE || $PLAC || $FACT && $FACT !== 'Y') {
-			if ($FACT && $FACT !== 'Y') {
-				$gedrec = "\n1 " . $fact . ' ' . $FACT;
-			} else {
-				$gedrec = "\n1 " . $fact;
-			}
-			if ($DATE) {
-				$gedrec .= "\n2 DATE " . $DATE;
-			}
-			if ($PLAC) {
-				$gedrec .= "\n2 PLAC " . $PLAC;
-
-				if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('ADVANCED_PLAC_FACTS'), $match)) {
-					foreach ($match[1] as $tag) {
-						$TAG = Filter::post($fact . '_' . $tag);
-						if ($TAG) {
-							$gedrec .= "\n3 " . $tag . ' ' . $TAG;
-						}
-					}
-				}
-				$LATI = Filter::post($fact . '_LATI');
-				$LONG = Filter::post($fact . '_LONG');
-				if ($LATI || $LONG) {
-					$gedrec .= "\n3 MAP\n4 LATI " . $LATI . "\n4 LONG " . $LONG;
-				}
-			}
-			if (Filter::postBool('SOUR_' . $fact)) {
-				return self::updateSource($gedrec, 2);
-			} else {
-				return $gedrec;
-			}
-		} elseif ($FACT === 'Y') {
-			if (Filter::postBool('SOUR_' . $fact)) {
-				return self::updateSource("\n1 " . $fact . ' Y', 2);
-			} else {
-				return "\n1 " . $fact . ' Y';
-			}
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * This function splits the $glevels, $tag, $islink, and $text arrays so that the
-	 * entries associated with a SOUR record are separate from everything else.
-	 *
-	 * Input arrays:
-	 * - $glevels[] - an array of the gedcom level for each line that was edited
-	 * - $tag[] - an array of the tags for each gedcom line that was edited
-	 * - $islink[] - an array of 1 or 0 values to indicate when the text is a link element
-	 * - $text[] - an array of the text data for each line
-	 *
-	 * Output arrays:
-	 * ** For the SOUR record:
-	 * - $glevelsSOUR[] - an array of the gedcom level for each line that was edited
-	 * - $tagSOUR[] - an array of the tags for each gedcom line that was edited
-	 * - $islinkSOUR[] - an array of 1 or 0 values to indicate when the text is a link element
-	 * - $textSOUR[] - an array of the text data for each line
-	 * ** For the remaining records:
-	 * - $glevelsRest[] - an array of the gedcom level for each line that was edited
-	 * - $tagRest[] - an array of the tags for each gedcom line that was edited
-	 * - $islinkRest[] - an array of 1 or 0 values to indicate when the text is a link element
-	 * - $textRest[] - an array of the text data for each line
-	 */
-	public static function splitSource() {
-		global $glevels, $tag, $islink, $text;
-		global $glevelsSOUR, $tagSOUR, $islinkSOUR, $textSOUR;
-		global $glevelsRest, $tagRest, $islinkRest, $textRest;
-
-		$glevelsSOUR = array();
-		$tagSOUR     = array();
-		$islinkSOUR  = array();
-		$textSOUR    = array();
-
-		$glevelsRest = array();
-		$tagRest     = array();
-		$islinkRest  = array();
-		$textRest    = array();
-
-		$inSOUR = false;
-
-		for ($i = 0; $i < count($glevels); $i++) {
-			if ($inSOUR) {
-				if ($levelSOUR < $glevels[$i]) {
-					$dest = 'S';
-				} else {
-					$inSOUR = false;
-					$dest   = 'R';
-				}
-			} else {
-				if ($tag[$i] === 'SOUR') {
-					$inSOUR    = true;
-					$levelSOUR = $glevels[$i];
-					$dest      = 'S';
-				} else {
-					$dest = 'R';
-				}
-			}
-			if ($dest === 'S') {
-				$glevelsSOUR[] = $glevels[$i];
-				$tagSOUR[]     = $tag[$i];
-				$islinkSOUR[]  = $islink[$i];
-				$textSOUR[]    = $text[$i];
-			} else {
-				$glevelsRest[] = $glevels[$i];
-				$tagRest[]     = $tag[$i];
-				$islinkRest[]  = $islink[$i];
-				$textRest[]    = $text[$i];
-			}
-		}
-	}
-
-	/**
-	 * Add new GEDCOM lines from the $xxxSOUR interface update arrays, which
-	 * were produced by the splitSOUR() function.
-	 * See the FunctionsEdit::handle_updatesges() function for details.
-	 *
-	 * @param string $inputRec
-	 * @param string $levelOverride
-	 *
-	 * @return string
-	 */
-	public static function updateSource($inputRec, $levelOverride = 'no') {
-		global $glevels, $tag, $islink, $text;
-		global $glevelsSOUR, $tagSOUR, $islinkSOUR, $textSOUR;
-
-		if (count($tagSOUR) === 0) {
-			return $inputRec; // No update required
-		}
-
-		// Save original interface update arrays before replacing them with the xxxSOUR ones
-		$glevelsSave = $glevels;
-		$tagSave     = $tag;
-		$islinkSave  = $islink;
-		$textSave    = $text;
-
-		$glevels = $glevelsSOUR;
-		$tag     = $tagSOUR;
-		$islink  = $islinkSOUR;
-		$text    = $textSOUR;
-
-		$myRecord = self::handleUpdates($inputRec, $levelOverride); // Now do the update
-
-		// Restore the original interface update arrays (just in case ...)
-		$glevels = $glevelsSave;
-		$tag     = $tagSave;
-		$islink  = $islinkSave;
-		$text    = $textSave;
-
-		return $myRecord;
-	}
-
-	/**
-	 * Add new GEDCOM lines from the $xxxRest interface update arrays, which
-	 * were produced by the splitSOUR() function.
-	 * See the FunctionsEdit::handle_updatesges() function for details.
-	 *
-	 * @param string $inputRec
-	 * @param string $levelOverride
-	 *
-	 * @return string
-	 */
-	public static function updateRest($inputRec, $levelOverride = 'no') {
-		global $glevels, $tag, $islink, $text;
-		global $glevelsRest, $tagRest, $islinkRest, $textRest;
-
-		if (count($tagRest) === 0) {
-			return $inputRec; // No update required
-		}
-
-		// Save original interface update arrays before replacing them with the xxxRest ones
-		$glevelsSave = $glevels;
-		$tagSave     = $tag;
-		$islinkSave  = $islink;
-		$textSave    = $text;
-
-		$glevels = $glevelsRest;
-		$tag     = $tagRest;
-		$islink  = $islinkRest;
-		$text    = $textRest;
-
-		$myRecord = self::handleUpdates($inputRec, $levelOverride); // Now do the update
-
-		// Restore the original interface update arrays (just in case ...)
-		$glevels = $glevelsSave;
-		$tag     = $tagSave;
-		$islink  = $islinkSave;
-		$text    = $textSave;
-
-		return $myRecord;
-	}
-
-	/**
-	 * Add new gedcom lines from interface update arrays
-	 * The edit_interface and FunctionsEdit::add_simple_tag function produce the following
-	 * arrays incoming from the $_POST form
-	 * - $glevels[] - an array of the gedcom level for each line that was edited
-	 * - $tag[] - an array of the tags for each gedcom line that was edited
-	 * - $islink[] - an array of 1 or 0 values to tell whether the text is a link element and should be surrounded by @@
-	 * - $text[] - an array of the text data for each line
-	 * With these arrays you can recreate the gedcom lines like this
-	 * <code>$glevel[0].' '.$tag[0].' '.$text[0]</code>
-	 * There will be an index in each of these arrays for each line of the gedcom
-	 * fact that is being edited.
-	 * If the $text[] array is empty for the given line, then it means that the
-	 * user removed that line during editing or that the line is supposed to be
-	 * empty (1 DEAT, 1 BIRT) for example. To know if the line should be removed
-	 * there is a section of code that looks ahead to the next lines to see if there
-	 * are sub lines. For example we don't want to remove the 1 DEAT line if it has
-	 * a 2 PLAC or 2 DATE line following it. If there are no sub lines, then the line
-	 * can be safely removed.
-	 *
-	 * @param string $newged the new gedcom record to add the lines to
-	 * @param string $levelOverride Override GEDCOM level specified in $glevels[0]
-	 *
-	 * @return string The updated gedcom record
-	 */
-	public static function handleUpdates($newged, $levelOverride = 'no') {
-		global $glevels, $islink, $tag, $uploaded_files, $text;
-
-		if ($levelOverride === 'no' || count($glevels) === 0) {
-			$levelAdjust = 0;
-		} else {
-			$levelAdjust = $levelOverride - $glevels[0];
-		}
-
-		for ($j = 0; $j < count($glevels); $j++) {
-
-			// Look for empty SOUR reference with non-empty sub-records.
-			// This can happen when the SOUR entry is deleted but its sub-records
-			// were incorrectly left intact.
-			// The sub-records should be deleted.
-			if ($tag[$j] === 'SOUR' && ($text[$j] === '@@' || $text[$j] === '')) {
-				$text[$j] = '';
-				$k        = $j + 1;
-				while (($k < count($glevels)) && ($glevels[$k] > $glevels[$j])) {
-					$text[$k] = '';
-					$k++;
-				}
-			}
-
-			if (trim($text[$j]) !== '') {
-				$pass = true;
-			} else {
-				//-- for facts with empty values they must have sub records
-				//-- this section checks if they have subrecords
-				$k    = $j + 1;
-				$pass = false;
-				while (($k < count($glevels)) && ($glevels[$k] > $glevels[$j])) {
-					if ($text[$k] !== '') {
-						if (($tag[$j] !== 'OBJE') || ($tag[$k] === 'FILE')) {
-							$pass = true;
-							break;
-						}
-					}
-					if (($tag[$k] === 'FILE') && (count($uploaded_files) > 0)) {
-						$filename = array_shift($uploaded_files);
-						if (!empty($filename)) {
-							$text[$k] = $filename;
-							$pass     = true;
-							break;
-						}
-					}
-					$k++;
-				}
-			}
-
-			//-- if the value is not empty or it has sub lines
-			//--- then write the line to the gedcom record
-			//-- we have to let some emtpy text lines pass through... (DEAT, BIRT, etc)
-			if ($pass) {
-				$newline = $glevels[$j] + $levelAdjust . ' ' . $tag[$j];
-				if ($text[$j] !== '') {
-					if ($islink[$j]) {
-						$newline .= ' @' . $text[$j] . '@';
-					} else {
-						$newline .= ' ' . $text[$j];
-					}
-				}
-				$newged .= "\n" . str_replace("\n", "\n" . (1 + substr($newline, 0, 1)) . ' CONT ', $newline);
-			}
-		}
-
-		return $newged;
-	}
-
-	/**
-	 * builds the form for adding new facts
-	 *
-	 * @param string $fact the new fact we are adding
-	 */
-	public static function createAddForm($fact) {
-		global $tags, $WT_TREE;
-
-		$tags = array();
-
-		// handle  MARRiage TYPE
-		if (substr($fact, 0, 5) === 'MARR_') {
-			$tags[0] = 'MARR';
-			self::addSimpleTag('1 MARR');
-			self::insertMissingSubtags($fact);
-		} else {
-			$tags[0] = $fact;
-			if ($fact === '_UID') {
-				$fact .= ' ' . GedcomTag::createUid();
-			}
-			// These new level 1 tags need to be turned into links
-			if (in_array($fact, array('ALIA', 'ASSO'))) {
-				$fact .= ' @';
-			}
-			if (in_array($fact, Config::emptyFacts())) {
-				self::addSimpleTag('1 ' . $fact . ' Y');
-			} else {
-				self::addSimpleTag('1 ' . $fact);
-			}
-			self::insertMissingSubtags($tags[0]);
-			//-- handle the special SOURce case for level 1 sources [ 1759246 ]
-			if ($fact === 'SOUR') {
-				self::addSimpleTag('2 PAGE');
-				self::addSimpleTag('3 TEXT');
-				if ($WT_TREE->getPreference('FULL_SOURCES')) {
-					self::addSimpleTag('3 DATE', '', GedcomTag::getLabel('DATA:DATE'));
-					self::addSimpleTag('2 QUAY');
-				}
-			}
-		}
-	}
-
-	/**
-	 * Create a form to edit a Fact object.
-	 *
-	 * @param Fact $fact
-	 *
-	 * @return string
-	 */
-	public static function createEditForm(Fact $fact) {
-		global $tags;
-
-		$record = $fact->getParent();
-
-		$tags     = array();
-		$gedlines = explode("\n", $fact->getGedcom());
-
-		$linenum = 0;
-		$fields  = explode(' ', $gedlines[$linenum]);
-		$glevel  = $fields[0];
-		$level   = $glevel;
-
-		$type       = $fact->getTag();
-		$level0type = $record::RECORD_TYPE;
-		$level1type = $type;
-
-		$i           = $linenum;
-		$inSource    = false;
-		$levelSource = 0;
-		$add_date    = true;
-
-		// List of tags we would expect at the next level
-		// NB add_missing_subtags() already takes care of the simple cases
-		// where a level 1 tag is missing a level 2 tag. Here we only need to
-		// handle the more complicated cases.
-		$expected_subtags = array(
-			'SOUR' => array('PAGE', 'DATA'),
-			'DATA' => array('TEXT'),
-			'PLAC' => array('MAP'),
-			'MAP'  => array('LATI', 'LONG'),
-		);
-		if ($record->getTree()->getPreference('FULL_SOURCES')) {
-			$expected_subtags['SOUR'][] = 'QUAY';
-			$expected_subtags['DATA'][] = 'DATE';
-		}
-		if (GedcomCodeTemp::isTagLDS($level1type)) {
-			$expected_subtags['STAT'] = array('DATE');
-		}
-		if (in_array($level1type, Config::dateAndTime())) {
-			$expected_subtags['DATE'] = array('TIME'); // TIME is NOT a valid 5.5.1 tag
-		}
-		if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $record->getTree()->getPreference('ADVANCED_PLAC_FACTS'), $match)) {
-			$expected_subtags['PLAC'] = array_merge($match[1], $expected_subtags['PLAC']);
-		}
-
-		$stack = array();
-		// Loop on existing tags :
-		while (true) {
-			// Keep track of our hierarchy, e.g. 1=>BIRT, 2=>PLAC, 3=>FONE
-			$stack[$level] = $type;
-			// Merge them together, e.g. BIRT:PLAC:FONE
-			$label = implode(':', array_slice($stack, 0, $level));
-
-			$text = '';
-			for ($j = 2; $j < count($fields); $j++) {
-				if ($j > 2) {
-					$text .= ' ';
-				}
-				$text .= $fields[$j];
-			}
-			$text = rtrim($text);
-			while (($i + 1 < count($gedlines)) && (preg_match("/" . ($level + 1) . ' CONT ?(.*)/', $gedlines[$i + 1], $cmatch) > 0)) {
-				$text .= "\n" . $cmatch[1];
-				$i++;
-			}
-
-			if ($type === 'SOUR') {
-				$inSource    = true;
-				$levelSource = $level;
-			} elseif ($levelSource >= $level) {
-				$inSource = false;
-			}
-
-			if ($type !== 'CONT') {
-				$tags[]    = $type;
-				$subrecord = $level . ' ' . $type . ' ' . $text;
-				if ($inSource && $type === 'DATE') {
-					self::addSimpleTag($subrecord, '', GedcomTag::getLabel($label, $record));
-				} elseif (!$inSource && $type === 'DATE') {
-					self::addSimpleTag($subrecord, $level1type, GedcomTag::getLabel($label, $record));
-					if ($level === '2') {
-						// We already have a date - no need to add one.
-						$add_date = false;
-					}
-				} elseif ($type === 'STAT') {
-					self::addSimpleTag($subrecord, $level1type, GedcomTag::getLabel($label, $record));
-				} else {
-					self::addSimpleTag($subrecord, $level0type, GedcomTag::getLabel($label, $record));
-				}
-			}
-
-			// Get a list of tags present at the next level
-			$subtags = array();
-			for ($ii = $i + 1; isset($gedlines[$ii]) && preg_match('/^(\d+) (\S+)/', $gedlines[$ii], $mm) && $mm[1] > $level; ++$ii) {
-				if ($mm[1] == $level + 1) {
-					$subtags[] = $mm[2];
-				}
-			}
-
-			// Insert missing tags
-			if (!empty($expected_subtags[$type])) {
-				foreach ($expected_subtags[$type] as $subtag) {
-					if (!in_array($subtag, $subtags)) {
-						self::addSimpleTag(($level + 1) . ' ' . $subtag, '', GedcomTag::getLabel($label . ':' . $subtag));
-						if (!empty($expected_subtags[$subtag])) {
-							foreach ($expected_subtags[$subtag] as $subsubtag) {
-								self::addSimpleTag(($level + 2) . ' ' . $subsubtag, '', GedcomTag::getLabel($label . ':' . $subtag . ':' . $subsubtag));
-							}
-						}
-					}
-				}
-			}
-
-			$i++;
-			if (isset($gedlines[$i])) {
-				$fields = explode(' ', $gedlines[$i]);
-				$level  = $fields[0];
-				if (isset($fields[1])) {
-					$type = trim($fields[1]);
-				} else {
-					$level = 0;
-				}
-			} else {
-				$level = 0;
-			}
-			if ($level <= $glevel) {
-				break;
-			}
-		}
-
-		if ($level1type !== '_PRIM') {
-			self::insertMissingSubtags($level1type, $add_date);
-		}
-
-		return $level1type;
-	}
-
-	/**
-	 * Populates the global $tags array with any missing sub-tags.
-	 *
-	 * @param string $level1tag the type of the level 1 gedcom record
-	 * @param bool $add_date
-	 */
-	public static function insertMissingSubtags($level1tag, $add_date = false) {
-		global $tags, $WT_TREE;
-
-		// handle  MARRiage TYPE
-		$type_val = '';
-		if (substr($level1tag, 0, 5) === 'MARR_') {
-			$type_val  = substr($level1tag, 5);
-			$level1tag = 'MARR';
-		}
-
-		foreach (Config::levelTwoTags() as $key => $value) {
-			if ($key === 'DATE' && in_array($level1tag, Config::nonDateFacts()) || $key === 'PLAC' && in_array($level1tag, Config::nonPlaceFacts())) {
-				continue;
-			}
-			if (in_array($level1tag, $value) && !in_array($key, $tags)) {
-				if ($key === 'TYPE') {
-					self::addSimpleTag('2 TYPE ' . $type_val, $level1tag);
-				} elseif ($level1tag === '_TODO' && $key === 'DATE') {
-					self::addSimpleTag('2 ' . $key . ' ' . strtoupper(date('d M Y')), $level1tag);
-				} elseif ($level1tag === '_TODO' && $key === '_WT_USER') {
-					self::addSimpleTag('2 ' . $key . ' ' . Auth::user()->getUserName(), $level1tag);
-				} elseif ($level1tag === 'TITL' && strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), $key) !== false) {
-					self::addSimpleTag('2 ' . $key, $level1tag);
-				} elseif ($level1tag === 'NAME' && strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), $key) !== false) {
-					self::addSimpleTag('2 ' . $key, $level1tag);
-				} elseif ($level1tag !== 'TITL' && $level1tag !== 'NAME') {
-					self::addSimpleTag('2 ' . $key, $level1tag);
-				}
-				// Add level 3/4 tags as appropriate
-				switch ($key) {
-				case 'PLAC':
-					if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('ADVANCED_PLAC_FACTS'), $match)) {
-						foreach ($match[1] as $tag) {
-							self::addSimpleTag('3 ' . $tag, '', GedcomTag::getLabel($level1tag . ':PLAC:' . $tag));
-						}
-					}
-					self::addSimpleTag('3 MAP');
-					self::addSimpleTag('4 LATI');
-					self::addSimpleTag('4 LONG');
-					break;
-				case 'FILE':
-					self::addSimpleTag('3 FORM');
-					break;
-				case 'EVEN':
-					self::addSimpleTag('3 DATE');
-					self::addSimpleTag('3 PLAC');
-					break;
-				case 'STAT':
-					if (GedcomCodeTemp::isTagLDS($level1tag)) {
-						self::addSimpleTag('3 DATE', '', GedcomTag::getLabel('STAT:DATE'));
-					}
-					break;
-				case 'DATE':
-					// TIME is NOT a valid 5.5.1 tag
-					if (in_array($level1tag, Config::dateAndTime())) {
-						self::addSimpleTag('3 TIME');
-					}
-					break;
-				case 'HUSB':
-				case 'WIFE':
-					self::addSimpleTag('3 AGE');
-					break;
-				case 'FAMC':
-					if ($level1tag === 'ADOP') {
-						self::addSimpleTag('3 ADOP BOTH');
-					}
-					break;
-				}
-			} elseif ($key === 'DATE' && $add_date) {
-				self::addSimpleTag('2 DATE', $level1tag, GedcomTag::getLabel($level1tag . ':DATE'));
-			}
-		}
-		// Do something (anything!) with unrecognized custom tags
-		if (substr($level1tag, 0, 1) === '_' && $level1tag !== '_UID' && $level1tag !== '_TODO') {
-			foreach (array('DATE', 'PLAC', 'ADDR', 'AGNC', 'TYPE', 'AGE') as $tag) {
-				if (!in_array($tag, $tags)) {
-					self::addSimpleTag('2 ' . $tag);
-					if ($tag === 'PLAC') {
-						if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('ADVANCED_PLAC_FACTS'), $match)) {
-							foreach ($match[1] as $ptag) {
-								self::addSimpleTag('3 ' . $ptag, '', GedcomTag::getLabel($level1tag . ':PLAC:' . $ptag));
-							}
-						}
-						self::addSimpleTag('3 MAP');
-						self::addSimpleTag('4 LATI');
-						self::addSimpleTag('4 LONG');
-					}
-				}
-			}
-		}
-	}
+        $options = '<option value="">' . I18N::translate('Census date') . '</option>';
+
+        foreach ($census_places as $census_place) {
+            $options .= '<option value=""></option>';
+            foreach ($census_place->allCensusDates() as $census) {
+                $date            = new Date($census->censusDate());
+                $year            = $date->minimumDate()->format('%Y');
+                $place_hierarchy = explode(', ', $census->censusPlace());
+                $options .= '<option value="' . $census->censusDate() . '" data-place="' . $census->censusPlace() . '" data-census="' . get_class($census) . '">' . $place_hierarchy[0] . ' ' . $year . '</option>';
+            }
+        }
+
+        return
+            '<input type="hidden" id="pid_array" name="pid_array" value="">' .
+            '<select class="census-assistant-selector" onchange="selectCensus(this);">' . $options . '</select>';
+    }
+
+    /**
+     * Prints collapsable fields to add ASSO/RELA, SOUR, OBJE, etc.
+     *
+     * @param string $tag
+     * @param int $level
+     * @param string $parent_tag
+     */
+    public static function printAddLayer($tag, $level = 2, $parent_tag = '') {
+        global $WT_TREE;
+
+        switch ($tag) {
+        case 'SOUR':
+            echo '<a href="#" onclick="return expand_layer(\'newsource\');"><i id="newsource_img" class="icon-plus"></i> ', I18N::translate('Add a source citation'), '</a>';
+            echo '<br>';
+            echo '<div id="newsource" style="display: none;">';
+            echo '<table class="facts_table">';
+            // 2 SOUR
+            self::addSimpleTag($level . ' SOUR @');
+            // 3 PAGE
+            self::addSimpleTag(($level + 1) . ' PAGE');
+            // 3 DATA
+            self::addSimpleTag(($level + 1) . ' DATA');
+            // 4 TEXT
+            self::addSimpleTag(($level + 2) . ' TEXT');
+            if ($WT_TREE->getPreference('FULL_SOURCES')) {
+                // 4 DATE
+                self::addSimpleTag(($level + 2) . ' DATE', '', GedcomTag::getLabel('DATA:DATE'));
+                // 3 QUAY
+                self::addSimpleTag(($level + 1) . ' QUAY');
+            }
+            // 3 OBJE
+            self::addSimpleTag(($level + 1) . ' OBJE');
+            // 3 SHARED_NOTE
+            self::addSimpleTag(($level + 1) . ' SHARED_NOTE');
+            echo '</table></div>';
+            break;
+
+        case 'ASSO':
+        case 'ASSO2':
+            //-- Add a new ASSOciate
+            if ($tag === 'ASSO') {
+                echo "<a href=\"#\" onclick=\"return expand_layer('newasso');\"><i id=\"newasso_img\" class=\"icon-plus\"></i> ", I18N::translate('Add an associate'), '</a>';
+                echo '<br>';
+                echo '<div id="newasso" style="display: none;">';
+            } else {
+                echo "<a href=\"#\" onclick=\"return expand_layer('newasso2');\"><i id=\"newasso2_img\" class=\"icon-plus\"></i> ", I18N::translate('Add an associate'), '</a>';
+                echo '<br>';
+                echo '<div id="newasso2" style="display: none;">';
+            }
+            echo '<table class="facts_table">';
+            // 2 ASSO
+            self::addSimpleTag($level . ' _ASSO @');
+            // 3 RELA
+            self::addSimpleTag(($level + 1) . ' RELA');
+            // 3 NOTE
+            self::addSimpleTag(($level + 1) . ' NOTE');
+            // 3 SHARED_NOTE
+            self::addSimpleTag(($level + 1) . ' SHARED_NOTE');
+            echo '</table></div>';
+            break;
+
+        case 'NOTE':
+            //-- Retrieve existing note or add new note to fact
+            echo "<a href=\"#\" onclick=\"return expand_layer('newnote');\"><i id=\"newnote_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a note'), '</a>';
+            echo '<br>';
+            echo '<div id="newnote" style="display: none;">';
+            echo '<table class="facts_table">';
+            // 2 NOTE
+            self::addSimpleTag($level . ' NOTE');
+            echo '</table></div>';
+            break;
+
+        case 'SHARED_NOTE':
+            echo "<a href=\"#\" onclick=\"return expand_layer('newshared_note');\"><i id=\"newshared_note_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a shared note'), '</a>';
+            echo '<br>';
+            echo '<div id="newshared_note" style="display: none;">';
+            echo '<table class="facts_table">';
+            // 2 SHARED NOTE
+            self::addSimpleTag($level . ' SHARED_NOTE', $parent_tag);
+            echo '</table></div>';
+            break;
+
+        case 'OBJE':
+            if ($WT_TREE->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($WT_TREE)) {
+                echo "<a href=\"#\" onclick=\"return expand_layer('newobje');\"><i id=\"newobje_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a media object'), '</a>';
+                echo '<br>';
+                echo '<div id="newobje" style="display: none;">';
+                echo '<table class="facts_table">';
+                self::addSimpleTag($level . ' OBJE');
+                echo '</table></div>';
+            }
+            break;
+
+        case 'RESN':
+            echo "<a href=\"#\" onclick=\"return expand_layer('newresn');\"><i id=\"newresn_img\" class=\"icon-plus\"></i> ", I18N::translate('Add a restriction'), '</a>';
+            echo '<br>';
+            echo '<div id="newresn" style="display: none;">';
+            echo '<table class="facts_table">';
+            // 2 RESN
+            self::addSimpleTag($level . ' RESN');
+            echo '</table></div>';
+            break;
+        }
+    }
+
+    /**
+     * Add some empty tags to create a new fact.
+     *
+     * @param string $fact
+     */
+    public static function addSimpleTags($fact) {
+        global $WT_TREE;
+
+        // For new individuals, these facts default to "Y"
+        if ($fact === 'MARR') {
+            self::addSimpleTag('0 ' . $fact . ' Y');
+        } else {
+            self::addSimpleTag('0 ' . $fact);
+        }
+
+        if (!in_array($fact, Config::nonDateFacts())) {
+            self::addSimpleTag('0 DATE', $fact, GedcomTag::getLabel($fact . ':DATE'));
+        }
+
+        if (!in_array($fact, Config::nonPlaceFacts())) {
+            self::addSimpleTag('0 PLAC', $fact, GedcomTag::getLabel($fact . ':PLAC'));
+
+            if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('ADVANCED_PLAC_FACTS'), $match)) {
+                foreach ($match[1] as $tag) {
+                    self::addSimpleTag('0 ' . $tag, $fact, GedcomTag::getLabel($fact . ':PLAC:' . $tag));
+                }
+            }
+            self::addSimpleTag('0 MAP', $fact);
+            self::addSimpleTag('0 LATI', $fact);
+            self::addSimpleTag('0 LONG', $fact);
+        }
+    }
+
+    /**
+     * Assemble the pieces of a newly created record into gedcom
+     *
+     * @return string
+     */
+    public static function addNewName() {
+        global $WT_TREE;
+
+        $gedrec = "\n1 NAME " . Filter::post('NAME');
+
+        $tags = array('NPFX', 'GIVN', 'SPFX', 'SURN', 'NSFX');
+
+        if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('ADVANCED_NAME_FACTS'), $match)) {
+            $tags = array_merge($tags, $match[1]);
+        }
+
+        // Paternal and Polish and Lithuanian surname traditions can also create a _MARNM
+        $SURNAME_TRADITION = $WT_TREE->getPreference('SURNAME_TRADITION');
+        if ($SURNAME_TRADITION === 'paternal' || $SURNAME_TRADITION === 'polish' || $SURNAME_TRADITION === 'lithuanian') {
+            $tags[] = '_MARNM';
+        }
+
+        foreach (array_unique($tags) as $tag) {
+            $TAG = Filter::post($tag);
+            if ($TAG) {
+                $gedrec .= "\n2 {$tag} {$TAG}";
+            }
+        }
+
+        return $gedrec;
+    }
+
+    /**
+     * Create a form to add a sex record.
+     *
+     * @return string
+     */
+    public static function addNewSex() {
+        switch (Filter::post('SEX', '[MF]', 'U')) {
+        case 'M':
+            return "\n1 SEX M";
+        case 'F':
+            return "\n1 SEX F";
+        default:
+            return "\n1 SEX U";
+        }
+    }
+
+    /**
+     * Create a form to add a new fact.
+     *
+     * @param string $fact
+     *
+     * @return string
+     */
+    public static function addNewFact($fact) {
+        global $WT_TREE;
+
+        $FACT = Filter::post($fact);
+        $DATE = Filter::post($fact . '_DATE');
+        $PLAC = Filter::post($fact . '_PLAC');
+        if ($DATE || $PLAC || $FACT && $FACT !== 'Y') {
+            if ($FACT && $FACT !== 'Y') {
+                $gedrec = "\n1 " . $fact . ' ' . $FACT;
+            } else {
+                $gedrec = "\n1 " . $fact;
+            }
+            if ($DATE) {
+                $gedrec .= "\n2 DATE " . $DATE;
+            }
+            if ($PLAC) {
+                $gedrec .= "\n2 PLAC " . $PLAC;
+
+                if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('ADVANCED_PLAC_FACTS'), $match)) {
+                    foreach ($match[1] as $tag) {
+                        $TAG = Filter::post($fact . '_' . $tag);
+                        if ($TAG) {
+                            $gedrec .= "\n3 " . $tag . ' ' . $TAG;
+                        }
+                    }
+                }
+                $LATI = Filter::post($fact . '_LATI');
+                $LONG = Filter::post($fact . '_LONG');
+                if ($LATI || $LONG) {
+                    $gedrec .= "\n3 MAP\n4 LATI " . $LATI . "\n4 LONG " . $LONG;
+                }
+            }
+            if (Filter::postBool('SOUR_' . $fact)) {
+                return self::updateSource($gedrec, 2);
+            } else {
+                return $gedrec;
+            }
+        } elseif ($FACT === 'Y') {
+            if (Filter::postBool('SOUR_' . $fact)) {
+                return self::updateSource("\n1 " . $fact . ' Y', 2);
+            } else {
+                return "\n1 " . $fact . ' Y';
+            }
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * This function splits the $glevels, $tag, $islink, and $text arrays so that the
+     * entries associated with a SOUR record are separate from everything else.
+     *
+     * Input arrays:
+     * - $glevels[] - an array of the gedcom level for each line that was edited
+     * - $tag[] - an array of the tags for each gedcom line that was edited
+     * - $islink[] - an array of 1 or 0 values to indicate when the text is a link element
+     * - $text[] - an array of the text data for each line
+     *
+     * Output arrays:
+     * ** For the SOUR record:
+     * - $glevelsSOUR[] - an array of the gedcom level for each line that was edited
+     * - $tagSOUR[] - an array of the tags for each gedcom line that was edited
+     * - $islinkSOUR[] - an array of 1 or 0 values to indicate when the text is a link element
+     * - $textSOUR[] - an array of the text data for each line
+     * ** For the remaining records:
+     * - $glevelsRest[] - an array of the gedcom level for each line that was edited
+     * - $tagRest[] - an array of the tags for each gedcom line that was edited
+     * - $islinkRest[] - an array of 1 or 0 values to indicate when the text is a link element
+     * - $textRest[] - an array of the text data for each line
+     */
+    public static function splitSource() {
+        global $glevels, $tag, $islink, $text;
+        global $glevelsSOUR, $tagSOUR, $islinkSOUR, $textSOUR;
+        global $glevelsRest, $tagRest, $islinkRest, $textRest;
+
+        $glevelsSOUR = array();
+        $tagSOUR     = array();
+        $islinkSOUR  = array();
+        $textSOUR    = array();
+
+        $glevelsRest = array();
+        $tagRest     = array();
+        $islinkRest  = array();
+        $textRest    = array();
+
+        $inSOUR = false;
+
+        for ($i = 0; $i < count($glevels); $i++) {
+            if ($inSOUR) {
+                if ($levelSOUR < $glevels[$i]) {
+                    $dest = 'S';
+                } else {
+                    $inSOUR = false;
+                    $dest   = 'R';
+                }
+            } else {
+                if ($tag[$i] === 'SOUR') {
+                    $inSOUR    = true;
+                    $levelSOUR = $glevels[$i];
+                    $dest      = 'S';
+                } else {
+                    $dest = 'R';
+                }
+            }
+            if ($dest === 'S') {
+                $glevelsSOUR[] = $glevels[$i];
+                $tagSOUR[]     = $tag[$i];
+                $islinkSOUR[]  = $islink[$i];
+                $textSOUR[]    = $text[$i];
+            } else {
+                $glevelsRest[] = $glevels[$i];
+                $tagRest[]     = $tag[$i];
+                $islinkRest[]  = $islink[$i];
+                $textRest[]    = $text[$i];
+            }
+        }
+    }
+
+    /**
+     * Add new GEDCOM lines from the $xxxSOUR interface update arrays, which
+     * were produced by the splitSOUR() function.
+     * See the FunctionsEdit::handle_updatesges() function for details.
+     *
+     * @param string $inputRec
+     * @param string $levelOverride
+     *
+     * @return string
+     */
+    public static function updateSource($inputRec, $levelOverride = 'no') {
+        global $glevels, $tag, $islink, $text;
+        global $glevelsSOUR, $tagSOUR, $islinkSOUR, $textSOUR;
+
+        if (count($tagSOUR) === 0) {
+            return $inputRec; // No update required
+        }
+
+        // Save original interface update arrays before replacing them with the xxxSOUR ones
+        $glevelsSave = $glevels;
+        $tagSave     = $tag;
+        $islinkSave  = $islink;
+        $textSave    = $text;
+
+        $glevels = $glevelsSOUR;
+        $tag     = $tagSOUR;
+        $islink  = $islinkSOUR;
+        $text    = $textSOUR;
+
+        $myRecord = self::handleUpdates($inputRec, $levelOverride); // Now do the update
+
+        // Restore the original interface update arrays (just in case ...)
+        $glevels = $glevelsSave;
+        $tag     = $tagSave;
+        $islink  = $islinkSave;
+        $text    = $textSave;
+
+        return $myRecord;
+    }
+
+    /**
+     * Add new GEDCOM lines from the $xxxRest interface update arrays, which
+     * were produced by the splitSOUR() function.
+     * See the FunctionsEdit::handle_updatesges() function for details.
+     *
+     * @param string $inputRec
+     * @param string $levelOverride
+     *
+     * @return string
+     */
+    public static function updateRest($inputRec, $levelOverride = 'no') {
+        global $glevels, $tag, $islink, $text;
+        global $glevelsRest, $tagRest, $islinkRest, $textRest;
+
+        if (count($tagRest) === 0) {
+            return $inputRec; // No update required
+        }
+
+        // Save original interface update arrays before replacing them with the xxxRest ones
+        $glevelsSave = $glevels;
+        $tagSave     = $tag;
+        $islinkSave  = $islink;
+        $textSave    = $text;
+
+        $glevels = $glevelsRest;
+        $tag     = $tagRest;
+        $islink  = $islinkRest;
+        $text    = $textRest;
+
+        $myRecord = self::handleUpdates($inputRec, $levelOverride); // Now do the update
+
+        // Restore the original interface update arrays (just in case ...)
+        $glevels = $glevelsSave;
+        $tag     = $tagSave;
+        $islink  = $islinkSave;
+        $text    = $textSave;
+
+        return $myRecord;
+    }
+
+    /**
+     * Add new gedcom lines from interface update arrays
+     * The edit_interface and FunctionsEdit::add_simple_tag function produce the following
+     * arrays incoming from the $_POST form
+     * - $glevels[] - an array of the gedcom level for each line that was edited
+     * - $tag[] - an array of the tags for each gedcom line that was edited
+     * - $islink[] - an array of 1 or 0 values to tell whether the text is a link element and should be surrounded by @@
+     * - $text[] - an array of the text data for each line
+     * With these arrays you can recreate the gedcom lines like this
+     * <code>$glevel[0].' '.$tag[0].' '.$text[0]</code>
+     * There will be an index in each of these arrays for each line of the gedcom
+     * fact that is being edited.
+     * If the $text[] array is empty for the given line, then it means that the
+     * user removed that line during editing or that the line is supposed to be
+     * empty (1 DEAT, 1 BIRT) for example. To know if the line should be removed
+     * there is a section of code that looks ahead to the next lines to see if there
+     * are sub lines. For example we don't want to remove the 1 DEAT line if it has
+     * a 2 PLAC or 2 DATE line following it. If there are no sub lines, then the line
+     * can be safely removed.
+     *
+     * @param string $newged the new gedcom record to add the lines to
+     * @param string $levelOverride Override GEDCOM level specified in $glevels[0]
+     *
+     * @return string The updated gedcom record
+     */
+    public static function handleUpdates($newged, $levelOverride = 'no') {
+        global $glevels, $islink, $tag, $uploaded_files, $text;
+
+        if ($levelOverride === 'no' || count($glevels) === 0) {
+            $levelAdjust = 0;
+        } else {
+            $levelAdjust = $levelOverride - $glevels[0];
+        }
+
+        for ($j = 0; $j < count($glevels); $j++) {
+
+            // Look for empty SOUR reference with non-empty sub-records.
+            // This can happen when the SOUR entry is deleted but its sub-records
+            // were incorrectly left intact.
+            // The sub-records should be deleted.
+            if ($tag[$j] === 'SOUR' && ($text[$j] === '@@' || $text[$j] === '')) {
+                $text[$j] = '';
+                $k        = $j + 1;
+                while (($k < count($glevels)) && ($glevels[$k] > $glevels[$j])) {
+                    $text[$k] = '';
+                    $k++;
+                }
+            }
+
+            if (trim($text[$j]) !== '') {
+                $pass = true;
+            } else {
+                //-- for facts with empty values they must have sub records
+                //-- this section checks if they have subrecords
+                $k    = $j + 1;
+                $pass = false;
+                while (($k < count($glevels)) && ($glevels[$k] > $glevels[$j])) {
+                    if ($text[$k] !== '') {
+                        if (($tag[$j] !== 'OBJE') || ($tag[$k] === 'FILE')) {
+                            $pass = true;
+                            break;
+                        }
+                    }
+                    if (($tag[$k] === 'FILE') && (count($uploaded_files) > 0)) {
+                        $filename = array_shift($uploaded_files);
+                        if (!empty($filename)) {
+                            $text[$k] = $filename;
+                            $pass     = true;
+                            break;
+                        }
+                    }
+                    $k++;
+                }
+            }
+
+            //-- if the value is not empty or it has sub lines
+            //--- then write the line to the gedcom record
+            //-- we have to let some emtpy text lines pass through... (DEAT, BIRT, etc)
+            if ($pass) {
+                $newline = $glevels[$j] + $levelAdjust . ' ' . $tag[$j];
+                if ($text[$j] !== '') {
+                    if ($islink[$j]) {
+                        $newline .= ' @' . $text[$j] . '@';
+                    } else {
+                        $newline .= ' ' . $text[$j];
+                    }
+                }
+                $newged .= "\n" . str_replace("\n", "\n" . (1 + substr($newline, 0, 1)) . ' CONT ', $newline);
+            }
+        }
+
+        return $newged;
+    }
+
+    /**
+     * builds the form for adding new facts
+     *
+     * @param string $fact the new fact we are adding
+     */
+    public static function createAddForm($fact) {
+        global $tags, $WT_TREE;
+
+        $tags = array();
+
+        // handle  MARRiage TYPE
+        if (substr($fact, 0, 5) === 'MARR_') {
+            $tags[0] = 'MARR';
+            self::addSimpleTag('1 MARR');
+            self::insertMissingSubtags($fact);
+        } else {
+            $tags[0] = $fact;
+            if ($fact === '_UID') {
+                $fact .= ' ' . GedcomTag::createUid();
+            }
+            // These new level 1 tags need to be turned into links
+            if (in_array($fact, array('ALIA', 'ASSO'))) {
+                $fact .= ' @';
+            }
+            if (in_array($fact, Config::emptyFacts())) {
+                self::addSimpleTag('1 ' . $fact . ' Y');
+            } else {
+                self::addSimpleTag('1 ' . $fact);
+            }
+            self::insertMissingSubtags($tags[0]);
+            //-- handle the special SOURce case for level 1 sources [ 1759246 ]
+            if ($fact === 'SOUR') {
+                self::addSimpleTag('2 PAGE');
+                self::addSimpleTag('3 TEXT');
+                if ($WT_TREE->getPreference('FULL_SOURCES')) {
+                    self::addSimpleTag('3 DATE', '', GedcomTag::getLabel('DATA:DATE'));
+                    self::addSimpleTag('2 QUAY');
+                }
+            }
+        }
+    }
+
+    /**
+     * Create a form to edit a Fact object.
+     *
+     * @param Fact $fact
+     *
+     * @return string
+     */
+    public static function createEditForm(Fact $fact) {
+        global $tags;
+
+        $record = $fact->getParent();
+
+        $tags     = array();
+        $gedlines = explode("\n", $fact->getGedcom());
+
+        $linenum = 0;
+        $fields  = explode(' ', $gedlines[$linenum]);
+        $glevel  = $fields[0];
+        $level   = $glevel;
+
+        $type       = $fact->getTag();
+        $level0type = $record::RECORD_TYPE;
+        $level1type = $type;
+
+        $i           = $linenum;
+        $inSource    = false;
+        $levelSource = 0;
+        $add_date    = true;
+
+        // List of tags we would expect at the next level
+        // NB add_missing_subtags() already takes care of the simple cases
+        // where a level 1 tag is missing a level 2 tag. Here we only need to
+        // handle the more complicated cases.
+        $expected_subtags = array(
+            'SOUR' => array('PAGE', 'DATA'),
+            'DATA' => array('TEXT'),
+            'PLAC' => array('MAP'),
+            'MAP'  => array('LATI', 'LONG'),
+        );
+        if ($record->getTree()->getPreference('FULL_SOURCES')) {
+            $expected_subtags['SOUR'][] = 'QUAY';
+            $expected_subtags['DATA'][] = 'DATE';
+        }
+        if (GedcomCodeTemp::isTagLDS($level1type)) {
+            $expected_subtags['STAT'] = array('DATE');
+        }
+        if (in_array($level1type, Config::dateAndTime())) {
+            $expected_subtags['DATE'] = array('TIME'); // TIME is NOT a valid 5.5.1 tag
+        }
+        if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $record->getTree()->getPreference('ADVANCED_PLAC_FACTS'), $match)) {
+            $expected_subtags['PLAC'] = array_merge($match[1], $expected_subtags['PLAC']);
+        }
+
+        $stack = array();
+        // Loop on existing tags :
+        while (true) {
+            // Keep track of our hierarchy, e.g. 1=>BIRT, 2=>PLAC, 3=>FONE
+            $stack[$level] = $type;
+            // Merge them together, e.g. BIRT:PLAC:FONE
+            $label = implode(':', array_slice($stack, 0, $level));
+
+            $text = '';
+            for ($j = 2; $j < count($fields); $j++) {
+                if ($j > 2) {
+                    $text .= ' ';
+                }
+                $text .= $fields[$j];
+            }
+            $text = rtrim($text);
+            while (($i + 1 < count($gedlines)) && (preg_match("/" . ($level + 1) . ' CONT ?(.*)/', $gedlines[$i + 1], $cmatch) > 0)) {
+                $text .= "\n" . $cmatch[1];
+                $i++;
+            }
+
+            if ($type === 'SOUR') {
+                $inSource    = true;
+                $levelSource = $level;
+            } elseif ($levelSource >= $level) {
+                $inSource = false;
+            }
+
+            if ($type !== 'CONT') {
+                $tags[]    = $type;
+                $subrecord = $level . ' ' . $type . ' ' . $text;
+                if ($inSource && $type === 'DATE') {
+                    self::addSimpleTag($subrecord, '', GedcomTag::getLabel($label, $record));
+                } elseif (!$inSource && $type === 'DATE') {
+                    self::addSimpleTag($subrecord, $level1type, GedcomTag::getLabel($label, $record));
+                    if ($level === '2') {
+                        // We already have a date - no need to add one.
+                        $add_date = false;
+                    }
+                } elseif ($type === 'STAT') {
+                    self::addSimpleTag($subrecord, $level1type, GedcomTag::getLabel($label, $record));
+                } else {
+                    self::addSimpleTag($subrecord, $level0type, GedcomTag::getLabel($label, $record));
+                }
+            }
+
+            // Get a list of tags present at the next level
+            $subtags = array();
+            for ($ii = $i + 1; isset($gedlines[$ii]) && preg_match('/^(\d+) (\S+)/', $gedlines[$ii], $mm) && $mm[1] > $level; ++$ii) {
+                if ($mm[1] == $level + 1) {
+                    $subtags[] = $mm[2];
+                }
+            }
+
+            // Insert missing tags
+            if (!empty($expected_subtags[$type])) {
+                foreach ($expected_subtags[$type] as $subtag) {
+                    if (!in_array($subtag, $subtags)) {
+                        self::addSimpleTag(($level + 1) . ' ' . $subtag, '', GedcomTag::getLabel($label . ':' . $subtag));
+                        if (!empty($expected_subtags[$subtag])) {
+                            foreach ($expected_subtags[$subtag] as $subsubtag) {
+                                self::addSimpleTag(($level + 2) . ' ' . $subsubtag, '', GedcomTag::getLabel($label . ':' . $subtag . ':' . $subsubtag));
+                            }
+                        }
+                    }
+                }
+            }
+
+            $i++;
+            if (isset($gedlines[$i])) {
+                $fields = explode(' ', $gedlines[$i]);
+                $level  = $fields[0];
+                if (isset($fields[1])) {
+                    $type = trim($fields[1]);
+                } else {
+                    $level = 0;
+                }
+            } else {
+                $level = 0;
+            }
+            if ($level <= $glevel) {
+                break;
+            }
+        }
+
+        if ($level1type !== '_PRIM') {
+            self::insertMissingSubtags($level1type, $add_date);
+        }
+
+        return $level1type;
+    }
+
+    /**
+     * Populates the global $tags array with any missing sub-tags.
+     *
+     * @param string $level1tag the type of the level 1 gedcom record
+     * @param bool $add_date
+     */
+    public static function insertMissingSubtags($level1tag, $add_date = false) {
+        global $tags, $WT_TREE;
+
+        // handle  MARRiage TYPE
+        $type_val = '';
+        if (substr($level1tag, 0, 5) === 'MARR_') {
+            $type_val  = substr($level1tag, 5);
+            $level1tag = 'MARR';
+        }
+
+        foreach (Config::levelTwoTags() as $key => $value) {
+            if ($key === 'DATE' && in_array($level1tag, Config::nonDateFacts()) || $key === 'PLAC' && in_array($level1tag, Config::nonPlaceFacts())) {
+                continue;
+            }
+            if (in_array($level1tag, $value) && !in_array($key, $tags)) {
+                if ($key === 'TYPE') {
+                    self::addSimpleTag('2 TYPE ' . $type_val, $level1tag);
+                } elseif ($level1tag === '_TODO' && $key === 'DATE') {
+                    self::addSimpleTag('2 ' . $key . ' ' . strtoupper(date('d M Y')), $level1tag);
+                } elseif ($level1tag === '_TODO' && $key === '_WT_USER') {
+                    self::addSimpleTag('2 ' . $key . ' ' . Auth::user()->getUserName(), $level1tag);
+                } elseif ($level1tag === 'TITL' && strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), $key) !== false) {
+                    self::addSimpleTag('2 ' . $key, $level1tag);
+                } elseif ($level1tag === 'NAME' && strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), $key) !== false) {
+                    self::addSimpleTag('2 ' . $key, $level1tag);
+                } elseif ($level1tag !== 'TITL' && $level1tag !== 'NAME') {
+                    self::addSimpleTag('2 ' . $key, $level1tag);
+                }
+                // Add level 3/4 tags as appropriate
+                switch ($key) {
+                case 'PLAC':
+                    if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('ADVANCED_PLAC_FACTS'), $match)) {
+                        foreach ($match[1] as $tag) {
+                            self::addSimpleTag('3 ' . $tag, '', GedcomTag::getLabel($level1tag . ':PLAC:' . $tag));
+                        }
+                    }
+                    self::addSimpleTag('3 MAP');
+                    self::addSimpleTag('4 LATI');
+                    self::addSimpleTag('4 LONG');
+                    break;
+                case 'FILE':
+                    self::addSimpleTag('3 FORM');
+                    break;
+                case 'EVEN':
+                    self::addSimpleTag('3 DATE');
+                    self::addSimpleTag('3 PLAC');
+                    break;
+                case 'STAT':
+                    if (GedcomCodeTemp::isTagLDS($level1tag)) {
+                        self::addSimpleTag('3 DATE', '', GedcomTag::getLabel('STAT:DATE'));
+                    }
+                    break;
+                case 'DATE':
+                    // TIME is NOT a valid 5.5.1 tag
+                    if (in_array($level1tag, Config::dateAndTime())) {
+                        self::addSimpleTag('3 TIME');
+                    }
+                    break;
+                case 'HUSB':
+                case 'WIFE':
+                    self::addSimpleTag('3 AGE');
+                    break;
+                case 'FAMC':
+                    if ($level1tag === 'ADOP') {
+                        self::addSimpleTag('3 ADOP BOTH');
+                    }
+                    break;
+                }
+            } elseif ($key === 'DATE' && $add_date) {
+                self::addSimpleTag('2 DATE', $level1tag, GedcomTag::getLabel($level1tag . ':DATE'));
+            }
+        }
+        // Do something (anything!) with unrecognized custom tags
+        if (substr($level1tag, 0, 1) === '_' && $level1tag !== '_UID' && $level1tag !== '_TODO') {
+            foreach (array('DATE', 'PLAC', 'ADDR', 'AGNC', 'TYPE', 'AGE') as $tag) {
+                if (!in_array($tag, $tags)) {
+                    self::addSimpleTag('2 ' . $tag);
+                    if ($tag === 'PLAC') {
+                        if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $WT_TREE->getPreference('ADVANCED_PLAC_FACTS'), $match)) {
+                            foreach ($match[1] as $ptag) {
+                                self::addSimpleTag('3 ' . $ptag, '', GedcomTag::getLabel($level1tag . ':PLAC:' . $ptag));
+                            }
+                        }
+                        self::addSimpleTag('3 MAP');
+                        self::addSimpleTag('4 LATI');
+                        self::addSimpleTag('4 LONG');
+                    }
+                }
+            }
+        }
+    }
 }

Switch Indentation +302 added lines, -302 removed lines

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

Braces +76 added lines, -38 removed lines

@@ -52,7 +52,8 @@ 
 /**
  * Class FunctionsEdit - common functions
  */
-class FunctionsEdit {
+class FunctionsEdit
+{
 	/**
 	 * Create a <select> control for a form.
 	 *
@@ -64,7 +65,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function selectEditControl($name, $values, $empty, $selected, $extra = '') {
+	public static function selectEditControl($name, $values, $empty, $selected, $extra = '')
+	{
 		if (is_null($empty)) {
 			$html = '';
 		} else {
@@ -104,7 +106,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function radioButtons($name, $values, $selected, $extra = '') {
+	public static function radioButtons($name, $values, $selected, $extra = '')
+	{
 		$html = '';
 		foreach ($values as $key => $value) {
 			$html .=
@@ -129,7 +132,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function editFieldYesNo($name, $selected = false, $extra = '') {
+	public static function editFieldYesNo($name, $selected = false, $extra = '')
+	{
 		return self::radioButtons(
 			$name, array(I18N::translate('no'), I18N::translate('yes')), $selected, $extra
 		);
@@ -144,7 +148,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function checkbox($name, $is_checked = false, $extra = '') {
+	public static function checkbox($name, $is_checked = false, $extra = '')
+	{
 		return '<input type="checkbox" name="' . $name . '" value="1" ' . ($is_checked ? 'checked ' : '') . $extra . '>';
 	}
 
@@ -160,7 +165,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function twoStateCheckbox($name, $is_checked = 0, $extra = '') {
+	public static function twoStateCheckbox($name, $is_checked = 0, $extra = '')
+	{
 		return
 			'<input type="hidden" id="' . $name . '" name="' . $name . '" value="' . ($is_checked ? 1 : 0) . '">' .
 			'<input type="checkbox" name="' . $name . '-GUI-ONLY" value="1"' .
@@ -176,7 +182,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function editLanguageCheckboxes($parameter_name, $accepted_languages) {
+	public static function editLanguageCheckboxes($parameter_name, $accepted_languages)
+	{
 		$html = '';
 		foreach (I18N::activeLocales() as $locale) {
 			$html .= '<div class="checkbox">';
@@ -200,7 +207,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function editFieldAccessLevel($name, $selected = '', $extra = '') {
+	public static function editFieldAccessLevel($name, $selected = '', $extra = '')
+	{
 		$ACCESS_LEVEL = array(
 			Auth::PRIV_PRIVATE => I18N::translate('Show to visitors'),
 			Auth::PRIV_USER    => I18N::translate('Show to members'),
@@ -220,7 +228,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function editFieldRestriction($name, $selected = '', $extra = '') {
+	public static function editFieldRestriction($name, $selected = '', $extra = '')
+	{
 		$RESN = array(
 			''             => '',
 			'none'         => I18N::translate('Show to visitors'), // Not valid GEDCOM, but very useful
@@ -241,7 +250,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function editFieldContact($name, $selected = '', $extra = '') {
+	public static function editFieldContact($name, $selected = '', $extra = '')
+	{
 		// Different ways to contact the users
 		$CONTACT_METHODS = array(
 			'messaging'  => I18N::translate('Internal messaging'),
@@ -263,7 +273,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function editFieldLanguage($name, $selected = '', $extra = '') {
+	public static function editFieldLanguage($name, $selected = '', $extra = '')
+	{
 		$languages = array();
 		foreach (I18N::activeLocales() as $locale) {
 			$languages[$locale->languageTag()] = $locale->endonym();
@@ -283,7 +294,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function editFieldInteger($name, $selected = '', $min, $max, $extra = '') {
+	public static function editFieldInteger($name, $selected = '', $min, $max, $extra = '')
+	{
 		$array = array();
 		for ($i = $min; $i <= $max; ++$i) {
 			$array[$i] = I18N::number($i);
@@ -301,7 +313,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function editFieldUsername($name, $selected = '', $extra = '') {
+	public static function editFieldUsername($name, $selected = '', $extra = '')
+	{
 		$users = array();
 		foreach (User::all() as $user) {
 			$users[$user->getUserName()] = $user->getRealName() . ' - ' . $user->getUserName();
@@ -324,7 +337,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function editFieldAdoption($name, $selected = '', $extra = '', Individual $individual = null) {
+	public static function editFieldAdoption($name, $selected = '', $extra = '', Individual $individual = null)
+	{
 		return self::selectEditControl($name, GedcomCodeAdop::getValues($individual), null, $selected, $extra);
 	}
 
@@ -338,7 +352,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function editFieldPedigree($name, $selected = '', $extra = '', Individual $individual = null) {
+	public static function editFieldPedigree($name, $selected = '', $extra = '', Individual $individual = null)
+	{
 		return self::selectEditControl($name, GedcomCodePedi::getValues($individual), '', $selected, $extra);
 	}
 
@@ -352,7 +367,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function editFieldNameType($name, $selected = '', $extra = '', Individual $individual = null) {
+	public static function editFieldNameType($name, $selected = '', $extra = '', Individual $individual = null)
+	{
 		return self::selectEditControl($name, GedcomCodeName::getValues($individual), '', $selected, $extra);
 	}
 
@@ -365,7 +381,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function editFieldRelationship($name, $selected = '', $extra = '') {
+	public static function editFieldRelationship($name, $selected = '', $extra = '')
+	{
 		$rela_codes = GedcomCodeRela::getValues();
 		// The user is allowed to specify values that aren't in the list.
 		if (!array_key_exists($selected, $rela_codes)) {
@@ -383,7 +400,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function removeLinks($gedrec, $xref) {
+	public static function removeLinks($gedrec, $xref)
+	{
 		$gedrec = preg_replace('/\n1 ' . WT_REGEX_TAG . ' @' . $xref . '@(\n[2-9].*)*/', '', $gedrec);
 		$gedrec = preg_replace('/\n2 ' . WT_REGEX_TAG . ' @' . $xref . '@(\n[3-9].*)*/', '', $gedrec);
 		$gedrec = preg_replace('/\n3 ' . WT_REGEX_TAG . ' @' . $xref . '@(\n[4-9].*)*/', '', $gedrec);
@@ -400,7 +418,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function printCalendarPopup($id) {
+	public static function printCalendarPopup($id)
+	{
 		return
 			' <a href="#" onclick="cal_toggleDate(\'caldiv' . $id . '\', \'' . $id . '\'); return false;" class="icon-button_calendar" title="' . I18N::translate('Select a date') . '"></a>' .
 			'<div id="caldiv' . $id . '" style="position:absolute;visibility:hidden;background-color:white;z-index:1000;"></div>';
@@ -413,7 +432,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function printAddNewMediaLink($element_id) {
+	public static function printAddNewMediaLink($element_id)
+	{
 		return '<a href="#" onclick="pastefield=document.getElementById(\'' . $element_id . '\'); window.open(\'addmedia.php?action=showmediaform\', \'_blank\', edit_window_specs); return false;" class="icon-button_addmedia" title="' . I18N::translate('Create a media object') . '"></a>';
 	}
 
@@ -424,7 +444,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function printAddNewRepositoryLink($element_id) {
+	public static function printAddNewRepositoryLink($element_id)
+	{
 		return '<a href="#" onclick="addnewrepository(document.getElementById(\'' . $element_id . '\')); return false;" class="icon-button_addrepository" title="' . I18N::translate('Create a repository') . '"></a>';
 	}
 
@@ -435,7 +456,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function printAddNewNoteLink($element_id) {
+	public static function printAddNewNoteLink($element_id)
+	{
 		return '<a href="#" onclick="addnewnote(document.getElementById(\'' . $element_id . '\')); return false;" class="icon-button_addnote" title="' . I18N::translate('Create a shared note') . '"></a>';
 	}
 
@@ -446,7 +468,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function printEditNoteLink($note_id) {
+	public static function printEditNoteLink($note_id)
+	{
 		return '<a href="#" onclick="edit_note(\'' . $note_id . '\'); return false;" class="icon-button_note" title="' . I18N::translate('Edit the shared note') . '"></a>';
 	}
 
@@ -457,7 +480,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function printAddNewSourceLink($element_id) {
+	public static function printAddNewSourceLink($element_id)
+	{
 		return '<a href="#" onclick="addnewsource(document.getElementById(\'' . $element_id . '\')); return false;" class="icon-button_addsource" title="' . I18N::translate('Create a source') . '"></a>';
 	}
 
@@ -480,7 +504,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function addSimpleTag($tag, $upperlevel = '', $label = '', $extra = null, Individual $person = null) {
+	public static function addSimpleTag($tag, $upperlevel = '', $label = '', $extra = null, Individual $person = null)
+	{
 		global $tags, $main_fact, $xref, $bdm, $action, $WT_TREE;
 
 		// Keep track of SOUR fields, so we can reference them in subsequent PAGE fields.
@@ -964,7 +989,8 @@ 
 	 * @param string $locale - Sort the censuses for this locale
 	 * @param string $xref   - The individual for whom we are adding a census
 	 */
-	public static function censusDateSelector($locale, $xref) {
+	public static function censusDateSelector($locale, $xref)
+	{
 		global $controller;
 
 		// Show more likely census details at the top of the list.
@@ -1049,7 +1075,8 @@ 
 	 * @param int $level
 	 * @param string $parent_tag
 	 */
-	public static function printAddLayer($tag, $level = 2, $parent_tag = '') {
+	public static function printAddLayer($tag, $level = 2, $parent_tag = '')
+	{
 		global $WT_TREE;
 
 		switch ($tag) {
@@ -1152,7 +1179,8 @@ 
 	 *
 	 * @param string $fact
 	 */
-	public static function addSimpleTags($fact) {
+	public static function addSimpleTags($fact)
+	{
 		global $WT_TREE;
 
 		// For new individuals, these facts default to "Y"
@@ -1185,7 +1213,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function addNewName() {
+	public static function addNewName()
+	{
 		global $WT_TREE;
 
 		$gedrec = "\n1 NAME " . Filter::post('NAME');
@@ -1217,7 +1246,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function addNewSex() {
+	public static function addNewSex()
+	{
 		switch (Filter::post('SEX', '[MF]', 'U')) {
 		case 'M':
 			return "\n1 SEX M";
@@ -1235,7 +1265,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function addNewFact($fact) {
+	public static function addNewFact($fact)
+	{
 		global $WT_TREE;
 
 		$FACT = Filter::post($fact);
@@ -1305,7 +1336,8 @@ 
 	 * - $islinkRest[] - an array of 1 or 0 values to indicate when the text is a link element
 	 * - $textRest[] - an array of the text data for each line
 	 */
-	public static function splitSource() {
+	public static function splitSource()
+	{
 		global $glevels, $tag, $islink, $text;
 		global $glevelsSOUR, $tagSOUR, $islinkSOUR, $textSOUR;
 		global $glevelsRest, $tagRest, $islinkRest, $textRest;
@@ -1363,7 +1395,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function updateSource($inputRec, $levelOverride = 'no') {
+	public static function updateSource($inputRec, $levelOverride = 'no')
+	{
 		global $glevels, $tag, $islink, $text;
 		global $glevelsSOUR, $tagSOUR, $islinkSOUR, $textSOUR;
 
@@ -1403,7 +1436,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function updateRest($inputRec, $levelOverride = 'no') {
+	public static function updateRest($inputRec, $levelOverride = 'no')
+	{
 		global $glevels, $tag, $islink, $text;
 		global $glevelsRest, $tagRest, $islinkRest, $textRest;
 
@@ -1458,7 +1492,8 @@ 
 	 *
 	 * @return string The updated gedcom record
 	 */
-	public static function handleUpdates($newged, $levelOverride = 'no') {
+	public static function handleUpdates($newged, $levelOverride = 'no')
+	{
 		global $glevels, $islink, $tag, $uploaded_files, $text;
 
 		if ($levelOverride === 'no' || count($glevels) === 0) {
@@ -1532,7 +1567,8 @@ 
 	 *
 	 * @param string $fact the new fact we are adding
 	 */
-	public static function createAddForm($fact) {
+	public static function createAddForm($fact)
+	{
 		global $tags, $WT_TREE;
 
 		$tags = array();
@@ -1576,7 +1612,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function createEditForm(Fact $fact) {
+	public static function createEditForm(Fact $fact)
+	{
 		global $tags;
 
 		$record = $fact->getParent();
@@ -1720,7 +1757,8 @@ 
 	 * @param string $level1tag the type of the level 1 gedcom record
 	 * @param bool $add_date
 	 */
-	public static function insertMissingSubtags($level1tag, $add_date = false) {
+	public static function insertMissingSubtags($level1tag, $add_date = false)
+	{
 		global $tags, $WT_TREE;
 
 		// handle  MARRiage TYPE

app/Functions/FunctionsCharts.php

Indentation +523 added lines, -523 removed lines

@@ -25,527 +25,527 @@
  * Class FunctionsCharts - common functions
  */
 class FunctionsCharts {
-	/**
-	 * print a table cell with sosa number
-	 *
-	 * @param int $sosa
-	 * @param string $pid optional pid
-	 * @param string $arrowDirection direction of link arrow
-	 */
-	public static function printSosaNumber($sosa, $pid = "", $arrowDirection = "up") {
-		if (substr($sosa, -1, 1) == ".") {
-			$personLabel = substr($sosa, 0, -1);
-		} else {
-			$personLabel = $sosa;
-		}
-		if ($arrowDirection == "blank") {
-			$visibility = "hidden";
-		} else {
-			$visibility = "normal";
-		}
-		echo "<td class=\"subheaders center\" style=\"vertical-align: middle; text-indent: 0px; margin-top: 0px; white-space: nowrap; visibility: ", $visibility, ";\">";
-		echo $personLabel;
-		if ($sosa != "1" && $pid != "") {
-			if ($arrowDirection == "left") {
-				$dir = 0;
-			} elseif ($arrowDirection == "right") {
-				$dir = 1;
-			} elseif ($arrowDirection == "down") {
-				$dir = 3;
-			} else {
-				$dir = 2; // either 'blank' or 'up'
-			}
-			echo '<br>';
-			self::printUrlArrow('#' . $pid, $pid, $dir);
-		}
-		echo '</td>';
-	}
-
-	/**
-	 * print the parents table for a family
-	 *
-	 * @param Family $family family gedcom ID
-	 * @param int $sosa child sosa number
-	 * @param string $label indi label (descendancy booklet)
-	 * @param string $parid parent ID (descendancy booklet)
-	 * @param string $gparid gd-parent ID (descendancy booklet)
-	 * @param int $show_full large or small box
-	 */
-	public static function printFamilyParents(Family $family, $sosa = 0, $label = '', $parid = '', $gparid = '', $show_full = 1) {
-
-		if ($show_full) {
-			$pbheight = Theme::theme()->parameter('chart-box-y') + 14;
-		} else {
-			$pbheight = Theme::theme()->parameter('compact-chart-box-y') + 14;
-		}
-
-		$husb = $family->getHusband();
-		if ($husb) {
-			echo '<a name="', $husb->getXref(), '"></a>';
-		} else {
-			$husb = new Individual('M', "0 @M@ INDI\n1 SEX M", null, $family->getTree());
-		}
-		$wife = $family->getWife();
-		if ($wife) {
-			echo '<a name="', $wife->getXref(), '"></a>';
-		} else {
-			$wife = new Individual('F', "0 @F@ INDI\n1 SEX F", null, $family->getTree());
-		}
-
-		if ($sosa) {
-			echo '<p class="name_head">', $family->getFullName(), '</p>';
-		}
-
-		/**
-		 * husband side
-		 */
-		echo '<table cellspacing="0" cellpadding="0" border="0"><tr><td rowspan="2">';
-		echo '<table border="0"><tr>';
-
-		if ($parid) {
-			if ($husb->getXref() == $parid) {
-				self::printSosaNumber($label);
-			} else {
-				self::printSosaNumber($label, '', 'blank');
-			}
-		} elseif ($sosa) {
-			self::printSosaNumber($sosa * 2);
-		}
-		if ($husb->isPendingAddtion()) {
-			echo '<td class="facts_value new">';
-		} elseif ($husb->isPendingDeletion()) {
-			echo '<td class="facts_value old">';
-		} else {
-			echo '<td>';
-		}
-		FunctionsPrint::printPedigreePerson($husb, $show_full);
-		echo '</td></tr></table>';
-		echo '</td>';
-		// husband’s parents
-		$hfam = $husb->getPrimaryChildFamily();
-		if ($hfam) {
-			// remove the|| test for $sosa
-			echo '<td rowspan="2"><img src="' . Theme::theme()->parameter('image-hline') . '"></td><td rowspan="2"><img src="' . Theme::theme()->parameter('image-vline') . '" width="3" height="' . ($pbheight + 9) . '"></td>';
-			echo '<td><img class="line5" src="' . Theme::theme()->parameter('image-hline') . '"></td><td>';
-			// husband’s father
-			if ($hfam && $hfam->getHusband()) {
-				echo '<table border="0"><tr>';
-				if ($sosa > 0) {
-					self::printSosaNumber($sosa * 4, $hfam->getHusband()->getXref(), 'down');
-				}
-				if (!empty($gparid) && $hfam->getHusband()->getXref() == $gparid) {
-					self::printSosaNumber(trim(substr($label, 0, -3), '.') . '.');
-				}
-				echo '<td>';
-				FunctionsPrint::printPedigreePerson($hfam->getHusband(), $show_full);
-				echo '</td></tr></table>';
-			} elseif ($hfam && !$hfam->getHusband()) {
-				// Empty box for grandfather
-				echo '<table border="0"><tr>';
-				echo '<td>';
-				FunctionsPrint::printPedigreePerson($hfam->getHusband(), $show_full);
-				echo '</td></tr></table>';
-			}
-			echo '</td>';
-		}
-		if ($hfam && ($sosa != -1)) {
-			echo '<td rowspan="2">';
-			self::printUrlArrow(($sosa == 0 ? '?famid=' . $hfam->getXref() . '&amp;ged=' . $hfam->getTree()->getNameUrl() : '#' . $hfam->getXref()), $hfam->getXref(), 1);
-			echo '</td>';
-		}
-		if ($hfam) {
-			// husband’s mother
-			echo '</tr><tr><td><img src="' . Theme::theme()->parameter('image-hline') . '"></td><td>';
-			if ($hfam && $hfam->getWife()) {
-				echo '<table border=\'0\'><tr>';
-				if ($sosa > 0) {
-					self::printSosaNumber($sosa * 4 + 1, $hfam->getWife()->getXref(), 'down');
-				}
-				if (!empty($gparid) && $hfam->getWife()->getXref() == $gparid) {
-					self::printSosaNumber(trim(substr($label, 0, -3), '.') . '.');
-				}
-				echo '<td>';
-				FunctionsPrint::printPedigreePerson($hfam->getWife(), $show_full);
-				echo '</td></tr></table>';
-			} elseif ($hfam && !$hfam->getWife()) {
-				// Empty box for grandmother
-				echo '<table border="0"><tr>';
-				echo '<td>';
-				FunctionsPrint::printPedigreePerson($hfam->getWife(), $show_full);
-				echo '</td></tr></table>';
-			}
-			echo '</td>';
-		}
-		echo '</tr></table>';
-		if ($sosa && $family->canShow()) {
-			foreach ($family->getFacts(WT_EVENTS_MARR) as $fact) {
-				echo '<a href="', $family->getHtmlUrl(), '" class="details1">';
-				echo str_repeat('&nbsp;', 10);
-				echo $fact->summary();
-				echo '</a>';
-			}
-		} else {
-			echo '<br>';
-		}
-
-		/**
-		 * wife side
-		 */
-		echo '<table cellspacing="0" cellpadding="0" border="0"><tr><td rowspan="2">';
-		echo '<table><tr>';
-		if ($parid) {
-			if ($wife->getXref() == $parid) {
-				self::printSosaNumber($label);
-			} else {
-				self::printSosaNumber($label, '', 'blank');
-			}
-		} elseif ($sosa) {
-			self::printSosaNumber($sosa * 2 + 1);
-		}
-		if ($wife->isPendingAddtion()) {
-			echo '<td class="facts_value new">';
-		} elseif ($wife->isPendingDeletion()) {
-			echo '<td class="facts_value old">';
-		} else {
-			echo '<td>';
-		}
-		FunctionsPrint::printPedigreePerson($wife, $show_full);
-		echo '</td></tr></table>';
-		echo '</td>';
-		// wife’s parents
-		$hfam = $wife->getPrimaryChildFamily();
-
-		if ($hfam) {
-			echo '<td rowspan="2"><img src="' . Theme::theme()->parameter('image-hline') . '"></td><td rowspan="2"><img src="' . Theme::theme()->parameter('image-vline') . '" width="3" height="' . ($pbheight + 9) . '"></td>';
-			echo '<td><img class="line5" src="' . Theme::theme()->parameter('image-hline') . '"></td><td>';
-			// wife’s father
-			if ($hfam && $hfam->getHusband()) {
-				echo '<table><tr>';
-				if ($sosa > 0) {
-					self::printSosaNumber($sosa * 4 + 2, $hfam->getHusband()->getXref(), 'down');
-				}
-				if (!empty($gparid) && $hfam->getHusband()->getXref() == $gparid) {
-					self::printSosaNumber(trim(substr($label, 0, -3), '.') . '.');
-				}
-				echo '<td>';
-				FunctionsPrint::printPedigreePerson($hfam->getHusband(), $show_full);
-				echo '</td></tr></table>';
-			} elseif ($hfam && !$hfam->getHusband()) {
-				// Empty box for grandfather
-				echo '<table border="0"><tr>';
-				echo '<td>';
-				FunctionsPrint::printPedigreePerson($hfam->getHusband(), $show_full);
-				echo '</td></tr></table>';
-			}
-			echo '</td>';
-		}
-		if ($hfam && ($sosa != -1)) {
-			echo '<td rowspan="2">';
-			self::printUrlArrow(($sosa == 0 ? '?famid=' . $hfam->getXref() . '&amp;ged=' . $hfam->getTree()->getNameUrl() : '#' . $hfam->getXref()), $hfam->getXref(), 1);
-			echo '</td>';
-		}
-		if ($hfam) {
-			// wife’s mother
-			echo '</tr><tr><td><img src="' . Theme::theme()->parameter('image-hline') . '"></td><td>';
-			if ($hfam && $hfam->getWife()) {
-				echo '<table><tr>';
-				if ($sosa > 0) {
-					self::printSosaNumber($sosa * 4 + 3, $hfam->getWife()->getXref(), 'down');
-				}
-				if (!empty($gparid) && $hfam->getWife()->getXref() == $gparid) {
-					self::printSosaNumber(trim(substr($label, 0, -3), '.') . '.');
-				}
-				echo '<td>';
-				FunctionsPrint::printPedigreePerson($hfam->getWife(), $show_full);
-				echo '</td></tr></table>';
-			} elseif ($hfam && !$hfam->getWife()) {
-				// Empty box for grandmother
-				echo '<table border="0"><tr>';
-				echo '<td>';
-				FunctionsPrint::printPedigreePerson($hfam->getWife(), $show_full);
-				echo '</td></tr></table>';
-			}
-			echo '</td>';
-		}
-		echo '</tr></table>';
-	}
-
-	/**
-	 * print the children table for a family
-	 *
-	 * @param Family $family family
-	 * @param string $childid child ID
-	 * @param int $sosa child sosa number
-	 * @param string $label indi label (descendancy booklet)
-	 * @param int $show_cousins display cousins on chart
-	 * @param int $show_full large or small box
-	 */
-	public static function printFamilyChildren(Family $family, $childid = '', $sosa = 0, $label = '', $show_cousins = 0, $show_full = 1) {
-
-		if ($show_full) {
-			$bheight = Theme::theme()->parameter('chart-box-y');
-		} else {
-			$bheight = Theme::theme()->parameter('compact-chart-box-y');
-		}
-
-		$pbheight = $bheight + 14;
-
-		$children = $family->getChildren();
-		$numchil  = count($children);
-
-		echo '<table border="0" cellpadding="0" cellspacing="2"><tr>';
-		if ($sosa > 0) {
-			echo '<td></td>';
-		}
-		echo '<td><span class="subheaders">';
-		if ($numchil == 0) {
-			echo I18N::translate('No children');
-		} else {
-			echo I18N::plural('%s child', '%s children', $numchil, $numchil);
-		}
-		echo '</span>';
-
-		if ($sosa == 0 && Auth::isEditor($family->getTree())) {
-			echo '<br>';
-			echo "<a href=\"#\" onclick=\"return add_child_to_family('", $family->getXref(), "', 'U');\">" . I18N::translate('Add a child to this family') . "</a>";
-			echo ' <a class="icon-sex_m_15x15" href="#" onclick="return add_child_to_family(\'', $family->getXref(), '\', \'M\');" title="', I18N::translate('son'), '"></a>';
-			echo ' <a class="icon-sex_f_15x15" href="#" onclick="return add_child_to_family(\'', $family->getXref(), '\', \'F\');" title="', I18N::translate('daughter'), '"></a>';
-			echo '<br><br>';
-		}
-		echo '</td>';
-		if ($sosa > 0) {
-			echo '<td></td><td></td>';
-		}
-		echo '</tr>';
-
-		$nchi = 1;
-		if ($children) {
-			foreach ($children as $child) {
-				echo '<tr>';
-				if ($sosa != 0) {
-					if ($child->getXref() == $childid) {
-						self::printSosaNumber($sosa, $childid);
-					} elseif (empty($label)) {
-						self::printSosaNumber("");
-					} else {
-						self::printSosaNumber($label . ($nchi++) . ".");
-					}
-				}
-				if ($child->isPendingAddtion()) {
-					echo '<td class="new">';
-				} elseif ($child->isPendingDeletion()) {
-					echo '<td class="old">';
-				} else {
-					echo '<td>';
-				}
-				FunctionsPrint::printPedigreePerson($child, $show_full);
-				echo '</td>';
-				if ($sosa != 0) {
-					// loop for all families where current child is a spouse
-					$famids = $child->getSpouseFamilies();
-
-					$maxfam = count($famids) - 1;
-					for ($f = 0; $f <= $maxfam; $f++) {
-						$famid_child = $famids[$f]->getXref();
-						// multiple marriages
-						if ($f > 0) {
-							echo '</tr><tr><td></td>';
-							echo '<td style="text-align:end; vertical-align: top;">';
-
-							//find out how many cousins there are to establish vertical line on second families
-							$fchildren = $famids[$f]->getChildren();
-							$kids      = count($fchildren);
-							$Pheader   = ($bheight - 1) * $kids;
-							$PBadj     = 6; // default
-							if ($show_cousins > 0) {
-								if ($kids) {
-									$PBadj = max(0, $Pheader / 2 + $kids * 4.5);
-								}
-							}
-
-							if ($f == $maxfam) {
-								echo '<img height="' . ((($bheight / 2)) + $PBadj) . 'px"';
-							} else {
-								echo '<img height="' . $pbheight . 'px"';
-							}
-							echo ' width="3" src="' . Theme::theme()->parameter('image-vline') . '">';
-							echo '</td>';
-						}
-						echo '<td class="details1" style="text-align:center;">';
-						$spouse = $famids[$f]->getSpouse($child);
-
-						$marr = $famids[$f]->getFirstFact('MARR');
-						$div  = $famids[$f]->getFirstFact('DIV');
-						if ($marr) {
-							// marriage date
-							echo $marr->getDate()->minimumDate()->format('%Y');
-							// divorce date
-							if ($div) {
-								echo '–', $div->getDate()->minimumDate()->format('%Y');
-							}
-						}
-						echo "<br><img width=\"100%\" class=\"line5\" height=\"3\" src=\"" . Theme::theme()->parameter('image-hline') . "\" alt=\"\">";
-						echo "</td>";
-						// spouse information
-						echo "<td style=\"vertical-align: center;";
-						if (!empty($divrec)) {
-							echo " filter:alpha(opacity=40);opacity:0.4;\">";
-						} else {
-							echo "\">";
-						}
-						FunctionsPrint::printPedigreePerson($spouse, $show_full);
-						echo "</td>";
-						// cousins
-						if ($show_cousins) {
-							self::printCousins($famid_child, $show_full);
-						}
-					}
-				}
-				echo "</tr>";
-			}
-		} elseif ($sosa < 1) {
-			// message 'no children' except for sosa
-			if (preg_match('/\n1 NCHI (\d+)/', $family->getGedcom(), $match) && $match[1] == 0) {
-				echo '<tr><td><i class="icon-childless"></i> ' . I18N::translate('This family remained childless') . '</td></tr>';
-			}
-		}
-		echo "</table><br>";
-	}
-
-	/**
-	 * print a family with Sosa-Stradonitz numbering system
-	 * ($rootid=1, father=2, mother=3 ...)
-	 *
-	 * @param string $famid family gedcom ID
-	 * @param string $childid tree root ID
-	 * @param int $sosa starting sosa number
-	 * @param string $label indi label (descendancy booklet)
-	 * @param string $parid parent ID (descendancy booklet)
-	 * @param string $gparid gd-parent ID (descendancy booklet)
-	 * @param int $show_cousins display cousins on chart
-	 * @param int $show_full large or small box
-	 */
-	public static function printSosaFamily($famid, $childid, $sosa, $label = '', $parid = '', $gparid = '', $show_cousins = 0, $show_full = 1) {
-		global $WT_TREE;
-
-		echo '<hr>';
-		echo '<p style="page-break-before: always;">';
-		if (!empty($famid)) {
-			echo '<a name="', $famid, '"></a>';
-		}
-		self::printFamilyParents(Family::getInstance($famid, $WT_TREE), $sosa, $label, $parid, $gparid, $show_full);
-		echo '<br>';
-		echo '<table><tr><td>';
-		self::printFamilyChildren(Family::getInstance($famid, $WT_TREE), $childid, $sosa, $label, $show_cousins, $show_full);
-		echo '</td></tr></table>';
-		echo '<br>';
-	}
-
-	/**
-	 * print an arrow to a new url
-	 *
-	 * @param string $url target url
-	 * @param string $label arrow label
-	 * @param int $dir arrow direction 0=left 1=right 2=up 3=down (default=2)
-	 */
-	public static function printUrlArrow($url, $label, $dir = 2) {
-		if ($url === '') {
-			return;
-		}
-
-		// arrow direction
-		$adir = $dir;
-		if (I18N::direction() === 'rtl' && $dir === 0) {
-			$adir = 1;
-		}
-		if (I18N::direction() === 'rtl' && $dir === 1) {
-			$adir = 0;
-		}
-
-		// arrow style     0         1         2         3
-		$array_style = array('icon-larrow', 'icon-rarrow', 'icon-uarrow', 'icon-darrow');
-		$astyle      = $array_style[$adir];
-
-		// Labels include people’s names, which may contain markup
-		echo '<a href="' . $url . '" title="' . strip_tags($label) . '" class="' . $astyle . '"></a>';
-	}
-
-	/**
-	 * builds and returns sosa relationship name in the active language
-	 *
-	 * @param string $sosa sosa number
-	 *
-	 * @return string
-	 */
-	public static function getSosaName($sosa) {
-		$path = '';
-		while ($sosa > 1) {
-			if ($sosa % 2 == 1) {
-				$sosa -= 1;
-				$path = 'mot' . $path;
-			} else {
-				$path = 'fat' . $path;
-			}
-			$sosa /= 2;
-		}
-
-		return Functions::getRelationshipNameFromPath($path, null, null);
-	}
-
-	/**
-	 * print cousins list
-	 *
-	 * @param string $famid family ID
-	 * @param int $show_full large or small box
-	 */
-	public static function printCousins($famid, $show_full = 1) {
-		global $WT_TREE;
-
-		if ($show_full) {
-			$bheight = Theme::theme()->parameter('chart-box-y');
-		} else {
-			$bheight = Theme::theme()->parameter('compact-chart-box-y');
-		}
-
-		$family    = Family::getInstance($famid, $WT_TREE);
-		$fchildren = $family->getChildren();
-
-		$kids = count($fchildren);
-
-		echo '<td>';
-		if ($kids) {
-			echo '<table cellspacing="0" cellpadding="0" border="0" ><tr>';
-			if ($kids > 1) {
-				echo '<td rowspan="', $kids, '"><img width="3px" height="', (($bheight + 9) * ($kids - 1)), 'px" src="', Theme::theme()->parameter('image-vline'), '"></td>';
-			}
-			$ctkids = count($fchildren);
-			$i      = 1;
-			foreach ($fchildren as $fchil) {
-				if ($i == 1) {
-					echo '<td><img width="10px" height="3px" style="vertical-align:top"';
-				} else {
-					echo '<td><img width="10px" height="3px"';
-				}
-				if (I18N::direction() === 'ltr') {
-					echo ' style="padding-right: 2px;"';
-				} else {
-					echo ' style="padding-left: 2px;"';
-				}
-				echo ' src="', Theme::theme()->parameter('image-hline'), '"></td><td>';
-				FunctionsPrint::printPedigreePerson($fchil, $show_full);
-				echo '</td></tr>';
-				if ($i < $ctkids) {
-					echo '<tr>';
-					$i++;
-				}
-			}
-			echo '</table>';
-		} else {
-			// If there is known that there are no children (as opposed to no known children)
-			if (preg_match('/\n1 NCHI (\d+)/', $family->getGedcom(), $match) && $match[1] == 0) {
-				echo ' <i class="icon-childless" title="', I18N::translate('This family remained childless'), '"></i>';
-			}
-		}
-		echo '</td>';
-	}
+    /**
+     * print a table cell with sosa number
+     *
+     * @param int $sosa
+     * @param string $pid optional pid
+     * @param string $arrowDirection direction of link arrow
+     */
+    public static function printSosaNumber($sosa, $pid = "", $arrowDirection = "up") {
+        if (substr($sosa, -1, 1) == ".") {
+            $personLabel = substr($sosa, 0, -1);
+        } else {
+            $personLabel = $sosa;
+        }
+        if ($arrowDirection == "blank") {
+            $visibility = "hidden";
+        } else {
+            $visibility = "normal";
+        }
+        echo "<td class=\"subheaders center\" style=\"vertical-align: middle; text-indent: 0px; margin-top: 0px; white-space: nowrap; visibility: ", $visibility, ";\">";
+        echo $personLabel;
+        if ($sosa != "1" && $pid != "") {
+            if ($arrowDirection == "left") {
+                $dir = 0;
+            } elseif ($arrowDirection == "right") {
+                $dir = 1;
+            } elseif ($arrowDirection == "down") {
+                $dir = 3;
+            } else {
+                $dir = 2; // either 'blank' or 'up'
+            }
+            echo '<br>';
+            self::printUrlArrow('#' . $pid, $pid, $dir);
+        }
+        echo '</td>';
+    }
+
+    /**
+     * print the parents table for a family
+     *
+     * @param Family $family family gedcom ID
+     * @param int $sosa child sosa number
+     * @param string $label indi label (descendancy booklet)
+     * @param string $parid parent ID (descendancy booklet)
+     * @param string $gparid gd-parent ID (descendancy booklet)
+     * @param int $show_full large or small box
+     */
+    public static function printFamilyParents(Family $family, $sosa = 0, $label = '', $parid = '', $gparid = '', $show_full = 1) {
+
+        if ($show_full) {
+            $pbheight = Theme::theme()->parameter('chart-box-y') + 14;
+        } else {
+            $pbheight = Theme::theme()->parameter('compact-chart-box-y') + 14;
+        }
+
+        $husb = $family->getHusband();
+        if ($husb) {
+            echo '<a name="', $husb->getXref(), '"></a>';
+        } else {
+            $husb = new Individual('M', "0 @M@ INDI\n1 SEX M", null, $family->getTree());
+        }
+        $wife = $family->getWife();
+        if ($wife) {
+            echo '<a name="', $wife->getXref(), '"></a>';
+        } else {
+            $wife = new Individual('F', "0 @F@ INDI\n1 SEX F", null, $family->getTree());
+        }
+
+        if ($sosa) {
+            echo '<p class="name_head">', $family->getFullName(), '</p>';
+        }
+
+        /**
+         * husband side
+         */
+        echo '<table cellspacing="0" cellpadding="0" border="0"><tr><td rowspan="2">';
+        echo '<table border="0"><tr>';
+
+        if ($parid) {
+            if ($husb->getXref() == $parid) {
+                self::printSosaNumber($label);
+            } else {
+                self::printSosaNumber($label, '', 'blank');
+            }
+        } elseif ($sosa) {
+            self::printSosaNumber($sosa * 2);
+        }
+        if ($husb->isPendingAddtion()) {
+            echo '<td class="facts_value new">';
+        } elseif ($husb->isPendingDeletion()) {
+            echo '<td class="facts_value old">';
+        } else {
+            echo '<td>';
+        }
+        FunctionsPrint::printPedigreePerson($husb, $show_full);
+        echo '</td></tr></table>';
+        echo '</td>';
+        // husband’s parents
+        $hfam = $husb->getPrimaryChildFamily();
+        if ($hfam) {
+            // remove the|| test for $sosa
+            echo '<td rowspan="2"><img src="' . Theme::theme()->parameter('image-hline') . '"></td><td rowspan="2"><img src="' . Theme::theme()->parameter('image-vline') . '" width="3" height="' . ($pbheight + 9) . '"></td>';
+            echo '<td><img class="line5" src="' . Theme::theme()->parameter('image-hline') . '"></td><td>';
+            // husband’s father
+            if ($hfam && $hfam->getHusband()) {
+                echo '<table border="0"><tr>';
+                if ($sosa > 0) {
+                    self::printSosaNumber($sosa * 4, $hfam->getHusband()->getXref(), 'down');
+                }
+                if (!empty($gparid) && $hfam->getHusband()->getXref() == $gparid) {
+                    self::printSosaNumber(trim(substr($label, 0, -3), '.') . '.');
+                }
+                echo '<td>';
+                FunctionsPrint::printPedigreePerson($hfam->getHusband(), $show_full);
+                echo '</td></tr></table>';
+            } elseif ($hfam && !$hfam->getHusband()) {
+                // Empty box for grandfather
+                echo '<table border="0"><tr>';
+                echo '<td>';
+                FunctionsPrint::printPedigreePerson($hfam->getHusband(), $show_full);
+                echo '</td></tr></table>';
+            }
+            echo '</td>';
+        }
+        if ($hfam && ($sosa != -1)) {
+            echo '<td rowspan="2">';
+            self::printUrlArrow(($sosa == 0 ? '?famid=' . $hfam->getXref() . '&amp;ged=' . $hfam->getTree()->getNameUrl() : '#' . $hfam->getXref()), $hfam->getXref(), 1);
+            echo '</td>';
+        }
+        if ($hfam) {
+            // husband’s mother
+            echo '</tr><tr><td><img src="' . Theme::theme()->parameter('image-hline') . '"></td><td>';
+            if ($hfam && $hfam->getWife()) {
+                echo '<table border=\'0\'><tr>';
+                if ($sosa > 0) {
+                    self::printSosaNumber($sosa * 4 + 1, $hfam->getWife()->getXref(), 'down');
+                }
+                if (!empty($gparid) && $hfam->getWife()->getXref() == $gparid) {
+                    self::printSosaNumber(trim(substr($label, 0, -3), '.') . '.');
+                }
+                echo '<td>';
+                FunctionsPrint::printPedigreePerson($hfam->getWife(), $show_full);
+                echo '</td></tr></table>';
+            } elseif ($hfam && !$hfam->getWife()) {
+                // Empty box for grandmother
+                echo '<table border="0"><tr>';
+                echo '<td>';
+                FunctionsPrint::printPedigreePerson($hfam->getWife(), $show_full);
+                echo '</td></tr></table>';
+            }
+            echo '</td>';
+        }
+        echo '</tr></table>';
+        if ($sosa && $family->canShow()) {
+            foreach ($family->getFacts(WT_EVENTS_MARR) as $fact) {
+                echo '<a href="', $family->getHtmlUrl(), '" class="details1">';
+                echo str_repeat('&nbsp;', 10);
+                echo $fact->summary();
+                echo '</a>';
+            }
+        } else {
+            echo '<br>';
+        }
+
+        /**
+         * wife side
+         */
+        echo '<table cellspacing="0" cellpadding="0" border="0"><tr><td rowspan="2">';
+        echo '<table><tr>';
+        if ($parid) {
+            if ($wife->getXref() == $parid) {
+                self::printSosaNumber($label);
+            } else {
+                self::printSosaNumber($label, '', 'blank');
+            }
+        } elseif ($sosa) {
+            self::printSosaNumber($sosa * 2 + 1);
+        }
+        if ($wife->isPendingAddtion()) {
+            echo '<td class="facts_value new">';
+        } elseif ($wife->isPendingDeletion()) {
+            echo '<td class="facts_value old">';
+        } else {
+            echo '<td>';
+        }
+        FunctionsPrint::printPedigreePerson($wife, $show_full);
+        echo '</td></tr></table>';
+        echo '</td>';
+        // wife’s parents
+        $hfam = $wife->getPrimaryChildFamily();
+
+        if ($hfam) {
+            echo '<td rowspan="2"><img src="' . Theme::theme()->parameter('image-hline') . '"></td><td rowspan="2"><img src="' . Theme::theme()->parameter('image-vline') . '" width="3" height="' . ($pbheight + 9) . '"></td>';
+            echo '<td><img class="line5" src="' . Theme::theme()->parameter('image-hline') . '"></td><td>';
+            // wife’s father
+            if ($hfam && $hfam->getHusband()) {
+                echo '<table><tr>';
+                if ($sosa > 0) {
+                    self::printSosaNumber($sosa * 4 + 2, $hfam->getHusband()->getXref(), 'down');
+                }
+                if (!empty($gparid) && $hfam->getHusband()->getXref() == $gparid) {
+                    self::printSosaNumber(trim(substr($label, 0, -3), '.') . '.');
+                }
+                echo '<td>';
+                FunctionsPrint::printPedigreePerson($hfam->getHusband(), $show_full);
+                echo '</td></tr></table>';
+            } elseif ($hfam && !$hfam->getHusband()) {
+                // Empty box for grandfather
+                echo '<table border="0"><tr>';
+                echo '<td>';
+                FunctionsPrint::printPedigreePerson($hfam->getHusband(), $show_full);
+                echo '</td></tr></table>';
+            }
+            echo '</td>';
+        }
+        if ($hfam && ($sosa != -1)) {
+            echo '<td rowspan="2">';
+            self::printUrlArrow(($sosa == 0 ? '?famid=' . $hfam->getXref() . '&amp;ged=' . $hfam->getTree()->getNameUrl() : '#' . $hfam->getXref()), $hfam->getXref(), 1);
+            echo '</td>';
+        }
+        if ($hfam) {
+            // wife’s mother
+            echo '</tr><tr><td><img src="' . Theme::theme()->parameter('image-hline') . '"></td><td>';
+            if ($hfam && $hfam->getWife()) {
+                echo '<table><tr>';
+                if ($sosa > 0) {
+                    self::printSosaNumber($sosa * 4 + 3, $hfam->getWife()->getXref(), 'down');
+                }
+                if (!empty($gparid) && $hfam->getWife()->getXref() == $gparid) {
+                    self::printSosaNumber(trim(substr($label, 0, -3), '.') . '.');
+                }
+                echo '<td>';
+                FunctionsPrint::printPedigreePerson($hfam->getWife(), $show_full);
+                echo '</td></tr></table>';
+            } elseif ($hfam && !$hfam->getWife()) {
+                // Empty box for grandmother
+                echo '<table border="0"><tr>';
+                echo '<td>';
+                FunctionsPrint::printPedigreePerson($hfam->getWife(), $show_full);
+                echo '</td></tr></table>';
+            }
+            echo '</td>';
+        }
+        echo '</tr></table>';
+    }
+
+    /**
+     * print the children table for a family
+     *
+     * @param Family $family family
+     * @param string $childid child ID
+     * @param int $sosa child sosa number
+     * @param string $label indi label (descendancy booklet)
+     * @param int $show_cousins display cousins on chart
+     * @param int $show_full large or small box
+     */
+    public static function printFamilyChildren(Family $family, $childid = '', $sosa = 0, $label = '', $show_cousins = 0, $show_full = 1) {
+
+        if ($show_full) {
+            $bheight = Theme::theme()->parameter('chart-box-y');
+        } else {
+            $bheight = Theme::theme()->parameter('compact-chart-box-y');
+        }
+
+        $pbheight = $bheight + 14;
+
+        $children = $family->getChildren();
+        $numchil  = count($children);
+
+        echo '<table border="0" cellpadding="0" cellspacing="2"><tr>';
+        if ($sosa > 0) {
+            echo '<td></td>';
+        }
+        echo '<td><span class="subheaders">';
+        if ($numchil == 0) {
+            echo I18N::translate('No children');
+        } else {
+            echo I18N::plural('%s child', '%s children', $numchil, $numchil);
+        }
+        echo '</span>';
+
+        if ($sosa == 0 && Auth::isEditor($family->getTree())) {
+            echo '<br>';
+            echo "<a href=\"#\" onclick=\"return add_child_to_family('", $family->getXref(), "', 'U');\">" . I18N::translate('Add a child to this family') . "</a>";
+            echo ' <a class="icon-sex_m_15x15" href="#" onclick="return add_child_to_family(\'', $family->getXref(), '\', \'M\');" title="', I18N::translate('son'), '"></a>';
+            echo ' <a class="icon-sex_f_15x15" href="#" onclick="return add_child_to_family(\'', $family->getXref(), '\', \'F\');" title="', I18N::translate('daughter'), '"></a>';
+            echo '<br><br>';
+        }
+        echo '</td>';
+        if ($sosa > 0) {
+            echo '<td></td><td></td>';
+        }
+        echo '</tr>';
+
+        $nchi = 1;
+        if ($children) {
+            foreach ($children as $child) {
+                echo '<tr>';
+                if ($sosa != 0) {
+                    if ($child->getXref() == $childid) {
+                        self::printSosaNumber($sosa, $childid);
+                    } elseif (empty($label)) {
+                        self::printSosaNumber("");
+                    } else {
+                        self::printSosaNumber($label . ($nchi++) . ".");
+                    }
+                }
+                if ($child->isPendingAddtion()) {
+                    echo '<td class="new">';
+                } elseif ($child->isPendingDeletion()) {
+                    echo '<td class="old">';
+                } else {
+                    echo '<td>';
+                }
+                FunctionsPrint::printPedigreePerson($child, $show_full);
+                echo '</td>';
+                if ($sosa != 0) {
+                    // loop for all families where current child is a spouse
+                    $famids = $child->getSpouseFamilies();
+
+                    $maxfam = count($famids) - 1;
+                    for ($f = 0; $f <= $maxfam; $f++) {
+                        $famid_child = $famids[$f]->getXref();
+                        // multiple marriages
+                        if ($f > 0) {
+                            echo '</tr><tr><td></td>';
+                            echo '<td style="text-align:end; vertical-align: top;">';
+
+                            //find out how many cousins there are to establish vertical line on second families
+                            $fchildren = $famids[$f]->getChildren();
+                            $kids      = count($fchildren);
+                            $Pheader   = ($bheight - 1) * $kids;
+                            $PBadj     = 6; // default
+                            if ($show_cousins > 0) {
+                                if ($kids) {
+                                    $PBadj = max(0, $Pheader / 2 + $kids * 4.5);
+                                }
+                            }
+
+                            if ($f == $maxfam) {
+                                echo '<img height="' . ((($bheight / 2)) + $PBadj) . 'px"';
+                            } else {
+                                echo '<img height="' . $pbheight . 'px"';
+                            }
+                            echo ' width="3" src="' . Theme::theme()->parameter('image-vline') . '">';
+                            echo '</td>';
+                        }
+                        echo '<td class="details1" style="text-align:center;">';
+                        $spouse = $famids[$f]->getSpouse($child);
+
+                        $marr = $famids[$f]->getFirstFact('MARR');
+                        $div  = $famids[$f]->getFirstFact('DIV');
+                        if ($marr) {
+                            // marriage date
+                            echo $marr->getDate()->minimumDate()->format('%Y');
+                            // divorce date
+                            if ($div) {
+                                echo '–', $div->getDate()->minimumDate()->format('%Y');
+                            }
+                        }
+                        echo "<br><img width=\"100%\" class=\"line5\" height=\"3\" src=\"" . Theme::theme()->parameter('image-hline') . "\" alt=\"\">";
+                        echo "</td>";
+                        // spouse information
+                        echo "<td style=\"vertical-align: center;";
+                        if (!empty($divrec)) {
+                            echo " filter:alpha(opacity=40);opacity:0.4;\">";
+                        } else {
+                            echo "\">";
+                        }
+                        FunctionsPrint::printPedigreePerson($spouse, $show_full);
+                        echo "</td>";
+                        // cousins
+                        if ($show_cousins) {
+                            self::printCousins($famid_child, $show_full);
+                        }
+                    }
+                }
+                echo "</tr>";
+            }
+        } elseif ($sosa < 1) {
+            // message 'no children' except for sosa
+            if (preg_match('/\n1 NCHI (\d+)/', $family->getGedcom(), $match) && $match[1] == 0) {
+                echo '<tr><td><i class="icon-childless"></i> ' . I18N::translate('This family remained childless') . '</td></tr>';
+            }
+        }
+        echo "</table><br>";
+    }
+
+    /**
+     * print a family with Sosa-Stradonitz numbering system
+     * ($rootid=1, father=2, mother=3 ...)
+     *
+     * @param string $famid family gedcom ID
+     * @param string $childid tree root ID
+     * @param int $sosa starting sosa number
+     * @param string $label indi label (descendancy booklet)
+     * @param string $parid parent ID (descendancy booklet)
+     * @param string $gparid gd-parent ID (descendancy booklet)
+     * @param int $show_cousins display cousins on chart
+     * @param int $show_full large or small box
+     */
+    public static function printSosaFamily($famid, $childid, $sosa, $label = '', $parid = '', $gparid = '', $show_cousins = 0, $show_full = 1) {
+        global $WT_TREE;
+
+        echo '<hr>';
+        echo '<p style="page-break-before: always;">';
+        if (!empty($famid)) {
+            echo '<a name="', $famid, '"></a>';
+        }
+        self::printFamilyParents(Family::getInstance($famid, $WT_TREE), $sosa, $label, $parid, $gparid, $show_full);
+        echo '<br>';
+        echo '<table><tr><td>';
+        self::printFamilyChildren(Family::getInstance($famid, $WT_TREE), $childid, $sosa, $label, $show_cousins, $show_full);
+        echo '</td></tr></table>';
+        echo '<br>';
+    }
+
+    /**
+     * print an arrow to a new url
+     *
+     * @param string $url target url
+     * @param string $label arrow label
+     * @param int $dir arrow direction 0=left 1=right 2=up 3=down (default=2)
+     */
+    public static function printUrlArrow($url, $label, $dir = 2) {
+        if ($url === '') {
+            return;
+        }
+
+        // arrow direction
+        $adir = $dir;
+        if (I18N::direction() === 'rtl' && $dir === 0) {
+            $adir = 1;
+        }
+        if (I18N::direction() === 'rtl' && $dir === 1) {
+            $adir = 0;
+        }
+
+        // arrow style     0         1         2         3
+        $array_style = array('icon-larrow', 'icon-rarrow', 'icon-uarrow', 'icon-darrow');
+        $astyle      = $array_style[$adir];
+
+        // Labels include people’s names, which may contain markup
+        echo '<a href="' . $url . '" title="' . strip_tags($label) . '" class="' . $astyle . '"></a>';
+    }
+
+    /**
+     * builds and returns sosa relationship name in the active language
+     *
+     * @param string $sosa sosa number
+     *
+     * @return string
+     */
+    public static function getSosaName($sosa) {
+        $path = '';
+        while ($sosa > 1) {
+            if ($sosa % 2 == 1) {
+                $sosa -= 1;
+                $path = 'mot' . $path;
+            } else {
+                $path = 'fat' . $path;
+            }
+            $sosa /= 2;
+        }
+
+        return Functions::getRelationshipNameFromPath($path, null, null);
+    }
+
+    /**
+     * print cousins list
+     *
+     * @param string $famid family ID
+     * @param int $show_full large or small box
+     */
+    public static function printCousins($famid, $show_full = 1) {
+        global $WT_TREE;
+
+        if ($show_full) {
+            $bheight = Theme::theme()->parameter('chart-box-y');
+        } else {
+            $bheight = Theme::theme()->parameter('compact-chart-box-y');
+        }
+
+        $family    = Family::getInstance($famid, $WT_TREE);
+        $fchildren = $family->getChildren();
+
+        $kids = count($fchildren);
+
+        echo '<td>';
+        if ($kids) {
+            echo '<table cellspacing="0" cellpadding="0" border="0" ><tr>';
+            if ($kids > 1) {
+                echo '<td rowspan="', $kids, '"><img width="3px" height="', (($bheight + 9) * ($kids - 1)), 'px" src="', Theme::theme()->parameter('image-vline'), '"></td>';
+            }
+            $ctkids = count($fchildren);
+            $i      = 1;
+            foreach ($fchildren as $fchil) {
+                if ($i == 1) {
+                    echo '<td><img width="10px" height="3px" style="vertical-align:top"';
+                } else {
+                    echo '<td><img width="10px" height="3px"';
+                }
+                if (I18N::direction() === 'ltr') {
+                    echo ' style="padding-right: 2px;"';
+                } else {
+                    echo ' style="padding-left: 2px;"';
+                }
+                echo ' src="', Theme::theme()->parameter('image-hline'), '"></td><td>';
+                FunctionsPrint::printPedigreePerson($fchil, $show_full);
+                echo '</td></tr>';
+                if ($i < $ctkids) {
+                    echo '<tr>';
+                    $i++;
+                }
+            }
+            echo '</table>';
+        } else {
+            // If there is known that there are no children (as opposed to no known children)
+            if (preg_match('/\n1 NCHI (\d+)/', $family->getGedcom(), $match) && $match[1] == 0) {
+                echo ' <i class="icon-childless" title="', I18N::translate('This family remained childless'), '"></i>';
+            }
+        }
+        echo '</td>';
+    }
 }

Braces +16 added lines, -8 removed lines

@@ -24,7 +24,8 @@ 
 /**
  * Class FunctionsCharts - common functions
  */
-class FunctionsCharts {
+class FunctionsCharts
+{
 	/**
 	 * print a table cell with sosa number
 	 *
@@ -32,7 +33,8 @@ 
 	 * @param string $pid optional pid
 	 * @param string $arrowDirection direction of link arrow
 	 */
-	public static function printSosaNumber($sosa, $pid = "", $arrowDirection = "up") {
+	public static function printSosaNumber($sosa, $pid = "", $arrowDirection = "up")
+	{
 		if (substr($sosa, -1, 1) == ".") {
 			$personLabel = substr($sosa, 0, -1);
 		} else {
@@ -71,7 +73,8 @@ 
 	 * @param string $gparid gd-parent ID (descendancy booklet)
 	 * @param int $show_full large or small box
 	 */
-	public static function printFamilyParents(Family $family, $sosa = 0, $label = '', $parid = '', $gparid = '', $show_full = 1) {
+	public static function printFamilyParents(Family $family, $sosa = 0, $label = '', $parid = '', $gparid = '', $show_full = 1)
+	{
 
 		if ($show_full) {
 			$pbheight = Theme::theme()->parameter('chart-box-y') + 14;
@@ -280,7 +283,8 @@ 
 	 * @param int $show_cousins display cousins on chart
 	 * @param int $show_full large or small box
 	 */
-	public static function printFamilyChildren(Family $family, $childid = '', $sosa = 0, $label = '', $show_cousins = 0, $show_full = 1) {
+	public static function printFamilyChildren(Family $family, $childid = '', $sosa = 0, $label = '', $show_cousins = 0, $show_full = 1)
+	{
 
 		if ($show_full) {
 			$bheight = Theme::theme()->parameter('chart-box-y');
@@ -425,7 +429,8 @@ 
 	 * @param int $show_cousins display cousins on chart
 	 * @param int $show_full large or small box
 	 */
-	public static function printSosaFamily($famid, $childid, $sosa, $label = '', $parid = '', $gparid = '', $show_cousins = 0, $show_full = 1) {
+	public static function printSosaFamily($famid, $childid, $sosa, $label = '', $parid = '', $gparid = '', $show_cousins = 0, $show_full = 1)
+	{
 		global $WT_TREE;
 
 		echo '<hr>';
@@ -448,7 +453,8 @@ 
 	 * @param string $label arrow label
 	 * @param int $dir arrow direction 0=left 1=right 2=up 3=down (default=2)
 	 */
-	public static function printUrlArrow($url, $label, $dir = 2) {
+	public static function printUrlArrow($url, $label, $dir = 2)
+	{
 		if ($url === '') {
 			return;
 		}
@@ -477,7 +483,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getSosaName($sosa) {
+	public static function getSosaName($sosa)
+	{
 		$path = '';
 		while ($sosa > 1) {
 			if ($sosa % 2 == 1) {
@@ -498,7 +505,8 @@ 
 	 * @param string $famid family ID
 	 * @param int $show_full large or small box
 	 */
-	public static function printCousins($famid, $show_full = 1) {
+	public static function printCousins($famid, $show_full = 1)
+	{
 		global $WT_TREE;
 
 		if ($show_full) {

app/Tree.php

Indentation +768 added lines, -768 removed lines

@@ -23,772 +23,772 @@
  * Provide an interface to the wt_gedcom table.
  */
 class Tree {
-	/** @var int The tree's ID number */
-	private $tree_id;
-
-	/** @var string The tree's name */
-	private $name;
-
-	/** @var string The tree's title */
-	private $title;
-
-	/** @var int[] Default access rules for facts in this tree */
-	private $fact_privacy;
-
-	/** @var int[] Default access rules for individuals in this tree */
-	private $individual_privacy;
-
-	/** @var integer[][] Default access rules for individual facts in this tree */
-	private $individual_fact_privacy;
-
-	/** @var Tree[] All trees that we have permission to see. */
-	private static $trees;
-
-	/** @var string[] Cached copy of the wt_gedcom_setting table. */
-	private $preferences;
-
-	/** @var string[][] Cached copy of the wt_user_gedcom_setting table. */
-	private $user_preferences = array();
-
-	/**
-	 * Create a tree object. This is a private constructor - it can only
-	 * be called from Tree::getAll() to ensure proper initialisation.
-	 *
-	 * @param int    $tree_id
-	 * @param string $tree_name
-	 * @param string $tree_title
-	 */
-	private function __construct($tree_id, $tree_name, $tree_title) {
-		$this->tree_id                 = $tree_id;
-		$this->name                    = $tree_name;
-		$this->title                   = $tree_title;
-		$this->fact_privacy            = array();
-		$this->individual_privacy      = array();
-		$this->individual_fact_privacy = array();
-
-		// Load the privacy settings for this tree
-		$rows = Database::prepare(
-			"SELECT xref, tag_type, CASE resn WHEN 'none' THEN :priv_public WHEN 'privacy' THEN :priv_user WHEN 'confidential' THEN :priv_none WHEN 'hidden' THEN :priv_hide END AS resn" .
-			" FROM `##default_resn` WHERE gedcom_id = :tree_id"
-		)->execute(array(
-			'priv_public' => Auth::PRIV_PRIVATE,
-			'priv_user'   => Auth::PRIV_USER,
-			'priv_none'   => Auth::PRIV_NONE,
-			'priv_hide'   => Auth::PRIV_HIDE,
-			'tree_id'     => $this->tree_id,
-		))->fetchAll();
-
-		foreach ($rows as $row) {
-			if ($row->xref !== null) {
-				if ($row->tag_type !== null) {
-					$this->individual_fact_privacy[$row->xref][$row->tag_type] = (int) $row->resn;
-				} else {
-					$this->individual_privacy[$row->xref] = (int) $row->resn;
-				}
-			} else {
-				$this->fact_privacy[$row->tag_type] = (int) $row->resn;
-			}
-		}
-
-	}
-
-	/**
-	 * The ID of this tree
-	 *
-	 * @return int
-	 */
-	public function getTreeId() {
-		return $this->tree_id;
-	}
-
-	/**
-	 * The name of this tree
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	}
-
-	/**
-	 * The name of this tree
-	 *
-	 * @return string
-	 */
-	public function getNameHtml() {
-		return Filter::escapeHtml($this->name);
-	}
-
-	/**
-	 * The name of this tree
-	 *
-	 * @return string
-	 */
-	public function getNameUrl() {
-		return Filter::escapeUrl($this->name);
-	}
-
-	/**
-	 * The title of this tree
-	 *
-	 * @return string
-	 */
-	public function getTitle() {
-		return $this->title;
-	}
-
-	/**
-	 * The title of this tree, with HTML markup
-	 *
-	 * @return string
-	 */
-	public function getTitleHtml() {
-		return '<span dir="auto">' . Filter::escapeHtml($this->title) . '</span>';
-	}
-
-	/**
-	 * The fact-level privacy for this tree.
-	 *
-	 * @return int[]
-	 */
-	public function getFactPrivacy() {
-		return $this->fact_privacy;
-	}
-
-	/**
-	 * The individual-level privacy for this tree.
-	 *
-	 * @return int[]
-	 */
-	public function getIndividualPrivacy() {
-		return $this->individual_privacy;
-	}
-
-	/**
-	 * The individual-fact-level privacy for this tree.
-	 *
-	 * @return integer[][]
-	 */
-	public function getIndividualFactPrivacy() {
-		return $this->individual_fact_privacy;
-	}
-
-	/**
-	 * Get the tree’s configuration settings.
-	 *
-	 * @param string      $setting_name
-	 * @param string|null $default
-	 *
-	 * @return string|null
-	 */
-	public function getPreference($setting_name, $default = null) {
-		if ($this->preferences === null) {
-			$this->preferences = Database::prepare(
-				"SELECT setting_name, setting_value FROM `##gedcom_setting` WHERE gedcom_id = ?"
-			)->execute(array($this->tree_id))->fetchAssoc();
-		}
-
-		if (array_key_exists($setting_name, $this->preferences)) {
-			return $this->preferences[$setting_name];
-		} else {
-			return $default;
-		}
-	}
-
-	/**
-	 * Set the tree’s configuration settings.
-	 *
-	 * @param string $setting_name
-	 * @param string $setting_value
-	 *
-	 * @return $this
-	 */
-	public function setPreference($setting_name, $setting_value) {
-		if ($setting_value !== $this->getPreference($setting_name)) {
-			// Update the database
-			if ($setting_value === null) {
-				Database::prepare(
-					"DELETE FROM `##gedcom_setting` WHERE gedcom_id = :tree_id AND setting_name = :setting_name"
-				)->execute(array(
-					'tree_id'      => $this->tree_id,
-					'setting_name' => $setting_name,
-				));
-			} else {
-				Database::prepare(
-					"REPLACE INTO `##gedcom_setting` (gedcom_id, setting_name, setting_value)" .
-					" VALUES (:tree_id, :setting_name, LEFT(:setting_value, 255))"
-				)->execute(array(
-					'tree_id'       => $this->tree_id,
-					'setting_name'  => $setting_name,
-					'setting_value' => $setting_value,
-				));
-			}
-			// Update our cache
-			$this->preferences[$setting_name] = $setting_value;
-			// Audit log of changes
-			Log::addConfigurationLog('Tree preference "' . $setting_name . '" set to "' . $setting_value . '"', $this);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Get the tree’s user-configuration settings.
-	 *
-	 * @param User        $user
-	 * @param string      $setting_name
-	 * @param string|null $default
-	 *
-	 * @return string
-	 */
-	public function getUserPreference(User $user, $setting_name, $default = null) {
-		// There are lots of settings, and we need to fetch lots of them on every page
-		// so it is quicker to fetch them all in one go.
-		if (!array_key_exists($user->getUserId(), $this->user_preferences)) {
-			$this->user_preferences[$user->getUserId()] = Database::prepare(
-				"SELECT setting_name, setting_value FROM `##user_gedcom_setting` WHERE user_id = ? AND gedcom_id = ?"
-			)->execute(array($user->getUserId(), $this->tree_id))->fetchAssoc();
-		}
-
-		if (array_key_exists($setting_name, $this->user_preferences[$user->getUserId()])) {
-			return $this->user_preferences[$user->getUserId()][$setting_name];
-		} else {
-			return $default;
-		}
-	}
-
-	/**
-	 * Set the tree’s user-configuration settings.
-	 *
-	 * @param User    $user
-	 * @param string  $setting_name
-	 * @param string  $setting_value
-	 *
-	 * @return $this
-	 */
-	public function setUserPreference(User $user, $setting_name, $setting_value) {
-		if ($this->getUserPreference($user, $setting_name) !== $setting_value) {
-			// Update the database
-			if ($setting_value === null) {
-				Database::prepare(
-					"DELETE FROM `##user_gedcom_setting` WHERE gedcom_id = :tree_id AND user_id = :user_id AND setting_name = :setting_name"
-				)->execute(array(
-					'tree_id'      => $this->tree_id,
-					'user_id'      => $user->getUserId(),
-					'setting_name' => $setting_name,
-				));
-			} else {
-				Database::prepare(
-					"REPLACE INTO `##user_gedcom_setting` (user_id, gedcom_id, setting_name, setting_value) VALUES (:user_id, :tree_id, :setting_name, LEFT(:setting_value, 255))"
-				)->execute(array(
-					'user_id'       => $user->getUserId(),
-					'tree_id'       => $this->tree_id,
-					'setting_name'  => $setting_name,
-					'setting_value' => $setting_value,
-				));
-			}
-			// Update our cache
-			$this->user_preferences[$user->getUserId()][$setting_name] = $setting_value;
-			// Audit log of changes
-			Log::addConfigurationLog('Tree preference "' . $setting_name . '" set to "' . $setting_value . '" for user "' . $user->getUserName() . '"', $this);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Can a user accept changes for this tree?
-	 *
-	 * @param User $user
-	 *
-	 * @return bool
-	 */
-	public function canAcceptChanges(User $user) {
-		return Auth::isModerator($this, $user);
-	}
-
-	/**
-	 * Fetch all the trees that we have permission to access.
-	 *
-	 * @return Tree[]
-	 */
-	public static function getAll() {
-		if (self::$trees === null) {
-			self::$trees = array();
-			$rows        = Database::prepare(
-				"SELECT g.gedcom_id AS tree_id, g.gedcom_name AS tree_name, gs1.setting_value AS tree_title" .
-				" FROM `##gedcom` g" .
-				" LEFT JOIN `##gedcom_setting`      gs1 ON (g.gedcom_id=gs1.gedcom_id AND gs1.setting_name='title')" .
-				" LEFT JOIN `##gedcom_setting`      gs2 ON (g.gedcom_id=gs2.gedcom_id AND gs2.setting_name='imported')" .
-				" LEFT JOIN `##gedcom_setting`      gs3 ON (g.gedcom_id=gs3.gedcom_id AND gs3.setting_name='REQUIRE_AUTHENTICATION')" .
-				" LEFT JOIN `##user_gedcom_setting` ugs ON (g.gedcom_id=ugs.gedcom_id AND ugs.setting_name='canedit' AND ugs.user_id=?)" .
-				" WHERE " .
-				"  g.gedcom_id>0 AND (" . // exclude the "template" tree
-				"    EXISTS (SELECT 1 FROM `##user_setting` WHERE user_id=? AND setting_name='canadmin' AND setting_value=1)" . // Admin sees all
-				"   ) OR (" .
-				"    (gs2.setting_value = 1 OR ugs.setting_value = 'admin') AND (" . // Allow imported trees, with either:
-				"     gs3.setting_value <> 1 OR" . // visitor access
-				"     IFNULL(ugs.setting_value, 'none')<>'none'" . // explicit access
-				"   )" .
-				"  )" .
-				" ORDER BY g.sort_order, 3"
-			)->execute(array(Auth::id(), Auth::id()))->fetchAll();
-			foreach ($rows as $row) {
-				self::$trees[] = new self((int) $row->tree_id, $row->tree_name, $row->tree_title);
-			}
-		}
-
-		return self::$trees;
-	}
-
-	/**
-	 * Find the tree with a specific ID.
-	 *
-	 * @param int $tree_id
-	 *
-	 * @throws \DomainException
-	 *
-	 * @return Tree
-	 */
-	public static function findById($tree_id) {
-		foreach (self::getAll() as $tree) {
-			if ($tree->tree_id == $tree_id) {
-				return $tree;
-			}
-		}
-		throw new \DomainException;
-	}
-
-	/**
-	 * Find the tree with a specific name.
-	 *
-	 * @param string $tree_name
-	 *
-	 * @return Tree|null
-	 */
-	public static function findByName($tree_name) {
-		foreach (self::getAll() as $tree) {
-			if ($tree->name === $tree_name) {
-				return $tree;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Create arguments to select_edit_control()
-	 * Note - these will be escaped later
-	 *
-	 * @return string[]
-	 */
-	public static function getIdList() {
-		$list = array();
-		foreach (self::getAll() as $tree) {
-			$list[$tree->tree_id] = $tree->title;
-		}
-
-		return $list;
-	}
-
-	/**
-	 * Create arguments to select_edit_control()
-	 * Note - these will be escaped later
-	 *
-	 * @return string[]
-	 */
-	public static function getNameList() {
-		$list = array();
-		foreach (self::getAll() as $tree) {
-			$list[$tree->name] = $tree->title;
-		}
-
-		return $list;
-	}
-
-	/**
-	 * Create a new tree
-	 *
-	 * @param string $tree_name
-	 * @param string $tree_title
-	 *
-	 * @return Tree
-	 */
-	public static function create($tree_name, $tree_title) {
-		try {
-			// Create a new tree
-			Database::prepare(
-				"INSERT INTO `##gedcom` (gedcom_name) VALUES (?)"
-			)->execute(array($tree_name));
-			$tree_id = Database::prepare("SELECT LAST_INSERT_ID()")->fetchOne();
-		} catch (PDOException $ex) {
-			// A tree with that name already exists?
-			return self::findByName($tree_name);
-		}
-
-		// Update the list of trees - to include this new one
-		self::$trees = null;
-		$tree        = self::findById($tree_id);
-
-		$tree->setPreference('imported', '0');
-		$tree->setPreference('title', $tree_title);
-
-		// Module privacy
-		Module::setDefaultAccess($tree_id);
-
-		// Set preferences from default tree
-		Database::prepare(
-			"INSERT INTO `##gedcom_setting` (gedcom_id, setting_name, setting_value)" .
-			" SELECT :tree_id, setting_name, setting_value" .
-			" FROM `##gedcom_setting` WHERE gedcom_id = -1"
-		)->execute(array(
-			'tree_id' => $tree_id,
-		));
-
-		Database::prepare(
-			"INSERT INTO `##default_resn` (gedcom_id, tag_type, resn)" .
-			" SELECT :tree_id, tag_type, resn" .
-			" FROM `##default_resn` WHERE gedcom_id = -1"
-		)->execute(array(
-			'tree_id' => $tree_id,
-		));
-
-		Database::prepare(
-			"INSERT INTO `##block` (gedcom_id, location, block_order, module_name)" .
-			" SELECT :tree_id, location, block_order, module_name" .
-			" FROM `##block` WHERE gedcom_id = -1"
-		)->execute(array(
-			'tree_id' => $tree_id,
-		));
-
-		// Gedcom and privacy settings
-		$tree->setPreference('CONTACT_USER_ID', Auth::id());
-		$tree->setPreference('WEBMASTER_USER_ID', Auth::id());
-		$tree->setPreference('LANGUAGE', WT_LOCALE); // Default to the current admin’s language
-		switch (WT_LOCALE) {
-		case 'es':
-			$tree->setPreference('SURNAME_TRADITION', 'spanish');
-			break;
-		case 'is':
-			$tree->setPreference('SURNAME_TRADITION', 'icelandic');
-			break;
-		case 'lt':
-			$tree->setPreference('SURNAME_TRADITION', 'lithuanian');
-			break;
-		case 'pl':
-			$tree->setPreference('SURNAME_TRADITION', 'polish');
-			break;
-		case 'pt':
-		case 'pt-BR':
-			$tree->setPreference('SURNAME_TRADITION', 'portuguese');
-			break;
-		default:
-			$tree->setPreference('SURNAME_TRADITION', 'paternal');
-			break;
-		}
-
-		// Genealogy data
-		// It is simpler to create a temporary/unimported GEDCOM than to populate all the tables...
-		$john_doe = /* I18N: This should be a common/default/placeholder name of an individual. Put slashes around the surname. */
-			I18N::translate('John /DOE/');
-		$note     = I18N::translate('Edit this individual and replace their details with your own.');
-		Database::prepare("INSERT INTO `##gedcom_chunk` (gedcom_id, chunk_data) VALUES (?, ?)")->execute(array(
-			$tree_id,
-			"0 HEAD\n1 CHAR UTF-8\n0 @I1@ INDI\n1 NAME {$john_doe}\n1 SEX M\n1 BIRT\n2 DATE 01 JAN 1850\n2 NOTE {$note}\n0 TRLR\n",
-		));
-
-		// Update our cache
-		self::$trees[$tree->tree_id] = $tree;
-
-		return $tree;
-	}
-
-	/**
-	 * Are there any pending edits for this tree, than need reviewing by a moderator.
-	 *
-	 * @return bool
-	 */
-	public function hasPendingEdit() {
-		return (bool) Database::prepare(
-			"SELECT 1 FROM `##change` WHERE status = 'pending' AND gedcom_id = :tree_id"
-		)->execute(array(
-			'tree_id' => $this->tree_id,
-		))->fetchOne();
-	}
-
-	/**
-	 * Delete all the genealogy data from a tree - in preparation for importing
-	 * new data. Optionally retain the media data, for when the user has been
-	 * editing their data offline using an application which deletes (or does not
-	 * support) media data.
-	 *
-	 * @param bool $keep_media
-	 */
-	public function deleteGenealogyData($keep_media) {
-		Database::prepare("DELETE FROM `##gedcom_chunk` WHERE gedcom_id = ?")->execute(array($this->tree_id));
-		Database::prepare("DELETE FROM `##individuals`  WHERE i_file    = ?")->execute(array($this->tree_id));
-		Database::prepare("DELETE FROM `##families`     WHERE f_file    = ?")->execute(array($this->tree_id));
-		Database::prepare("DELETE FROM `##sources`      WHERE s_file    = ?")->execute(array($this->tree_id));
-		Database::prepare("DELETE FROM `##other`        WHERE o_file    = ?")->execute(array($this->tree_id));
-		Database::prepare("DELETE FROM `##places`       WHERE p_file    = ?")->execute(array($this->tree_id));
-		Database::prepare("DELETE FROM `##placelinks`   WHERE pl_file   = ?")->execute(array($this->tree_id));
-		Database::prepare("DELETE FROM `##name`         WHERE n_file    = ?")->execute(array($this->tree_id));
-		Database::prepare("DELETE FROM `##dates`        WHERE d_file    = ?")->execute(array($this->tree_id));
-		Database::prepare("DELETE FROM `##change`       WHERE gedcom_id = ?")->execute(array($this->tree_id));
-
-		if ($keep_media) {
-			Database::prepare("DELETE FROM `##link` WHERE l_file =? AND l_type<>'OBJE'")->execute(array($this->tree_id));
-		} else {
-			Database::prepare("DELETE FROM `##link`  WHERE l_file =?")->execute(array($this->tree_id));
-			Database::prepare("DELETE FROM `##media` WHERE m_file =?")->execute(array($this->tree_id));
-		}
-	}
-
-	/**
-	 * Delete everything relating to a tree
-	 */
-	public function delete() {
-		// If this is the default tree, then unset it
-		if (Site::getPreference('DEFAULT_GEDCOM') === $this->name) {
-			Site::setPreference('DEFAULT_GEDCOM', '');
-		}
-
-		$this->deleteGenealogyData(false);
-
-		Database::prepare("DELETE `##block_setting` FROM `##block_setting` JOIN `##block` USING (block_id) WHERE gedcom_id=?")->execute(array($this->tree_id));
-		Database::prepare("DELETE FROM `##block`               WHERE gedcom_id = ?")->execute(array($this->tree_id));
-		Database::prepare("DELETE FROM `##user_gedcom_setting` WHERE gedcom_id = ?")->execute(array($this->tree_id));
-		Database::prepare("DELETE FROM `##gedcom_setting`      WHERE gedcom_id = ?")->execute(array($this->tree_id));
-		Database::prepare("DELETE FROM `##module_privacy`      WHERE gedcom_id = ?")->execute(array($this->tree_id));
-		Database::prepare("DELETE FROM `##next_id`             WHERE gedcom_id = ?")->execute(array($this->tree_id));
-		Database::prepare("DELETE FROM `##hit_counter`         WHERE gedcom_id = ?")->execute(array($this->tree_id));
-		Database::prepare("DELETE FROM `##default_resn`        WHERE gedcom_id = ?")->execute(array($this->tree_id));
-		Database::prepare("DELETE FROM `##gedcom_chunk`        WHERE gedcom_id = ?")->execute(array($this->tree_id));
-		Database::prepare("DELETE FROM `##log`                 WHERE gedcom_id = ?")->execute(array($this->tree_id));
-		Database::prepare("DELETE FROM `##gedcom`              WHERE gedcom_id = ?")->execute(array($this->tree_id));
-
-		// After updating the database, we need to fetch a new (sorted) copy
-		self::$trees = null;
-	}
-
-	/**
-	 * Export the tree to a GEDCOM file
-	 *
-	 * @param resource $stream
-	 */
-	public function exportGedcom($stream) {
-		$stmt = Database::prepare(
-			"SELECT i_gedcom AS gedcom, i_id AS xref, 1 AS n FROM `##individuals` WHERE i_file = :tree_id_1" .
-			" UNION ALL " .
-			"SELECT f_gedcom AS gedcom, f_id AS xref, 2 AS n FROM `##families`    WHERE f_file = :tree_id_2" .
-			" UNION ALL " .
-			"SELECT s_gedcom AS gedcom, s_id AS xref, 3 AS n FROM `##sources`     WHERE s_file = :tree_id_3" .
-			" UNION ALL " .
-			"SELECT o_gedcom AS gedcom, o_id AS xref, 4 AS n FROM `##other`       WHERE o_file = :tree_id_4 AND o_type NOT IN ('HEAD', 'TRLR')" .
-			" UNION ALL " .
-			"SELECT m_gedcom AS gedcom, m_id AS xref, 5 AS n FROM `##media`       WHERE m_file = :tree_id_5" .
-			" ORDER BY n, LENGTH(xref), xref"
-		)->execute(array(
-			'tree_id_1' => $this->tree_id,
-			'tree_id_2' => $this->tree_id,
-			'tree_id_3' => $this->tree_id,
-			'tree_id_4' => $this->tree_id,
-			'tree_id_5' => $this->tree_id,
-		));
-
-		$buffer = FunctionsExport::reformatRecord(FunctionsExport::gedcomHeader($this));
-		while ($row = $stmt->fetch()) {
-			$buffer .= FunctionsExport::reformatRecord($row->gedcom);
-			if (strlen($buffer) > 65535) {
-				fwrite($stream, $buffer);
-				$buffer = '';
-			}
-		}
-		fwrite($stream, $buffer . '0 TRLR' . WT_EOL);
-		$stmt->closeCursor();
-	}
-
-	/**
-	 * Import data from a gedcom file into this tree.
-	 *
-	 * @param string  $path       The full path to the (possibly temporary) file.
-	 * @param string  $filename   The preferred filename, for export/download.
-	 *
-	 * @throws \Exception
-	 */
-	public function importGedcomFile($path, $filename) {
-		// Read the file in blocks of roughly 64K. Ensure that each block
-		// contains complete gedcom records. This will ensure we don’t split
-		// multi-byte characters, as well as simplifying the code to import
-		// each block.
-
-		$file_data = '';
-		$fp        = fopen($path, 'rb');
-
-		// Don’t allow the user to cancel the request. We do not want to be left with an incomplete transaction.
-		ignore_user_abort(true);
-
-		Database::beginTransaction();
-		$this->deleteGenealogyData($this->getPreference('keep_media'));
-		$this->setPreference('gedcom_filename', $filename);
-		$this->setPreference('imported', '0');
-
-		while (!feof($fp)) {
-			$file_data .= fread($fp, 65536);
-			// There is no strrpos() function that searches for substrings :-(
-			for ($pos = strlen($file_data) - 1; $pos > 0; --$pos) {
-				if ($file_data[$pos] === '0' && ($file_data[$pos - 1] === "\n" || $file_data[$pos - 1] === "\r")) {
-					// We’ve found the last record boundary in this chunk of data
-					break;
-				}
-			}
-			if ($pos) {
-				Database::prepare(
-					"INSERT INTO `##gedcom_chunk` (gedcom_id, chunk_data) VALUES (?, ?)"
-				)->execute(array($this->tree_id, substr($file_data, 0, $pos)));
-				$file_data = substr($file_data, $pos);
-			}
-		}
-		Database::prepare(
-			"INSERT INTO `##gedcom_chunk` (gedcom_id, chunk_data) VALUES (?, ?)"
-		)->execute(array($this->tree_id, $file_data));
-
-		Database::commit();
-		fclose($fp);
-	}
-
-	/**
-	 * Generate a new XREF, unique across all family trees
-	 *
-	 * @param string $type
-	 *
-	 * @return string
-	 */
-	public function getNewXref($type = 'INDI') {
-		/** @var string[] Which tree preference is used for which record type */
-		static $type_to_preference = array(
-			'INDI' => 'GEDCOM_ID_PREFIX',
-			'FAM'  => 'FAM_ID_PREFIX',
-			'OBJE' => 'MEDIA_ID_PREFIX',
-			'NOTE' => 'NOTE_ID_PREFIX',
-			'SOUR' => 'SOURCE_ID_PREFIX',
-			'REPO' => 'REPO_ID_PREFIX',
-		);
-
-		if (array_key_exists($type, $type_to_preference)) {
-			$prefix = $this->getPreference($type_to_preference[$type]);
-		} else {
-			// Use the first non-underscore character
-			$prefix = substr(trim($type, '_'), 0, 1);
-		}
-
-		$increment = 1.0;
-		do {
-			// Use LAST_INSERT_ID(expr) to provide a transaction-safe sequence. See
-			// http://dev.mysql.com/doc/refman/5.6/en/information-functions.html#function_last-insert-id
-			$statement = Database::prepare(
-				"UPDATE `##next_id` SET next_id = LAST_INSERT_ID(next_id + :increment) WHERE record_type = :record_type AND gedcom_id = :tree_id"
-			);
-			$statement->execute(array(
-				'increment'   => (int) $increment,
-				'record_type' => $type,
-				'tree_id'     => $this->tree_id,
-			));
-
-			if ($statement->rowCount() === 0) {
-				// First time we've used this record type.
-				Database::prepare(
-					"INSERT INTO `##next_id` (gedcom_id, record_type, next_id) VALUES(:tree_id, :record_type, 1)"
-				)->execute(array(
-					'record_type' => $type,
-					'tree_id'     => $this->tree_id,
-				));
-				$num = 1;
-			} else {
-				$num = Database::prepare("SELECT LAST_INSERT_ID()")->fetchOne();
-			}
-
-			// Records may already exist with this sequence number.
-			$already_used = Database::prepare(
-				"SELECT i_id FROM `##individuals` WHERE i_id = :i_id" .
-				" UNION ALL " .
-				"SELECT f_id FROM `##families` WHERE f_id = :f_id" .
-				" UNION ALL " .
-				"SELECT s_id FROM `##sources` WHERE s_id = :s_id" .
-				" UNION ALL " .
-				"SELECT m_id FROM `##media` WHERE m_id = :m_id" .
-				" UNION ALL " .
-				"SELECT o_id FROM `##other` WHERE o_id = :o_id" .
-				" UNION ALL " .
-				"SELECT xref FROM `##change` WHERE xref = :xref"
-			)->execute(array(
-				'i_id' => $prefix . $num,
-				'f_id' => $prefix . $num,
-				's_id' => $prefix . $num,
-				'm_id' => $prefix . $num,
-				'o_id' => $prefix . $num,
-				'xref' => $prefix . $num,
-			))->fetchOne();
-
-			// This exponential increment allows us to scan over large blocks of
-			// existing data in a reasonable time.
-			$increment *= 1.01;
-		} while ($already_used);
-
-		return $prefix . $num;
-	}
-
-	/**
-	 * Create a new record from GEDCOM data.
-	 *
-	 * @param string $gedcom
-	 *
-	 * @throws \Exception
-	 *
-	 * @return GedcomRecord
-	 */
-	public function createRecord($gedcom) {
-		if (preg_match('/^0 @(' . WT_REGEX_XREF . ')@ (' . WT_REGEX_TAG . ')/', $gedcom, $match)) {
-			$xref = $match[1];
-			$type = $match[2];
-		} else {
-			throw new \Exception('Invalid argument to GedcomRecord::createRecord(' . $gedcom . ')');
-		}
-		if (strpos("\r", $gedcom) !== false) {
-			// MSDOS line endings will break things in horrible ways
-			throw new \Exception('Evil line endings found in GedcomRecord::createRecord(' . $gedcom . ')');
-		}
-
-		// webtrees creates XREFs containing digits. Anything else (e.g. “new”) is just a placeholder.
-		if (!preg_match('/\d/', $xref)) {
-			$xref   = $this->getNewXref($type);
-			$gedcom = preg_replace('/^0 @(' . WT_REGEX_XREF . ')@/', '0 @' . $xref . '@', $gedcom);
-		}
-
-		// Create a change record, if not already present
-		if (!preg_match('/\n1 CHAN/', $gedcom)) {
-			$gedcom .= "\n1 CHAN\n2 DATE " . date('d M Y') . "\n3 TIME " . date('H:i:s') . "\n2 _WT_USER " . Auth::user()->getUserName();
-		}
-
-		// Create a pending change
-		Database::prepare(
-			"INSERT INTO `##change` (gedcom_id, xref, old_gedcom, new_gedcom, user_id) VALUES (?, ?, '', ?, ?)"
-		)->execute(array(
-			$this->tree_id,
-			$xref,
-			$gedcom,
-			Auth::id(),
-		));
-
-		Log::addEditLog('Create: ' . $type . ' ' . $xref);
-
-		// Accept this pending change
-		if (Auth::user()->getPreference('auto_accept')) {
-			FunctionsImport::acceptAllChanges($xref, $this->tree_id);
-		}
-		// Return the newly created record. Note that since GedcomRecord
-		// has a cache of pending changes, we cannot use it to create a
-		// record with a newly created pending change.
-		return GedcomRecord::getInstance($xref, $this, $gedcom);
-	}
+    /** @var int The tree's ID number */
+    private $tree_id;
+
+    /** @var string The tree's name */
+    private $name;
+
+    /** @var string The tree's title */
+    private $title;
+
+    /** @var int[] Default access rules for facts in this tree */
+    private $fact_privacy;
+
+    /** @var int[] Default access rules for individuals in this tree */
+    private $individual_privacy;
+
+    /** @var integer[][] Default access rules for individual facts in this tree */
+    private $individual_fact_privacy;
+
+    /** @var Tree[] All trees that we have permission to see. */
+    private static $trees;
+
+    /** @var string[] Cached copy of the wt_gedcom_setting table. */
+    private $preferences;
+
+    /** @var string[][] Cached copy of the wt_user_gedcom_setting table. */
+    private $user_preferences = array();
+
+    /**
+     * Create a tree object. This is a private constructor - it can only
+     * be called from Tree::getAll() to ensure proper initialisation.
+     *
+     * @param int    $tree_id
+     * @param string $tree_name
+     * @param string $tree_title
+     */
+    private function __construct($tree_id, $tree_name, $tree_title) {
+        $this->tree_id                 = $tree_id;
+        $this->name                    = $tree_name;
+        $this->title                   = $tree_title;
+        $this->fact_privacy            = array();
+        $this->individual_privacy      = array();
+        $this->individual_fact_privacy = array();
+
+        // Load the privacy settings for this tree
+        $rows = Database::prepare(
+            "SELECT xref, tag_type, CASE resn WHEN 'none' THEN :priv_public WHEN 'privacy' THEN :priv_user WHEN 'confidential' THEN :priv_none WHEN 'hidden' THEN :priv_hide END AS resn" .
+            " FROM `##default_resn` WHERE gedcom_id = :tree_id"
+        )->execute(array(
+            'priv_public' => Auth::PRIV_PRIVATE,
+            'priv_user'   => Auth::PRIV_USER,
+            'priv_none'   => Auth::PRIV_NONE,
+            'priv_hide'   => Auth::PRIV_HIDE,
+            'tree_id'     => $this->tree_id,
+        ))->fetchAll();
+
+        foreach ($rows as $row) {
+            if ($row->xref !== null) {
+                if ($row->tag_type !== null) {
+                    $this->individual_fact_privacy[$row->xref][$row->tag_type] = (int) $row->resn;
+                } else {
+                    $this->individual_privacy[$row->xref] = (int) $row->resn;
+                }
+            } else {
+                $this->fact_privacy[$row->tag_type] = (int) $row->resn;
+            }
+        }
+
+    }
+
+    /**
+     * The ID of this tree
+     *
+     * @return int
+     */
+    public function getTreeId() {
+        return $this->tree_id;
+    }
+
+    /**
+     * The name of this tree
+     *
+     * @return string
+     */
+    public function getName() {
+        return $this->name;
+    }
+
+    /**
+     * The name of this tree
+     *
+     * @return string
+     */
+    public function getNameHtml() {
+        return Filter::escapeHtml($this->name);
+    }
+
+    /**
+     * The name of this tree
+     *
+     * @return string
+     */
+    public function getNameUrl() {
+        return Filter::escapeUrl($this->name);
+    }
+
+    /**
+     * The title of this tree
+     *
+     * @return string
+     */
+    public function getTitle() {
+        return $this->title;
+    }
+
+    /**
+     * The title of this tree, with HTML markup
+     *
+     * @return string
+     */
+    public function getTitleHtml() {
+        return '<span dir="auto">' . Filter::escapeHtml($this->title) . '</span>';
+    }
+
+    /**
+     * The fact-level privacy for this tree.
+     *
+     * @return int[]
+     */
+    public function getFactPrivacy() {
+        return $this->fact_privacy;
+    }
+
+    /**
+     * The individual-level privacy for this tree.
+     *
+     * @return int[]
+     */
+    public function getIndividualPrivacy() {
+        return $this->individual_privacy;
+    }
+
+    /**
+     * The individual-fact-level privacy for this tree.
+     *
+     * @return integer[][]
+     */
+    public function getIndividualFactPrivacy() {
+        return $this->individual_fact_privacy;
+    }
+
+    /**
+     * Get the tree’s configuration settings.
+     *
+     * @param string      $setting_name
+     * @param string|null $default
+     *
+     * @return string|null
+     */
+    public function getPreference($setting_name, $default = null) {
+        if ($this->preferences === null) {
+            $this->preferences = Database::prepare(
+                "SELECT setting_name, setting_value FROM `##gedcom_setting` WHERE gedcom_id = ?"
+            )->execute(array($this->tree_id))->fetchAssoc();
+        }
+
+        if (array_key_exists($setting_name, $this->preferences)) {
+            return $this->preferences[$setting_name];
+        } else {
+            return $default;
+        }
+    }
+
+    /**
+     * Set the tree’s configuration settings.
+     *
+     * @param string $setting_name
+     * @param string $setting_value
+     *
+     * @return $this
+     */
+    public function setPreference($setting_name, $setting_value) {
+        if ($setting_value !== $this->getPreference($setting_name)) {
+            // Update the database
+            if ($setting_value === null) {
+                Database::prepare(
+                    "DELETE FROM `##gedcom_setting` WHERE gedcom_id = :tree_id AND setting_name = :setting_name"
+                )->execute(array(
+                    'tree_id'      => $this->tree_id,
+                    'setting_name' => $setting_name,
+                ));
+            } else {
+                Database::prepare(
+                    "REPLACE INTO `##gedcom_setting` (gedcom_id, setting_name, setting_value)" .
+                    " VALUES (:tree_id, :setting_name, LEFT(:setting_value, 255))"
+                )->execute(array(
+                    'tree_id'       => $this->tree_id,
+                    'setting_name'  => $setting_name,
+                    'setting_value' => $setting_value,
+                ));
+            }
+            // Update our cache
+            $this->preferences[$setting_name] = $setting_value;
+            // Audit log of changes
+            Log::addConfigurationLog('Tree preference "' . $setting_name . '" set to "' . $setting_value . '"', $this);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the tree’s user-configuration settings.
+     *
+     * @param User        $user
+     * @param string      $setting_name
+     * @param string|null $default
+     *
+     * @return string
+     */
+    public function getUserPreference(User $user, $setting_name, $default = null) {
+        // There are lots of settings, and we need to fetch lots of them on every page
+        // so it is quicker to fetch them all in one go.
+        if (!array_key_exists($user->getUserId(), $this->user_preferences)) {
+            $this->user_preferences[$user->getUserId()] = Database::prepare(
+                "SELECT setting_name, setting_value FROM `##user_gedcom_setting` WHERE user_id = ? AND gedcom_id = ?"
+            )->execute(array($user->getUserId(), $this->tree_id))->fetchAssoc();
+        }
+
+        if (array_key_exists($setting_name, $this->user_preferences[$user->getUserId()])) {
+            return $this->user_preferences[$user->getUserId()][$setting_name];
+        } else {
+            return $default;
+        }
+    }
+
+    /**
+     * Set the tree’s user-configuration settings.
+     *
+     * @param User    $user
+     * @param string  $setting_name
+     * @param string  $setting_value
+     *
+     * @return $this
+     */
+    public function setUserPreference(User $user, $setting_name, $setting_value) {
+        if ($this->getUserPreference($user, $setting_name) !== $setting_value) {
+            // Update the database
+            if ($setting_value === null) {
+                Database::prepare(
+                    "DELETE FROM `##user_gedcom_setting` WHERE gedcom_id = :tree_id AND user_id = :user_id AND setting_name = :setting_name"
+                )->execute(array(
+                    'tree_id'      => $this->tree_id,
+                    'user_id'      => $user->getUserId(),
+                    'setting_name' => $setting_name,
+                ));
+            } else {
+                Database::prepare(
+                    "REPLACE INTO `##user_gedcom_setting` (user_id, gedcom_id, setting_name, setting_value) VALUES (:user_id, :tree_id, :setting_name, LEFT(:setting_value, 255))"
+                )->execute(array(
+                    'user_id'       => $user->getUserId(),
+                    'tree_id'       => $this->tree_id,
+                    'setting_name'  => $setting_name,
+                    'setting_value' => $setting_value,
+                ));
+            }
+            // Update our cache
+            $this->user_preferences[$user->getUserId()][$setting_name] = $setting_value;
+            // Audit log of changes
+            Log::addConfigurationLog('Tree preference "' . $setting_name . '" set to "' . $setting_value . '" for user "' . $user->getUserName() . '"', $this);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Can a user accept changes for this tree?
+     *
+     * @param User $user
+     *
+     * @return bool
+     */
+    public function canAcceptChanges(User $user) {
+        return Auth::isModerator($this, $user);
+    }
+
+    /**
+     * Fetch all the trees that we have permission to access.
+     *
+     * @return Tree[]
+     */
+    public static function getAll() {
+        if (self::$trees === null) {
+            self::$trees = array();
+            $rows        = Database::prepare(
+                "SELECT g.gedcom_id AS tree_id, g.gedcom_name AS tree_name, gs1.setting_value AS tree_title" .
+                " FROM `##gedcom` g" .
+                " LEFT JOIN `##gedcom_setting`      gs1 ON (g.gedcom_id=gs1.gedcom_id AND gs1.setting_name='title')" .
+                " LEFT JOIN `##gedcom_setting`      gs2 ON (g.gedcom_id=gs2.gedcom_id AND gs2.setting_name='imported')" .
+                " LEFT JOIN `##gedcom_setting`      gs3 ON (g.gedcom_id=gs3.gedcom_id AND gs3.setting_name='REQUIRE_AUTHENTICATION')" .
+                " LEFT JOIN `##user_gedcom_setting` ugs ON (g.gedcom_id=ugs.gedcom_id AND ugs.setting_name='canedit' AND ugs.user_id=?)" .
+                " WHERE " .
+                "  g.gedcom_id>0 AND (" . // exclude the "template" tree
+                "    EXISTS (SELECT 1 FROM `##user_setting` WHERE user_id=? AND setting_name='canadmin' AND setting_value=1)" . // Admin sees all
+                "   ) OR (" .
+                "    (gs2.setting_value = 1 OR ugs.setting_value = 'admin') AND (" . // Allow imported trees, with either:
+                "     gs3.setting_value <> 1 OR" . // visitor access
+                "     IFNULL(ugs.setting_value, 'none')<>'none'" . // explicit access
+                "   )" .
+                "  )" .
+                " ORDER BY g.sort_order, 3"
+            )->execute(array(Auth::id(), Auth::id()))->fetchAll();
+            foreach ($rows as $row) {
+                self::$trees[] = new self((int) $row->tree_id, $row->tree_name, $row->tree_title);
+            }
+        }
+
+        return self::$trees;
+    }
+
+    /**
+     * Find the tree with a specific ID.
+     *
+     * @param int $tree_id
+     *
+     * @throws \DomainException
+     *
+     * @return Tree
+     */
+    public static function findById($tree_id) {
+        foreach (self::getAll() as $tree) {
+            if ($tree->tree_id == $tree_id) {
+                return $tree;
+            }
+        }
+        throw new \DomainException;
+    }
+
+    /**
+     * Find the tree with a specific name.
+     *
+     * @param string $tree_name
+     *
+     * @return Tree|null
+     */
+    public static function findByName($tree_name) {
+        foreach (self::getAll() as $tree) {
+            if ($tree->name === $tree_name) {
+                return $tree;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Create arguments to select_edit_control()
+     * Note - these will be escaped later
+     *
+     * @return string[]
+     */
+    public static function getIdList() {
+        $list = array();
+        foreach (self::getAll() as $tree) {
+            $list[$tree->tree_id] = $tree->title;
+        }
+
+        return $list;
+    }
+
+    /**
+     * Create arguments to select_edit_control()
+     * Note - these will be escaped later
+     *
+     * @return string[]
+     */
+    public static function getNameList() {
+        $list = array();
+        foreach (self::getAll() as $tree) {
+            $list[$tree->name] = $tree->title;
+        }
+
+        return $list;
+    }
+
+    /**
+     * Create a new tree
+     *
+     * @param string $tree_name
+     * @param string $tree_title
+     *
+     * @return Tree
+     */
+    public static function create($tree_name, $tree_title) {
+        try {
+            // Create a new tree
+            Database::prepare(
+                "INSERT INTO `##gedcom` (gedcom_name) VALUES (?)"
+            )->execute(array($tree_name));
+            $tree_id = Database::prepare("SELECT LAST_INSERT_ID()")->fetchOne();
+        } catch (PDOException $ex) {
+            // A tree with that name already exists?
+            return self::findByName($tree_name);
+        }
+
+        // Update the list of trees - to include this new one
+        self::$trees = null;
+        $tree        = self::findById($tree_id);
+
+        $tree->setPreference('imported', '0');
+        $tree->setPreference('title', $tree_title);
+
+        // Module privacy
+        Module::setDefaultAccess($tree_id);
+
+        // Set preferences from default tree
+        Database::prepare(
+            "INSERT INTO `##gedcom_setting` (gedcom_id, setting_name, setting_value)" .
+            " SELECT :tree_id, setting_name, setting_value" .
+            " FROM `##gedcom_setting` WHERE gedcom_id = -1"
+        )->execute(array(
+            'tree_id' => $tree_id,
+        ));
+
+        Database::prepare(
+            "INSERT INTO `##default_resn` (gedcom_id, tag_type, resn)" .
+            " SELECT :tree_id, tag_type, resn" .
+            " FROM `##default_resn` WHERE gedcom_id = -1"
+        )->execute(array(
+            'tree_id' => $tree_id,
+        ));
+
+        Database::prepare(
+            "INSERT INTO `##block` (gedcom_id, location, block_order, module_name)" .
+            " SELECT :tree_id, location, block_order, module_name" .
+            " FROM `##block` WHERE gedcom_id = -1"
+        )->execute(array(
+            'tree_id' => $tree_id,
+        ));
+
+        // Gedcom and privacy settings
+        $tree->setPreference('CONTACT_USER_ID', Auth::id());
+        $tree->setPreference('WEBMASTER_USER_ID', Auth::id());
+        $tree->setPreference('LANGUAGE', WT_LOCALE); // Default to the current admin’s language
+        switch (WT_LOCALE) {
+        case 'es':
+            $tree->setPreference('SURNAME_TRADITION', 'spanish');
+            break;
+        case 'is':
+            $tree->setPreference('SURNAME_TRADITION', 'icelandic');
+            break;
+        case 'lt':
+            $tree->setPreference('SURNAME_TRADITION', 'lithuanian');
+            break;
+        case 'pl':
+            $tree->setPreference('SURNAME_TRADITION', 'polish');
+            break;
+        case 'pt':
+        case 'pt-BR':
+            $tree->setPreference('SURNAME_TRADITION', 'portuguese');
+            break;
+        default:
+            $tree->setPreference('SURNAME_TRADITION', 'paternal');
+            break;
+        }
+
+        // Genealogy data
+        // It is simpler to create a temporary/unimported GEDCOM than to populate all the tables...
+        $john_doe = /* I18N: This should be a common/default/placeholder name of an individual. Put slashes around the surname. */
+            I18N::translate('John /DOE/');
+        $note     = I18N::translate('Edit this individual and replace their details with your own.');
+        Database::prepare("INSERT INTO `##gedcom_chunk` (gedcom_id, chunk_data) VALUES (?, ?)")->execute(array(
+            $tree_id,
+            "0 HEAD\n1 CHAR UTF-8\n0 @I1@ INDI\n1 NAME {$john_doe}\n1 SEX M\n1 BIRT\n2 DATE 01 JAN 1850\n2 NOTE {$note}\n0 TRLR\n",
+        ));
+
+        // Update our cache
+        self::$trees[$tree->tree_id] = $tree;
+
+        return $tree;
+    }
+
+    /**
+     * Are there any pending edits for this tree, than need reviewing by a moderator.
+     *
+     * @return bool
+     */
+    public function hasPendingEdit() {
+        return (bool) Database::prepare(
+            "SELECT 1 FROM `##change` WHERE status = 'pending' AND gedcom_id = :tree_id"
+        )->execute(array(
+            'tree_id' => $this->tree_id,
+        ))->fetchOne();
+    }
+
+    /**
+     * Delete all the genealogy data from a tree - in preparation for importing
+     * new data. Optionally retain the media data, for when the user has been
+     * editing their data offline using an application which deletes (or does not
+     * support) media data.
+     *
+     * @param bool $keep_media
+     */
+    public function deleteGenealogyData($keep_media) {
+        Database::prepare("DELETE FROM `##gedcom_chunk` WHERE gedcom_id = ?")->execute(array($this->tree_id));
+        Database::prepare("DELETE FROM `##individuals`  WHERE i_file    = ?")->execute(array($this->tree_id));
+        Database::prepare("DELETE FROM `##families`     WHERE f_file    = ?")->execute(array($this->tree_id));
+        Database::prepare("DELETE FROM `##sources`      WHERE s_file    = ?")->execute(array($this->tree_id));
+        Database::prepare("DELETE FROM `##other`        WHERE o_file    = ?")->execute(array($this->tree_id));
+        Database::prepare("DELETE FROM `##places`       WHERE p_file    = ?")->execute(array($this->tree_id));
+        Database::prepare("DELETE FROM `##placelinks`   WHERE pl_file   = ?")->execute(array($this->tree_id));
+        Database::prepare("DELETE FROM `##name`         WHERE n_file    = ?")->execute(array($this->tree_id));
+        Database::prepare("DELETE FROM `##dates`        WHERE d_file    = ?")->execute(array($this->tree_id));
+        Database::prepare("DELETE FROM `##change`       WHERE gedcom_id = ?")->execute(array($this->tree_id));
+
+        if ($keep_media) {
+            Database::prepare("DELETE FROM `##link` WHERE l_file =? AND l_type<>'OBJE'")->execute(array($this->tree_id));
+        } else {
+            Database::prepare("DELETE FROM `##link`  WHERE l_file =?")->execute(array($this->tree_id));
+            Database::prepare("DELETE FROM `##media` WHERE m_file =?")->execute(array($this->tree_id));
+        }
+    }
+
+    /**
+     * Delete everything relating to a tree
+     */
+    public function delete() {
+        // If this is the default tree, then unset it
+        if (Site::getPreference('DEFAULT_GEDCOM') === $this->name) {
+            Site::setPreference('DEFAULT_GEDCOM', '');
+        }
+
+        $this->deleteGenealogyData(false);
+
+        Database::prepare("DELETE `##block_setting` FROM `##block_setting` JOIN `##block` USING (block_id) WHERE gedcom_id=?")->execute(array($this->tree_id));
+        Database::prepare("DELETE FROM `##block`               WHERE gedcom_id = ?")->execute(array($this->tree_id));
+        Database::prepare("DELETE FROM `##user_gedcom_setting` WHERE gedcom_id = ?")->execute(array($this->tree_id));
+        Database::prepare("DELETE FROM `##gedcom_setting`      WHERE gedcom_id = ?")->execute(array($this->tree_id));
+        Database::prepare("DELETE FROM `##module_privacy`      WHERE gedcom_id = ?")->execute(array($this->tree_id));
+        Database::prepare("DELETE FROM `##next_id`             WHERE gedcom_id = ?")->execute(array($this->tree_id));
+        Database::prepare("DELETE FROM `##hit_counter`         WHERE gedcom_id = ?")->execute(array($this->tree_id));
+        Database::prepare("DELETE FROM `##default_resn`        WHERE gedcom_id = ?")->execute(array($this->tree_id));
+        Database::prepare("DELETE FROM `##gedcom_chunk`        WHERE gedcom_id = ?")->execute(array($this->tree_id));
+        Database::prepare("DELETE FROM `##log`                 WHERE gedcom_id = ?")->execute(array($this->tree_id));
+        Database::prepare("DELETE FROM `##gedcom`              WHERE gedcom_id = ?")->execute(array($this->tree_id));
+
+        // After updating the database, we need to fetch a new (sorted) copy
+        self::$trees = null;
+    }
+
+    /**
+     * Export the tree to a GEDCOM file
+     *
+     * @param resource $stream
+     */
+    public function exportGedcom($stream) {
+        $stmt = Database::prepare(
+            "SELECT i_gedcom AS gedcom, i_id AS xref, 1 AS n FROM `##individuals` WHERE i_file = :tree_id_1" .
+            " UNION ALL " .
+            "SELECT f_gedcom AS gedcom, f_id AS xref, 2 AS n FROM `##families`    WHERE f_file = :tree_id_2" .
+            " UNION ALL " .
+            "SELECT s_gedcom AS gedcom, s_id AS xref, 3 AS n FROM `##sources`     WHERE s_file = :tree_id_3" .
+            " UNION ALL " .
+            "SELECT o_gedcom AS gedcom, o_id AS xref, 4 AS n FROM `##other`       WHERE o_file = :tree_id_4 AND o_type NOT IN ('HEAD', 'TRLR')" .
+            " UNION ALL " .
+            "SELECT m_gedcom AS gedcom, m_id AS xref, 5 AS n FROM `##media`       WHERE m_file = :tree_id_5" .
+            " ORDER BY n, LENGTH(xref), xref"
+        )->execute(array(
+            'tree_id_1' => $this->tree_id,
+            'tree_id_2' => $this->tree_id,
+            'tree_id_3' => $this->tree_id,
+            'tree_id_4' => $this->tree_id,
+            'tree_id_5' => $this->tree_id,
+        ));
+
+        $buffer = FunctionsExport::reformatRecord(FunctionsExport::gedcomHeader($this));
+        while ($row = $stmt->fetch()) {
+            $buffer .= FunctionsExport::reformatRecord($row->gedcom);
+            if (strlen($buffer) > 65535) {
+                fwrite($stream, $buffer);
+                $buffer = '';
+            }
+        }
+        fwrite($stream, $buffer . '0 TRLR' . WT_EOL);
+        $stmt->closeCursor();
+    }
+
+    /**
+     * Import data from a gedcom file into this tree.
+     *
+     * @param string  $path       The full path to the (possibly temporary) file.
+     * @param string  $filename   The preferred filename, for export/download.
+     *
+     * @throws \Exception
+     */
+    public function importGedcomFile($path, $filename) {
+        // Read the file in blocks of roughly 64K. Ensure that each block
+        // contains complete gedcom records. This will ensure we don’t split
+        // multi-byte characters, as well as simplifying the code to import
+        // each block.
+
+        $file_data = '';
+        $fp        = fopen($path, 'rb');
+
+        // Don’t allow the user to cancel the request. We do not want to be left with an incomplete transaction.
+        ignore_user_abort(true);
+
+        Database::beginTransaction();
+        $this->deleteGenealogyData($this->getPreference('keep_media'));
+        $this->setPreference('gedcom_filename', $filename);
+        $this->setPreference('imported', '0');
+
+        while (!feof($fp)) {
+            $file_data .= fread($fp, 65536);
+            // There is no strrpos() function that searches for substrings :-(
+            for ($pos = strlen($file_data) - 1; $pos > 0; --$pos) {
+                if ($file_data[$pos] === '0' && ($file_data[$pos - 1] === "\n" || $file_data[$pos - 1] === "\r")) {
+                    // We’ve found the last record boundary in this chunk of data
+                    break;
+                }
+            }
+            if ($pos) {
+                Database::prepare(
+                    "INSERT INTO `##gedcom_chunk` (gedcom_id, chunk_data) VALUES (?, ?)"
+                )->execute(array($this->tree_id, substr($file_data, 0, $pos)));
+                $file_data = substr($file_data, $pos);
+            }
+        }
+        Database::prepare(
+            "INSERT INTO `##gedcom_chunk` (gedcom_id, chunk_data) VALUES (?, ?)"
+        )->execute(array($this->tree_id, $file_data));
+
+        Database::commit();
+        fclose($fp);
+    }
+
+    /**
+     * Generate a new XREF, unique across all family trees
+     *
+     * @param string $type
+     *
+     * @return string
+     */
+    public function getNewXref($type = 'INDI') {
+        /** @var string[] Which tree preference is used for which record type */
+        static $type_to_preference = array(
+            'INDI' => 'GEDCOM_ID_PREFIX',
+            'FAM'  => 'FAM_ID_PREFIX',
+            'OBJE' => 'MEDIA_ID_PREFIX',
+            'NOTE' => 'NOTE_ID_PREFIX',
+            'SOUR' => 'SOURCE_ID_PREFIX',
+            'REPO' => 'REPO_ID_PREFIX',
+        );
+
+        if (array_key_exists($type, $type_to_preference)) {
+            $prefix = $this->getPreference($type_to_preference[$type]);
+        } else {
+            // Use the first non-underscore character
+            $prefix = substr(trim($type, '_'), 0, 1);
+        }
+
+        $increment = 1.0;
+        do {
+            // Use LAST_INSERT_ID(expr) to provide a transaction-safe sequence. See
+            // http://dev.mysql.com/doc/refman/5.6/en/information-functions.html#function_last-insert-id
+            $statement = Database::prepare(
+                "UPDATE `##next_id` SET next_id = LAST_INSERT_ID(next_id + :increment) WHERE record_type = :record_type AND gedcom_id = :tree_id"
+            );
+            $statement->execute(array(
+                'increment'   => (int) $increment,
+                'record_type' => $type,
+                'tree_id'     => $this->tree_id,
+            ));
+
+            if ($statement->rowCount() === 0) {
+                // First time we've used this record type.
+                Database::prepare(
+                    "INSERT INTO `##next_id` (gedcom_id, record_type, next_id) VALUES(:tree_id, :record_type, 1)"
+                )->execute(array(
+                    'record_type' => $type,
+                    'tree_id'     => $this->tree_id,
+                ));
+                $num = 1;
+            } else {
+                $num = Database::prepare("SELECT LAST_INSERT_ID()")->fetchOne();
+            }
+
+            // Records may already exist with this sequence number.
+            $already_used = Database::prepare(
+                "SELECT i_id FROM `##individuals` WHERE i_id = :i_id" .
+                " UNION ALL " .
+                "SELECT f_id FROM `##families` WHERE f_id = :f_id" .
+                " UNION ALL " .
+                "SELECT s_id FROM `##sources` WHERE s_id = :s_id" .
+                " UNION ALL " .
+                "SELECT m_id FROM `##media` WHERE m_id = :m_id" .
+                " UNION ALL " .
+                "SELECT o_id FROM `##other` WHERE o_id = :o_id" .
+                " UNION ALL " .
+                "SELECT xref FROM `##change` WHERE xref = :xref"
+            )->execute(array(
+                'i_id' => $prefix . $num,
+                'f_id' => $prefix . $num,
+                's_id' => $prefix . $num,
+                'm_id' => $prefix . $num,
+                'o_id' => $prefix . $num,
+                'xref' => $prefix . $num,
+            ))->fetchOne();
+
+            // This exponential increment allows us to scan over large blocks of
+            // existing data in a reasonable time.
+            $increment *= 1.01;
+        } while ($already_used);
+
+        return $prefix . $num;
+    }
+
+    /**
+     * Create a new record from GEDCOM data.
+     *
+     * @param string $gedcom
+     *
+     * @throws \Exception
+     *
+     * @return GedcomRecord
+     */
+    public function createRecord($gedcom) {
+        if (preg_match('/^0 @(' . WT_REGEX_XREF . ')@ (' . WT_REGEX_TAG . ')/', $gedcom, $match)) {
+            $xref = $match[1];
+            $type = $match[2];
+        } else {
+            throw new \Exception('Invalid argument to GedcomRecord::createRecord(' . $gedcom . ')');
+        }
+        if (strpos("\r", $gedcom) !== false) {
+            // MSDOS line endings will break things in horrible ways
+            throw new \Exception('Evil line endings found in GedcomRecord::createRecord(' . $gedcom . ')');
+        }
+
+        // webtrees creates XREFs containing digits. Anything else (e.g. “new”) is just a placeholder.
+        if (!preg_match('/\d/', $xref)) {
+            $xref   = $this->getNewXref($type);
+            $gedcom = preg_replace('/^0 @(' . WT_REGEX_XREF . ')@/', '0 @' . $xref . '@', $gedcom);
+        }
+
+        // Create a change record, if not already present
+        if (!preg_match('/\n1 CHAN/', $gedcom)) {
+            $gedcom .= "\n1 CHAN\n2 DATE " . date('d M Y') . "\n3 TIME " . date('H:i:s') . "\n2 _WT_USER " . Auth::user()->getUserName();
+        }
+
+        // Create a pending change
+        Database::prepare(
+            "INSERT INTO `##change` (gedcom_id, xref, old_gedcom, new_gedcom, user_id) VALUES (?, ?, '', ?, ?)"
+        )->execute(array(
+            $this->tree_id,
+            $xref,
+            $gedcom,
+            Auth::id(),
+        ));
+
+        Log::addEditLog('Create: ' . $type . ' ' . $xref);
+
+        // Accept this pending change
+        if (Auth::user()->getPreference('auto_accept')) {
+            FunctionsImport::acceptAllChanges($xref, $this->tree_id);
+        }
+        // Return the newly created record. Note that since GedcomRecord
+        // has a cache of pending changes, we cannot use it to create a
+        // record with a newly created pending change.
+        return GedcomRecord::getInstance($xref, $this, $gedcom);
+    }
 }

Switch Indentation +19 added lines, -19 removed lines

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

Braces +58 added lines, -29 removed lines

@@ -22,7 +22,8 @@ 
 /**
  * Provide an interface to the wt_gedcom table.
  */
-class Tree {
+class Tree
+{
 	/** @var int The tree's ID number */
 	private $tree_id;
 
@@ -58,7 +59,8 @@ 
 	 * @param string $tree_name
 	 * @param string $tree_title
 	 */
-	private function __construct($tree_id, $tree_name, $tree_title) {
+	private function __construct($tree_id, $tree_name, $tree_title)
+	{
 		$this->tree_id                 = $tree_id;
 		$this->name                    = $tree_name;
 		$this->title                   = $tree_title;
@@ -97,7 +99,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function getTreeId() {
+	public function getTreeId()
+	{
 		return $this->tree_id;
 	}
 
@@ -106,7 +109,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getName() {
+	public function getName()
+	{
 		return $this->name;
 	}
 
@@ -115,7 +119,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getNameHtml() {
+	public function getNameHtml()
+	{
 		return Filter::escapeHtml($this->name);
 	}
 
@@ -124,7 +129,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getNameUrl() {
+	public function getNameUrl()
+	{
 		return Filter::escapeUrl($this->name);
 	}
 
@@ -133,7 +139,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return $this->title;
 	}
 
@@ -142,7 +149,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getTitleHtml() {
+	public function getTitleHtml()
+	{
 		return '<span dir="auto">' . Filter::escapeHtml($this->title) . '</span>';
 	}
 
@@ -151,7 +159,8 @@ 
 	 *
 	 * @return int[]
 	 */
-	public function getFactPrivacy() {
+	public function getFactPrivacy()
+	{
 		return $this->fact_privacy;
 	}
 
@@ -160,7 +169,8 @@ 
 	 *
 	 * @return int[]
 	 */
-	public function getIndividualPrivacy() {
+	public function getIndividualPrivacy()
+	{
 		return $this->individual_privacy;
 	}
 
@@ -169,7 +179,8 @@ 
 	 *
 	 * @return integer[][]
 	 */
-	public function getIndividualFactPrivacy() {
+	public function getIndividualFactPrivacy()
+	{
 		return $this->individual_fact_privacy;
 	}
 
@@ -181,7 +192,8 @@ 
 	 *
 	 * @return string|null
 	 */
-	public function getPreference($setting_name, $default = null) {
+	public function getPreference($setting_name, $default = null)
+	{
 		if ($this->preferences === null) {
 			$this->preferences = Database::prepare(
 				"SELECT setting_name, setting_value FROM `##gedcom_setting` WHERE gedcom_id = ?"
@@ -203,7 +215,8 @@ 
 	 *
 	 * @return $this
 	 */
-	public function setPreference($setting_name, $setting_value) {
+	public function setPreference($setting_name, $setting_value)
+	{
 		if ($setting_value !== $this->getPreference($setting_name)) {
 			// Update the database
 			if ($setting_value === null) {
@@ -241,7 +254,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getUserPreference(User $user, $setting_name, $default = null) {
+	public function getUserPreference(User $user, $setting_name, $default = null)
+	{
 		// There are lots of settings, and we need to fetch lots of them on every page
 		// so it is quicker to fetch them all in one go.
 		if (!array_key_exists($user->getUserId(), $this->user_preferences)) {
@@ -266,7 +280,8 @@ 
 	 *
 	 * @return $this
 	 */
-	public function setUserPreference(User $user, $setting_name, $setting_value) {
+	public function setUserPreference(User $user, $setting_name, $setting_value)
+	{
 		if ($this->getUserPreference($user, $setting_name) !== $setting_value) {
 			// Update the database
 			if ($setting_value === null) {
@@ -303,7 +318,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function canAcceptChanges(User $user) {
+	public function canAcceptChanges(User $user)
+	{
 		return Auth::isModerator($this, $user);
 	}
 
@@ -312,7 +328,8 @@ 
 	 *
 	 * @return Tree[]
 	 */
-	public static function getAll() {
+	public static function getAll()
+	{
 		if (self::$trees === null) {
 			self::$trees = array();
 			$rows        = Database::prepare(
@@ -350,7 +367,8 @@ 
 	 *
 	 * @return Tree
 	 */
-	public static function findById($tree_id) {
+	public static function findById($tree_id)
+	{
 		foreach (self::getAll() as $tree) {
 			if ($tree->tree_id == $tree_id) {
 				return $tree;
@@ -366,7 +384,8 @@ 
 	 *
 	 * @return Tree|null
 	 */
-	public static function findByName($tree_name) {
+	public static function findByName($tree_name)
+	{
 		foreach (self::getAll() as $tree) {
 			if ($tree->name === $tree_name) {
 				return $tree;
@@ -382,7 +401,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public static function getIdList() {
+	public static function getIdList()
+	{
 		$list = array();
 		foreach (self::getAll() as $tree) {
 			$list[$tree->tree_id] = $tree->title;
@@ -397,7 +417,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public static function getNameList() {
+	public static function getNameList()
+	{
 		$list = array();
 		foreach (self::getAll() as $tree) {
 			$list[$tree->name] = $tree->title;
@@ -414,7 +435,8 @@ 
 	 *
 	 * @return Tree
 	 */
-	public static function create($tree_name, $tree_title) {
+	public static function create($tree_name, $tree_title)
+	{
 		try {
 			// Create a new tree
 			Database::prepare(
@@ -508,7 +530,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function hasPendingEdit() {
+	public function hasPendingEdit()
+	{
 		return (bool) Database::prepare(
 			"SELECT 1 FROM `##change` WHERE status = 'pending' AND gedcom_id = :tree_id"
 		)->execute(array(
@@ -524,7 +547,8 @@ 
 	 *
 	 * @param bool $keep_media
 	 */
-	public function deleteGenealogyData($keep_media) {
+	public function deleteGenealogyData($keep_media)
+	{
 		Database::prepare("DELETE FROM `##gedcom_chunk` WHERE gedcom_id = ?")->execute(array($this->tree_id));
 		Database::prepare("DELETE FROM `##individuals`  WHERE i_file    = ?")->execute(array($this->tree_id));
 		Database::prepare("DELETE FROM `##families`     WHERE f_file    = ?")->execute(array($this->tree_id));
@@ -547,7 +571,8 @@ 
 	/**
 	 * Delete everything relating to a tree
 	 */
-	public function delete() {
+	public function delete()
+	{
 		// If this is the default tree, then unset it
 		if (Site::getPreference('DEFAULT_GEDCOM') === $this->name) {
 			Site::setPreference('DEFAULT_GEDCOM', '');
@@ -576,7 +601,8 @@ 
 	 *
 	 * @param resource $stream
 	 */
-	public function exportGedcom($stream) {
+	public function exportGedcom($stream)
+	{
 		$stmt = Database::prepare(
 			"SELECT i_gedcom AS gedcom, i_id AS xref, 1 AS n FROM `##individuals` WHERE i_file = :tree_id_1" .
 			" UNION ALL " .
@@ -616,7 +642,8 @@ 
 	 *
 	 * @throws \Exception
 	 */
-	public function importGedcomFile($path, $filename) {
+	public function importGedcomFile($path, $filename)
+	{
 		// Read the file in blocks of roughly 64K. Ensure that each block
 		// contains complete gedcom records. This will ensure we don’t split
 		// multi-byte characters, as well as simplifying the code to import
@@ -664,7 +691,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getNewXref($type = 'INDI') {
+	public function getNewXref($type = 'INDI')
+	{
 		/** @var string[] Which tree preference is used for which record type */
 		static $type_to_preference = array(
 			'INDI' => 'GEDCOM_ID_PREFIX',
@@ -747,7 +775,8 @@ 
 	 *
 	 * @return GedcomRecord
 	 */
-	public function createRecord($gedcom) {
+	public function createRecord($gedcom)
+	{
 		if (preg_match('/^0 @(' . WT_REGEX_XREF . ')@ (' . WT_REGEX_TAG . ')/', $gedcom, $match)) {
 			$xref = $match[1];
 			$type = $match[2];

app/SurnameTradition/SpanishSurnameTradition.php

Indentation +65 added lines, -65 removed lines

@@ -23,74 +23,74 @@
  * Child:  Pablo /CCCC/ /AAAA/
  */
 class SpanishSurnameTradition extends DefaultSurnameTradition implements SurnameTraditionInterface {
-	/**
-	 * What names are given to a new child
-	 *
-	 * @param string $father_name A GEDCOM NAME
-	 * @param string $mother_name A GEDCOM NAME
-	 * @param string $child_sex   M, F or U
-	 *
-	 * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.)
-	 */
-	public function newChildNames($father_name, $mother_name, $child_sex) {
-		if (preg_match(self::REGEX_SURNS, $father_name, $match_father)) {
-			$father_surname = $match_father['SURN1'];
-		} else {
-			$father_surname = '';
-		}
+    /**
+     * What names are given to a new child
+     *
+     * @param string $father_name A GEDCOM NAME
+     * @param string $mother_name A GEDCOM NAME
+     * @param string $child_sex   M, F or U
+     *
+     * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.)
+     */
+    public function newChildNames($father_name, $mother_name, $child_sex) {
+        if (preg_match(self::REGEX_SURNS, $father_name, $match_father)) {
+            $father_surname = $match_father['SURN1'];
+        } else {
+            $father_surname = '';
+        }
 
-		if (preg_match(self::REGEX_SURNS, $mother_name, $match_mother)) {
-			$mother_surname = $match_mother['SURN1'];
-		} else {
-			$mother_surname = '';
-		}
+        if (preg_match(self::REGEX_SURNS, $mother_name, $match_mother)) {
+            $mother_surname = $match_mother['SURN1'];
+        } else {
+            $mother_surname = '';
+        }
 
-		return array(
-			'NAME' => '/' . $father_surname . '/ /' . $mother_surname . '/',
-			'SURN' => trim($father_surname . ',' . $mother_surname, ','),
-		);
-	}
+        return array(
+            'NAME' => '/' . $father_surname . '/ /' . $mother_surname . '/',
+            'SURN' => trim($father_surname . ',' . $mother_surname, ','),
+        );
+    }
 
-	/**
-	 * What names are given to a new parent
-	 *
-	 * @param string $child_name A GEDCOM NAME
-	 * @param string $parent_sex M, F or U
-	 *
-	 * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.)
-	 */
-	public function newParentNames($child_name, $parent_sex) {
-		if (preg_match(self::REGEX_SURNS, $child_name, $match)) {
-			switch ($parent_sex) {
-			case 'M':
-				return array(
-					'NAME' => '/' . $match['SURN1'] . '/ //',
-					'SURN' => $match['SURN1'],
-				);
-			case 'F':
-				return array(
-					'NAME' => '/' . $match['SURN2'] . '/ //',
-					'SURN' => $match['SURN2'],
-				);
-			}
-		}
+    /**
+     * What names are given to a new parent
+     *
+     * @param string $child_name A GEDCOM NAME
+     * @param string $parent_sex M, F or U
+     *
+     * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.)
+     */
+    public function newParentNames($child_name, $parent_sex) {
+        if (preg_match(self::REGEX_SURNS, $child_name, $match)) {
+            switch ($parent_sex) {
+            case 'M':
+                return array(
+                    'NAME' => '/' . $match['SURN1'] . '/ //',
+                    'SURN' => $match['SURN1'],
+                );
+            case 'F':
+                return array(
+                    'NAME' => '/' . $match['SURN2'] . '/ //',
+                    'SURN' => $match['SURN2'],
+                );
+            }
+        }
 
-		return array(
-			'NAME' => '// //',
-		);
-	}
+        return array(
+            'NAME' => '// //',
+        );
+    }
 
-	/**
-	 * What names are given to a new spouse
-	 *
-	 * @param string $spouse_name A GEDCOM NAME
-	 * @param string $spouse_sex  M, F or U
-	 *
-	 * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.)
-	 */
-	public function newSpouseNames($spouse_name, $spouse_sex) {
-		return array(
-			'NAME' => '// //',
-		);
-	}
+    /**
+     * What names are given to a new spouse
+     *
+     * @param string $spouse_name A GEDCOM NAME
+     * @param string $spouse_sex  M, F or U
+     *
+     * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.)
+     */
+    public function newSpouseNames($spouse_name, $spouse_sex) {
+        return array(
+            'NAME' => '// //',
+        );
+    }
 }

Switch Indentation +10 added lines, -10 removed lines

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

Braces +8 added lines, -4 removed lines

@@ -22,7 +22,8 @@ 
  * Father: Jose  /CCCC/ /DDDD/
  * Child:  Pablo /CCCC/ /AAAA/
  */
-class SpanishSurnameTradition extends DefaultSurnameTradition implements SurnameTraditionInterface {
+class SpanishSurnameTradition extends DefaultSurnameTradition implements SurnameTraditionInterface
+{
 	/**
 	 * What names are given to a new child
 	 *
@@ -32,7 +33,8 @@ 
 	 *
 	 * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.)
 	 */
-	public function newChildNames($father_name, $mother_name, $child_sex) {
+	public function newChildNames($father_name, $mother_name, $child_sex)
+	{
 		if (preg_match(self::REGEX_SURNS, $father_name, $match_father)) {
 			$father_surname = $match_father['SURN1'];
 		} else {
@@ -59,7 +61,8 @@ 
 	 *
 	 * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.)
 	 */
-	public function newParentNames($child_name, $parent_sex) {
+	public function newParentNames($child_name, $parent_sex)
+	{
 		if (preg_match(self::REGEX_SURNS, $child_name, $match)) {
 			switch ($parent_sex) {
 			case 'M':
@@ -88,7 +91,8 @@ 
 	 *
 	 * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.)
 	 */
-	public function newSpouseNames($spouse_name, $spouse_sex) {
+	public function newSpouseNames($spouse_name, $spouse_sex)
+	{
 		return array(
 			'NAME' => '// //',
 		);