fisharebest / webtrees

reportengine.php

Switch Indentation +108 added lines, -108 removed lines

@@ -58,32 +58,32 @@ 
 	$newvars[$name]['id'] = $var;
 	if (!empty($type[$name])) {
 		switch ($type[$name]) {
-		case 'INDI':
-			$record = Individual::getInstance($var, $WT_TREE);
-			if ($record && $record->canShowName()) {
-				$newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($WT_TREE));
-			} else {
-				$action = 'setup';
-			}
-			break;
-		case 'FAM':
-			$record = Family::getInstance($var, $WT_TREE);
-			if ($record && $record->canShowName()) {
-				$newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($WT_TREE));
-			} else {
-				$action = 'setup';
-			}
-			break;
-		case 'SOUR':
-			$record = Source::getInstance($var, $WT_TREE);
-			if ($record && $record->canShowName()) {
-				$newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($WT_TREE));
-			} else {
-				$action = 'setup';
-			}
-			break;
-		default:
-			break;
+		    case 'INDI':
+			    $record = Individual::getInstance($var, $WT_TREE);
+			    if ($record && $record->canShowName()) {
+				    $newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($WT_TREE));
+			    } else {
+				    $action = 'setup';
+			    }
+			    break;
+		    case 'FAM':
+			    $record = Family::getInstance($var, $WT_TREE);
+			    if ($record && $record->canShowName()) {
+				    $newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($WT_TREE));
+			    } else {
+				    $action = 'setup';
+			    }
+			    break;
+		    case 'SOUR':
+			    $record = Source::getInstance($var, $WT_TREE);
+			    if ($record && $record->canShowName()) {
+				    $newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($WT_TREE));
+			    } else {
+				    $action = 'setup';
+			    }
+			    break;
+		    default:
+			    break;
 		}
 	}
 }
@@ -111,12 +111,12 @@ 
 
 //-- choose a report to run
 switch ($action) {
-case 'choose':
-	$controller
-		->setPageTitle(I18N::translate('Choose a report to run'))
-		->pageHeader();
+    case 'choose':
+	    $controller
+		    ->setPageTitle(I18N::translate('Choose a report to run'))
+		    ->pageHeader();
 
-	echo '<div id="reportengine-page">
+	    echo '<div id="reportengine-page">
 		<h2 class="center">', I18N::translate('Choose a report to run'), '</h2>
 		<form name="choosereport" method="get" action="reportengine.php">
 		<input type="hidden" name="action" value="setup">
@@ -124,27 +124,27 @@ 
 		<table class="facts_table width40">
 		<tr><td class="descriptionbox wrap width33 vmiddle">', I18N::translate('Report'), '</td>
 		<td class="optionbox"><select name="report">';
-	foreach ($reports as $file => $report) {
-		echo '<option value="', Filter::escapeHtml($file), '">', Filter::escapeHtml($report), '</option>';
-	}
-	echo '</select></td></tr>
+	    foreach ($reports as $file => $report) {
+		    echo '<option value="', Filter::escapeHtml($file), '">', Filter::escapeHtml($report), '</option>';
+	    }
+	    echo '</select></td></tr>
 		<tr><td class="topbottombar" colspan="2"><input type="submit" value="', I18N::translate('continue'), '"></td></tr>
 		</table></form></div>';
-	break;
+	    break;
 
-case 'setup':
-	$report_setup = new ReportParserSetup($report);
-	$report_array = $report_setup->reportProperties();
+    case 'setup':
+	    $report_setup = new ReportParserSetup($report);
+	    $report_array = $report_setup->reportProperties();
 
-	$controller
-		->setPageTitle($report_array['title'])
-		->pageHeader()
-		->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-		->addInlineJavascript('autocomplete();');
+	    $controller
+		    ->setPageTitle($report_array['title'])
+		    ->pageHeader()
+		    ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+		    ->addInlineJavascript('autocomplete();');
 
-	FunctionsPrint::initializeCalendarPopup();
+	    FunctionsPrint::initializeCalendarPopup();
 
-	echo '<div id="reportengine-page">
+	    echo '<div id="reportengine-page">
 		<h2 class="center">', $report_array['title'], '</h2>
 		<form name="setupreport" method="get" action="reportengine.php">
 		<input type="hidden" name="action" value="run">
@@ -152,55 +152,55 @@ 
 		<table class="facts_table width50">
 		<tr><td class="descriptionbox width30 wrap">', I18N::translate('Report'), '</td><td class="optionbox">', $report_array['description'], '</td></tr>';
 
-	if (!isset($report_array['inputs'])) {
-		$report_array['inputs'] = array();
-	}
-	foreach ($report_array['inputs'] as $input) {
-		echo '<tr><td class="descriptionbox wrap">';
-		echo '<input type="hidden" name="varnames[]" value="', Filter::escapeHtml($input["name"]), '">';
-		echo I18N::translate($input['value']), '</td><td class="optionbox">';
-		if (!isset($input['type'])) {
-			$input['type'] = 'text';
-		}
-		if (!isset($input['default'])) {
-			$input['default'] = '';
-		}
-		if (!isset($input['lookup'])) {
-			$input['lookup'] = '';
-		}
+	    if (!isset($report_array['inputs'])) {
+		    $report_array['inputs'] = array();
+	    }
+	    foreach ($report_array['inputs'] as $input) {
+		    echo '<tr><td class="descriptionbox wrap">';
+		    echo '<input type="hidden" name="varnames[]" value="', Filter::escapeHtml($input["name"]), '">';
+		    echo I18N::translate($input['value']), '</td><td class="optionbox">';
+		    if (!isset($input['type'])) {
+			    $input['type'] = 'text';
+		    }
+		    if (!isset($input['default'])) {
+			    $input['default'] = '';
+		    }
+		    if (!isset($input['lookup'])) {
+			    $input['lookup'] = '';
+		    }
 
-		if ($input['type'] == 'text') {
-			echo '<input';
+		    if ($input['type'] == 'text') {
+			    echo '<input';
 
-			switch ($input['lookup']) {
-			case 'INDI':
-				echo ' data-autocomplete-type="INDI"';
-				if (!empty($pid)) {
-					$input['default'] = $pid;
-				} else {
-					$input['default'] = $controller->getSignificantIndividual()->getXref();
-				}
-				break;
-			case 'FAM':
-				echo ' data-autocomplete-type="FAM"';
-				if (!empty($famid)) {
-					$input['default'] = $famid;
-				} else {
-					$input['default'] = $controller->getSignificantFamily()->getXref();
-				}
-				break;
-			case 'SOUR':
-				echo ' data-autocomplete-type="SOUR"';
-				if (!empty($sid)) {
-					$input['default'] = $sid;
-				}
-				break;
-			case 'DATE':
-				if (isset($input['default'])) {
-					$input['default'] = strtoupper($input['default']);
-				}
-				break;
-			}
+			    switch ($input['lookup']) {
+			        case 'INDI':
+				        echo ' data-autocomplete-type="INDI"';
+				        if (!empty($pid)) {
+					        $input['default'] = $pid;
+				        } else {
+					        $input['default'] = $controller->getSignificantIndividual()->getXref();
+				        }
+				        break;
+			        case 'FAM':
+				        echo ' data-autocomplete-type="FAM"';
+				        if (!empty($famid)) {
+					        $input['default'] = $famid;
+				        } else {
+					        $input['default'] = $controller->getSignificantFamily()->getXref();
+				        }
+				        break;
+			        case 'SOUR':
+				        echo ' data-autocomplete-type="SOUR"';
+				        if (!empty($sid)) {
+					        $input['default'] = $sid;
+				        }
+				        break;
+			        case 'DATE':
+				        if (isset($input['default'])) {
+					        $input['default'] = strtoupper($input['default']);
+				        }
+				        break;
+			    }
 
 			echo ' type="text" name="vars[', Filter::escapeHtml($input['name']), ']" id="', Filter::escapeHtml($input['name']), '" value="', Filter::escapeHtml($input['default']), '" style="direction: ltr;">';
 		}
@@ -266,20 +266,20 @@ 
 		</td></tr></table></form></div>';
 	break;
 
-case 'run':
-	if (strstr($report, 'report_singlepage.xml') !== false) {
-		// This is a custom module?
-		new \ReportPedigree;
-		break;
-	}
+    case 'run':
+	    if (strstr($report, 'report_singlepage.xml') !== false) {
+		    // This is a custom module?
+		    new \ReportPedigree;
+		    break;
+	    }
 
-	switch ($output) {
-	case 'HTML':
-		header('Content-type: text/html; charset=UTF-8');
-		new ReportParserGenerate($report, new ReportHtml, $vars);
-		break;
-	case 'PDF':
-		new ReportParserGenerate($report, new ReportPdf, $vars);
-		break;
-	}
+	    switch ($output) {
+	        case 'HTML':
+		        header('Content-type: text/html; charset=UTF-8');
+		        new ReportParserGenerate($report, new ReportHtml, $vars);
+		        break;
+	        case 'PDF':
+		        new ReportParserGenerate($report, new ReportPdf, $vars);
+		        break;
+	    }
 }

relationship.php

Switch Indentation +33 added lines, -33 removed lines

@@ -179,39 +179,39 @@
 		foreach ($path as $n => $xref) {
 			if ($n % 2 === 1) {
 				switch ($relationships[$n]) {
-				case 'hus':
-				case 'wif':
-				case 'spo':
-				case 'bro':
-				case 'sis':
-				case 'sib':
-					$table[$x + 1][$y] = '<div style="background:url(' . Theme::theme()->parameter('image-hline') . ') repeat-x center;  width: 94px; text-align: center"><div class="hline-text" style="height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $WT_TREE), Individual::getInstance($path[$n + 1], $WT_TREE)) . '</div><div style="height: 32px;">' . $horizontal_arrow . '</div></div>';
-					$x += 2;
-					break;
-				case 'son':
-				case 'dau':
-				case 'chi':
-					if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) {
-						$table[$x + 1][$y - 1] = '<div style="background:url(' . $diagonal2 . '); width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: end;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $WT_TREE), Individual::getInstance($path[$n + 1], $WT_TREE)) . '</div><div style="height: 32px; text-align: start;">' . $down_arrow . '</div></div>';
-						$x += 2;
-					} else {
-						$table[$x][$y - 1] = '<div style="background:url(' . Theme::theme()
-								->parameter('image-vline') . ') repeat-y center; height: 64px; text-align: center;"><div class="vline-text" style="display: inline-block; width:50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $WT_TREE), Individual::getInstance($path[$n + 1], $WT_TREE)) . '</div><div style="display: inline-block; width:50%; line-height: 64px;">' . $down_arrow . '</div></div>';
-					}
-					$y -= 2;
-					break;
-				case 'fat':
-				case 'mot':
-				case 'par':
-					if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) {
-						$table[$x + 1][$y + 1] = '<div style="background:url(' . $diagonal1 . '); background-position: top right; width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: start;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $WT_TREE), Individual::getInstance($path[$n + 1], $WT_TREE)) . '</div><div style="height: 32px; text-align: end;">' . $up_arrow . '</div></div>';
-						$x += 2;
-					} else {
-						$table[$x][$y + 1] = '<div style="background:url(' . Theme::theme()
-								->parameter('image-vline') . ') repeat-y center; height: 64px; text-align:center; "><div class="vline-text" style="display: inline-block; width: 50%; line-height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $WT_TREE), Individual::getInstance($path[$n + 1], $WT_TREE)) . '</div><div style="display: inline-block; width: 50%; line-height: 32px">' . $up_arrow . '</div></div>';
-					}
-					$y += 2;
-					break;
+				    case 'hus':
+				    case 'wif':
+				    case 'spo':
+				    case 'bro':
+				    case 'sis':
+				    case 'sib':
+					    $table[$x + 1][$y] = '<div style="background:url(' . Theme::theme()->parameter('image-hline') . ') repeat-x center;  width: 94px; text-align: center"><div class="hline-text" style="height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $WT_TREE), Individual::getInstance($path[$n + 1], $WT_TREE)) . '</div><div style="height: 32px;">' . $horizontal_arrow . '</div></div>';
+					    $x += 2;
+					    break;
+				    case 'son':
+				    case 'dau':
+				    case 'chi':
+					    if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) {
+						    $table[$x + 1][$y - 1] = '<div style="background:url(' . $diagonal2 . '); width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: end;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $WT_TREE), Individual::getInstance($path[$n + 1], $WT_TREE)) . '</div><div style="height: 32px; text-align: start;">' . $down_arrow . '</div></div>';
+						    $x += 2;
+					    } else {
+						    $table[$x][$y - 1] = '<div style="background:url(' . Theme::theme()
+								    ->parameter('image-vline') . ') repeat-y center; height: 64px; text-align: center;"><div class="vline-text" style="display: inline-block; width:50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $WT_TREE), Individual::getInstance($path[$n + 1], $WT_TREE)) . '</div><div style="display: inline-block; width:50%; line-height: 64px;">' . $down_arrow . '</div></div>';
+					    }
+					    $y -= 2;
+					    break;
+				    case 'fat':
+				    case 'mot':
+				    case 'par':
+					    if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) {
+						    $table[$x + 1][$y + 1] = '<div style="background:url(' . $diagonal1 . '); background-position: top right; width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: start;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $WT_TREE), Individual::getInstance($path[$n + 1], $WT_TREE)) . '</div><div style="height: 32px; text-align: end;">' . $up_arrow . '</div></div>';
+						    $x += 2;
+					    } else {
+						    $table[$x][$y + 1] = '<div style="background:url(' . Theme::theme()
+								    ->parameter('image-vline') . ') repeat-y center; height: 64px; text-align:center; "><div class="vline-text" style="display: inline-block; width: 50%; line-height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $WT_TREE), Individual::getInstance($path[$n + 1], $WT_TREE)) . '</div><div style="display: inline-block; width: 50%; line-height: 32px">' . $up_arrow . '</div></div>';
+					    }
+					    $y += 2;
+					    break;
 				}
 				$max_x = max($max_x, $x);
 				$min_y = min($min_y, $y);

descendancy.php

Switch Indentation +19 added lines, -19 removed lines

@@ -96,25 +96,25 @@
 	echo '<p class="ui-state-error">', $controller->error_message, '</p>';
 } else {
 	switch ($controller->chart_style) {
-	case 0: // List
-		echo '<ul id="descendancy_chart" class="chart_common">';
-		$controller->printChildDescendancy($controller->root, $controller->generations);
-		echo '</ul>';
-		break;
-	case 1: // Booklet
-		$show_cousins = true;
-		echo '<div id="descendancy_booklet">';
-		$controller->printChildFamily($controller->root, $controller->generations);
-		echo '</div>';
-		break;
-	case 2: // Individual list
-		$descendants = $controller->individualDescendancy($controller->root, $controller->generations, array());
-		echo '<div id="descendancy-list">', FunctionsPrintLists::individualTable($descendants), '</div>';
-		break;
-	case 3: // Family list
-		$descendants = $controller->familyDescendancy($controller->root, $controller->generations, array());
-		echo '<div id="descendancy-list">', FunctionsPrintLists::familyTable($descendants), '</div>';
-		break;
+	    case 0: // List
+		    echo '<ul id="descendancy_chart" class="chart_common">';
+		    $controller->printChildDescendancy($controller->root, $controller->generations);
+		    echo '</ul>';
+		    break;
+	    case 1: // Booklet
+		    $show_cousins = true;
+		    echo '<div id="descendancy_booklet">';
+		    $controller->printChildFamily($controller->root, $controller->generations);
+		    echo '</div>';
+		    break;
+	    case 2: // Individual list
+		    $descendants = $controller->individualDescendancy($controller->root, $controller->generations, array());
+		    echo '<div id="descendancy-list">', FunctionsPrintLists::individualTable($descendants), '</div>';
+		    break;
+	    case 3: // Family list
+		    $descendants = $controller->familyDescendancy($controller->root, $controller->generations, array());
+		    echo '<div id="descendancy-list">', FunctionsPrintLists::familyTable($descendants), '</div>';
+		    break;
 	}
 }
 ?>

autocomplete.php

Switch Indentation +465 added lines, -465 removed lines

@@ -31,471 +31,471 @@
 $type = Filter::get('field');
 
 switch ($type) {
-case 'ASSO': // Associates of an individuals, whose name contains the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT 'INDI' AS type, i_id AS xref, i_gedcom AS gedcom, n_full" .
-		" FROM `##individuals`" .
-		" JOIN `##name` ON i_id = n_id AND i_file = n_file" .
-		" WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
-		" ORDER BY n_full COLLATE :collate"
-	)->execute(array(
-		'term_1'  => $term,
-		'term_2'  => $term,
-		'tree_id' => $WT_TREE->getTreeId(),
-		'collate' => I18N::collation(),
-	))->fetchAll();
-
-	// Filter for privacy and whether they could be alive at the right time
-	$event_date = Filter::get('extra');
-	$date       = new Date($event_date);
-	$event_jd   = $date->julianDay();
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShow()) {
-			if ($event_jd) {
-				// Exclude individuals who were born after the event.
-				$person_birth_jd = $person->getEstimatedBirthDate()->minimumJulianDay();
-				if ($person_birth_jd && $person_birth_jd > $event_jd) {
-					continue;
-				}
-				// Exclude individuals who died before the event.
-				$person_death_jd = $person->getEstimatedDeathDate()->maximumJulianDay();
-				if ($person_death_jd && $person_death_jd < $event_jd) {
-					continue;
-				}
-			}
-			// Add the age (if we have it) or the lifespan (if we do not).
-			$label = $person->getFullName();
-			if ($event_jd && $person->getBirthDate()->isOK()) {
-				$label .= ', <span class="age">(' . I18N::translate('Age') . ' ' . Date::getAge($person->getBirthDate(), $date, 0) . ')</span>';
-			} else {
-				$label .= ', <i>' . $person->getLifeSpan() . '</i>';
-			}
-			$data[$row->xref] = array('value' => $row->xref, 'label' => $label);
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'CEME': // Cemetery fields, that contain the search term
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT i_id AS xref, i_gedcom AS gedcom" .
-		" FROM `##individuals`" .
-		" WHERE i_gedcom LIKE '%\n2 CEME %' AND i_file = :tree_id" .
-		" ORDER BY SUBSTRING_INDEX(i_gedcom, '\n2 CEME ', -1) COLLATE :collation"
-	)->execute(array(
-		'tree_id'   => $WT_TREE->getTreeId(),
-		'collation' => I18N::collation(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if (preg_match('/\n2 CEME (.*' . preg_quote($term, '/') . '.*)/i', $person->getGedcom(), $match)) {
-			if (!in_array($match[1], $data)) {
-				$data[] = $match[1];
-			}
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'FAM': // Families, whose name contains the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_FAM_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($family->canShowName()) {
-			$marriage_year = $family->getMarriageYear();
-			if ($marriage_year) {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
-			} else {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
-			}
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'GIVN': // Given names, that start with the search term
-	// Do not filter by privacy. Given names on their own do not identify individuals.
-	echo json_encode(
-		Database::prepare(
-			"SELECT DISTINCT n_givn" .
-			" FROM `##name`" .
-			" WHERE n_givn LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
-			" ORDER BY n_givn COLLATE :collation"
-		)->execute(array(
-			'term'      => $term,
-			'tree_id'   => $WT_TREE->getTreeId(),
-			'collation' => I18N::collation(),
-		))->fetchOneColumn()
-	);
-
-	return;
-
-case 'INDI': // Individuals, whose name contains the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT i_id AS xref, i_gedcom AS gedcom, n_full" .
-		" FROM `##individuals`" .
-		" JOIN `##name` ON i_id = n_id AND i_file = n_file" .
-		" WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
-		" ORDER BY n_full COLLATE :collation"
-	)->execute(array(
-		'term_1'    => $term,
-		'term_2'    => $term,
-		'tree_id'   => $WT_TREE->getTreeId(),
-		'collation' => I18N::collation(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShowName()) {
-			$data[] = array('value' => $row->xref, 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'NOTE': // Notes which contain the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_NOTE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($note->canShowName()) {
-			$data[] = array('value' => $note->getXref(), 'label' => $note->getFullName());
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'OBJE':
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_OBJE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($media->canShowName()) {
-			$data[] = array('value' => $row->xref, 'label' => '<img src="' . $media->getHtmlUrlDirect() . '" width="25"> ' . $media->getFullName());
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'PLAC': // Place names (with hierarchy), that include the search term
-	// Do not filter by privacy. Place names on their own do not identify individuals.
-	$data = array();
-	foreach (Place::findPlaces($term, $WT_TREE) as $place) {
-		$data[] = $place->getGedcomName();
-	}
-	if (!$data && $WT_TREE->getPreference('GEONAMES_ACCOUNT')) {
-		// No place found? Use an external gazetteer
-		$url =
-			"http://api.geonames.org/searchJSON" .
-			"?name_startsWith=" . urlencode($term) .
-			"&lang=" . WT_LOCALE .
-			"&fcode=CMTY&fcode=ADM4&fcode=PPL&fcode=PPLA&fcode=PPLC" .
-			"&style=full" .
-			"&username=" . $WT_TREE->getPreference('GEONAMES_ACCOUNT');
-		// try to use curl when file_get_contents not allowed
-		if (ini_get('allow_url_fopen')) {
-			$json = file_get_contents($url);
-		} elseif (function_exists('curl_init')) {
-			$ch = curl_init();
-			curl_setopt($ch, CURLOPT_URL, $url);
-			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-			$json = curl_exec($ch);
-			curl_close($ch);
-		} else {
-			return $data;
-		}
-		$places = json_decode($json, true);
-		if (isset($places['geonames']) && is_array($places['geonames'])) {
-			foreach ($places['geonames'] as $k => $place) {
-				$data[] = $place['name'] . ', ' . $place['adminName2'] . ', ' . $place['adminName1'] . ', ' . $place['countryName'];
-			}
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'PLAC2': // Place names (without hierarchy), that include the search term
-	// Do not filter by privacy. Place names on their own do not identify individuals.
-	echo json_encode(
-		Database::prepare(
-			"SELECT p_place" .
-			" FROM `##places`" .
-			" WHERE p_place LIKE CONCAT('%', :term, '%') AND p_file = :tree_id" .
-			" ORDER BY p_place COLLATE :collation"
-		)->execute(array(
-			'term'      => $term,
-			'tree_id'   => $WT_TREE->getTreeId(),
-			'collation' => I18N::collation(),
-		))->fetchOneColumn()
-	);
-
-	return;
-
-case 'REPO': // Repositories, that include the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_REPO_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($record->canShowName()) {
-			foreach ($record->getFacts('NAME') as $fact) {
-				$data[] = array('value' => $record->getXref(), 'label' => $fact->getValue());
-			}
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'REPO_NAME': // Repository names, that include the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_REPO_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($record->canShowName()) {
-			$data[] = strip_tags($record->getFullName());
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'SOUR': // Sources, that include the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_SOUR_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$record = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($record->canShowName()) {
-			foreach ($record->getFacts('TITL') as $fact) {
-				$data[] = array('value' => $record->getXref(), 'label' => $fact->getValue());
-			}
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'PAGE': // Citation details, for a given source, that contain the search term
-	$data = array();
-	$sid  = Filter::get('extra', WT_REGEX_XREF);
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT i_id AS xref, i_gedcom AS gedcom" .
-		" FROM `##individuals`" .
-		" WHERE i_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND i_file = :tree_id"
-	)->execute(array(
-		'xref'    => $sid,
-		'term'    => $term,
-		'tree_id' => $WT_TREE->getTreeId(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
-			$data[] = $match[1];
-		}
-		if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
-			$data[] = $match[1];
-		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT f_id AS xref, f_gedcom AS gedcom" .
-		" FROM `##families`" .
-		" WHERE f_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND f_file = :tree_id"
-	)->execute(array(
-		'xref'    => $sid,
-		'term'    => $term,
-		'tree_id' => $WT_TREE->getTreeId(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
-			$data[] = $match[1];
-		}
-		if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
-			$data[] = $match[1];
-		}
-	}
-	// array_unique() converts the keys from integer to string, which breaks
-	// the JSON encoding - so need to call array_values() to convert them
-	// back into integers.
-	$data = array_values(array_unique($data));
-	echo json_encode($data);
-
-	return;
-
-case 'SOUR_TITL': // Source titles, that include the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT s_id AS xref, s_gedcom AS gedcom, s_name" .
-		" FROM `##sources`" .
-		" WHERE s_name LIKE CONCAT('%', REPLACE(:term, ' ', '%'), '%') AND s_file = :tree_id" .
-		" ORDER BY s_name COLLATE :collation"
-	)->execute(array(
-		'term'      => $term,
-		'tree_id'   => $WT_TREE->getTreeId(),
-		'collation' => I18N::collation(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($source->canShowName()) {
-			$data[] = $row->s_name;
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'SURN': // Surnames, that start with the search term
-	// Do not filter by privacy. Surnames on their own do not identify individuals.
-	echo json_encode(
-		Database::prepare(
-			"SELECT DISTINCT n_surname" .
-			" FROM `##name`" .
-			" WHERE n_surname LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
-			" ORDER BY n_surname COLLATE :collation"
-		)->execute(array(
-			'term'      => $term,
-			'tree_id'   => $WT_TREE->getTreeId(),
-			'collation' => I18N::collation(),
-		))->fetchOneColumn()
-	);
-
-	return;
-
-case 'IFSRO':
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_INDI_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShowName()) {
-			$data[] = array('value' => $person->getXref(), 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
-		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_SOUR_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($source->canShowName()) {
-			$data[] = array('value' => $source->getXref(), 'label' => $source->getFullName());
-		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_REPO_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$repository = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($repository->canShowName()) {
-			$data[] = array('value' => $repository->getXref(), 'label' => $repository->getFullName());
-		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_OBJE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($media->canShowName()) {
-			$data[] = array('value' => $media->getXref(), 'label' => '<img src="' . $media->getHtmlUrlDirect() . '" width="25"> ' . $media->getFullName());
-		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_FAM_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($family->canShowName()) {
-			$marriage_year = $family->getMarriageYear();
-			if ($marriage_year) {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
-			} else {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
-			}
-		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_NOTE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($note->canShowName()) {
-			$data[] = array('value' => $note->getXref(), 'label' => $note->getFullName());
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'IFS':
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_INDI_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShowName()) {
-			$data[] = array('value' => $person->getXref(), 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
-		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_SOUR_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($source->canShowName()) {
-			$data[] = array('value' => $source->getXref(), 'label' => $source->getFullName());
-		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_FAM_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($family->canShowName()) {
-			$marriage_year = $family->getMarriageYear();
-			if ($marriage_year) {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
-			} else {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
-			}
-		}
-	}
-	echo json_encode($data);
-
-	return;
+    case 'ASSO': // Associates of an individuals, whose name contains the search terms
+	    $data = array();
+	    // Fetch all data, regardless of privacy
+	    $rows = Database::prepare(
+		    "SELECT 'INDI' AS type, i_id AS xref, i_gedcom AS gedcom, n_full" .
+		    " FROM `##individuals`" .
+		    " JOIN `##name` ON i_id = n_id AND i_file = n_file" .
+		    " WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
+		    " ORDER BY n_full COLLATE :collate"
+	    )->execute(array(
+		    'term_1'  => $term,
+		    'term_2'  => $term,
+		    'tree_id' => $WT_TREE->getTreeId(),
+		    'collate' => I18N::collation(),
+	    ))->fetchAll();
+
+	    // Filter for privacy and whether they could be alive at the right time
+	    $event_date = Filter::get('extra');
+	    $date       = new Date($event_date);
+	    $event_jd   = $date->julianDay();
+	    foreach ($rows as $row) {
+		    $person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if ($person->canShow()) {
+			    if ($event_jd) {
+				    // Exclude individuals who were born after the event.
+				    $person_birth_jd = $person->getEstimatedBirthDate()->minimumJulianDay();
+				    if ($person_birth_jd && $person_birth_jd > $event_jd) {
+					    continue;
+				    }
+				    // Exclude individuals who died before the event.
+				    $person_death_jd = $person->getEstimatedDeathDate()->maximumJulianDay();
+				    if ($person_death_jd && $person_death_jd < $event_jd) {
+					    continue;
+				    }
+			    }
+			    // Add the age (if we have it) or the lifespan (if we do not).
+			    $label = $person->getFullName();
+			    if ($event_jd && $person->getBirthDate()->isOK()) {
+				    $label .= ', <span class="age">(' . I18N::translate('Age') . ' ' . Date::getAge($person->getBirthDate(), $date, 0) . ')</span>';
+			    } else {
+				    $label .= ', <i>' . $person->getLifeSpan() . '</i>';
+			    }
+			    $data[$row->xref] = array('value' => $row->xref, 'label' => $label);
+		    }
+	    }
+	    echo json_encode($data);
+
+	    return;
+
+    case 'CEME': // Cemetery fields, that contain the search term
+	    $data = array();
+	    // Fetch all data, regardless of privacy
+	    $rows = Database::prepare(
+		    "SELECT i_id AS xref, i_gedcom AS gedcom" .
+		    " FROM `##individuals`" .
+		    " WHERE i_gedcom LIKE '%\n2 CEME %' AND i_file = :tree_id" .
+		    " ORDER BY SUBSTRING_INDEX(i_gedcom, '\n2 CEME ', -1) COLLATE :collation"
+	    )->execute(array(
+		    'tree_id'   => $WT_TREE->getTreeId(),
+		    'collation' => I18N::collation(),
+	    ))->fetchAll();
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if (preg_match('/\n2 CEME (.*' . preg_quote($term, '/') . '.*)/i', $person->getGedcom(), $match)) {
+			    if (!in_array($match[1], $data)) {
+				    $data[] = $match[1];
+			    }
+		    }
+	    }
+	    echo json_encode($data);
+
+	    return;
+
+    case 'FAM': // Families, whose name contains the search terms
+	    $data = array();
+	    // Fetch all data, regardless of privacy
+	    $rows = get_FAM_rows($WT_TREE, $term);
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if ($family->canShowName()) {
+			    $marriage_year = $family->getMarriageYear();
+			    if ($marriage_year) {
+				    $data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
+			    } else {
+				    $data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
+			    }
+		    }
+	    }
+	    echo json_encode($data);
+
+	    return;
+
+    case 'GIVN': // Given names, that start with the search term
+	    // Do not filter by privacy. Given names on their own do not identify individuals.
+	    echo json_encode(
+		    Database::prepare(
+			    "SELECT DISTINCT n_givn" .
+			    " FROM `##name`" .
+			    " WHERE n_givn LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
+			    " ORDER BY n_givn COLLATE :collation"
+		    )->execute(array(
+			    'term'      => $term,
+			    'tree_id'   => $WT_TREE->getTreeId(),
+			    'collation' => I18N::collation(),
+		    ))->fetchOneColumn()
+	    );
+
+	    return;
+
+    case 'INDI': // Individuals, whose name contains the search terms
+	    $data = array();
+	    // Fetch all data, regardless of privacy
+	    $rows = Database::prepare(
+		    "SELECT i_id AS xref, i_gedcom AS gedcom, n_full" .
+		    " FROM `##individuals`" .
+		    " JOIN `##name` ON i_id = n_id AND i_file = n_file" .
+		    " WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
+		    " ORDER BY n_full COLLATE :collation"
+	    )->execute(array(
+		    'term_1'    => $term,
+		    'term_2'    => $term,
+		    'tree_id'   => $WT_TREE->getTreeId(),
+		    'collation' => I18N::collation(),
+	    ))->fetchAll();
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if ($person->canShowName()) {
+			    $data[] = array('value' => $row->xref, 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
+		    }
+	    }
+	    echo json_encode($data);
+
+	    return;
+
+    case 'NOTE': // Notes which contain the search terms
+	    $data = array();
+	    // Fetch all data, regardless of privacy
+	    $rows = get_NOTE_rows($WT_TREE, $term);
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if ($note->canShowName()) {
+			    $data[] = array('value' => $note->getXref(), 'label' => $note->getFullName());
+		    }
+	    }
+	    echo json_encode($data);
+
+	    return;
+
+    case 'OBJE':
+	    $data = array();
+	    // Fetch all data, regardless of privacy
+	    $rows = get_OBJE_rows($WT_TREE, $term);
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if ($media->canShowName()) {
+			    $data[] = array('value' => $row->xref, 'label' => '<img src="' . $media->getHtmlUrlDirect() . '" width="25"> ' . $media->getFullName());
+		    }
+	    }
+	    echo json_encode($data);
+
+	    return;
+
+    case 'PLAC': // Place names (with hierarchy), that include the search term
+	    // Do not filter by privacy. Place names on their own do not identify individuals.
+	    $data = array();
+	    foreach (Place::findPlaces($term, $WT_TREE) as $place) {
+		    $data[] = $place->getGedcomName();
+	    }
+	    if (!$data && $WT_TREE->getPreference('GEONAMES_ACCOUNT')) {
+		    // No place found? Use an external gazetteer
+		    $url =
+			    "http://api.geonames.org/searchJSON" .
+			    "?name_startsWith=" . urlencode($term) .
+			    "&lang=" . WT_LOCALE .
+			    "&fcode=CMTY&fcode=ADM4&fcode=PPL&fcode=PPLA&fcode=PPLC" .
+			    "&style=full" .
+			    "&username=" . $WT_TREE->getPreference('GEONAMES_ACCOUNT');
+		    // try to use curl when file_get_contents not allowed
+		    if (ini_get('allow_url_fopen')) {
+			    $json = file_get_contents($url);
+		    } elseif (function_exists('curl_init')) {
+			    $ch = curl_init();
+			    curl_setopt($ch, CURLOPT_URL, $url);
+			    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+			    $json = curl_exec($ch);
+			    curl_close($ch);
+		    } else {
+			    return $data;
+		    }
+		    $places = json_decode($json, true);
+		    if (isset($places['geonames']) && is_array($places['geonames'])) {
+			    foreach ($places['geonames'] as $k => $place) {
+				    $data[] = $place['name'] . ', ' . $place['adminName2'] . ', ' . $place['adminName1'] . ', ' . $place['countryName'];
+			    }
+		    }
+	    }
+	    echo json_encode($data);
+
+	    return;
+
+    case 'PLAC2': // Place names (without hierarchy), that include the search term
+	    // Do not filter by privacy. Place names on their own do not identify individuals.
+	    echo json_encode(
+		    Database::prepare(
+			    "SELECT p_place" .
+			    " FROM `##places`" .
+			    " WHERE p_place LIKE CONCAT('%', :term, '%') AND p_file = :tree_id" .
+			    " ORDER BY p_place COLLATE :collation"
+		    )->execute(array(
+			    'term'      => $term,
+			    'tree_id'   => $WT_TREE->getTreeId(),
+			    'collation' => I18N::collation(),
+		    ))->fetchOneColumn()
+	    );
+
+	    return;
+
+    case 'REPO': // Repositories, that include the search terms
+	    $data = array();
+	    // Fetch all data, regardless of privacy
+	    $rows = get_REPO_rows($WT_TREE, $term);
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if ($record->canShowName()) {
+			    foreach ($record->getFacts('NAME') as $fact) {
+				    $data[] = array('value' => $record->getXref(), 'label' => $fact->getValue());
+			    }
+		    }
+	    }
+	    echo json_encode($data);
+
+	    return;
+
+    case 'REPO_NAME': // Repository names, that include the search terms
+	    $data = array();
+	    // Fetch all data, regardless of privacy
+	    $rows = get_REPO_rows($WT_TREE, $term);
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if ($record->canShowName()) {
+			    $data[] = strip_tags($record->getFullName());
+		    }
+	    }
+	    echo json_encode($data);
+
+	    return;
+
+    case 'SOUR': // Sources, that include the search terms
+	    $data = array();
+	    // Fetch all data, regardless of privacy
+	    $rows = get_SOUR_rows($WT_TREE, $term);
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $record = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if ($record->canShowName()) {
+			    foreach ($record->getFacts('TITL') as $fact) {
+				    $data[] = array('value' => $record->getXref(), 'label' => $fact->getValue());
+			    }
+		    }
+	    }
+	    echo json_encode($data);
+
+	    return;
+
+    case 'PAGE': // Citation details, for a given source, that contain the search term
+	    $data = array();
+	    $sid  = Filter::get('extra', WT_REGEX_XREF);
+	    // Fetch all data, regardless of privacy
+	    $rows = Database::prepare(
+		    "SELECT i_id AS xref, i_gedcom AS gedcom" .
+		    " FROM `##individuals`" .
+		    " WHERE i_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND i_file = :tree_id"
+	    )->execute(array(
+		    'xref'    => $sid,
+		    'term'    => $term,
+		    'tree_id' => $WT_TREE->getTreeId(),
+	    ))->fetchAll();
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
+			    $data[] = $match[1];
+		    }
+		    if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
+			    $data[] = $match[1];
+		    }
+	    }
+	    // Fetch all data, regardless of privacy
+	    $rows = Database::prepare(
+		    "SELECT f_id AS xref, f_gedcom AS gedcom" .
+		    " FROM `##families`" .
+		    " WHERE f_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND f_file = :tree_id"
+	    )->execute(array(
+		    'xref'    => $sid,
+		    'term'    => $term,
+		    'tree_id' => $WT_TREE->getTreeId(),
+	    ))->fetchAll();
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
+			    $data[] = $match[1];
+		    }
+		    if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
+			    $data[] = $match[1];
+		    }
+	    }
+	    // array_unique() converts the keys from integer to string, which breaks
+	    // the JSON encoding - so need to call array_values() to convert them
+	    // back into integers.
+	    $data = array_values(array_unique($data));
+	    echo json_encode($data);
+
+	    return;
+
+    case 'SOUR_TITL': // Source titles, that include the search terms
+	    $data = array();
+	    // Fetch all data, regardless of privacy
+	    $rows = Database::prepare(
+		    "SELECT s_id AS xref, s_gedcom AS gedcom, s_name" .
+		    " FROM `##sources`" .
+		    " WHERE s_name LIKE CONCAT('%', REPLACE(:term, ' ', '%'), '%') AND s_file = :tree_id" .
+		    " ORDER BY s_name COLLATE :collation"
+	    )->execute(array(
+		    'term'      => $term,
+		    'tree_id'   => $WT_TREE->getTreeId(),
+		    'collation' => I18N::collation(),
+	    ))->fetchAll();
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if ($source->canShowName()) {
+			    $data[] = $row->s_name;
+		    }
+	    }
+	    echo json_encode($data);
+
+	    return;
+
+    case 'SURN': // Surnames, that start with the search term
+	    // Do not filter by privacy. Surnames on their own do not identify individuals.
+	    echo json_encode(
+		    Database::prepare(
+			    "SELECT DISTINCT n_surname" .
+			    " FROM `##name`" .
+			    " WHERE n_surname LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
+			    " ORDER BY n_surname COLLATE :collation"
+		    )->execute(array(
+			    'term'      => $term,
+			    'tree_id'   => $WT_TREE->getTreeId(),
+			    'collation' => I18N::collation(),
+		    ))->fetchOneColumn()
+	    );
+
+	    return;
+
+    case 'IFSRO':
+	    $data = array();
+	    // Fetch all data, regardless of privacy
+	    $rows = get_INDI_rows($WT_TREE, $term);
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if ($person->canShowName()) {
+			    $data[] = array('value' => $person->getXref(), 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
+		    }
+	    }
+	    // Fetch all data, regardless of privacy
+	    $rows = get_SOUR_rows($WT_TREE, $term);
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if ($source->canShowName()) {
+			    $data[] = array('value' => $source->getXref(), 'label' => $source->getFullName());
+		    }
+	    }
+	    // Fetch all data, regardless of privacy
+	    $rows = get_REPO_rows($WT_TREE, $term);
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $repository = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if ($repository->canShowName()) {
+			    $data[] = array('value' => $repository->getXref(), 'label' => $repository->getFullName());
+		    }
+	    }
+	    // Fetch all data, regardless of privacy
+	    $rows = get_OBJE_rows($WT_TREE, $term);
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if ($media->canShowName()) {
+			    $data[] = array('value' => $media->getXref(), 'label' => '<img src="' . $media->getHtmlUrlDirect() . '" width="25"> ' . $media->getFullName());
+		    }
+	    }
+	    // Fetch all data, regardless of privacy
+	    $rows = get_FAM_rows($WT_TREE, $term);
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if ($family->canShowName()) {
+			    $marriage_year = $family->getMarriageYear();
+			    if ($marriage_year) {
+				    $data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
+			    } else {
+				    $data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
+			    }
+		    }
+	    }
+	    // Fetch all data, regardless of privacy
+	    $rows = get_NOTE_rows($WT_TREE, $term);
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if ($note->canShowName()) {
+			    $data[] = array('value' => $note->getXref(), 'label' => $note->getFullName());
+		    }
+	    }
+	    echo json_encode($data);
+
+	    return;
+
+    case 'IFS':
+	    $data = array();
+	    // Fetch all data, regardless of privacy
+	    $rows = get_INDI_rows($WT_TREE, $term);
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if ($person->canShowName()) {
+			    $data[] = array('value' => $person->getXref(), 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
+		    }
+	    }
+	    // Fetch all data, regardless of privacy
+	    $rows = get_SOUR_rows($WT_TREE, $term);
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if ($source->canShowName()) {
+			    $data[] = array('value' => $source->getXref(), 'label' => $source->getFullName());
+		    }
+	    }
+	    // Fetch all data, regardless of privacy
+	    $rows = get_FAM_rows($WT_TREE, $term);
+	    // Filter for privacy
+	    foreach ($rows as $row) {
+		    $family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+		    if ($family->canShowName()) {
+			    $marriage_year = $family->getMarriageYear();
+			    if ($marriage_year) {
+				    $data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
+			    } else {
+				    $data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
+			    }
+		    }
+	    }
+	    echo json_encode($data);
+
+	    return;
 }
 
 /**

help_text.php

Switch Indentation +190 added lines, -190 removed lines

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

addmedia.php

Switch Indentation +332 added lines, -332 removed lines

@@ -76,338 +76,338 @@
 // …and also in the admin_media_upload.php script
 
 switch ($action) {
-case 'create': // Save the information from the “showcreateform” action
-	$controller->setPageTitle(I18N::translate('Create a media object'));
-
-	// Validate the media folder
-	$folderName = str_replace('\\', '/', $folder);
-	$folderName = trim($folderName, '/');
-	if ($folderName == '.') {
-		$folderName = '';
-	}
-	if ($folderName) {
-		$folderName .= '/';
-		// Not allowed to use “../”
-		if (strpos('/' . $folderName, '/../') !== false) {
-			FlashMessages::addMessage('Folder names are not allowed to include “../”');
-			break;
-		}
-	}
-
-	// Make sure the media folder exists
-	if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-		if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-			FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)));
-		} else {
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'danger');
-			break;
-		}
-	}
-
-	// Managers can create new media paths (subfolders). Users must use existing folders.
-	if ($folderName && !is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
-		if (Auth::isManager($WT_TREE)) {
-			if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
-				FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)));
-			} else {
-				FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)), 'danger');
-				break;
-			}
-		} else {
-			// Regular users should not have seen this option - so no need for an error message.
-			break;
-		}
-	}
-
-	// The media folder exists. Now create a thumbnail folder to match it.
-	if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
-		if (!File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)), 'danger');
-			break;
-		}
-	}
-
-	// A thumbnail file with no main image?
-	if (!empty($_FILES['thumbnail']['name']) && empty($_FILES['mediafile']['name'])) {
-		// Assume the user used the wrong field, and treat this as a main image
-		$_FILES['mediafile'] = $_FILES['thumbnail'];
-		unset($_FILES['thumbnail']);
-	}
-
-	// Thumbnail files must contain images.
-	if (!empty($_FILES['thumbnail']['name']) && !preg_match('/^image/', $_FILES['thumbnail']['type'])) {
-		FlashMessages::addMessage(I18N::translate('Thumbnail files must contain images.'));
-		break;
-	}
-
-	// User-specified filename?
-	if ($tag[0] == 'FILE' && $text[0]) {
-		$filename = $text[0];
-	}
-	// Use the name of the uploaded file?
-	// If no filename specified, use the name of the uploaded file?
-	if (!$filename && !empty($_FILES['mediafile']['name'])) {
-		$filename = $_FILES['mediafile']['name'];
-	}
-
-	// Validate the media path and filename
-	if (preg_match('/^https?:\/\//i', $text[0], $match)) {
-		// External media needs no further validation
-		$fileName   = $filename;
-		$folderName = '';
-		unset($_FILES['mediafile'], $_FILES['thumbnail']);
-	} elseif (preg_match('/([\/\\\\<>])/', $filename, $match)) {
-		// Local media files cannot contain certain special characters
-		FlashMessages::addMessage(I18N::translate('Filenames are not allowed to contain the character “%s”.', $match[1]));
-		break;
-	} elseif (preg_match('/(\.(php|pl|cgi|bash|sh|bat|exe|com|htm|html|shtml))$/i', $filename, $match)) {
-		// Do not allow obvious script files.
-		FlashMessages::addMessage(I18N::translate('Filenames are not allowed to have the extension “%s”.', $match[1]));
-		break;
-	} elseif (!$filename) {
-		FlashMessages::addMessage(I18N::translate('No media file was provided.'));
-		break;
-	} else {
-		$fileName = $filename;
-	}
-
-	// Now copy the file to the correct location.
-	if (!empty($_FILES['mediafile']['name'])) {
-		$serverFileName = WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName . $fileName;
-		if (file_exists($serverFileName)) {
-			FlashMessages::addMessage(I18N::translate('The file %s already exists. Use another filename.', $folderName . $fileName));
-			break;
-		}
-		if (move_uploaded_file($_FILES['mediafile']['tmp_name'], $serverFileName)) {
-			Log::addMediaLog('Media file ' . $serverFileName . ' uploaded');
-		} else {
-			FlashMessages::addMessage(
-				I18N::translate('There was an error uploading your file.') .
-				'<br>' .
-				Functions::fileUploadErrorText($_FILES['mediafile']['error'])
-			);
-			break;
-		}
-
-		// Now copy the (optional) thumbnail
-		if (!empty($_FILES['thumbnail']['name']) && preg_match('/^image\/(png|gif|jpeg)/', $_FILES['thumbnail']['type'], $match)) {
-			// Thumbnails have either
-			// (a) the same filename as the main image
-			// (b) the same filename as the main image - but with a .png extension
-			if ($match[1] == 'png' && !preg_match('/\.(png)$/i', $fileName)) {
-				$thumbFile = preg_replace('/\.[a-z0-9]{3,5}$/', '.png', $fileName);
-			} else {
-				$thumbFile = $fileName;
-			}
-			$serverFileName = WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName . $thumbFile;
-			if (move_uploaded_file($_FILES['thumbnail']['tmp_name'], $serverFileName)) {
-				Log::addMediaLog('Thumbnail file ' . $serverFileName . ' uploaded');
-			}
-		}
-	}
-
-	$controller->pageHeader();
-	// Build the gedcom record
-	$newged = "0 @new@ OBJE";
-	if ($tag[0] == 'FILE') {
-		// The admin has an edit field to change the filename
-		$text[0] = $folderName . $fileName;
-	} else {
-		// Users keep the original filename
-		$newged .= "\n1 FILE " . $folderName . $fileName;
-	}
-
-	$newged = FunctionsEdit::handleUpdates($newged);
-
-	$new_media = $WT_TREE->createRecord($newged);
-	if ($linktoid) {
-		$record = GedcomRecord::getInstance($linktoid, $WT_TREE);
-		$record->createFact('1 OBJE @' . $new_media->getXref() . '@', true);
-		Log::addEditLog('Media ID ' . $new_media->getXref() . " successfully added to $linktoid.");
-		$controller->addInlineJavascript('closePopupAndReloadParent();');
-	} else {
-		Log::addEditLog('Media ID ' . $new_media->getXref() . ' successfully added.');
-		$controller->addInlineJavascript('openerpasteid("' . $new_media->getXref() . '");');
-	}
-	echo '<button onclick="closePopupAndReloadParent();">', I18N::translate('close'), '</button>';
-
-	return;
-
-case 'update': // Save the information from the “editmedia” action
-	$controller->setPageTitle(I18N::translate('Edit the media object'));
-
-	// Validate the media folder
-	$folderName = str_replace('\\', '/', $folder);
-	$folderName = trim($folderName, '/');
-	if ($folderName == '.') {
-		$folderName = '';
-	}
-	if ($folderName) {
-		$folderName .= '/';
-		// Not allowed to use “../”
-		if (strpos('/' . $folderName, '/../') !== false) {
-			FlashMessages::addMessage('Folder names are not allowed to include “../”');
-			break;
-		}
-	}
-
-	// Make sure the media folder exists
-	if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-		if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-			FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)));
-		} else {
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'danger');
-			break;
-		}
-	}
-
-	// Managers can create new media paths (subfolders). Users must use existing folders.
-	if ($folderName && !is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
-		if (Auth::isManager($WT_TREE)) {
-			if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
-				FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)));
-			} else {
-				FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)), 'danger');
-				break;
-			}
-		} else {
-			// Regular users should not have seen this option - so no need for an error message.
-			break;
-		}
-	}
-
-	// The media folder exists. Now create a thumbnail folder to match it.
-	if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
-		if (!File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)), 'danger');
-			break;
-		}
-	}
-
-	// Validate the media path and filename
-	if (preg_match('/^https?:\/\//i', $filename, $match)) {
-		// External media needs no further validation
-		$fileName   = $filename;
-		$folderName = '';
-		unset($_FILES['mediafile'], $_FILES['thumbnail']);
-	} elseif (preg_match('/([\/\\\\<>])/', $filename, $match)) {
-		// Local media files cannot contain certain special characters
-		FlashMessages::addMessage(I18N::translate('Filenames are not allowed to contain the character “%s”.', $match[1]));
-		break;
-	} elseif (preg_match('/(\.(php|pl|cgi|bash|sh|bat|exe|com|htm|html|shtml))$/i', $filename, $match)) {
-		// Do not allow obvious script files.
-		FlashMessages::addMessage(I18N::translate('Filenames are not allowed to have the extension “%s”.', $match[1]));
-		break;
-	} elseif (!$filename) {
-		FlashMessages::addMessage(I18N::translate('No media file was provided.'));
-		break;
-	} else {
-		$fileName = $filename;
-	}
-
-	$oldFilename = $media->getFilename();
-	$newFilename = $folderName . $fileName;
-
-	// Cannot rename local to external or vice-versa
-	if (Functions::isFileExternal($oldFilename) != Functions::isFileExternal($filename)) {
-		FlashMessages::addMessage(I18N::translate('The media file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
-		break;
-	}
-
-	$messages  = false;
-	$move_file = false;
-
-	// Move files on disk (if we can) to reflect the change to the GEDCOM data
-	if (!$media->isExternal()) {
-		$oldServerFile  = $media->getServerFilename('main');
-		$oldServerThumb = $media->getServerFilename('thumb');
-
-		$newmedia       = new Media("xxx", "0 @xxx@ OBJE\n1 FILE " . $newFilename, null, $WT_TREE);
-		$newServerFile  = $newmedia->getServerFilename('main');
-		$newServerThumb = $newmedia->getServerFilename('thumb');
-
-		// We could be either renaming an existing file, or updating a record (with no valid file) to point to a new file
-		if ($oldServerFile !== $newServerFile) {
-			//-- check if the file is used in more than one gedcom
-			//-- do not allow it to be moved or renamed if it is
-			if (!$media->isExternal() && FunctionsDb::isMediaUsedInOtherTree($media->getFilename(), $WT_TREE->getTreeId())) {
-				FlashMessages::addMessage(I18N::translate('This file is linked to another family tree on this server. It cannot be deleted, moved, or renamed until these links have been removed.'));
-				break;
-			}
-
-			$move_file = true;
-			if (!file_exists($newServerFile) || md5_file($oldServerFile) === md5_file($newServerFile)) {
-				try {
-					rename($oldServerFile, $newServerFile);
-					FlashMessages::addMessage(I18N::translate('The media file %1$s has been renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
-				} catch (\ErrorException $ex) {
-					FlashMessages::addMessage(I18N::translate('The media file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
-				}
-				$messages = true;
-			}
-			if (!file_exists($newServerFile)) {
-				FlashMessages::addMessage(I18N::translate('The media file %s does not exist.', Html::filename($newFilename)));
-				$messages = true;
-			}
-		}
-		if ($oldServerThumb != $newServerThumb) {
-			$move_file = true;
-			if (!file_exists($newServerThumb) || md5_file($oldServerFile) == md5_file($newServerThumb)) {
-				try {
-					rename($oldServerThumb, $newServerThumb);
-					FlashMessages::addMessage(I18N::translate('The thumbnail file %1$s has been renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
-				} catch (\ErrorException $ex) {
-					FlashMessages::addMessage(I18N::translate('The thumbnail file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
-				}
-				$messages = true;
-			}
-			if (!file_exists($newServerThumb)) {
-				FlashMessages::addMessage(I18N::translate('The thumbnail file %s does not exist.', Html::filename($newFilename)));
-				$messages = true;
-			}
-		}
-	}
-
-	// Insert the 1 FILE xxx record into the arrays used by function FunctionsEdit::handle_updatesges()
-	$glevels = array_merge(array('1'), $glevels);
-	$tag     = array_merge(array('FILE'), $tag);
-	$islink  = array_merge(array(0), $islink);
-	$text    = array_merge(array($newFilename), $text);
-
-	$record = GedcomRecord::getInstance($pid, $WT_TREE);
-	$newrec = "0 @$pid@ OBJE\n";
-	$newrec = FunctionsEdit::handleUpdates($newrec);
-	$record->updateRecord($newrec, $update_CHAN);
-
-	if ($move_file) {
-		// We've moved a file. Therefore we must approve the change, as rejecting
-		// the change will create broken references.
-		FunctionsImport::acceptAllChanges($record->getXref(), $record->getTree()->getTreeId());
-	}
-
-	if ($pid && $linktoid) {
-		$record = GedcomRecord::getInstance($linktoid, $WT_TREE);
-		$record->createFact('1 OBJE @' . $pid . '@', true);
-		Log::addEditLog('Media ID ' . $pid . " successfully added to $linktoid.");
-	}
-	$controller->pageHeader();
-	if ($messages) {
-		echo '<button onclick="closePopupAndReloadParent();">', I18N::translate('close'), '</button>';
-	} else {
-		$controller->addInlineJavascript('closePopupAndReloadParent();');
-	}
-
-	return;
-case 'showmediaform':
-	$controller->setPageTitle(I18N::translate('Create a media object'));
-	$action = 'create';
-	break;
-case 'editmedia':
-	$controller->setPageTitle(I18N::translate('Edit the media object'));
-	$action = 'update';
-	break;
-default:
-	throw new \Exception('Bad $action (' . $action . ') in addmedia.php');
+    case 'create': // Save the information from the “showcreateform” action
+	    $controller->setPageTitle(I18N::translate('Create a media object'));
+
+	    // Validate the media folder
+	    $folderName = str_replace('\\', '/', $folder);
+	    $folderName = trim($folderName, '/');
+	    if ($folderName == '.') {
+		    $folderName = '';
+	    }
+	    if ($folderName) {
+		    $folderName .= '/';
+		    // Not allowed to use “../”
+		    if (strpos('/' . $folderName, '/../') !== false) {
+			    FlashMessages::addMessage('Folder names are not allowed to include “../”');
+			    break;
+		    }
+	    }
+
+	    // Make sure the media folder exists
+	    if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+		    if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+			    FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)));
+		    } else {
+			    FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'danger');
+			    break;
+		    }
+	    }
+
+	    // Managers can create new media paths (subfolders). Users must use existing folders.
+	    if ($folderName && !is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
+		    if (Auth::isManager($WT_TREE)) {
+			    if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
+				    FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)));
+			    } else {
+				    FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)), 'danger');
+				    break;
+			    }
+		    } else {
+			    // Regular users should not have seen this option - so no need for an error message.
+			    break;
+		    }
+	    }
+
+	    // The media folder exists. Now create a thumbnail folder to match it.
+	    if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
+		    if (!File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
+			    FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)), 'danger');
+			    break;
+		    }
+	    }
+
+	    // A thumbnail file with no main image?
+	    if (!empty($_FILES['thumbnail']['name']) && empty($_FILES['mediafile']['name'])) {
+		    // Assume the user used the wrong field, and treat this as a main image
+		    $_FILES['mediafile'] = $_FILES['thumbnail'];
+		    unset($_FILES['thumbnail']);
+	    }
+
+	    // Thumbnail files must contain images.
+	    if (!empty($_FILES['thumbnail']['name']) && !preg_match('/^image/', $_FILES['thumbnail']['type'])) {
+		    FlashMessages::addMessage(I18N::translate('Thumbnail files must contain images.'));
+		    break;
+	    }
+
+	    // User-specified filename?
+	    if ($tag[0] == 'FILE' && $text[0]) {
+		    $filename = $text[0];
+	    }
+	    // Use the name of the uploaded file?
+	    // If no filename specified, use the name of the uploaded file?
+	    if (!$filename && !empty($_FILES['mediafile']['name'])) {
+		    $filename = $_FILES['mediafile']['name'];
+	    }
+
+	    // Validate the media path and filename
+	    if (preg_match('/^https?:\/\//i', $text[0], $match)) {
+		    // External media needs no further validation
+		    $fileName   = $filename;
+		    $folderName = '';
+		    unset($_FILES['mediafile'], $_FILES['thumbnail']);
+	    } elseif (preg_match('/([\/\\\\<>])/', $filename, $match)) {
+		    // Local media files cannot contain certain special characters
+		    FlashMessages::addMessage(I18N::translate('Filenames are not allowed to contain the character “%s”.', $match[1]));
+		    break;
+	    } elseif (preg_match('/(\.(php|pl|cgi|bash|sh|bat|exe|com|htm|html|shtml))$/i', $filename, $match)) {
+		    // Do not allow obvious script files.
+		    FlashMessages::addMessage(I18N::translate('Filenames are not allowed to have the extension “%s”.', $match[1]));
+		    break;
+	    } elseif (!$filename) {
+		    FlashMessages::addMessage(I18N::translate('No media file was provided.'));
+		    break;
+	    } else {
+		    $fileName = $filename;
+	    }
+
+	    // Now copy the file to the correct location.
+	    if (!empty($_FILES['mediafile']['name'])) {
+		    $serverFileName = WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName . $fileName;
+		    if (file_exists($serverFileName)) {
+			    FlashMessages::addMessage(I18N::translate('The file %s already exists. Use another filename.', $folderName . $fileName));
+			    break;
+		    }
+		    if (move_uploaded_file($_FILES['mediafile']['tmp_name'], $serverFileName)) {
+			    Log::addMediaLog('Media file ' . $serverFileName . ' uploaded');
+		    } else {
+			    FlashMessages::addMessage(
+				    I18N::translate('There was an error uploading your file.') .
+				    '<br>' .
+				    Functions::fileUploadErrorText($_FILES['mediafile']['error'])
+			    );
+			    break;
+		    }
+
+		    // Now copy the (optional) thumbnail
+		    if (!empty($_FILES['thumbnail']['name']) && preg_match('/^image\/(png|gif|jpeg)/', $_FILES['thumbnail']['type'], $match)) {
+			    // Thumbnails have either
+			    // (a) the same filename as the main image
+			    // (b) the same filename as the main image - but with a .png extension
+			    if ($match[1] == 'png' && !preg_match('/\.(png)$/i', $fileName)) {
+				    $thumbFile = preg_replace('/\.[a-z0-9]{3,5}$/', '.png', $fileName);
+			    } else {
+				    $thumbFile = $fileName;
+			    }
+			    $serverFileName = WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName . $thumbFile;
+			    if (move_uploaded_file($_FILES['thumbnail']['tmp_name'], $serverFileName)) {
+				    Log::addMediaLog('Thumbnail file ' . $serverFileName . ' uploaded');
+			    }
+		    }
+	    }
+
+	    $controller->pageHeader();
+	    // Build the gedcom record
+	    $newged = "0 @new@ OBJE";
+	    if ($tag[0] == 'FILE') {
+		    // The admin has an edit field to change the filename
+		    $text[0] = $folderName . $fileName;
+	    } else {
+		    // Users keep the original filename
+		    $newged .= "\n1 FILE " . $folderName . $fileName;
+	    }
+
+	    $newged = FunctionsEdit::handleUpdates($newged);
+
+	    $new_media = $WT_TREE->createRecord($newged);
+	    if ($linktoid) {
+		    $record = GedcomRecord::getInstance($linktoid, $WT_TREE);
+		    $record->createFact('1 OBJE @' . $new_media->getXref() . '@', true);
+		    Log::addEditLog('Media ID ' . $new_media->getXref() . " successfully added to $linktoid.");
+		    $controller->addInlineJavascript('closePopupAndReloadParent();');
+	    } else {
+		    Log::addEditLog('Media ID ' . $new_media->getXref() . ' successfully added.');
+		    $controller->addInlineJavascript('openerpasteid("' . $new_media->getXref() . '");');
+	    }
+	    echo '<button onclick="closePopupAndReloadParent();">', I18N::translate('close'), '</button>';
+
+	    return;
+
+    case 'update': // Save the information from the “editmedia” action
+	    $controller->setPageTitle(I18N::translate('Edit the media object'));
+
+	    // Validate the media folder
+	    $folderName = str_replace('\\', '/', $folder);
+	    $folderName = trim($folderName, '/');
+	    if ($folderName == '.') {
+		    $folderName = '';
+	    }
+	    if ($folderName) {
+		    $folderName .= '/';
+		    // Not allowed to use “../”
+		    if (strpos('/' . $folderName, '/../') !== false) {
+			    FlashMessages::addMessage('Folder names are not allowed to include “../”');
+			    break;
+		    }
+	    }
+
+	    // Make sure the media folder exists
+	    if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+		    if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+			    FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)));
+		    } else {
+			    FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'danger');
+			    break;
+		    }
+	    }
+
+	    // Managers can create new media paths (subfolders). Users must use existing folders.
+	    if ($folderName && !is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
+		    if (Auth::isManager($WT_TREE)) {
+			    if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
+				    FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)));
+			    } else {
+				    FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)), 'danger');
+				    break;
+			    }
+		    } else {
+			    // Regular users should not have seen this option - so no need for an error message.
+			    break;
+		    }
+	    }
+
+	    // The media folder exists. Now create a thumbnail folder to match it.
+	    if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
+		    if (!File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
+			    FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)), 'danger');
+			    break;
+		    }
+	    }
+
+	    // Validate the media path and filename
+	    if (preg_match('/^https?:\/\//i', $filename, $match)) {
+		    // External media needs no further validation
+		    $fileName   = $filename;
+		    $folderName = '';
+		    unset($_FILES['mediafile'], $_FILES['thumbnail']);
+	    } elseif (preg_match('/([\/\\\\<>])/', $filename, $match)) {
+		    // Local media files cannot contain certain special characters
+		    FlashMessages::addMessage(I18N::translate('Filenames are not allowed to contain the character “%s”.', $match[1]));
+		    break;
+	    } elseif (preg_match('/(\.(php|pl|cgi|bash|sh|bat|exe|com|htm|html|shtml))$/i', $filename, $match)) {
+		    // Do not allow obvious script files.
+		    FlashMessages::addMessage(I18N::translate('Filenames are not allowed to have the extension “%s”.', $match[1]));
+		    break;
+	    } elseif (!$filename) {
+		    FlashMessages::addMessage(I18N::translate('No media file was provided.'));
+		    break;
+	    } else {
+		    $fileName = $filename;
+	    }
+
+	    $oldFilename = $media->getFilename();
+	    $newFilename = $folderName . $fileName;
+
+	    // Cannot rename local to external or vice-versa
+	    if (Functions::isFileExternal($oldFilename) != Functions::isFileExternal($filename)) {
+		    FlashMessages::addMessage(I18N::translate('The media file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+		    break;
+	    }
+
+	    $messages  = false;
+	    $move_file = false;
+
+	    // Move files on disk (if we can) to reflect the change to the GEDCOM data
+	    if (!$media->isExternal()) {
+		    $oldServerFile  = $media->getServerFilename('main');
+		    $oldServerThumb = $media->getServerFilename('thumb');
+
+		    $newmedia       = new Media("xxx", "0 @xxx@ OBJE\n1 FILE " . $newFilename, null, $WT_TREE);
+		    $newServerFile  = $newmedia->getServerFilename('main');
+		    $newServerThumb = $newmedia->getServerFilename('thumb');
+
+		    // We could be either renaming an existing file, or updating a record (with no valid file) to point to a new file
+		    if ($oldServerFile !== $newServerFile) {
+			    //-- check if the file is used in more than one gedcom
+			    //-- do not allow it to be moved or renamed if it is
+			    if (!$media->isExternal() && FunctionsDb::isMediaUsedInOtherTree($media->getFilename(), $WT_TREE->getTreeId())) {
+				    FlashMessages::addMessage(I18N::translate('This file is linked to another family tree on this server. It cannot be deleted, moved, or renamed until these links have been removed.'));
+				    break;
+			    }
+
+			    $move_file = true;
+			    if (!file_exists($newServerFile) || md5_file($oldServerFile) === md5_file($newServerFile)) {
+				    try {
+					    rename($oldServerFile, $newServerFile);
+					    FlashMessages::addMessage(I18N::translate('The media file %1$s has been renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+				    } catch (\ErrorException $ex) {
+					    FlashMessages::addMessage(I18N::translate('The media file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+				    }
+				    $messages = true;
+			    }
+			    if (!file_exists($newServerFile)) {
+				    FlashMessages::addMessage(I18N::translate('The media file %s does not exist.', Html::filename($newFilename)));
+				    $messages = true;
+			    }
+		    }
+		    if ($oldServerThumb != $newServerThumb) {
+			    $move_file = true;
+			    if (!file_exists($newServerThumb) || md5_file($oldServerFile) == md5_file($newServerThumb)) {
+				    try {
+					    rename($oldServerThumb, $newServerThumb);
+					    FlashMessages::addMessage(I18N::translate('The thumbnail file %1$s has been renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+				    } catch (\ErrorException $ex) {
+					    FlashMessages::addMessage(I18N::translate('The thumbnail file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+				    }
+				    $messages = true;
+			    }
+			    if (!file_exists($newServerThumb)) {
+				    FlashMessages::addMessage(I18N::translate('The thumbnail file %s does not exist.', Html::filename($newFilename)));
+				    $messages = true;
+			    }
+		    }
+	    }
+
+	    // Insert the 1 FILE xxx record into the arrays used by function FunctionsEdit::handle_updatesges()
+	    $glevels = array_merge(array('1'), $glevels);
+	    $tag     = array_merge(array('FILE'), $tag);
+	    $islink  = array_merge(array(0), $islink);
+	    $text    = array_merge(array($newFilename), $text);
+
+	    $record = GedcomRecord::getInstance($pid, $WT_TREE);
+	    $newrec = "0 @$pid@ OBJE\n";
+	    $newrec = FunctionsEdit::handleUpdates($newrec);
+	    $record->updateRecord($newrec, $update_CHAN);
+
+	    if ($move_file) {
+		    // We've moved a file. Therefore we must approve the change, as rejecting
+		    // the change will create broken references.
+		    FunctionsImport::acceptAllChanges($record->getXref(), $record->getTree()->getTreeId());
+	    }
+
+	    if ($pid && $linktoid) {
+		    $record = GedcomRecord::getInstance($linktoid, $WT_TREE);
+		    $record->createFact('1 OBJE @' . $pid . '@', true);
+		    Log::addEditLog('Media ID ' . $pid . " successfully added to $linktoid.");
+	    }
+	    $controller->pageHeader();
+	    if ($messages) {
+		    echo '<button onclick="closePopupAndReloadParent();">', I18N::translate('close'), '</button>';
+	    } else {
+		    $controller->addInlineJavascript('closePopupAndReloadParent();');
+	    }
+
+	    return;
+    case 'showmediaform':
+	    $controller->setPageTitle(I18N::translate('Create a media object'));
+	    $action = 'create';
+	    break;
+    case 'editmedia':
+	    $controller->setPageTitle(I18N::translate('Edit the media object'));
+	    $action = 'update';
+	    break;
+    default:
+	    throw new \Exception('Bad $action (' . $action . ') in addmedia.php');
 }
 
 $controller->pageHeader();

edituser.php

Switch Indentation +46 added lines, -46 removed lines

@@ -53,52 +53,52 @@
 // Respond to form action
 if ($form_action && Filter::checkCsrf()) {
 	switch ($form_action) {
-	case 'update':
-		if ($form_username !== Auth::user()->getUserName() && User::findByUserName($form_username)) {
-			FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
-		} elseif ($form_email !== Auth::user()->getEmail() && User::findByEmail($form_email)) {
-			FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
-		} else {
-			// Change username
-			if ($form_username !== Auth::user()->getUserName()) {
-				Log::addAuthenticationLog('User ' . Auth::user()->getUserName() . ' renamed to ' . $form_username);
-				Auth::user()->setUserName($form_username);
-			}
-
-			// Change password
-			if ($form_pass1 && $form_pass1 === $form_pass2) {
-				Auth::user()->setPassword($form_pass1);
-			}
-
-			// Change other settings
-			Auth::user()
-				->setRealName($form_realname)
-				->setEmail($form_email)
-				->setPreference('language', $form_language)
-				->setPreference('TIMEZONE', $form_timezone)
-				->setPreference('contactmethod', $form_contact_method)
-				->setPreference('visibleonline', $form_visible_online ? '1' : '0');
-
-			if ($form_theme === null) {
-				Auth::user()->deletePreference('theme');
-			} else {
-				Auth::user()->setPreference('theme', $form_theme);
-			}
-
-			$WT_TREE->setUserPreference(Auth::user(), 'rootid', $form_rootid);
-		}
-		break;
-
-	case 'delete':
-		// An administrator can only be deleted by another administrator
-		if (!Auth::user()->getPreference('canadmin')) {
-			// Keep a reference to the currently logged in user because after logging out this user,
-			// a call to Auth::user() will not return this user anymore
-			$currentUser = Auth::user();
-			Auth::logout();
-			$currentUser->delete();
-		}
-		break;
+	    case 'update':
+		    if ($form_username !== Auth::user()->getUserName() && User::findByUserName($form_username)) {
+			    FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
+		    } elseif ($form_email !== Auth::user()->getEmail() && User::findByEmail($form_email)) {
+			    FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
+		    } else {
+			    // Change username
+			    if ($form_username !== Auth::user()->getUserName()) {
+				    Log::addAuthenticationLog('User ' . Auth::user()->getUserName() . ' renamed to ' . $form_username);
+				    Auth::user()->setUserName($form_username);
+			    }
+
+			    // Change password
+			    if ($form_pass1 && $form_pass1 === $form_pass2) {
+				    Auth::user()->setPassword($form_pass1);
+			    }
+
+			    // Change other settings
+			    Auth::user()
+				    ->setRealName($form_realname)
+				    ->setEmail($form_email)
+				    ->setPreference('language', $form_language)
+				    ->setPreference('TIMEZONE', $form_timezone)
+				    ->setPreference('contactmethod', $form_contact_method)
+				    ->setPreference('visibleonline', $form_visible_online ? '1' : '0');
+
+			    if ($form_theme === null) {
+				    Auth::user()->deletePreference('theme');
+			    } else {
+				    Auth::user()->setPreference('theme', $form_theme);
+			    }
+
+			    $WT_TREE->setUserPreference(Auth::user(), 'rootid', $form_rootid);
+		    }
+		    break;
+
+	    case 'delete':
+		    // An administrator can only be deleted by another administrator
+		    if (!Auth::user()->getPreference('canadmin')) {
+			    // Keep a reference to the currently logged in user because after logging out this user,
+			    // a call to Auth::user() will not return this user anymore
+			    $currentUser = Auth::user();
+			    Auth::logout();
+			    $currentUser->delete();
+		    }
+		    break;
 	}
 
 	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);

app/Census/CensusColumnSexMF.php

Switch Indentation +6 added lines, -6 removed lines

@@ -37,12 +37,12 @@
 	 */
 	public function generate(Individual $individual, Individual $head = null) {
 		switch ($individual->getSex()) {
-		case 'M':
-			return $this->male;
-		case 'F':
-			return $this->female;
-		default:
-			return '';
+		    case 'M':
+			    return $this->male;
+		    case 'F':
+			    return $this->female;
+		    default:
+			    return '';
 		}
 	}
 }

app/Statement.php

Switch Indentation +12 added lines, -12 removed lines

@@ -63,18 +63,18 @@
 				$key = ':' . $key;
 			}
 			switch (gettype($bind_variable)) {
-			case 'NULL':
-				$this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_NULL);
-				break;
-			case 'boolean':
-				$this->pdo_statement->bindValue($key, (int) $bind_variable, PDO::PARAM_INT);
-				break;
-			case 'integer':
-				$this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_INT);
-				break;
-			default:
-				$this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_STR);
-				break;
+			    case 'NULL':
+				    $this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_NULL);
+				    break;
+			    case 'boolean':
+				    $this->pdo_statement->bindValue($key, (int) $bind_variable, PDO::PARAM_INT);
+				    break;
+			    case 'integer':
+				    $this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_INT);
+				    break;
+			    default:
+				    $this->pdo_statement->bindValue($key, $bind_variable, PDO::PARAM_STR);
+				    break;
 			}
 		}