fisharebest / webtrees

admin_site_config.php

Indentation +99 added lines, -99 removed lines

@@ -26,136 +26,136 @@ 
 
 switch (Filter::post('action')) {
 case 'site':
-	if (Filter::checkCsrf()) {
-		$INDEX_DIRECTORY = Filter::post('INDEX_DIRECTORY');
-		if (substr($INDEX_DIRECTORY, -1) !== '/') {
-			$INDEX_DIRECTORY .= '/';
-		}
-		if (File::mkdir($INDEX_DIRECTORY)) {
-			Site::setPreference('INDEX_DIRECTORY', $INDEX_DIRECTORY);
-		} else {
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Filter::escapeHtml($INDEX_DIRECTORY)), 'danger');
-		}
-		Site::setPreference('MEMORY_LIMIT', Filter::post('MEMORY_LIMIT'));
-		Site::setPreference('MAX_EXECUTION_TIME', Filter::post('MAX_EXECUTION_TIME'));
-		Site::setPreference('ALLOW_USER_THEMES', Filter::postBool('ALLOW_USER_THEMES'));
-		Site::setPreference('THEME_DIR', Filter::post('THEME_DIR'));
-		Site::setPreference('ALLOW_CHANGE_GEDCOM', Filter::postBool('ALLOW_CHANGE_GEDCOM'));
-		Site::setPreference('SESSION_TIME', Filter::post('SESSION_TIME'));
-		Site::setPreference('SERVER_URL', Filter::post('SERVER_URL'));
-		Site::setPreference('TIMEZONE', Filter::post('TIMEZONE'));
-		FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
-	}
-	header('Location: ' . WT_BASE_URL . 'admin.php');
-
-	return;
+    if (Filter::checkCsrf()) {
+        $INDEX_DIRECTORY = Filter::post('INDEX_DIRECTORY');
+        if (substr($INDEX_DIRECTORY, -1) !== '/') {
+            $INDEX_DIRECTORY .= '/';
+        }
+        if (File::mkdir($INDEX_DIRECTORY)) {
+            Site::setPreference('INDEX_DIRECTORY', $INDEX_DIRECTORY);
+        } else {
+            FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Filter::escapeHtml($INDEX_DIRECTORY)), 'danger');
+        }
+        Site::setPreference('MEMORY_LIMIT', Filter::post('MEMORY_LIMIT'));
+        Site::setPreference('MAX_EXECUTION_TIME', Filter::post('MAX_EXECUTION_TIME'));
+        Site::setPreference('ALLOW_USER_THEMES', Filter::postBool('ALLOW_USER_THEMES'));
+        Site::setPreference('THEME_DIR', Filter::post('THEME_DIR'));
+        Site::setPreference('ALLOW_CHANGE_GEDCOM', Filter::postBool('ALLOW_CHANGE_GEDCOM'));
+        Site::setPreference('SESSION_TIME', Filter::post('SESSION_TIME'));
+        Site::setPreference('SERVER_URL', Filter::post('SERVER_URL'));
+        Site::setPreference('TIMEZONE', Filter::post('TIMEZONE'));
+        FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
+    }
+    header('Location: ' . WT_BASE_URL . 'admin.php');
+
+    return;
 
 case 'email':
-	if (Filter::checkCsrf()) {
-		Site::setPreference('SMTP_ACTIVE', Filter::post('SMTP_ACTIVE'));
-		Site::setPreference('SMTP_FROM_NAME', Filter::post('SMTP_FROM_NAME'));
-		Site::setPreference('SMTP_HOST', Filter::post('SMTP_HOST'));
-		Site::setPreference('SMTP_PORT', Filter::post('SMTP_PORT'));
-		Site::setPreference('SMTP_AUTH', Filter::post('SMTP_AUTH'));
-		Site::setPreference('SMTP_AUTH_USER', Filter::post('SMTP_AUTH_USER'));
-		Site::setPreference('SMTP_SSL', Filter::post('SMTP_SSL'));
-		Site::setPreference('SMTP_HELO', Filter::post('SMTP_HELO'));
-		if (Filter::post('SMTP_AUTH_PASS')) {
-			Site::setPreference('SMTP_AUTH_PASS', Filter::post('SMTP_AUTH_PASS'));
-		}
-		FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
-	}
-	header('Location: ' . WT_BASE_URL . 'admin.php');
-
-	return;
+    if (Filter::checkCsrf()) {
+        Site::setPreference('SMTP_ACTIVE', Filter::post('SMTP_ACTIVE'));
+        Site::setPreference('SMTP_FROM_NAME', Filter::post('SMTP_FROM_NAME'));
+        Site::setPreference('SMTP_HOST', Filter::post('SMTP_HOST'));
+        Site::setPreference('SMTP_PORT', Filter::post('SMTP_PORT'));
+        Site::setPreference('SMTP_AUTH', Filter::post('SMTP_AUTH'));
+        Site::setPreference('SMTP_AUTH_USER', Filter::post('SMTP_AUTH_USER'));
+        Site::setPreference('SMTP_SSL', Filter::post('SMTP_SSL'));
+        Site::setPreference('SMTP_HELO', Filter::post('SMTP_HELO'));
+        if (Filter::post('SMTP_AUTH_PASS')) {
+            Site::setPreference('SMTP_AUTH_PASS', Filter::post('SMTP_AUTH_PASS'));
+        }
+        FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
+    }
+    header('Location: ' . WT_BASE_URL . 'admin.php');
+
+    return;
 case 'login':
-	if (Filter::checkCsrf()) {
-		Site::setPreference('LOGIN_URL', Filter::post('LOGIN_URL'));
-		Site::setPreference('WELCOME_TEXT_AUTH_MODE', Filter::post('WELCOME_TEXT_AUTH_MODE'));
-		Site::setPreference('WELCOME_TEXT_AUTH_MODE_' . WT_LOCALE, Filter::post('WELCOME_TEXT_AUTH_MODE_4'));
-		Site::setPreference('USE_REGISTRATION_MODULE', Filter::post('USE_REGISTRATION_MODULE'));
-		Site::setPreference('SHOW_REGISTER_CAUTION', Filter::post('SHOW_REGISTER_CAUTION'));
-		FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
-	}
-	header('Location: ' . WT_BASE_URL . 'admin.php');
-
-	return;
+    if (Filter::checkCsrf()) {
+        Site::setPreference('LOGIN_URL', Filter::post('LOGIN_URL'));
+        Site::setPreference('WELCOME_TEXT_AUTH_MODE', Filter::post('WELCOME_TEXT_AUTH_MODE'));
+        Site::setPreference('WELCOME_TEXT_AUTH_MODE_' . WT_LOCALE, Filter::post('WELCOME_TEXT_AUTH_MODE_4'));
+        Site::setPreference('USE_REGISTRATION_MODULE', Filter::post('USE_REGISTRATION_MODULE'));
+        Site::setPreference('SHOW_REGISTER_CAUTION', Filter::post('SHOW_REGISTER_CAUTION'));
+        FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
+    }
+    header('Location: ' . WT_BASE_URL . 'admin.php');
+
+    return;
 
 case 'tracking':
-	if (Filter::checkCsrf()) {
-		Site::setPreference('BING_WEBMASTER_ID', Filter::post('BING_WEBMASTER_ID'));
-		Site::setPreference('GOOGLE_WEBMASTER_ID', Filter::post('GOOGLE_WEBMASTER_ID'));
-		Site::setPreference('GOOGLE_ANALYTICS_ID', Filter::post('GOOGLE_ANALYTICS_ID'));
-		Site::setPreference('PIWIK_URL', Filter::post('PIWIK_URL'));
-		Site::setPreference('PIWIK_SITE_ID', Filter::post('PIWIK_SITE_ID'));
-		Site::setPreference('STATCOUNTER_PROJECT_ID', Filter::post('STATCOUNTER_PROJECT_ID'));
-		Site::setPreference('STATCOUNTER_SECURITY_ID', Filter::post('STATCOUNTER_SECURITY_ID'));
-		FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
-	}
-	header('Location: ' . WT_BASE_URL . 'admin.php');
-
-	return;
+    if (Filter::checkCsrf()) {
+        Site::setPreference('BING_WEBMASTER_ID', Filter::post('BING_WEBMASTER_ID'));
+        Site::setPreference('GOOGLE_WEBMASTER_ID', Filter::post('GOOGLE_WEBMASTER_ID'));
+        Site::setPreference('GOOGLE_ANALYTICS_ID', Filter::post('GOOGLE_ANALYTICS_ID'));
+        Site::setPreference('PIWIK_URL', Filter::post('PIWIK_URL'));
+        Site::setPreference('PIWIK_SITE_ID', Filter::post('PIWIK_SITE_ID'));
+        Site::setPreference('STATCOUNTER_PROJECT_ID', Filter::post('STATCOUNTER_PROJECT_ID'));
+        Site::setPreference('STATCOUNTER_SECURITY_ID', Filter::post('STATCOUNTER_SECURITY_ID'));
+        FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
+    }
+    header('Location: ' . WT_BASE_URL . 'admin.php');
+
+    return;
 
 case 'languages':
-	if (Filter::checkCsrf()) {
-		Site::setPreference('LANGUAGES', implode(',', Filter::postArray('LANGUAGES')));
-		FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
-	}
-	header('Location: ' . WT_BASE_URL . 'admin.php');
+    if (Filter::checkCsrf()) {
+        Site::setPreference('LANGUAGES', implode(',', Filter::postArray('LANGUAGES')));
+        FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
+    }
+    header('Location: ' . WT_BASE_URL . 'admin.php');
 
-	return;
+    return;
 }
 
 // Lists of options for <select> controls.
 $SMTP_SSL_OPTIONS = array(
-	'none'                                                                        => I18N::translate('none'),
-	/* I18N: Secure Sockets Layer - a secure communications protocol*/ 'ssl'      => I18N::translate('ssl'),
-	/* I18N: Transport Layer Security - a secure communications protocol */ 'tls' => I18N::translate('tls'),
+    'none'                                                                        => I18N::translate('none'),
+    /* I18N: Secure Sockets Layer - a secure communications protocol*/ 'ssl'      => I18N::translate('ssl'),
+    /* I18N: Transport Layer Security - a secure communications protocol */ 'tls' => I18N::translate('tls'),
 );
 
 $SMTP_ACTIVE_OPTIONS = array(
-	'internal' => I18N::translate('Use PHP mail to send messages'),
-	'sendmail' => /* I18N: "sendmail" is the name of some mail software */ I18N::translate('Use sendmail to send messages'),
-	'external' => I18N::translate('Use SMTP to send messages'),
+    'internal' => I18N::translate('Use PHP mail to send messages'),
+    'sendmail' => /* I18N: "sendmail" is the name of some mail software */ I18N::translate('Use sendmail to send messages'),
+    'external' => I18N::translate('Use SMTP to send messages'),
 );
 
 if (!function_exists('proc_open')) {
-	unset($SMTP_ACTIVE_OPTIONS['sendmail']);
+    unset($SMTP_ACTIVE_OPTIONS['sendmail']);
 }
 
 $WELCOME_TEXT_AUTH_MODE_OPTIONS = array(
-	0 => I18N::translate('No predefined text'),
-	1 => I18N::translate('Predefined text that states all users can request a user account'),
-	2 => I18N::translate('Predefined text that states admin will decide on each request for a user account'),
-	3 => I18N::translate('Predefined text that states only family members can request a user account'),
-	4 => I18N::translate('Choose user defined welcome text typed below'),
+    0 => I18N::translate('No predefined text'),
+    1 => I18N::translate('Predefined text that states all users can request a user account'),
+    2 => I18N::translate('Predefined text that states admin will decide on each request for a user account'),
+    3 => I18N::translate('Predefined text that states only family members can request a user account'),
+    4 => I18N::translate('Choose user defined welcome text typed below'),
 );
 
 $language_tags = array();
 foreach (I18N::activeLocales() as $active_locale) {
-	$language_tags[] = $active_locale->languageTag();
+    $language_tags[] = $active_locale->languageTag();
 }
 
 switch (Filter::get('action')) {
 case 'site':
-	$controller->setPageTitle(I18N::translate('Website preferences'));
-	break;
+    $controller->setPageTitle(I18N::translate('Website preferences'));
+    break;
 case 'email':
-	$controller->setPageTitle(I18N::translate('Sending email'));
-	break;
+    $controller->setPageTitle(I18N::translate('Sending email'));
+    break;
 case 'login':
-	$controller->setPageTitle(I18N::translate('Sign-in and registration'));
-	break;
+    $controller->setPageTitle(I18N::translate('Sign-in and registration'));
+    break;
 case 'tracking':
-	$controller->setPageTitle(/* I18N: e.g. http://www.google.com/analytics */ I18N::translate('Tracking and analytics'));
-	break;
+    $controller->setPageTitle(/* I18N: e.g. http://www.google.com/analytics */ I18N::translate('Tracking and analytics'));
+    break;
 case 'languages':
-	$controller->setPageTitle(I18N::translate('Languages'));
-	break;
+    $controller->setPageTitle(I18N::translate('Languages'));
+    break;
 default:
-	header('Location: ' . WT_BASE_URL . 'admin.php');
+    header('Location: ' . WT_BASE_URL . 'admin.php');
 
-	return;
+    return;
 }
 
 $controller->pageHeader();
@@ -221,10 +221,10 @@ 
 			<input type="text" class="form-control" id="MAX_EXECUTION_TIME" name="MAX_EXECUTION_TIME" value="<?php echo Filter::escapeHtml(Site::getPreference('MAX_EXECUTION_TIME')) ?>" pattern="[0-9]*" placeholder="<?php echo get_cfg_var('max_execution_time') ?>" maxlength="255">
 			<p class="small text-muted">
 				<?php echo I18N::plural(
-					'By default, your server allows scripts to run for %s second.',
-					'By default, your server allows scripts to run for %s seconds.',
-					get_cfg_var('max_execution_time'), I18N::number(get_cfg_var('max_execution_time')));
-				?>
+                    'By default, your server allows scripts to run for %s second.',
+                    'By default, your server allows scripts to run for %s seconds.',
+                    get_cfg_var('max_execution_time'), I18N::number(get_cfg_var('max_execution_time')));
+                ?>
 				<?php echo I18N::translate('You can request a higher or lower limit, although the server may ignore this request.') ?>
 				<?php echo I18N::translate('Leave this blank to use the default value.') ?>
 			</p>

reportengine.php

Indentation +170 added lines, -170 removed lines

@@ -43,80 +43,80 @@ 
 $varnames = Filter::get('varnames');
 $type     = Filter::get('type');
 if (!is_array($vars)) {
-	$vars = array();
+    $vars = array();
 }
 if (!is_array($varnames)) {
-	$varnames = array();
+    $varnames = array();
 }
 if (!is_array($type)) {
-	$type = array();
+    $type = array();
 }
 
 //-- setup the arrays
 $newvars = array();
 foreach ($vars as $name => $var) {
-	$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;
-		}
-	}
+    $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;
+        }
+    }
 }
 $vars = $newvars;
 
 foreach ($varnames as $name) {
-	if (!isset($vars[$name])) {
-		$vars[$name]['id'] = '';
-	}
+    if (!isset($vars[$name])) {
+        $vars[$name]['id'] = '';
+    }
 }
 
 $reports = array();
 foreach (Module::getActiveReports($WT_TREE) as $rep) {
-	$menu = $rep->getReportMenu();
-	if (preg_match('/report=(' . preg_quote(WT_MODULES_DIR, '/') . '[a-z0-9_]+\/[a-z0-9_]+\.xml)/', $menu->getLink(), $match)) {
-		$reports[$match[1]] = $menu->getLabel();
-	}
+    $menu = $rep->getReportMenu();
+    if (preg_match('/report=(' . preg_quote(WT_MODULES_DIR, '/') . '[a-z0-9_]+\/[a-z0-9_]+\.xml)/', $menu->getLink(), $match)) {
+        $reports[$match[1]] = $menu->getLabel();
+    }
 }
 
 if (!empty($report)) {
-	if (!array_key_exists($report, $reports)) {
-		$action = 'choose';
-	}
+    if (!array_key_exists($report, $reports)) {
+        $action = 'choose';
+    }
 }
 
 //-- choose a report to run
 switch ($action) {
 case 'choose':
-	$controller
-		->setPageTitle(I18N::translate('Choose a report to run'))
-		->pageHeader();
+    $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();
+    $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,102 +152,102 @@ 
 		<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;">';
-		}
-		if ($input['type'] == 'checkbox') {
-			echo '<input type="checkbox" name="vars[', Filter::escapeHtml($input['name']), ']" id="', Filter::escapeHtml($input['name']), '" value="1" ';
-			echo $input['default'] == '1' ? 'checked' : '';
-			echo '>';
-		}
-		if ($input['type'] == 'select') {
-			echo '<select name="vars[', Filter::escapeHtml($input['name']), ']" id="', Filter::escapeHtml($input['name']), '_var">';
-			$options = preg_split('/[|]+/', $input['options']);
-			foreach ($options as $option) {
-				$opt                   = explode('=>', $option);
-				list($value, $display) = $opt;
-				if (preg_match('/^I18N::number\((.+?)(,([\d+]))?\)$/', $display, $match)) {
-					$display = I18N::number($match[1], isset($match[3]) ? $match[3] : 0);
-				} elseif (preg_match('/^I18N::translate\(\'(.+)\'\)$/', $display, $match)) {
-					$display = I18N::translate($match[1]);
-				} elseif (preg_match('/^I18N::translateContext\(\'(.+)\', *\'(.+)\'\)$/', $display, $match)) {
-					$display = I18N::translateContext($match[1], $match[2]);
-				}
-				echo '<option value="', Filter::escapeHtml($value), '" ';
-				if ($opt[0] == $input['default']) {
-					echo 'selected';
-				}
-				echo '>', Filter::escapeHtml($display), '</option>';
-			}
-			echo '</select>';
-		}
-		if (isset($input['lookup'])) {
-			echo '<input type="hidden" name="type[', Filter::escapeHtml($input['name']), ']" value="', Filter::escapeHtml($input['lookup']), '">';
-			if ($input['lookup'] == 'INDI') {
-				echo FunctionsPrint::printFindIndividualLink('pid');
-			} elseif ($input['lookup'] == 'PLAC') {
-				echo FunctionsPrint::printFindPlaceLink($input['name']);
-			} elseif ($input['lookup'] == 'FAM') {
-				echo FunctionsPrint::printFindFamilyLink('famid');
-			} elseif ($input['lookup'] == 'SOUR') {
-				echo FunctionsPrint::printFindSourceLink($input['name']);
-			} elseif ($input['lookup'] == 'DATE') {
-				echo ' <a href="#" onclick="cal_toggleDate(\'div_', Filter::escapeJs($input['name']), '\', \'', Filter::escapeJs($input['name']), '\'); return false;" class="icon-button_calendar" title="', I18N::translate('Select a date'), '"></a>';
-				echo '<div id="div_', Filter::escapeHtml($input['name']), '" style="position:absolute;visibility:hidden;background-color:white;"></div>';
-			}
-		}
-		echo '</td></tr>';
-	}
-	echo '<tr>
+            echo ' type="text" name="vars[', Filter::escapeHtml($input['name']), ']" id="', Filter::escapeHtml($input['name']), '" value="', Filter::escapeHtml($input['default']), '" style="direction: ltr;">';
+        }
+        if ($input['type'] == 'checkbox') {
+            echo '<input type="checkbox" name="vars[', Filter::escapeHtml($input['name']), ']" id="', Filter::escapeHtml($input['name']), '" value="1" ';
+            echo $input['default'] == '1' ? 'checked' : '';
+            echo '>';
+        }
+        if ($input['type'] == 'select') {
+            echo '<select name="vars[', Filter::escapeHtml($input['name']), ']" id="', Filter::escapeHtml($input['name']), '_var">';
+            $options = preg_split('/[|]+/', $input['options']);
+            foreach ($options as $option) {
+                $opt                   = explode('=>', $option);
+                list($value, $display) = $opt;
+                if (preg_match('/^I18N::number\((.+?)(,([\d+]))?\)$/', $display, $match)) {
+                    $display = I18N::number($match[1], isset($match[3]) ? $match[3] : 0);
+                } elseif (preg_match('/^I18N::translate\(\'(.+)\'\)$/', $display, $match)) {
+                    $display = I18N::translate($match[1]);
+                } elseif (preg_match('/^I18N::translateContext\(\'(.+)\', *\'(.+)\'\)$/', $display, $match)) {
+                    $display = I18N::translateContext($match[1], $match[2]);
+                }
+                echo '<option value="', Filter::escapeHtml($value), '" ';
+                if ($opt[0] == $input['default']) {
+                    echo 'selected';
+                }
+                echo '>', Filter::escapeHtml($display), '</option>';
+            }
+            echo '</select>';
+        }
+        if (isset($input['lookup'])) {
+            echo '<input type="hidden" name="type[', Filter::escapeHtml($input['name']), ']" value="', Filter::escapeHtml($input['lookup']), '">';
+            if ($input['lookup'] == 'INDI') {
+                echo FunctionsPrint::printFindIndividualLink('pid');
+            } elseif ($input['lookup'] == 'PLAC') {
+                echo FunctionsPrint::printFindPlaceLink($input['name']);
+            } elseif ($input['lookup'] == 'FAM') {
+                echo FunctionsPrint::printFindFamilyLink('famid');
+            } elseif ($input['lookup'] == 'SOUR') {
+                echo FunctionsPrint::printFindSourceLink($input['name']);
+            } elseif ($input['lookup'] == 'DATE') {
+                echo ' <a href="#" onclick="cal_toggleDate(\'div_', Filter::escapeJs($input['name']), '\', \'', Filter::escapeJs($input['name']), '\'); return false;" class="icon-button_calendar" title="', I18N::translate('Select a date'), '"></a>';
+                echo '<div id="div_', Filter::escapeHtml($input['name']), '" style="position:absolute;visibility:hidden;background-color:white;"></div>';
+            }
+        }
+        echo '</td></tr>';
+    }
+    echo '<tr>
 		<td colspan="2" class="optionbox">
 		<div class="report-type">
 		<div>
@@ -264,22 +264,22 @@ 
 		<tr><td class="topbottombar" colspan="2">
 		<input type="submit" value="', I18N::translate('continue'), '">
 		</td></tr></table></form></div>';
-	break;
+    break;
 
 case 'run':
-	if (strstr($report, 'report_singlepage.xml') !== false) {
-		// This is a custom module?
-		new \ReportPedigree;
-		break;
-	}
+    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

Indentation +106 added lines, -106 removed lines

@@ -45,20 +45,20 @@ 
 $person2 = Individual::getInstance($pid2, $WT_TREE);
 
 $controller
-	->restrictAccess(Module::isActiveChart($WT_TREE, 'relationships_chart'))
-	->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-	->addInlineJavascript('autocomplete();');
+    ->restrictAccess(Module::isActiveChart($WT_TREE, 'relationships_chart'))
+    ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+    ->addInlineJavascript('autocomplete();');
 
 if ($person1 && $person2) {
-	$controller
-		->setPageTitle(I18N::translate(/* I18N: %s are individual’s names */ 'Relationships between %1$s and %2$s', $person1->getFullName(), $person2->getFullName()))
-		->pageHeader();
-	$paths = $controller->calculateRelationships($person1, $person2, $recursion, (bool) $ancestors);
+    $controller
+        ->setPageTitle(I18N::translate(/* I18N: %s are individual’s names */ 'Relationships between %1$s and %2$s', $person1->getFullName(), $person2->getFullName()))
+        ->pageHeader();
+    $paths = $controller->calculateRelationships($person1, $person2, $recursion, (bool) $ancestors);
 } else {
-	$controller
-		->setPageTitle(I18N::translate('Relationships'))
-		->pageHeader();
-	$paths = array();
+    $controller
+        ->setPageTitle(I18N::translate('Relationships'))
+        ->pageHeader();
+    $paths = array();
 }
 
 ?>
@@ -143,102 +143,102 @@ 
 <?php
 
 if ($person1 && $person2) {
-	if (I18N::direction() === 'ltr') {
-		$horizontal_arrow = '<br><i class="icon-rarrow"></i>';
-		$diagonal1        = Theme::theme()->parameter('image-dline');
-		$diagonal2        = Theme::theme()->parameter('image-dline2');
-	} else {
-		$horizontal_arrow = '<br><i class="icon-larrow"></i>';
-		$diagonal1        = Theme::theme()->parameter('image-dline2');
-		$diagonal2        = Theme::theme()->parameter('image-dline');
-	}
-	$up_arrow   = ' <i class="icon-uarrow"></i>';
-	$down_arrow = ' <i class="icon-darrow"></i>';
+    if (I18N::direction() === 'ltr') {
+        $horizontal_arrow = '<br><i class="icon-rarrow"></i>';
+        $diagonal1        = Theme::theme()->parameter('image-dline');
+        $diagonal2        = Theme::theme()->parameter('image-dline2');
+    } else {
+        $horizontal_arrow = '<br><i class="icon-larrow"></i>';
+        $diagonal1        = Theme::theme()->parameter('image-dline2');
+        $diagonal2        = Theme::theme()->parameter('image-dline');
+    }
+    $up_arrow   = ' <i class="icon-uarrow"></i>';
+    $down_arrow = ' <i class="icon-darrow"></i>';
 
-	$num_paths = 0;
-	foreach ($paths as $path) {
-		// Extract the relationship names between pairs of individuals
-		$relationships = $controller->oldStyleRelationshipPath($path);
-		if (empty($relationships)) {
-			// Cannot see one of the families/individuals, due to privacy;
-			continue;
-		}
-		echo '<h3>', I18N::translate('Relationship: %s', Functions::getRelationshipNameFromPath(implode('', $relationships), $person1, $person2)), '</h3>';
-		$num_paths++;
+    $num_paths = 0;
+    foreach ($paths as $path) {
+        // Extract the relationship names between pairs of individuals
+        $relationships = $controller->oldStyleRelationshipPath($path);
+        if (empty($relationships)) {
+            // Cannot see one of the families/individuals, due to privacy;
+            continue;
+        }
+        echo '<h3>', I18N::translate('Relationship: %s', Functions::getRelationshipNameFromPath(implode('', $relationships), $person1, $person2)), '</h3>';
+        $num_paths++;
 
-		// Use a table/grid for layout.
-		$table = array();
-		// Current position in the grid.
-		$x     = 0;
-		$y     = 0;
-		// Extent of the grid.
-		$min_y = 0;
-		$max_y = 0;
-		$max_x = 0;
-		// For each node in the path.
-		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;
-				}
-				$max_x = max($max_x, $x);
-				$min_y = min($min_y, $y);
-				$max_y = max($max_y, $y);
-			} else {
-				$individual = Individual::getInstance($xref, $WT_TREE);
-				ob_start();
-				FunctionsPrint::printPedigreePerson($individual, $show_full);
-				$table[$x][$y] = ob_get_clean();
-			}
-		}
-		echo '<table id="relationship-page" style="border-collapse: collapse; margin: 20px 50px;">';
-		for ($y = $max_y; $y >= $min_y; --$y) {
-			echo '<tr>';
-			for ($x = 0; $x <= $max_x; ++$x) {
-				echo '<td style="padding: 0;">';
-				if (isset($table[$x][$y])) {
-					echo $table[$x][$y];
-				}
-				echo '</td>';
-			}
-			echo '</tr>';
-		}
-		echo '</table>';
-	}
+        // Use a table/grid for layout.
+        $table = array();
+        // Current position in the grid.
+        $x     = 0;
+        $y     = 0;
+        // Extent of the grid.
+        $min_y = 0;
+        $max_y = 0;
+        $max_x = 0;
+        // For each node in the path.
+        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;
+                }
+                $max_x = max($max_x, $x);
+                $min_y = min($min_y, $y);
+                $max_y = max($max_y, $y);
+            } else {
+                $individual = Individual::getInstance($xref, $WT_TREE);
+                ob_start();
+                FunctionsPrint::printPedigreePerson($individual, $show_full);
+                $table[$x][$y] = ob_get_clean();
+            }
+        }
+        echo '<table id="relationship-page" style="border-collapse: collapse; margin: 20px 50px;">';
+        for ($y = $max_y; $y >= $min_y; --$y) {
+            echo '<tr>';
+            for ($x = 0; $x <= $max_x; ++$x) {
+                echo '<td style="padding: 0;">';
+                if (isset($table[$x][$y])) {
+                    echo $table[$x][$y];
+                }
+                echo '</td>';
+            }
+            echo '</tr>';
+        }
+        echo '</table>';
+    }
 
-	if (!$num_paths) {
-		echo '<p>', I18N::translate('No link between the two individuals could be found.'), '</p>';
-	}
+    if (!$num_paths) {
+        echo '<p>', I18N::translate('No link between the two individuals could be found.'), '</p>';
+    }
 }

fanchart.php

Indentation +10 added lines, -10 removed lines

@@ -26,17 +26,17 @@ 
 global $WT_TREE;
 
 if (Filter::getBool('img')) {
-	header('Content-Type: image/png');
-	echo $controller->generateFanChart('png');
+    header('Content-Type: image/png');
+    echo $controller->generateFanChart('png');
 
-	return;
+    return;
 }
 
 $controller
-	->restrictAccess(Module::isActiveChart($WT_TREE, 'fan_chart'))
-	->pageHeader()
-	->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-	->addInlineJavascript('
+    ->restrictAccess(Module::isActiveChart($WT_TREE, 'fan_chart'))
+    ->pageHeader()
+    ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+    ->addInlineJavascript('
 		autocomplete();
 		var WT_FANCHART = (function() {
 			jQuery("area")
@@ -119,12 +119,12 @@ 
 <?php
 
 if ($controller->error_message) {
-	echo '<p class="ui-state-error">', $controller->error_message, '</p>';
+    echo '<p class="ui-state-error">', $controller->error_message, '</p>';
 
-	return;
+    return;
 }
 
 if ($controller->root) {
-	echo '<div id="fan_chart">', $controller->generateFanChart('html'), '</div>';
+    echo '<div id="fan_chart">', $controller->generateFanChart('html'), '</div>';
 }
 echo '</div>';

descendancy.php

Indentation +26 added lines, -26 removed lines

@@ -32,10 +32,10 @@ 
 
 $controller = new DescendancyController;
 $controller
-	->restrictAccess(Module::isActiveChart($WT_TREE, 'descendancy_chart'))
-	->pageHeader()
-	->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-	->addInlineJavascript('autocomplete();');
+    ->restrictAccess(Module::isActiveChart($WT_TREE, 'descendancy_chart'))
+    ->pageHeader()
+    ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+    ->addInlineJavascript('autocomplete();');
 
 ?>
 <div id="descendancy-page"><h2><?php echo $controller->getPageTitle(); ?></h2>
@@ -93,29 +93,29 @@ 
 
 <?php
 if ($controller->error_message) {
-	echo '<p class="ui-state-error">', $controller->error_message, '</p>';
+    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;
-	}
+    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;
+    }
 }
 ?>
 </div>

autocomplete.php

Indentation +498 added lines, -498 removed lines

@@ -32,470 +32,470 @@ 
 
 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;
+    $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;
+    $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;
+    $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;
+    // 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;
+    $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;
+    $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;
+    $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;
+    // 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;
+    // 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;
+    $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;
+    $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;
+    $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;
+    $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;
+    $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;
+    // 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;
+    $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;
+    $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;
 }
 
 /**
@@ -507,19 +507,19 @@ 
  * @return \stdClass[]
  */
 function get_FAM_rows(Tree $tree, $term) {
-	return Database::prepare(
-		"SELECT DISTINCT 'FAM' AS type, f_id AS xref, f_gedcom AS gedcom, husb_name.n_sort, wife_name.n_sort" .
-		" FROM `##families`" .
-		" JOIN `##name` AS husb_name ON f_husb = husb_name.n_id AND f_file = husb_name.n_file" .
-		" JOIN `##name` AS wife_name ON f_wife = wife_name.n_id AND f_file = wife_name.n_file" .
-		" WHERE CONCAT(husb_name.n_full, ' ', wife_name.n_full) LIKE CONCAT('%', REPLACE(:term, ' ', '%'), '%') AND f_file = :tree_id" .
-		" AND husb_name.n_type <> '_MARNM' AND wife_name.n_type <> '_MARNM'" .
-		" ORDER BY husb_name.n_sort, wife_name.n_sort COLLATE :collation"
-	)->execute(array(
-		'term'      => $term,
-		'tree_id'   => $tree->getTreeId(),
-		'collation' => I18N::collation(),
-	))->fetchAll();
+    return Database::prepare(
+        "SELECT DISTINCT 'FAM' AS type, f_id AS xref, f_gedcom AS gedcom, husb_name.n_sort, wife_name.n_sort" .
+        " FROM `##families`" .
+        " JOIN `##name` AS husb_name ON f_husb = husb_name.n_id AND f_file = husb_name.n_file" .
+        " JOIN `##name` AS wife_name ON f_wife = wife_name.n_id AND f_file = wife_name.n_file" .
+        " WHERE CONCAT(husb_name.n_full, ' ', wife_name.n_full) LIKE CONCAT('%', REPLACE(:term, ' ', '%'), '%') AND f_file = :tree_id" .
+        " AND husb_name.n_type <> '_MARNM' AND wife_name.n_type <> '_MARNM'" .
+        " ORDER BY husb_name.n_sort, wife_name.n_sort COLLATE :collation"
+    )->execute(array(
+        'term'      => $term,
+        'tree_id'   => $tree->getTreeId(),
+        'collation' => I18N::collation(),
+    ))->fetchAll();
 }
 
 /**
@@ -531,16 +531,16 @@ 
  * @return \stdClass[]
  */
 function get_INDI_rows(Tree $tree, $term) {
-	return 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, ' ', '%'), '%') AND i_file = :tree_id ORDER BY n_full COLLATE :collation"
-	)->execute(array(
-		'term'      => $term,
-		'tree_id'   => $tree->getTreeId(),
-		'collation' => I18N::collation(),
-	))->fetchAll();
+    return 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, ' ', '%'), '%') AND i_file = :tree_id ORDER BY n_full COLLATE :collation"
+    )->execute(array(
+        'term'      => $term,
+        'tree_id'   => $tree->getTreeId(),
+        'collation' => I18N::collation(),
+    ))->fetchAll();
 }
 
 /**
@@ -552,17 +552,17 @@ 
  * @return \stdClass[]
  */
 function get_NOTE_rows(Tree $tree, $term) {
-	return Database::prepare(
-		"SELECT o_id AS xref, o_gedcom AS gedcom" .
-		" FROM `##other`" .
-		" JOIN `##name` ON o_id = n_id AND o_file = n_file" .
-		" WHERE o_gedcom LIKE CONCAT('%', REPLACE(:term, ' ', '%'), '%') AND o_file = :tree_id AND o_type = 'NOTE'" .
-		" ORDER BY n_full COLLATE :collation"
-	)->execute(array(
-		'term'      => $term,
-		'tree_id'   => $tree->getTreeId(),
-		'collation' => I18N::collation(),
-	))->fetchAll();
+    return Database::prepare(
+        "SELECT o_id AS xref, o_gedcom AS gedcom" .
+        " FROM `##other`" .
+        " JOIN `##name` ON o_id = n_id AND o_file = n_file" .
+        " WHERE o_gedcom LIKE CONCAT('%', REPLACE(:term, ' ', '%'), '%') AND o_file = :tree_id AND o_type = 'NOTE'" .
+        " ORDER BY n_full COLLATE :collation"
+    )->execute(array(
+        'term'      => $term,
+        'tree_id'   => $tree->getTreeId(),
+        'collation' => I18N::collation(),
+    ))->fetchAll();
 }
 
 /**
@@ -574,17 +574,17 @@ 
  * @return \stdClass[]
  */
 function get_OBJE_rows(Tree $tree, $term) {
-	return Database::prepare(
-		"SELECT 'OBJE' AS type, m_id AS xref, m_gedcom AS gedcom" .
-		" FROM `##media`" .
-		" WHERE (m_titl LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR m_id LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND m_file = :tree_id" .
-		" ORDER BY m_titl COLLATE :collation"
-	)->execute(array(
-		'term_1'    => $term,
-		'term_2'    => $term,
-		'tree_id'   => $tree->getTreeId(),
-		'collation' => I18N::collation(),
-	))->fetchAll();
+    return Database::prepare(
+        "SELECT 'OBJE' AS type, m_id AS xref, m_gedcom AS gedcom" .
+        " FROM `##media`" .
+        " WHERE (m_titl LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR m_id LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND m_file = :tree_id" .
+        " ORDER BY m_titl COLLATE :collation"
+    )->execute(array(
+        'term_1'    => $term,
+        'term_2'    => $term,
+        'tree_id'   => $tree->getTreeId(),
+        'collation' => I18N::collation(),
+    ))->fetchAll();
 }
 
 /**
@@ -596,17 +596,17 @@ 
  * @return \stdClass[]
  */
 function get_REPO_rows(Tree $tree, $term) {
-	return Database::prepare(
-		"SELECT o_id AS xref, o_gedcom AS gedcom" .
-		" FROM `##other`" .
-		" JOIN `##name` ON o_id = n_id AND o_file = n_file" .
-		" WHERE n_full LIKE CONCAT('%', REPLACE(:term, ' ', '%'), '%') AND o_file = :tree_id AND o_type = 'REPO'" .
-		" ORDER BY n_full COLLATE :collation"
-	)->execute(array(
-		'term'      => $term,
-		'tree_id'   => $tree->getTreeId(),
-		'collation' => I18N::collation(),
-	))->fetchAll();
+    return Database::prepare(
+        "SELECT o_id AS xref, o_gedcom AS gedcom" .
+        " FROM `##other`" .
+        " JOIN `##name` ON o_id = n_id AND o_file = n_file" .
+        " WHERE n_full LIKE CONCAT('%', REPLACE(:term, ' ', '%'), '%') AND o_file = :tree_id AND o_type = 'REPO'" .
+        " ORDER BY n_full COLLATE :collation"
+    )->execute(array(
+        'term'      => $term,
+        'tree_id'   => $tree->getTreeId(),
+        'collation' => I18N::collation(),
+    ))->fetchAll();
 }
 
 /**
@@ -618,14 +618,14 @@ 
  * @return \stdClass[]
  */
 function get_SOUR_rows(Tree $tree, $term) {
-	return Database::prepare(
-		"SELECT s_id AS xref, s_gedcom AS gedcom" .
-		" 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'   => $tree->getTreeId(),
-		'collation' => I18N::collation(),
-	))->fetchAll();
+    return Database::prepare(
+        "SELECT s_id AS xref, s_gedcom AS gedcom" .
+        " 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'   => $tree->getTreeId(),
+        'collation' => I18N::collation(),
+    ))->fetchAll();
 }

help_text.php

Indentation +269 added lines, -269 removed lines

@@ -20,306 +20,306 @@
 
 $help = Filter::get('help');
 switch ($help) {
-	//////////////////////////////////////////////////////////////////////////////
-	// This is a list of all known gedcom tags. We list them all here so that
-	// xgettext() may find them.
-	//
-	// Tags such as BIRT:PLAC are only used as labels, and do not require help
-	// text. These are only used for translating labels.
-	//
-	// Tags such as _BIRT_CHIL are pseudo-tags, used to create family events.
-	//
-	// Generally, these tags need to be lists explicitly in FunctionsEdit::add_simple_tag()
-	//////////////////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+    // This is a list of all known gedcom tags. We list them all here so that
+    // xgettext() may find them.
+    //
+    // Tags such as BIRT:PLAC are only used as labels, and do not require help
+    // text. These are only used for translating labels.
+    //
+    // Tags such as _BIRT_CHIL are pseudo-tags, used to create family events.
+    //
+    // 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'),
-	);
+    $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;
-	}
-	$example1 .= '<br>' . str_replace('/', '-', $example1) . '<br>' . str_replace('/', '.', $example1);
-	$example2 .= '<br>' . str_replace('/', '-', $example2) . '<br>' . str_replace('/', '.', $example2);
-	$text =
-		'<p>' . I18N::translate('Dates are stored using English abbreviations and keywords. Shortcuts are available as alternatives to these abbreviations and keywords.') . '</p>' .
-		'<table border="1">' .
-		'<tr><th>' . I18N::translate('Date') . '</th><th>' . I18N::translate('Format') . '</th><th>' . I18N::translate('Shortcut') . '</th></tr>' .
-		'<tr><td>' . $dates['1900'] . '</td><td><kbd dir="ltr" lang="en">1900</kbd></td><td></td></tr>' .
-		'<tr><td>' . $dates['JAN 1900'] . '<br>' . $dates['FEB 1900'] . '<br>' . $dates['MAR 1900'] . '<br>' . $dates['APR 1900'] . '<br>' . $dates['MAY 1900'] . '<br>' . $dates['JUN 1900'] . '<br>' . $dates['JUL 1900'] . '<br>' . $dates['AUG 1900'] . '<br>' . $dates['SEP 1900'] . '<br>' . $dates['OCT 1900'] . '<br>' . $dates['NOV 1900'] . '<br>' . $dates['DEC 1900'] . '</td><td><kbd dir="ltr" lang="en">JAN 1900<br>FEB 1900<br>MAR 1900<br>APR 1900<br>MAY 1900<br>JUN 1900<br>JUL 1900<br>AUG 1900<br>SEP 1900<br>OCT 1900<br>NOV 1900<br>DEC 1900</kbd></td><td></td></tr>' .
-		'<tr><td>' . $dates['11 DEC 1913'] . '</td><td><kbd dir="ltr" lang="en">11 DEC 1913</kbd></td><td><kbd dir="ltr" lang="en">' . $example1 . '</kbd></td></tr>' .
-		'<tr><td>' . $dates['01 FEB 2003'] . '</td><td><kbd dir="ltr" lang="en">01 FEB 2003</kbd></td><td><kbd dir="ltr" lang="en">' . $example2 . '</kbd></td></tr>' .
-		'<tr><td>' . $dates['ABT 1900'] . '</td><td><kbd dir="ltr" lang="en">ABT 1900</kbd></td><td><kbd dir="ltr" lang="en">~1900</kbd></td></tr>' .
-		'<tr><td>' . $dates['EST 1900'] . '</td><td><kbd dir="ltr" lang="en">EST 1900</kbd></td><td><kbd dir="ltr" lang="en">*1900</kbd></td></tr>' .
-		'<tr><td>' . $dates['CAL 1900'] . '</td><td><kbd dir="ltr" lang="en">CAL 1900</kbd></td><td><kbd dir="ltr" lang="en">#1900</kbd></td></tr>' .
-		'<tr><td>' . $dates['INT 1900 (...)'] . '</td><td><kbd dir="ltr" lang="en">INT 1900 (...)</kbd></td><td></td></tr>' .
-		'</table>' .
-		'<p>' . I18N::translate('Date ranges are used to indicate that an event, such as a birth, happened on an unknown date within a possible range.') . '</p>' .
-		'<table border="1">' .
-		'<tr><th>' . I18N::translate('Date range') . '</th><th>' . I18N::translate('Format') . '</th><th>' . I18N::translate('Shortcut') . '</th></tr>' .
-		'<tr><td>' . $dates['BET 1900 AND 1910'] . '</td><td><kbd dir="ltr" lang="en">BET 1900 AND 1910</kbd></td><td><kbd dir="ltr" lang="en">1900-1910</kbd></td></tr>' .
-		'<tr><td>' . $dates['AFT 1900'] . '</td><td><kbd dir="ltr" lang="en">AFT 1900</kbd></td><td><kbd dir="ltr" lang="en">&gt;1900</kbd></td></tr>' .
-		'<tr><td>' . $dates['BEF 1910'] . '</td><td><kbd dir="ltr" lang="en">BEF 1910</kbd></td><td><kbd dir="ltr" lang="en">&lt;1910</kbd></td></tr>' .
-		'<tr><td>' . $dates['BET JAN 1900 AND MAR 1900'] . '</td><td><kbd dir="ltr" lang="en">BET JAN 1900 AND MAR 1900</kbd></td><td><kbd dir="ltr" lang="en">Q1 1900</kbd></td></tr>' .
-		'<tr><td>' . $dates['BET APR 1900 AND JUN 1900'] . '</td><td><kbd dir="ltr" lang="en">BET APR 1900 AND JUN 1900</kbd></td><td><kbd dir="ltr" lang="en">Q2 1900</kbd></td></tr>' .
-		'<tr><td>' . $dates['BET JUL 1900 AND SEP 1900'] . '</td><td><kbd dir="ltr" lang="en">BET JUL 1900 AND SEP 1900</kbd></td><td><kbd dir="ltr" lang="en">Q3 1900</kbd></td></tr>' .
-		'<tr><td>' . $dates['BET OCT 1900 AND DEC 1900'] . '</td><td><kbd dir="ltr" lang="en">BET OCT 1900 AND DEC 1900</kbd></td><td><kbd dir="ltr" lang="en">Q4 1900</kbd></td></tr>' .
-		'</table>' .
-		'<p>' . I18N::translate('Date periods are used to indicate that a fact, such as an occupation, continued for a period of time.') . '</p>' .
-		'<table border="1">' .
-		'<tr><th>' . I18N::translate('Date period') . '</th><th>' . I18N::translate('Format') . '</th><th>' . I18N::translate('Shortcut') . '</th></tr>' .
-		'<tr><td>' . $dates['FROM 1900 TO 1910'] . '</td><td><kbd dir="ltr" lang="en">FROM 1900 TO 1910</kbd></td><td><kbd dir="ltr" lang="en">1900~1910</kbd></td></tr>' .
-		'<tr><td>' . $dates['FROM 1900'] . '</td><td><kbd dir="ltr" lang="en">FROM 1900</kbd></td><td><kbd dir="ltr" lang="en">1900-</kbd></td></tr>' .
-		'<tr><td>' . $dates['TO 1910'] . '</td><td><kbd dir="ltr" lang="en">TO 1910</kbd></td><td><kbd dir="ltr" lang="en">-1900</kbd></td></tr>' .
-		'</table>' .
-		'<p>' . I18N::translate('Simple dates are assumed to be in the gregorian calendar. To specify a date in another calendar, add a keyword before the date. This keyword is optional if the month or year format make the date unambiguous.') . '</p>' .
-		'<table border="1">' .
-		'<tr><th>' . I18N::translate('Date') . '</th><th>' . I18N::translate('Format') . '</th></tr>' .
-		'<tr><th colspan="2">' . I18N::translate('Julian') . '</th></tr>' .
-		'<tr><td>' . $dates['@#DJULIAN@ 14 JAN 1700'] . '</td><td><kbd dir="ltr" lang="en">@#DJULIAN@ 14 JAN 1700</kbd></td></tr>' .
-		'<tr><td>' . $dates['@#DJULIAN@ 44 B.C.'] . '</td><td><kbd dir="ltr" lang="en">@#DJULIAN@ 44 B.C.</kbd></td></tr>' .
-		'<tr><td>' . $dates['@#DJULIAN@ 20 FEB 1742/43'] . '</td><td><kbd dir="ltr" lang="en">@#DJULIAN@ 20 FEB 1742/43</kbd></td></tr>' .
-		'<tr><td>' . $dates['BET @#DJULIAN@ 01 SEP 1752 AND @#DGREGORIAN@ 30 SEP 1752'] . '</td><td><kbd dir="ltr" lang="en">BET @#DJULIAN@ 01 SEP 1752 AND @#DGREGORIAN@ 30 SEP 1752</kbd></td></tr>' .
-		'<tr><th colspan="2">' . I18N::translate('Jewish') . '</th></tr>' .
-		'<tr><td>' . $dates['@#DHEBREW@ 5481'] . '</td><td><kbd dir="ltr" lang="en">@#DHEBREW@ 5481</kbd></td></tr>' .
-		'<tr><td>' . $dates['@#DHEBREW@ TSH 5481'] . '</td><td><kbd dir="ltr" lang="en">@#DHEBREW@ TSH 5481</kbd></td></tr>' .
-		'<tr><td>' . $dates['ABT @#DHEBREW@ CSH 5481'] . '</td><td><kbd dir="ltr" lang="en">ABT @#DHEBREW@ CSH 5481</kbd></td></tr>' .
-		'<tr><td>' . $dates['BET @#DHEBREW@ KSL 5481 AND @#DHEBREW@ TVT 5481'] . '</td><td><kbd dir="ltr" lang="en">BET @#DHEBREW@ KSL 5481 AND @#DHEBREW@ TVT 5481</kbd></td></tr>' .
-		'<tr><td>' . $dates['FROM @#DHEBREW@ SHV 5481 TO @#DHEBREW@ ADR 5481'] . '</td><td><kbd dir="ltr" lang="en">FROM @#DHEBREW@ SHV 5481 TO @#DHEBREW@ ADR 5481</kbd></td></tr>' .
-		'<tr><td>' . $dates['AFT @#DHEBREW@ ADR 5481'] . '</td><td><kbd dir="ltr" lang="en">AFT @#DHEBREW@ ADR 5481</kbd></td></tr>' .
-		'<tr><td>' . $dates['AFT @#DHEBREW@ ADS 5480'] . '</td><td><kbd dir="ltr" lang="en">AFT @#DHEBREW@ ADS 5480</kbd></td></tr>' .
-		'<tr><td>' . $dates['BEF @#DHEBREW@ NSN 5481'] . '</td><td><kbd dir="ltr" lang="en">BEF @#DHEBREW@ NSN 5481</kbd></td></tr>' .
-		'<tr><td>' . $dates['ABT @#DHEBREW@ IYR 5481'] . '</td><td><kbd dir="ltr" lang="en">ABT @#DHEBREW@ IYR 5481</kbd></td></tr>' .
-		'<tr><td>' . $dates['FROM @#DHEBREW@ SVN 5481'] . '</td><td><kbd dir="ltr" lang="en">FROM @#DHEBREW@ SVN 5481</kbd></td></tr>' .
-		'<tr><td>' . $dates['TO @#DHEBREW@ TMZ 5481'] . '</td><td><kbd dir="ltr" lang="en">TO @#DHEBREW@ TMZ 5481</kbd></td></tr>' .
-		'<tr><td>' . $dates['EST @#DHEBREW@ AAV 5481'] . '</td><td><kbd dir="ltr" lang="en">EST @#DHEBREW@ AAV 5481</kbd></td></tr>' .
-		'<tr><td>' . $dates['@#DHEBREW@ 03 ELL 5481'] . '</td><td><kbd dir="ltr" lang="en">@#DHEBREW@ 03 ELL 5481</kbd></td></tr>' .
-		'<tr><th colspan="2">' . I18N::translate('Hijri') . '</th></tr>' .
-		'<tr><td>' . $dates['@#DHIJRI@ 1497'] . '</td><td><kbd dir="ltr" lang="en">@#DHIJRI@ 1497</kbd></td></tr>' .
-		'<tr><td>' . $dates['@#DHIJRI@ MUHAR 1497'] . '</td><td><kbd dir="ltr" lang="en">@#DHIJRI@ MUHAR 1497</kbd></td></tr>' .
-		'<tr><td>' . $dates['ABT @#DHIJRI@ SAFAR 1497'] . '</td><td><kbd dir="ltr" lang="en">ABT @#DHIJRI@ SAFAR 1497</kbd></td></tr>' .
-		'<tr><td>' . $dates['BET @#DHIJRI@ RABIA 1497 AND @#DHIJRI@ RABIT 1497'] . '</td><td><kbd dir="ltr" lang="en">BET @#DHIJRI@ RABIA 1497 AND @#DHIJRI@ RABIT 1497</kbd></td></tr>' .
-		'<tr><td>' . $dates['FROM @#DHIJRI@ JUMAA 1497 TO @#DHIJRI@ JUMAT 1497'] . '</td><td><kbd dir="ltr" lang="en">FROM @#DHIJRI@ JUMAA 1497 TO @#DHIJRI@ JUMAT 1497</kbd></td></tr>' .
-		'<tr><td>' . $dates['AFT @#DHIJRI@ RAJAB 1497'] . '</td><td><kbd dir="ltr" lang="en">AFT @#DHIJRI@ RAJAB 1497</kbd></td></tr>' .
-		'<tr><td>' . $dates['BEF @#DHIJRI@ SHAAB 1497'] . '</td><td><kbd dir="ltr" lang="en">BEF @#DHIJRI@ SHAAB 1497</kbd></td></tr>' .
-		'<tr><td>' . $dates['ABT @#DHIJRI@ RAMAD 1497'] . '</td><td><kbd dir="ltr" lang="en">ABT @#DHIJRI@ RAMAD 1497</kbd></td></tr>' .
-		'<tr><td>' . $dates['FROM @#DHIJRI@ SHAWW 1497'] . '</td><td><kbd dir="ltr" lang="en">FROM @#DHIJRI@ SHAWW 1497</kbd></td></tr>' .
-		'<tr><td>' . $dates['TO @#DHIJRI@ DHUAQ 1497'] . '</td><td><kbd dir="ltr" lang="en">TO @#DHIJRI@ DHUAQ 1497</kbd></td></tr>' .
-		'<tr><td>' . $dates['@#DHIJRI@ 03 DHUAH 1497'] . '</td><td><kbd dir="ltr" lang="en">@#DHIJRI@ 03 DHUAH 1497</kbd></td></tr>' .
-		'<tr><th colspan="2">' . I18N::translate('French') . '</th></tr>' .
-		'<tr><td>' . $dates['@#DFRENCH R@ 12'] . '</td><td><kbd dir="ltr" lang="en">@#DFRENCH R@ 12</kbd></td></tr>' .
-		'<tr><td>' . $dates['@#DFRENCH R@ VEND 12'] . '</td><td><kbd dir="ltr" lang="en">@#DFRENCH R@ VEND 12</kbd></td></tr>' .
-		'<tr><td>' . $dates['ABT @#DFRENCH R@ BRUM 12'] . '</td><td><kbd dir="ltr" lang="en">ABT @#DFRENCH R@ BRUM 12</kbd></td></tr>' .
-		'<tr><td>' . $dates['BET @#DFRENCH R@ FRIM 12 AND @#DFRENCH R@ NIVO 12'] . '</td><td><kbd dir="ltr" lang="en">BET @#DFRENCH R@ FRIM 12 AND @#DFRENCH R@ NIVO 12</kbd></td></tr>' .
-		'<tr><td>' . $dates['FROM @#DFRENCH R@ PLUV 12 TO @#DFRENCH R@ VENT 12'] . '</td><td><kbd dir="ltr" lang="en">FROM @#DFRENCH R@ PLUV 12 TO @#DFRENCH R@ VENT 12</kbd></td></tr>' .
-		'<tr><td>' . $dates['AFT @#DFRENCH R@ GERM 12'] . '</td><td><kbd dir="ltr" lang="en">AFT @#DFRENCH R@ GERM 12</kbd></td></tr>' .
-		'<tr><td>' . $dates['BEF @#DFRENCH R@ FLOR 12'] . '</td><td><kbd dir="ltr" lang="en">BEF @#DFRENCH R@ FLOR 12</kbd></td></tr>' .
-		'<tr><td>' . $dates['ABT @#DFRENCH R@ PRAI 12'] . '</td><td><kbd dir="ltr" lang="en">ABT @#DFRENCH R@ PRAI 12</kbd></td></tr>' .
-		'<tr><td>' . $dates['FROM @#DFRENCH R@ MESS 12'] . '</td><td><kbd dir="ltr" lang="en">FROM @#DFRENCH R@ MESS 12</kbd></td></tr>' .
-		'<tr><td>' . $dates['TO @#DFRENCH R@ THER 12'] . '</td><td><kbd dir="ltr" lang="en">TO @#DFRENCH R@ THER 12</kbd></td></tr>' .
-		'<tr><td>' . $dates['EST @#DFRENCH R@ FRUC 12'] . '</td><td><kbd dir="ltr" lang="en">EST @#DFRENCH R@ FRUC 12</kbd></td></tr>' .
-		'<tr><td>' . $dates['@#DFRENCH R@ 03 COMP 12'] . '</td><td><kbd dir="ltr" lang="en">@#DFRENCH R@ 03 COMP 12</kbd></td></tr>' .
-		'</table>';
-	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 =
+        '<p>' . I18N::translate('Dates are stored using English abbreviations and keywords. Shortcuts are available as alternatives to these abbreviations and keywords.') . '</p>' .
+        '<table border="1">' .
+        '<tr><th>' . I18N::translate('Date') . '</th><th>' . I18N::translate('Format') . '</th><th>' . I18N::translate('Shortcut') . '</th></tr>' .
+        '<tr><td>' . $dates['1900'] . '</td><td><kbd dir="ltr" lang="en">1900</kbd></td><td></td></tr>' .
+        '<tr><td>' . $dates['JAN 1900'] . '<br>' . $dates['FEB 1900'] . '<br>' . $dates['MAR 1900'] . '<br>' . $dates['APR 1900'] . '<br>' . $dates['MAY 1900'] . '<br>' . $dates['JUN 1900'] . '<br>' . $dates['JUL 1900'] . '<br>' . $dates['AUG 1900'] . '<br>' . $dates['SEP 1900'] . '<br>' . $dates['OCT 1900'] . '<br>' . $dates['NOV 1900'] . '<br>' . $dates['DEC 1900'] . '</td><td><kbd dir="ltr" lang="en">JAN 1900<br>FEB 1900<br>MAR 1900<br>APR 1900<br>MAY 1900<br>JUN 1900<br>JUL 1900<br>AUG 1900<br>SEP 1900<br>OCT 1900<br>NOV 1900<br>DEC 1900</kbd></td><td></td></tr>' .
+        '<tr><td>' . $dates['11 DEC 1913'] . '</td><td><kbd dir="ltr" lang="en">11 DEC 1913</kbd></td><td><kbd dir="ltr" lang="en">' . $example1 . '</kbd></td></tr>' .
+        '<tr><td>' . $dates['01 FEB 2003'] . '</td><td><kbd dir="ltr" lang="en">01 FEB 2003</kbd></td><td><kbd dir="ltr" lang="en">' . $example2 . '</kbd></td></tr>' .
+        '<tr><td>' . $dates['ABT 1900'] . '</td><td><kbd dir="ltr" lang="en">ABT 1900</kbd></td><td><kbd dir="ltr" lang="en">~1900</kbd></td></tr>' .
+        '<tr><td>' . $dates['EST 1900'] . '</td><td><kbd dir="ltr" lang="en">EST 1900</kbd></td><td><kbd dir="ltr" lang="en">*1900</kbd></td></tr>' .
+        '<tr><td>' . $dates['CAL 1900'] . '</td><td><kbd dir="ltr" lang="en">CAL 1900</kbd></td><td><kbd dir="ltr" lang="en">#1900</kbd></td></tr>' .
+        '<tr><td>' . $dates['INT 1900 (...)'] . '</td><td><kbd dir="ltr" lang="en">INT 1900 (...)</kbd></td><td></td></tr>' .
+        '</table>' .
+        '<p>' . I18N::translate('Date ranges are used to indicate that an event, such as a birth, happened on an unknown date within a possible range.') . '</p>' .
+        '<table border="1">' .
+        '<tr><th>' . I18N::translate('Date range') . '</th><th>' . I18N::translate('Format') . '</th><th>' . I18N::translate('Shortcut') . '</th></tr>' .
+        '<tr><td>' . $dates['BET 1900 AND 1910'] . '</td><td><kbd dir="ltr" lang="en">BET 1900 AND 1910</kbd></td><td><kbd dir="ltr" lang="en">1900-1910</kbd></td></tr>' .
+        '<tr><td>' . $dates['AFT 1900'] . '</td><td><kbd dir="ltr" lang="en">AFT 1900</kbd></td><td><kbd dir="ltr" lang="en">&gt;1900</kbd></td></tr>' .
+        '<tr><td>' . $dates['BEF 1910'] . '</td><td><kbd dir="ltr" lang="en">BEF 1910</kbd></td><td><kbd dir="ltr" lang="en">&lt;1910</kbd></td></tr>' .
+        '<tr><td>' . $dates['BET JAN 1900 AND MAR 1900'] . '</td><td><kbd dir="ltr" lang="en">BET JAN 1900 AND MAR 1900</kbd></td><td><kbd dir="ltr" lang="en">Q1 1900</kbd></td></tr>' .
+        '<tr><td>' . $dates['BET APR 1900 AND JUN 1900'] . '</td><td><kbd dir="ltr" lang="en">BET APR 1900 AND JUN 1900</kbd></td><td><kbd dir="ltr" lang="en">Q2 1900</kbd></td></tr>' .
+        '<tr><td>' . $dates['BET JUL 1900 AND SEP 1900'] . '</td><td><kbd dir="ltr" lang="en">BET JUL 1900 AND SEP 1900</kbd></td><td><kbd dir="ltr" lang="en">Q3 1900</kbd></td></tr>' .
+        '<tr><td>' . $dates['BET OCT 1900 AND DEC 1900'] . '</td><td><kbd dir="ltr" lang="en">BET OCT 1900 AND DEC 1900</kbd></td><td><kbd dir="ltr" lang="en">Q4 1900</kbd></td></tr>' .
+        '</table>' .
+        '<p>' . I18N::translate('Date periods are used to indicate that a fact, such as an occupation, continued for a period of time.') . '</p>' .
+        '<table border="1">' .
+        '<tr><th>' . I18N::translate('Date period') . '</th><th>' . I18N::translate('Format') . '</th><th>' . I18N::translate('Shortcut') . '</th></tr>' .
+        '<tr><td>' . $dates['FROM 1900 TO 1910'] . '</td><td><kbd dir="ltr" lang="en">FROM 1900 TO 1910</kbd></td><td><kbd dir="ltr" lang="en">1900~1910</kbd></td></tr>' .
+        '<tr><td>' . $dates['FROM 1900'] . '</td><td><kbd dir="ltr" lang="en">FROM 1900</kbd></td><td><kbd dir="ltr" lang="en">1900-</kbd></td></tr>' .
+        '<tr><td>' . $dates['TO 1910'] . '</td><td><kbd dir="ltr" lang="en">TO 1910</kbd></td><td><kbd dir="ltr" lang="en">-1900</kbd></td></tr>' .
+        '</table>' .
+        '<p>' . I18N::translate('Simple dates are assumed to be in the gregorian calendar. To specify a date in another calendar, add a keyword before the date. This keyword is optional if the month or year format make the date unambiguous.') . '</p>' .
+        '<table border="1">' .
+        '<tr><th>' . I18N::translate('Date') . '</th><th>' . I18N::translate('Format') . '</th></tr>' .
+        '<tr><th colspan="2">' . I18N::translate('Julian') . '</th></tr>' .
+        '<tr><td>' . $dates['@#DJULIAN@ 14 JAN 1700'] . '</td><td><kbd dir="ltr" lang="en">@#DJULIAN@ 14 JAN 1700</kbd></td></tr>' .
+        '<tr><td>' . $dates['@#DJULIAN@ 44 B.C.'] . '</td><td><kbd dir="ltr" lang="en">@#DJULIAN@ 44 B.C.</kbd></td></tr>' .
+        '<tr><td>' . $dates['@#DJULIAN@ 20 FEB 1742/43'] . '</td><td><kbd dir="ltr" lang="en">@#DJULIAN@ 20 FEB 1742/43</kbd></td></tr>' .
+        '<tr><td>' . $dates['BET @#DJULIAN@ 01 SEP 1752 AND @#DGREGORIAN@ 30 SEP 1752'] . '</td><td><kbd dir="ltr" lang="en">BET @#DJULIAN@ 01 SEP 1752 AND @#DGREGORIAN@ 30 SEP 1752</kbd></td></tr>' .
+        '<tr><th colspan="2">' . I18N::translate('Jewish') . '</th></tr>' .
+        '<tr><td>' . $dates['@#DHEBREW@ 5481'] . '</td><td><kbd dir="ltr" lang="en">@#DHEBREW@ 5481</kbd></td></tr>' .
+        '<tr><td>' . $dates['@#DHEBREW@ TSH 5481'] . '</td><td><kbd dir="ltr" lang="en">@#DHEBREW@ TSH 5481</kbd></td></tr>' .
+        '<tr><td>' . $dates['ABT @#DHEBREW@ CSH 5481'] . '</td><td><kbd dir="ltr" lang="en">ABT @#DHEBREW@ CSH 5481</kbd></td></tr>' .
+        '<tr><td>' . $dates['BET @#DHEBREW@ KSL 5481 AND @#DHEBREW@ TVT 5481'] . '</td><td><kbd dir="ltr" lang="en">BET @#DHEBREW@ KSL 5481 AND @#DHEBREW@ TVT 5481</kbd></td></tr>' .
+        '<tr><td>' . $dates['FROM @#DHEBREW@ SHV 5481 TO @#DHEBREW@ ADR 5481'] . '</td><td><kbd dir="ltr" lang="en">FROM @#DHEBREW@ SHV 5481 TO @#DHEBREW@ ADR 5481</kbd></td></tr>' .
+        '<tr><td>' . $dates['AFT @#DHEBREW@ ADR 5481'] . '</td><td><kbd dir="ltr" lang="en">AFT @#DHEBREW@ ADR 5481</kbd></td></tr>' .
+        '<tr><td>' . $dates['AFT @#DHEBREW@ ADS 5480'] . '</td><td><kbd dir="ltr" lang="en">AFT @#DHEBREW@ ADS 5480</kbd></td></tr>' .
+        '<tr><td>' . $dates['BEF @#DHEBREW@ NSN 5481'] . '</td><td><kbd dir="ltr" lang="en">BEF @#DHEBREW@ NSN 5481</kbd></td></tr>' .
+        '<tr><td>' . $dates['ABT @#DHEBREW@ IYR 5481'] . '</td><td><kbd dir="ltr" lang="en">ABT @#DHEBREW@ IYR 5481</kbd></td></tr>' .
+        '<tr><td>' . $dates['FROM @#DHEBREW@ SVN 5481'] . '</td><td><kbd dir="ltr" lang="en">FROM @#DHEBREW@ SVN 5481</kbd></td></tr>' .
+        '<tr><td>' . $dates['TO @#DHEBREW@ TMZ 5481'] . '</td><td><kbd dir="ltr" lang="en">TO @#DHEBREW@ TMZ 5481</kbd></td></tr>' .
+        '<tr><td>' . $dates['EST @#DHEBREW@ AAV 5481'] . '</td><td><kbd dir="ltr" lang="en">EST @#DHEBREW@ AAV 5481</kbd></td></tr>' .
+        '<tr><td>' . $dates['@#DHEBREW@ 03 ELL 5481'] . '</td><td><kbd dir="ltr" lang="en">@#DHEBREW@ 03 ELL 5481</kbd></td></tr>' .
+        '<tr><th colspan="2">' . I18N::translate('Hijri') . '</th></tr>' .
+        '<tr><td>' . $dates['@#DHIJRI@ 1497'] . '</td><td><kbd dir="ltr" lang="en">@#DHIJRI@ 1497</kbd></td></tr>' .
+        '<tr><td>' . $dates['@#DHIJRI@ MUHAR 1497'] . '</td><td><kbd dir="ltr" lang="en">@#DHIJRI@ MUHAR 1497</kbd></td></tr>' .
+        '<tr><td>' . $dates['ABT @#DHIJRI@ SAFAR 1497'] . '</td><td><kbd dir="ltr" lang="en">ABT @#DHIJRI@ SAFAR 1497</kbd></td></tr>' .
+        '<tr><td>' . $dates['BET @#DHIJRI@ RABIA 1497 AND @#DHIJRI@ RABIT 1497'] . '</td><td><kbd dir="ltr" lang="en">BET @#DHIJRI@ RABIA 1497 AND @#DHIJRI@ RABIT 1497</kbd></td></tr>' .
+        '<tr><td>' . $dates['FROM @#DHIJRI@ JUMAA 1497 TO @#DHIJRI@ JUMAT 1497'] . '</td><td><kbd dir="ltr" lang="en">FROM @#DHIJRI@ JUMAA 1497 TO @#DHIJRI@ JUMAT 1497</kbd></td></tr>' .
+        '<tr><td>' . $dates['AFT @#DHIJRI@ RAJAB 1497'] . '</td><td><kbd dir="ltr" lang="en">AFT @#DHIJRI@ RAJAB 1497</kbd></td></tr>' .
+        '<tr><td>' . $dates['BEF @#DHIJRI@ SHAAB 1497'] . '</td><td><kbd dir="ltr" lang="en">BEF @#DHIJRI@ SHAAB 1497</kbd></td></tr>' .
+        '<tr><td>' . $dates['ABT @#DHIJRI@ RAMAD 1497'] . '</td><td><kbd dir="ltr" lang="en">ABT @#DHIJRI@ RAMAD 1497</kbd></td></tr>' .
+        '<tr><td>' . $dates['FROM @#DHIJRI@ SHAWW 1497'] . '</td><td><kbd dir="ltr" lang="en">FROM @#DHIJRI@ SHAWW 1497</kbd></td></tr>' .
+        '<tr><td>' . $dates['TO @#DHIJRI@ DHUAQ 1497'] . '</td><td><kbd dir="ltr" lang="en">TO @#DHIJRI@ DHUAQ 1497</kbd></td></tr>' .
+        '<tr><td>' . $dates['@#DHIJRI@ 03 DHUAH 1497'] . '</td><td><kbd dir="ltr" lang="en">@#DHIJRI@ 03 DHUAH 1497</kbd></td></tr>' .
+        '<tr><th colspan="2">' . I18N::translate('French') . '</th></tr>' .
+        '<tr><td>' . $dates['@#DFRENCH R@ 12'] . '</td><td><kbd dir="ltr" lang="en">@#DFRENCH R@ 12</kbd></td></tr>' .
+        '<tr><td>' . $dates['@#DFRENCH R@ VEND 12'] . '</td><td><kbd dir="ltr" lang="en">@#DFRENCH R@ VEND 12</kbd></td></tr>' .
+        '<tr><td>' . $dates['ABT @#DFRENCH R@ BRUM 12'] . '</td><td><kbd dir="ltr" lang="en">ABT @#DFRENCH R@ BRUM 12</kbd></td></tr>' .
+        '<tr><td>' . $dates['BET @#DFRENCH R@ FRIM 12 AND @#DFRENCH R@ NIVO 12'] . '</td><td><kbd dir="ltr" lang="en">BET @#DFRENCH R@ FRIM 12 AND @#DFRENCH R@ NIVO 12</kbd></td></tr>' .
+        '<tr><td>' . $dates['FROM @#DFRENCH R@ PLUV 12 TO @#DFRENCH R@ VENT 12'] . '</td><td><kbd dir="ltr" lang="en">FROM @#DFRENCH R@ PLUV 12 TO @#DFRENCH R@ VENT 12</kbd></td></tr>' .
+        '<tr><td>' . $dates['AFT @#DFRENCH R@ GERM 12'] . '</td><td><kbd dir="ltr" lang="en">AFT @#DFRENCH R@ GERM 12</kbd></td></tr>' .
+        '<tr><td>' . $dates['BEF @#DFRENCH R@ FLOR 12'] . '</td><td><kbd dir="ltr" lang="en">BEF @#DFRENCH R@ FLOR 12</kbd></td></tr>' .
+        '<tr><td>' . $dates['ABT @#DFRENCH R@ PRAI 12'] . '</td><td><kbd dir="ltr" lang="en">ABT @#DFRENCH R@ PRAI 12</kbd></td></tr>' .
+        '<tr><td>' . $dates['FROM @#DFRENCH R@ MESS 12'] . '</td><td><kbd dir="ltr" lang="en">FROM @#DFRENCH R@ MESS 12</kbd></td></tr>' .
+        '<tr><td>' . $dates['TO @#DFRENCH R@ THER 12'] . '</td><td><kbd dir="ltr" lang="en">TO @#DFRENCH R@ THER 12</kbd></td></tr>' .
+        '<tr><td>' . $dates['EST @#DFRENCH R@ FRUC 12'] . '</td><td><kbd dir="ltr" lang="en">EST @#DFRENCH R@ FRUC 12</kbd></td></tr>' .
+        '<tr><td>' . $dates['@#DFRENCH R@ 03 COMP 12'] . '</td><td><kbd dir="ltr" lang="en">@#DFRENCH R@ 03 COMP 12</kbd></td></tr>' .
+        '</table>';
+    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;
+    $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;
+    $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;
+    $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;
+    $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;
+    $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;
+    $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;
+    $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;
+    $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;
+    $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;
+    $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;
+    $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;
+    $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;
+    $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

admin_trees_duplicates.php

Indentation +71 added lines, -71 removed lines

@@ -29,119 +29,119 @@
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isManager($WT_TREE))
-	->setPageTitle(I18N::translate('Find duplicates') . ' — ' . $WT_TREE->getTitleHtml())
-	->pageHeader();
+    ->restrictAccess(Auth::isManager($WT_TREE))
+    ->setPageTitle(I18N::translate('Find duplicates') . ' — ' . $WT_TREE->getTitleHtml())
+    ->pageHeader();
 
 $repositories = Database::prepare(
-	"SELECT GROUP_CONCAT(n_id) AS xrefs " .
-	" FROM `##other`" .
-	" JOIN `##name` ON o_id = n_id AND o_file = n_file" .
-	" WHERE o_file = :tree_id AND o_type = 'REPO'" .
-	" GROUP BY n_full" .
-	" HAVING COUNT(n_id) > 1"
+    "SELECT GROUP_CONCAT(n_id) AS xrefs " .
+    " FROM `##other`" .
+    " JOIN `##name` ON o_id = n_id AND o_file = n_file" .
+    " WHERE o_file = :tree_id AND o_type = 'REPO'" .
+    " GROUP BY n_full" .
+    " HAVING COUNT(n_id) > 1"
 )->execute(array(
-	'tree_id' => $WT_TREE->getTreeId(),
+    'tree_id' => $WT_TREE->getTreeId(),
 ))->fetchAll();
 
 $repositories = array_map(
-	function (\stdClass $x) use ($WT_TREE) {
-		$tmp = explode(',', $x->xrefs);
+    function (\stdClass $x) use ($WT_TREE) {
+        $tmp = explode(',', $x->xrefs);
 
-		return array_map(function ($y) use ($WT_TREE) {
-			return Repository::getInstance($y, $WT_TREE);
-		}, $tmp);
-	}, $repositories
+        return array_map(function ($y) use ($WT_TREE) {
+            return Repository::getInstance($y, $WT_TREE);
+        }, $tmp);
+    }, $repositories
 );
 
 $sources = Database::prepare(
-	"SELECT GROUP_CONCAT(n_id) AS xrefs " .
-	" FROM `##sources`" .
-	" JOIN `##name` ON s_id = n_id AND s_file = n_file" .
-	" WHERE s_file = :tree_id" .
-	" GROUP BY n_full" .
-	" HAVING COUNT(n_id) > 1"
+    "SELECT GROUP_CONCAT(n_id) AS xrefs " .
+    " FROM `##sources`" .
+    " JOIN `##name` ON s_id = n_id AND s_file = n_file" .
+    " WHERE s_file = :tree_id" .
+    " GROUP BY n_full" .
+    " HAVING COUNT(n_id) > 1"
 )->execute(array(
-	'tree_id' => $WT_TREE->getTreeId(),
+    'tree_id' => $WT_TREE->getTreeId(),
 ))->fetchAll();
 
 $sources = array_map(
-	function (\stdClass $x) use ($WT_TREE) {
-		$tmp = explode(',', $x->xrefs);
+    function (\stdClass $x) use ($WT_TREE) {
+        $tmp = explode(',', $x->xrefs);
 
-		return array_map(function ($y) use ($WT_TREE) {
-			return Source::getInstance($y, $WT_TREE);
-		}, $tmp);
-	}, $sources
+        return array_map(function ($y) use ($WT_TREE) {
+            return Source::getInstance($y, $WT_TREE);
+        }, $tmp);
+    }, $sources
 );
 
 $individuals = Database::prepare(
-	"SELECT DISTINCT GROUP_CONCAT(d_gid ORDER BY d_gid) AS xrefs" .
-	" FROM `##dates` AS d" .
-	" JOIN `##name` ON d_file = n_file AND d_gid = n_id" .
-	" WHERE d_file = :tree_id AND d_fact IN ('BIRT', 'CHR', 'BAPM', 'DEAT', 'BURI')" .
-	" GROUP BY d_day, d_month, d_year, d_type, d_fact, n_type, n_full" .
-	" HAVING COUNT(DISTINCT d_gid) > 1"
+    "SELECT DISTINCT GROUP_CONCAT(d_gid ORDER BY d_gid) AS xrefs" .
+    " FROM `##dates` AS d" .
+    " JOIN `##name` ON d_file = n_file AND d_gid = n_id" .
+    " WHERE d_file = :tree_id AND d_fact IN ('BIRT', 'CHR', 'BAPM', 'DEAT', 'BURI')" .
+    " GROUP BY d_day, d_month, d_year, d_type, d_fact, n_type, n_full" .
+    " HAVING COUNT(DISTINCT d_gid) > 1"
 )->execute(array(
-	'tree_id' => $WT_TREE->getTreeId(),
+    'tree_id' => $WT_TREE->getTreeId(),
 ))->fetchAll();
 
 $individuals = array_map(
-	function (\stdClass $x) use ($WT_TREE) {
-		$tmp = explode(',', $x->xrefs);
+    function (\stdClass $x) use ($WT_TREE) {
+        $tmp = explode(',', $x->xrefs);
 
-		return array_map(function ($y) use ($WT_TREE) {
-			return Individual::getInstance($y, $WT_TREE);
-		}, $tmp);
-	}, $individuals
+        return array_map(function ($y) use ($WT_TREE) {
+            return Individual::getInstance($y, $WT_TREE);
+        }, $tmp);
+    }, $individuals
 );
 
 $families = Database::prepare(
-	"SELECT GROUP_CONCAT(f_id) AS xrefs " .
-	" FROM `##families`" .
-	" WHERE f_file = :tree_id" .
-	" GROUP BY LEAST(f_husb, f_wife), GREATEST(f_husb, f_wife)" .
-	" HAVING COUNT(f_id) > 1"
+    "SELECT GROUP_CONCAT(f_id) AS xrefs " .
+    " FROM `##families`" .
+    " WHERE f_file = :tree_id" .
+    " GROUP BY LEAST(f_husb, f_wife), GREATEST(f_husb, f_wife)" .
+    " HAVING COUNT(f_id) > 1"
 )->execute(array(
-	'tree_id' => $WT_TREE->getTreeId(),
+    'tree_id' => $WT_TREE->getTreeId(),
 ))->fetchAll();
 
 $families = array_map(
-	function (\stdClass $x) use ($WT_TREE) {
-		$tmp = explode(',', $x->xrefs);
+    function (\stdClass $x) use ($WT_TREE) {
+        $tmp = explode(',', $x->xrefs);
 
-		return array_map(function ($y) use ($WT_TREE) {
-			return Family::getInstance($y, $WT_TREE);
-		}, $tmp);
-	}, $families
+        return array_map(function ($y) use ($WT_TREE) {
+            return Family::getInstance($y, $WT_TREE);
+        }, $tmp);
+    }, $families
 );
 
 $media = Database::prepare(
-	"SELECT GROUP_CONCAT(m_id) AS xrefs " .
-	" FROM `##media`" .
-	" WHERE m_file = :tree_id" .
-	" GROUP BY m_titl" .
-	" HAVING COUNT(m_id) > 1"
+    "SELECT GROUP_CONCAT(m_id) AS xrefs " .
+    " FROM `##media`" .
+    " WHERE m_file = :tree_id" .
+    " GROUP BY m_titl" .
+    " HAVING COUNT(m_id) > 1"
 )->execute(array(
-	'tree_id' => $WT_TREE->getTreeId(),
+    'tree_id' => $WT_TREE->getTreeId(),
 ))->fetchAll();
 
 $media = array_map(
-	function (\stdClass $x) use ($WT_TREE) {
-		$tmp = explode(',', $x->xrefs);
+    function (\stdClass $x) use ($WT_TREE) {
+        $tmp = explode(',', $x->xrefs);
 
-		return array_map(function ($y) use ($WT_TREE) {
-			return Media::getInstance($y, $WT_TREE);
-		}, $tmp);
-	}, $media
+        return array_map(function ($y) use ($WT_TREE) {
+            return Media::getInstance($y, $WT_TREE);
+        }, $tmp);
+    }, $media
 );
 
 $all_duplicates = array(
-	I18N::translate('Repositories')  => $repositories,
-	I18N::translate('Sources')       => $sources,
-	I18N::translate('Individuals')   => $individuals,
-	I18N::translate('Families')      => $families,
-	I18N::translate('Media objects') => $media,
+    I18N::translate('Repositories')  => $repositories,
+    I18N::translate('Sources')       => $sources,
+    I18N::translate('Individuals')   => $individuals,
+    I18N::translate('Families')      => $families,
+    I18N::translate('Media objects') => $media,
 );
 
 ?>

addmedia.php

Indentation +533 added lines, -533 removed lines

@@ -49,27 +49,27 @@ 
 
 $controller = new SimpleController;
 $controller
-	->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-	->addInlineJavascript('autocomplete();')
-	->restrictAccess(Auth::isMember($WT_TREE));
+    ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+    ->addInlineJavascript('autocomplete();')
+    ->restrictAccess(Auth::isMember($WT_TREE));
 
 $disp  = true;
 $media = Media::getInstance($pid, $WT_TREE);
 if ($media) {
-	$disp = $media->canShow();
+    $disp = $media->canShow();
 }
 if ($action == 'update' || $action == 'create') {
-	if ($linktoid) {
-		$disp = GedcomRecord::getInstance($linktoid, $WT_TREE)->canShow();
-	}
+    if ($linktoid) {
+        $disp = GedcomRecord::getInstance($linktoid, $WT_TREE)->canShow();
+    }
 }
 
 if (!Auth::isEditor($WT_TREE) || !$disp) {
-	$controller
-		->pageHeader()
-		->addInlineJavascript('closePopupAndReloadParent();');
+    $controller
+        ->pageHeader()
+        ->addInlineJavascript('closePopupAndReloadParent();');
 
-	return;
+    return;
 }
 
 // There is a lot of common code in the create and update cases…
@@ -77,337 +77,337 @@ 
 
 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;
+    $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;
+    $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;
+    $controller->setPageTitle(I18N::translate('Create a media object'));
+    $action = 'create';
+    break;
 case 'editmedia':
-	$controller->setPageTitle(I18N::translate('Edit the media object'));
-	$action = 'update';
-	break;
+    $controller->setPageTitle(I18N::translate('Edit the media object'));
+    $action = 'update';
+    break;
 default:
-	throw new \Exception('Bad $action (' . $action . ') in addmedia.php');
+    throw new \Exception('Bad $action (' . $action . ') in addmedia.php');
 }
 
 $controller->pageHeader();
@@ -418,140 +418,140 @@ 
 echo '<input type="hidden" name="ged" value="', $WT_TREE->getNameHtml(), '">';
 echo '<input type="hidden" name="pid" value="', $pid, '">';
 if ($linktoid) {
-	echo '<input type="hidden" name="linktoid" value="', $linktoid, '">';
+    echo '<input type="hidden" name="linktoid" value="', $linktoid, '">';
 }
 echo '<table class="facts_table">';
 echo '<tr><td class="topbottombar" colspan="2">';
 echo $controller->getPageTitle(), FunctionsPrint::helpLink('OBJE');
 echo '</td></tr>';
 if (!$linktoid && $action == 'create') {
-	echo '<tr><td class="descriptionbox wrap width25">';
-	echo I18N::translate('Enter an individual, family, or source ID');
-	echo '</td><td class="optionbox wrap"><input type="text" data-autocomplete-type="IFS" name="linktoid" id="linktoid" size="6" value="">';
-	echo ' ', FunctionsPrint::printFindIndividualLink('linktoid');
-	echo ' ', FunctionsPrint::printFindFamilyLink('linktoid');
-	echo ' ', FunctionsPrint::printFindSourceLink('linktoid');
-	echo '<p class="small text-muted">', I18N::translate('Enter or search for the ID of the individual, family, or source to which this media object should be linked.'), '</p></td></tr>';
+    echo '<tr><td class="descriptionbox wrap width25">';
+    echo I18N::translate('Enter an individual, family, or source ID');
+    echo '</td><td class="optionbox wrap"><input type="text" data-autocomplete-type="IFS" name="linktoid" id="linktoid" size="6" value="">';
+    echo ' ', FunctionsPrint::printFindIndividualLink('linktoid');
+    echo ' ', FunctionsPrint::printFindFamilyLink('linktoid');
+    echo ' ', FunctionsPrint::printFindSourceLink('linktoid');
+    echo '<p class="small text-muted">', I18N::translate('Enter or search for the ID of the individual, family, or source to which this media object should be linked.'), '</p></td></tr>';
 }
 
 if ($media) {
-	$gedrec = $media->getGedcom();
+    $gedrec = $media->getGedcom();
 } else {
-	$gedrec = '';
+    $gedrec = '';
 }
 
 // 1 FILE
 if (preg_match('/\n\d (FILE.*)/', $gedrec, $match)) {
-	$gedfile = $match[1];
+    $gedfile = $match[1];
 } elseif ($filename) {
-	$gedfile = 'FILE ' . $filename;
+    $gedfile = 'FILE ' . $filename;
 } else {
-	$gedfile = 'FILE';
+    $gedfile = 'FILE';
 }
 
 if ($gedfile == 'FILE') {
-	// Box for user to choose to upload file from local computer
-	echo '<tr><td class="descriptionbox wrap width25">';
-	echo I18N::translate('Media file to upload') . '</td><td class="optionbox wrap"><input type="file" name="mediafile" onchange="updateFormat(this.value);" size="40"></td></tr>';
-	// Check for thumbnail generation support
-	if (Auth::isManager($WT_TREE)) {
-		echo '<tr><td class="descriptionbox wrap width25">';
-		echo I18N::translate('Thumbnail to upload') . '</td><td class="optionbox wrap"><input type="file" name="thumbnail" size="40">';
-		echo '<p class="small text-muted">', I18N::translate('Choose the thumbnail image that you want to upload. Although thumbnails can be generated automatically for images, you may wish to generate your own thumbnail, especially for other media types. For example, you can provide a still image from a video, or a photograph of the individual who made an audio recording.'), '</p>';
-		echo '</td></tr>';
-	}
+    // Box for user to choose to upload file from local computer
+    echo '<tr><td class="descriptionbox wrap width25">';
+    echo I18N::translate('Media file to upload') . '</td><td class="optionbox wrap"><input type="file" name="mediafile" onchange="updateFormat(this.value);" size="40"></td></tr>';
+    // Check for thumbnail generation support
+    if (Auth::isManager($WT_TREE)) {
+        echo '<tr><td class="descriptionbox wrap width25">';
+        echo I18N::translate('Thumbnail to upload') . '</td><td class="optionbox wrap"><input type="file" name="thumbnail" size="40">';
+        echo '<p class="small text-muted">', I18N::translate('Choose the thumbnail image that you want to upload. Although thumbnails can be generated automatically for images, you may wish to generate your own thumbnail, especially for other media types. For example, you can provide a still image from a video, or a photograph of the individual who made an audio recording.'), '</p>';
+        echo '</td></tr>';
+    }
 }
 
 // Filename on server
 $isExternal = Functions::isFileExternal($gedfile);
 if ($gedfile == 'FILE') {
-	if (Auth::isManager($WT_TREE)) {
-		FunctionsEdit::addSimpleTag(
-			"1 $gedfile",
-			'',
-			I18N::translate('Filename on server'),
-			'<p class="small text-muted">' . I18N::translate('Do not change to keep original filename.') . '<br>' . I18N::translate('You may enter a URL, beginning with “http://”.') . '</p>'
-		);
-	}
-	$folder = '';
+    if (Auth::isManager($WT_TREE)) {
+        FunctionsEdit::addSimpleTag(
+            "1 $gedfile",
+            '',
+            I18N::translate('Filename on server'),
+            '<p class="small text-muted">' . I18N::translate('Do not change to keep original filename.') . '<br>' . I18N::translate('You may enter a URL, beginning with “http://”.') . '</p>'
+        );
+    }
+    $folder = '';
 } else {
-	if ($isExternal) {
-		$fileName = substr($gedfile, 5);
-		$folder   = '';
-	} else {
-		$tmp      = substr($gedfile, 5);
-		$fileName = basename($tmp);
-		$folder   = dirname($tmp);
-		if ($folder === '.') {
-			$folder = '';
-		}
-	}
-
-	echo '<tr>';
-	echo '<td class="descriptionbox wrap width25">';
-	echo I18N::translate('Filename on server');
-	echo '</td>';
-	echo '<td class="optionbox wrap wrap">';
-	if (Auth::isManager($WT_TREE)) {
-		echo '<input name="filename" type="text" value="' . Filter::escapeHtml($fileName) . '" size="40"';
-		if ($isExternal) {
-			echo '>';
-		} else {
-			echo '><p class="small text-muted">' . I18N::translate('Do not change to keep original filename.') . '</p>';
-		}
-	} else {
-		echo $fileName;
-		echo '<input name="filename" type="hidden" value="' . Filter::escapeHtml($fileName) . '" size="40">';
-	}
-	echo '</td>';
-	echo '</tr>';
+    if ($isExternal) {
+        $fileName = substr($gedfile, 5);
+        $folder   = '';
+    } else {
+        $tmp      = substr($gedfile, 5);
+        $fileName = basename($tmp);
+        $folder   = dirname($tmp);
+        if ($folder === '.') {
+            $folder = '';
+        }
+    }
+
+    echo '<tr>';
+    echo '<td class="descriptionbox wrap width25">';
+    echo I18N::translate('Filename on server');
+    echo '</td>';
+    echo '<td class="optionbox wrap wrap">';
+    if (Auth::isManager($WT_TREE)) {
+        echo '<input name="filename" type="text" value="' . Filter::escapeHtml($fileName) . '" size="40"';
+        if ($isExternal) {
+            echo '>';
+        } else {
+            echo '><p class="small text-muted">' . I18N::translate('Do not change to keep original filename.') . '</p>';
+        }
+    } else {
+        echo $fileName;
+        echo '<input name="filename" type="hidden" value="' . Filter::escapeHtml($fileName) . '" size="40">';
+    }
+    echo '</td>';
+    echo '</tr>';
 }
 
 // Box for user to choose the folder to store the image
 if (!$isExternal) {
-	echo '<tr><td class="descriptionbox wrap width25">';
-	echo I18N::translate('Folder name on server'), '</td><td class="optionbox wrap">';
-	//-- don’t let regular users change the location of media items
-	if ($action !== 'update' || Auth::isManager($WT_TREE)) {
-		$mediaFolders = QueryMedia::folderList();
-		echo '<select name="folder_list" onchange="document.newmedia.folder.value=this.options[this.selectedIndex].value;">';
-		echo '<option ';
-		if ($folder == '') {
-			echo 'selected';
-		}
-		echo ' value=""> ', I18N::translate('Choose: '), ' </option>';
-		if (Auth::isAdmin()) {
-			echo '<option value="other" disabled>', I18N::translate('Other folder… please type in'), "</option>";
-		}
-		foreach ($mediaFolders as $f) {
-			echo '<option value="', $f, '" ';
-			if ($folder == $f) {
-				echo 'selected';
-			}
-			echo '>', $f, "</option>";
-		}
-		echo '</select>';
-	} else {
-		echo $folder;
-	}
-	if (Auth::isAdmin()) {
-		echo '<br><input type="text" name="folder" size="40" value="', $folder, '">';
-		if ($gedfile === 'FILE') {
-			echo '<p class="small text-muted">', I18N::translate('This entry is ignored if you have entered a URL into the filename field.'), '</p>';
-		}
-	} else {
-		echo '<input name="folder" type="hidden" value="', Filter::escapeHtml($folder), '">';
-	}
-	echo '<p class="small text-muted">', I18N::translate('If you have a large number of media files, you can organize them into folders and subfolders.'), '</p>'; echo '</td></tr>';
+    echo '<tr><td class="descriptionbox wrap width25">';
+    echo I18N::translate('Folder name on server'), '</td><td class="optionbox wrap">';
+    //-- don’t let regular users change the location of media items
+    if ($action !== 'update' || Auth::isManager($WT_TREE)) {
+        $mediaFolders = QueryMedia::folderList();
+        echo '<select name="folder_list" onchange="document.newmedia.folder.value=this.options[this.selectedIndex].value;">';
+        echo '<option ';
+        if ($folder == '') {
+            echo 'selected';
+        }
+        echo ' value=""> ', I18N::translate('Choose: '), ' </option>';
+        if (Auth::isAdmin()) {
+            echo '<option value="other" disabled>', I18N::translate('Other folder… please type in'), "</option>";
+        }
+        foreach ($mediaFolders as $f) {
+            echo '<option value="', $f, '" ';
+            if ($folder == $f) {
+                echo 'selected';
+            }
+            echo '>', $f, "</option>";
+        }
+        echo '</select>';
+    } else {
+        echo $folder;
+    }
+    if (Auth::isAdmin()) {
+        echo '<br><input type="text" name="folder" size="40" value="', $folder, '">';
+        if ($gedfile === 'FILE') {
+            echo '<p class="small text-muted">', I18N::translate('This entry is ignored if you have entered a URL into the filename field.'), '</p>';
+        }
+    } else {
+        echo '<input name="folder" type="hidden" value="', Filter::escapeHtml($folder), '">';
+    }
+    echo '<p class="small text-muted">', I18N::translate('If you have a large number of media files, you can organize them into folders and subfolders.'), '</p>'; echo '</td></tr>';
 } else {
-	echo '<input name="folder" type="hidden" value="">';
+    echo '<input name="folder" type="hidden" value="">';
 }
 
 // 1 FILE / 2 FORM
 if (preg_match('/\n(2 FORM .*)/', $gedrec, $match)) {
-	$gedform = $match[1];
+    $gedform = $match[1];
 } else {
-	$gedform = '2 FORM';
+    $gedform = '2 FORM';
 }
 $formid = FunctionsEdit::addSimpleTag($gedform);
 
@@ -573,45 +573,45 @@ 
 
 // 1 FILE / 2 FORM / 3 TYPE
 if (preg_match('/\n(3 TYPE .*)/', $gedrec, $match)) {
-	$gedtype = $match[1];
+    $gedtype = $match[1];
 } else {
-	$gedtype = '3 TYPE photo'; // default to ‘Photo’
+    $gedtype = '3 TYPE photo'; // default to ‘Photo’
 }
 FunctionsEdit::addSimpleTag($gedtype);
 
 // 1 FILE / 2 TITL
 if (preg_match('/\n(2 TITL .*)/', $gedrec, $match)) {
-	$gedtitl = $match[1];
+    $gedtitl = $match[1];
 } else {
-	$gedtitl = '2 TITL';
+    $gedtitl = '2 TITL';
 }
 FunctionsEdit::addSimpleTag($gedtitl);
 
 // 1 FILE / 2 TITL / 3 _HEB
 if (strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), '_HEB') !== false) {
-	if (preg_match('/\n(3 _HEB .*)/', $gedrec, $match)) {
-		$gedtitl = $match[1];
-	} else {
-		$gedtitl = '3 _HEB';
-	}
-	FunctionsEdit::addSimpleTag($gedtitl);
+    if (preg_match('/\n(3 _HEB .*)/', $gedrec, $match)) {
+        $gedtitl = $match[1];
+    } else {
+        $gedtitl = '3 _HEB';
+    }
+    FunctionsEdit::addSimpleTag($gedtitl);
 }
 
 // 1 FILE / 2 TITL / 3 ROMN
 if (strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), 'ROMN') !== false) {
-	if (preg_match('/\n(3 ROMN .*)/', $gedrec, $match)) {
-		$gedtitl = $match[1];
-	} else {
-		$gedtitl = '3 ROMN';
-	}
-	FunctionsEdit::addSimpleTag($gedtitl);
+    if (preg_match('/\n(3 ROMN .*)/', $gedrec, $match)) {
+        $gedtitl = $match[1];
+    } else {
+        $gedtitl = '3 ROMN';
+    }
+    FunctionsEdit::addSimpleTag($gedtitl);
 }
 
 // 1 _PRIM
 if (preg_match('/\n(1 _PRIM .*)/', $gedrec, $match)) {
-	$gedprim = $match[1];
+    $gedprim = $match[1];
 } else {
-	$gedprim = '1 _PRIM';
+    $gedprim = '1 _PRIM';
 }
 FunctionsEdit::addSimpleTag($gedprim);
 
@@ -623,87 +623,87 @@ 
 $sourceDATE  = '';
 $sourceQUAY  = '';
 if (!empty($gedrec)) {
-	preg_match_all('/\n(1 (?!FILE|FORM|TYPE|TITL|_PRIM|_THUM|CHAN|DATA).*(\n[2-9] .*)*)/', $gedrec, $matches);
-	foreach ($matches[1] as $subrec) {
-		$pieces = explode("\n", $subrec);
-		foreach ($pieces as $piece) {
-			$ft = preg_match("/(\d) (\w+)(.*)/", $piece, $match);
-			if ($ft == 0) {
-				continue;
-			}
-			$subLevel = $match[1];
-			$fact     = trim($match[2]);
-			$event    = trim($match[3]);
-			if ($fact === 'NOTE' || $fact === 'TEXT') {
-				$event .= Functions::getCont($subLevel + 1, $subrec);
-			}
-			if ($sourceSOUR !== '' && $subLevel <= $sourceLevel) {
-				// Get rid of all saved Source data
-				FunctionsEdit::addSimpleTag($sourceLevel . ' SOUR ' . $sourceSOUR);
-				FunctionsEdit::addSimpleTag(($sourceLevel + 1) . ' PAGE ' . $sourcePAGE);
-				FunctionsEdit::addSimpleTag(($sourceLevel + 2) . ' TEXT ' . $sourceTEXT);
-				FunctionsEdit::addSimpleTag(($sourceLevel + 2) . ' DATE ' . $sourceDATE, '', GedcomTag::getLabel('DATA:DATE'));
-				FunctionsEdit::addSimpleTag(($sourceLevel + 1) . ' QUAY ' . $sourceQUAY);
-				$sourceSOUR = '';
-			}
-
-			if ($fact === 'SOUR') {
-				$sourceLevel = $subLevel;
-				$sourceSOUR  = $event;
-				$sourcePAGE  = '';
-				$sourceTEXT  = '';
-				$sourceDATE  = '';
-				$sourceQUAY  = '';
-				continue;
-			}
-
-			// Save all incoming data about this source reference
-			if ($sourceSOUR !== '') {
-				if ($fact === 'PAGE') {
-					$sourcePAGE = $event;
-					continue;
-				}
-				if ($fact === 'TEXT') {
-					$sourceTEXT = $event;
-					continue;
-				}
-				if ($fact === 'DATE') {
-					$sourceDATE = $event;
-					continue;
-				}
-				if ($fact === 'QUAY') {
-					$sourceQUAY = $event;
-					continue;
-				}
-				continue;
-			}
-
-			// Output anything that isn’t part of a source reference
-			if (!empty($fact) && $fact !== 'CONC' && $fact !== 'CONT' && $fact !== 'DATA') {
-				FunctionsEdit::addSimpleTag($subLevel . ' ' . $fact . ' ' . $event);
-			}
-		}
-	}
-
-	if ($sourceSOUR !== '') {
-		// Get rid of all saved Source data
-		FunctionsEdit::addSimpleTag($sourceLevel . ' SOUR ' . $sourceSOUR);
-		FunctionsEdit::addSimpleTag(($sourceLevel + 1) . ' PAGE ' . $sourcePAGE);
-		FunctionsEdit::addSimpleTag(($sourceLevel + 2) . ' TEXT ' . $sourceTEXT);
-		FunctionsEdit::addSimpleTag(($sourceLevel + 2) . ' DATE ' . $sourceDATE, '', GedcomTag::getLabel('DATA:DATE'));
-		FunctionsEdit::addSimpleTag(($sourceLevel + 1) . ' QUAY ' . $sourceQUAY);
-	}
+    preg_match_all('/\n(1 (?!FILE|FORM|TYPE|TITL|_PRIM|_THUM|CHAN|DATA).*(\n[2-9] .*)*)/', $gedrec, $matches);
+    foreach ($matches[1] as $subrec) {
+        $pieces = explode("\n", $subrec);
+        foreach ($pieces as $piece) {
+            $ft = preg_match("/(\d) (\w+)(.*)/", $piece, $match);
+            if ($ft == 0) {
+                continue;
+            }
+            $subLevel = $match[1];
+            $fact     = trim($match[2]);
+            $event    = trim($match[3]);
+            if ($fact === 'NOTE' || $fact === 'TEXT') {
+                $event .= Functions::getCont($subLevel + 1, $subrec);
+            }
+            if ($sourceSOUR !== '' && $subLevel <= $sourceLevel) {
+                // Get rid of all saved Source data
+                FunctionsEdit::addSimpleTag($sourceLevel . ' SOUR ' . $sourceSOUR);
+                FunctionsEdit::addSimpleTag(($sourceLevel + 1) . ' PAGE ' . $sourcePAGE);
+                FunctionsEdit::addSimpleTag(($sourceLevel + 2) . ' TEXT ' . $sourceTEXT);
+                FunctionsEdit::addSimpleTag(($sourceLevel + 2) . ' DATE ' . $sourceDATE, '', GedcomTag::getLabel('DATA:DATE'));
+                FunctionsEdit::addSimpleTag(($sourceLevel + 1) . ' QUAY ' . $sourceQUAY);
+                $sourceSOUR = '';
+            }
+
+            if ($fact === 'SOUR') {
+                $sourceLevel = $subLevel;
+                $sourceSOUR  = $event;
+                $sourcePAGE  = '';
+                $sourceTEXT  = '';
+                $sourceDATE  = '';
+                $sourceQUAY  = '';
+                continue;
+            }
+
+            // Save all incoming data about this source reference
+            if ($sourceSOUR !== '') {
+                if ($fact === 'PAGE') {
+                    $sourcePAGE = $event;
+                    continue;
+                }
+                if ($fact === 'TEXT') {
+                    $sourceTEXT = $event;
+                    continue;
+                }
+                if ($fact === 'DATE') {
+                    $sourceDATE = $event;
+                    continue;
+                }
+                if ($fact === 'QUAY') {
+                    $sourceQUAY = $event;
+                    continue;
+                }
+                continue;
+            }
+
+            // Output anything that isn’t part of a source reference
+            if (!empty($fact) && $fact !== 'CONC' && $fact !== 'CONT' && $fact !== 'DATA') {
+                FunctionsEdit::addSimpleTag($subLevel . ' ' . $fact . ' ' . $event);
+            }
+        }
+    }
+
+    if ($sourceSOUR !== '') {
+        // Get rid of all saved Source data
+        FunctionsEdit::addSimpleTag($sourceLevel . ' SOUR ' . $sourceSOUR);
+        FunctionsEdit::addSimpleTag(($sourceLevel + 1) . ' PAGE ' . $sourcePAGE);
+        FunctionsEdit::addSimpleTag(($sourceLevel + 2) . ' TEXT ' . $sourceTEXT);
+        FunctionsEdit::addSimpleTag(($sourceLevel + 2) . ' DATE ' . $sourceDATE, '', GedcomTag::getLabel('DATA:DATE'));
+        FunctionsEdit::addSimpleTag(($sourceLevel + 1) . ' QUAY ' . $sourceQUAY);
+    }
 }
 if (Auth::isAdmin() && $action === 'update') {
-	echo '<tr><td class="descriptionbox wrap width25">';
-	echo GedcomTag::getLabel('CHAN'), '</td><td class="optionbox wrap">';
-	if ($NO_UPDATE_CHAN) {
-		echo '<input type="checkbox" checked name="preserve_last_changed">';
-	} else {
-		echo '<input type="checkbox" name="preserve_last_changed">';
-	}
-	echo I18N::translate('Keep the existing “last change” information'), '<br>';
-	echo '</td></tr>';
+    echo '<tr><td class="descriptionbox wrap width25">';
+    echo GedcomTag::getLabel('CHAN'), '</td><td class="optionbox wrap">';
+    if ($NO_UPDATE_CHAN) {
+        echo '<input type="checkbox" checked name="preserve_last_changed">';
+    } else {
+        echo '<input type="checkbox" name="preserve_last_changed">';
+    }
+    echo I18N::translate('Keep the existing “last change” information'), '<br>';
+    echo '</td></tr>';
 }
 echo '</table>';
 FunctionsEdit::printAddLayer('SOUR', 1);