Missing echo and cCode-Style

6 files changed, 421 insertions, 422 deletions

diff --git a/admin_site_change.php b/admin_site_change.php
index 43d3f7005a..cbecf54559 100644
--- a/admin_site_change.php
+++ b/admin_site_change.php
@@ -286,12 +286,12 @@ foreach (User::all() as $tmp_user) {
 
 ?>
 <ol class="breadcrumb small">
-	<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
-	<li><a href="admin_trees_manage.php"><?php echo I18N::translate('Manage family trees'); ?></a></li>
-	<li class="active"><?php echo $controller->getPageTitle(); ?></li>
+	<li><a href="admin.php"><?php echo I18N::translate('Control panel') ?></a></li>
+	<li><a href="admin_trees_manage.php"><?php echo I18N::translate('Manage family trees') ?></a></li>
+	<li class="active"><?php echo $controller->getPageTitle() ?></li>
 </ol>
 
-<h1><?php echo $controller->getPageTitle(); ?></h1>
+<h1><?php echo $controller->getPageTitle() ?></h1>
 
 <form class="form" name="logs">
 	<input type="hidden" name="action" value="show">
@@ -299,80 +299,80 @@ foreach (User::all() as $tmp_user) {
 	<div class="row">
 		<div class="form-group col-xs-6 col-md-3">
 			<label for="from">
-				<?php echo /* I18N: label for the start of a date range (from x to y) */ I18N::translate('From'); ?>
+				<?php echo /* I18N: label for the start of a date range (from x to y) */ I18N::translate('From') ?>
 			</label>
 			<div class="input-group date">
-				<input type="text" autocomplete="off" class="form-control" id="from" name="from" value="<?php echo Filter::escapeHtml($from); ?>">
+				<input type="text" autocomplete="off" class="form-control" id="from" name="from" value="<?php echo Filter::escapeHtml($from) ?>">
 				<span class="input-group-addon"><span class="fa fa-calendar"></span></span>
 			</div>
 		</div>
 
 		<div class="form-group col-xs-6 col-md-3">
 			<label for="to">
-				<?php /* I18N: label for the end of a date range (from x to y) */ echo I18N::translate('To'); ?>
+				<?php echo /* I18N: label for the end of a date range (from x to y) */ I18N::translate('To') ?>
 			</label>
 			<div class="input-group date">
-				<input type="text" autocomplete="off" class="form-control" id="to" name="to" value="<?php echo Filter::escapeHtml($to); ?>">
+				<input type="text" autocomplete="off" class="form-control" id="to" name="to" value="<?php echo Filter::escapeHtml($to) ?>">
 				<span class="input-group-addon"><span class="fa fa-calendar"></span></span>
 			</div>
 		</div>
 
 		<div class="form-group col-xs-6 col-md-3">
 			<label for="type">
-				<?php echo I18N::translate('Status'); ?>
+				<?php echo I18N::translate('Status') ?>
 			</label>
-			<?php echo FunctionsEdit::selectEditControl('type', $statuses, '', $type, 'class="form-control"'); ?>
+			<?php echo FunctionsEdit::selectEditControl('type', $statuses, '', $type, 'class="form-control"') ?>
 		</div>
 
 		<div class="form-group col-xs-6 col-md-3">
 			<label for="xref">
-				<?php echo I18N::translate('Record'); ?>
+				<?php echo I18N::translate('Record') ?>
 			</label>
-			<input class="form-control" type="text" id="xref" name="xref" value="<?php echo Filter::escapeHtml($xref); ?>">
+			<input class="form-control" type="text" id="xref" name="xref" value="<?php echo Filter::escapeHtml($xref) ?>">
 		</div>
 	</div>
 
 	<div class="row">
 		<div class="form-group col-xs-6 col-md-3">
 			<label for="oldged">
-				<?php echo I18N::translate('Old data'); ?>
+				<?php echo I18N::translate('Old data') ?>
 			</label>
-			<input class="form-control" type="text" id="oldged" name="oldged" value="<?php echo Filter::escapeHtml($oldged); ?>">
+			<input class="form-control" type="text" id="oldged" name="oldged" value="<?php echo Filter::escapeHtml($oldged) ?>">
 		</div>
 
 		<div class="form-group col-xs-6 col-md-3">
 			<label for="newged">
-				<?php echo I18N::translate('New data'); ?>
+				<?php echo I18N::translate('New data') ?>
 			</label>
-			<input class="form-control" type="text" id="newged" name="newged" value="<?php echo Filter::escapeHtml($newged); ?>">
+			<input class="form-control" type="text" id="newged" name="newged" value="<?php echo Filter::escapeHtml($newged) ?>">
 		</div>
 
 		<div class="form-group col-xs-6 col-md-3">
 			<label for="user">
-				<?php echo I18N::translate('User'); ?>
+				<?php echo I18N::translate('User') ?>
 			</label>
-			<?php echo FunctionsEdit::selectEditControl('user', $users_array, '', $user, 'class="form-control"'); ?>
+			<?php echo FunctionsEdit::selectEditControl('user', $users_array, '', $user, 'class="form-control"') ?>
 		</div>
 
 		<div class="form-group col-xs-6 col-md-3">
 			<label for="gedc">
-				<?php echo I18N::translate('Family tree'); ?>
+				<?php echo I18N::translate('Family tree') ?>
 			</label>
-			<?php echo FunctionsEdit::selectEditControl('gedc', Tree::getNameList(), '', $gedc, Auth::isAdmin() ? 'class="form-control"' : 'disabled class="form-control"'); ?>
+			<?php echo FunctionsEdit::selectEditControl('gedc', Tree::getNameList(), '', $gedc, Auth::isAdmin() ? 'class="form-control"' : 'disabled class="form-control"') ?>
 		</div>
 	</div>
 
 	<div class="row text-center">
 		<button type="submit" class="btn btn-primary">
-			<?php echo I18N::translate('Filter'); ?>
+			<?php echo I18N::translate('Filter') ?>
 		</button>
 
-		<button type="submit" class="btn btn-primary" onclick="document.logs.action.value='export';return true;" <?php echo $action === 'show' ? '' : 'disabled'; ?>>
-			<?php echo I18N::translate('Export'); ?>
+		<button type="submit" class="btn btn-primary" onclick="document.logs.action.value='export';return true;" <?php echo $action === 'show' ? '' : 'disabled' ?>>
+			<?php echo I18N::translate('Export') ?>
 		</button>
 
-		<button type="submit" class="btn btn-primary" onclick="if (confirm('<?php echo I18N::translate('Permanently delete these records?'); ?>')) {document.logs.action.value='delete'; return true;} else {return false;}" <?php echo $action === 'show' ? '' : 'disabled'; ?>>
-			<?php echo I18N::translate('Delete'); ?>
+		<button type="submit" class="btn btn-primary" onclick="if (confirm('<?php echo I18N::translate('Permanently delete these records?') ?>')) {document.logs.action.value='delete'; return true;} else {return false;}" <?php echo $action === 'show' ? '' : 'disabled' ?>>
+			<?php echo I18N::translate('Delete') ?>
 		</button>
 	</div>
 </form>
@@ -380,18 +380,18 @@ foreach (User::all() as $tmp_user) {
 <?php if ($action): ?>
 <table class="table table-bordered table-condensed table-hover table-site-changes">
 	<caption class="sr-only">
-		<?php echo $controller->getPageTitle(); ?>
+		<?php echo $controller->getPageTitle() ?>
 	</caption>
 	<thead>
 		<tr>
 			<th></th>
-			<th><?php echo I18N::translate('Timestamp'); ?></th>
-			<th><?php echo I18N::translate('Status'); ?></th>
-			<th><?php echo I18N::translate('Record'); ?></th>
-			<th><?php echo I18N::translate('Data'); ?></th>
-			<th><?php echo I18N::translate('User'); ?></th>
-			<th><?php echo I18N::translate('Family tree'); ?></th>
+			<th><?php echo I18N::translate('Timestamp') ?></th>
+			<th><?php echo I18N::translate('Status') ?></th>
+			<th><?php echo I18N::translate('Record') ?></th>
+			<th><?php echo I18N::translate('Data') ?></th>
+			<th><?php echo I18N::translate('User') ?></th>
+			<th><?php echo I18N::translate('Family tree') ?></th>
 		</tr>
 	</thead>
 </table>
-<?php endif; ?>
+<?php endif ?>
diff --git a/admin_site_config.php b/admin_site_config.php
index be57095a1c..867a9d8c11 100644
--- a/admin_site_config.php
+++ b/admin_site_config.php
@@ -156,14 +156,14 @@ $controller->pageHeader();
 ?>
 
 <ol class="breadcrumb small">
-	<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
-	<li class="active"><?php echo $controller->getPageTitle(); ?></li>
+	<li><a href="admin.php"><?php echo I18N::translate('Control panel') ?></a></li>
+	<li class="active"><?php echo $controller->getPageTitle() ?></li>
 </ol>
 
-<h1><?php echo $controller->getPageTitle(); ?></h1>
+<h1><?php echo $controller->getPageTitle() ?></h1>
 
 <form method="post" class="form-horizontal">
-	<?php echo Filter::getCsrf(); ?>
+	<?php echo Filter::getCsrf() ?>
 
 	<?php if (Filter::get('action') === 'site'): ?>
 	<input type="hidden" name="action" value="site">
@@ -171,21 +171,21 @@ $controller->pageHeader();
 	<!-- INDEX_DIRECTORY -->
 	<div class="form-group">
 		<label for="INDEX_DIRECTORY" class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Data folder'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Data folder') ?>
 		</label>
 		<div class="col-sm-9">
-			<input type="text" class="form-control" dir="ltr" id="INDEX_DIRECTORY" name="INDEX_DIRECTORY" value="<?php echo Filter::escapeHtml(Site::getPreference('INDEX_DIRECTORY')); ?>" maxlength="255" placeholder="data/" required>
+			<input type="text" class="form-control" dir="ltr" id="INDEX_DIRECTORY" name="INDEX_DIRECTORY" value="<?php echo Filter::escapeHtml(Site::getPreference('INDEX_DIRECTORY')) ?>" maxlength="255" placeholder="data/" required>
 			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the "Data folder" site configuration setting */ I18N::translate('This folder will be used by webtrees to store media files, GEDCOM files, temporary files, etc.  These files may contain private data, and should not be made available over the internet.'); ?>
+				<?php echo /* I18N: Help text for the "Data folder" site configuration setting */ I18N::translate('This folder will be used by webtrees to store media files, GEDCOM files, temporary files, etc.  These files may contain private data, and should not be made available over the internet.') ?>
 			</p>
 			<p class="small text-muted">
-				<?php echo /* I18N: “Apache” is a software program. */ I18N::translate('To protect this private data, webtrees uses an Apache configuration file (.htaccess) which blocks all access to this folder.  If your web-server does not support .htaccess files, and you cannot restrict access to this folder, then you can select another folder, away from your web documents.'); ?>
+				<?php echo /* I18N: “Apache” is a software program. */ I18N::translate('To protect this private data, webtrees uses an Apache configuration file (.htaccess) which blocks all access to this folder.  If your web-server does not support .htaccess files, and you cannot restrict access to this folder, then you can select another folder, away from your web documents.') ?>
 			</p>
 			<p class="small text-muted">
-				<?php echo I18N::translate('If you select a different folder, you must also move all files (except config.ini.php, index.php, and .htaccess) from the existing folder to the new folder.'); ?>
+				<?php echo I18N::translate('If you select a different folder, you must also move all files (except config.ini.php, index.php, and .htaccess) from the existing folder to the new folder.') ?>
 			</p>
 			<p class="small text-muted">
-				<?php echo I18N::translate('The folder can be specified in full (e.g. /home/user_name/webtrees_data/) or relative to the installation folder (e.g. ../../webtrees_data/).'); ?>
+				<?php echo I18N::translate('The folder can be specified in full (e.g. /home/user_name/webtrees_data/) or relative to the installation folder (e.g. ../../webtrees_data/).') ?>
 			</p>
 		</div>
 	</div>
@@ -193,14 +193,14 @@ $controller->pageHeader();
 	<!-- MEMORY_LIMIT -->
 	<div class="form-group">
 		<label for="MEMORY_LIMIT" class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Memory limit'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Memory limit') ?>
 		</label>
 		<div class="col-sm-9">
-			<input type="text" class="form-control" id="MEMORY_LIMIT" name="MEMORY_LIMIT" value="<?php echo Filter::escapeHtml(Site::getPreference('MEMORY_LIMIT')); ?>" pattern="[0-9]+[KMG]" placeholder="<?php echo get_cfg_var('memory_limit'); ?>" maxlength="255">
+			<input type="text" class="form-control" id="MEMORY_LIMIT" name="MEMORY_LIMIT" value="<?php echo Filter::escapeHtml(Site::getPreference('MEMORY_LIMIT')) ?>" pattern="[0-9]+[KMG]" placeholder="<?php echo get_cfg_var('memory_limit') ?>" maxlength="255">
 			<p class="small text-muted">
-				<?php echo /* I18N: %s is an amount of memory, such as 32MB */ I18N::translate('By default, your server allows scripts to use %s of memory.', get_cfg_var('memory_limit')); ?>
-				<?php echo I18N::translate('You can request a higher or lower limit, although the server may ignore this request.'); ?>
-				<?php echo I18N::translate('If you leave this setting empty, the default value will be used.'); ?>
+				<?php echo /* I18N: %s is an amount of memory, such as 32MB */ I18N::translate('By default, your server allows scripts to use %s of memory.', get_cfg_var('memory_limit')) ?>
+				<?php echo I18N::translate('You can request a higher or lower limit, although the server may ignore this request.') ?>
+				<?php echo I18N::translate('If you leave this setting empty, the default value will be used.') ?>
 			</p>
 		</div>
 	</div>
@@ -208,18 +208,18 @@ $controller->pageHeader();
 	<!-- MAX_EXECUTION_TIME -->
 	<div class="form-group">
 		<label for="MAX_EXECUTION_TIME" class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('PHP time limit'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('PHP time limit') ?>
 		</label>
 		<div class="col-sm-9">
-			<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">
+			<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')));
 				?>
-				<?php echo I18N::translate('You can request a higher or lower limit, although the server may ignore this request.'); ?>
-				<?php echo I18N::translate('If you leave this setting empty, the default value will be used.'); ?>
+				<?php echo I18N::translate('You can request a higher or lower limit, although the server may ignore this request.') ?>
+				<?php echo I18N::translate('If you leave this setting empty, the default value will be used.') ?>
 			</p>
 		</div>
 	</div>
@@ -227,12 +227,12 @@ $controller->pageHeader();
 	<!-- TIMEZONE -->
 	<div class="form-group">
 		<label for="TIMEZONE" class="col-sm-3 control-label">
-			<?php echo I18N::translate('Time zone'); ?>
+			<?php echo I18N::translate('Time zone') ?>
 		</label>
 		<div class="col-sm-9">
-			<?php echo FunctionsEdit::selectEditControl('TIMEZONE', array_combine(\DateTimeZone::listIdentifiers(), \DateTimeZone::listIdentifiers()), null, Site::getPreference('TIMEZONE') ?: 'UTC', 'class="form-control"'); ?>
+			<?php echo FunctionsEdit::selectEditControl('TIMEZONE', array_combine(\DateTimeZone::listIdentifiers(), \DateTimeZone::listIdentifiers()), null, Site::getPreference('TIMEZONE') ?: 'UTC', 'class="form-control"') ?>
 			<p class="small text-muted">
-				<?php echo I18N::translate('The time zone is required for date calculations, such as knowing today’s date.'); ?>
+				<?php echo I18N::translate('The time zone is required for date calculations, such as knowing today’s date.') ?>
 			</p>
 		</div>
 	</div>
@@ -240,15 +240,15 @@ $controller->pageHeader();
 	<!-- THEME_DIR -->
 	<div class="form-group">
 		<label for="THEME_DIR" class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Default theme'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Default theme') ?>
 		</label>
 		<div class="col-sm-9">
-			<?php echo FunctionsEdit::selectEditControl('THEME_DIR', Theme::themeNames(), null, Site::getPreference('THEME_DIR'), 'class="form-control"'); ?>
+			<?php echo FunctionsEdit::selectEditControl('THEME_DIR', Theme::themeNames(), null, Site::getPreference('THEME_DIR'), 'class="form-control"') ?>
 			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the "Default theme" site configuration setting */ I18N::translate('You can change the appearance of webtrees using “themes”.  Each theme has a different style, layout, color scheme, etc.'); ?>
+				<?php echo /* I18N: Help text for the "Default theme" site configuration setting */ I18N::translate('You can change the appearance of webtrees using “themes”.  Each theme has a different style, layout, color scheme, etc.') ?>
 			</p>
 			<p class="small text-muted">
-				<?php echo I18N::translate('Themes can be selected at three levels: user, family tree, and website.  User settings take priority over family tree settings, which in turn take priority over the website setting.  Selecting “default theme” at one level will use the theme at the next level.'); ?>
+				<?php echo I18N::translate('Themes can be selected at three levels: user, family tree, and website.  User settings take priority over family tree settings, which in turn take priority over the website setting.  Selecting “default theme” at one level will use the theme at the next level.') ?>
 			</p>
 		</div>
 	</div>
@@ -256,12 +256,12 @@ $controller->pageHeader();
 	<!-- ALLOW_USER_THEMES -->
 	<fieldset class="form-group">
 		<legend class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Allow users to select their own theme'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Allow users to select their own theme') ?>
 		</legend>
 		<div class="col-sm-9">
-			<?php echo FunctionsEdit::editFieldYesNo('ALLOW_USER_THEMES', Site::getPreference('ALLOW_USER_THEMES'), 'class="radio-inline"'); ?>
+			<?php echo FunctionsEdit::editFieldYesNo('ALLOW_USER_THEMES', Site::getPreference('ALLOW_USER_THEMES'), 'class="radio-inline"') ?>
 			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the “Allow users to select their own theme” site configuration setting */ I18N::translate('Gives users the option of selecting their own theme.'); ?>
+				<?php echo /* I18N: Help text for the “Allow users to select their own theme” site configuration setting */ I18N::translate('Gives users the option of selecting their own theme.') ?>
 			</p>
 		</div>
 	</fieldset>
@@ -269,12 +269,12 @@ $controller->pageHeader();
 	<!-- ALLOW_CHANGE_GEDCOM -->
 	<fieldset class="form-group">
 		<legend class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Show list of family trees'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Show list of family trees') ?>
 		</legend>
 		<div class="col-sm-9">
-			<?php echo FunctionsEdit::editFieldYesNo('ALLOW_CHANGE_GEDCOM', Site::getPreference('ALLOW_CHANGE_GEDCOM'), 'class="radio-inline"'); ?>
+			<?php echo FunctionsEdit::editFieldYesNo('ALLOW_CHANGE_GEDCOM', Site::getPreference('ALLOW_CHANGE_GEDCOM'), 'class="radio-inline"') ?>
 			<p class="small text-muted">
-				<?php /* I18N: Help text for the “Show list of family trees” site configuration setting */ I18N::translate('For websites with more than one family tree, this option will show the list of family trees in the main menu, the search pages, etc.'); ?>
+				<?php echo /* I18N: Help text for the “Show list of family trees” site configuration setting */ I18N::translate('For websites with more than one family tree, this option will show the list of family trees in the main menu, the search pages, etc.') ?>
 			</p>
 		</div>
 	</fieldset>
@@ -282,13 +282,13 @@ $controller->pageHeader();
 	<!-- SESSION_TIME -->
 	<div class="form-group">
 		<label for="SESSION_TIME" class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Session timeout'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Session timeout') ?>
 		</label>
 		<div class="col-sm-9">
-			<input type="text" class="form-control" id="SESSION_TIME" name="SESSION_TIME" value="<?php echo Filter::escapeHtml(Site::getPreference('SESSION_TIME')); ?>" pattern="[0-9]*" placeholder="7200" maxlength="255">
+			<input type="text" class="form-control" id="SESSION_TIME" name="SESSION_TIME" value="<?php echo Filter::escapeHtml(Site::getPreference('SESSION_TIME')) ?>" pattern="[0-9]*" placeholder="7200" maxlength="255">
 			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the “Session timeout” site configuration setting */ I18N::translate('The time in seconds that a webtrees session remains active before requiring a login.  The default is 7200, which is 2 hours.'); ?>
-				<?php echo I18N::translate('If you leave this setting empty, the default value will be used.'); ?>
+				<?php echo /* I18N: Help text for the “Session timeout” site configuration setting */ I18N::translate('The time in seconds that a webtrees session remains active before requiring a login.  The default is 7200, which is 2 hours.') ?>
+				<?php echo I18N::translate('If you leave this setting empty, the default value will be used.') ?>
 			</p>
 		</div>
 	</div>
@@ -296,13 +296,13 @@ $controller->pageHeader();
 	<!-- SERVER_URL -->
 	<div class="form-group">
 		<label for="SERVER_URL" class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Website URL'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Website URL') ?>
 		</label>
 		<div class="col-sm-9">
-			<?php echo FunctionsEdit::selectEditControl('SERVER_URL', array(WT_BASE_URL => WT_BASE_URL), '', Site::getPreference('SERVER_URL'), 'class="form-control"'); ?>
+			<?php echo FunctionsEdit::selectEditControl('SERVER_URL', array(WT_BASE_URL => WT_BASE_URL), '', Site::getPreference('SERVER_URL'), 'class="form-control"') ?>
 			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the "Website URL" site configuration setting */ I18N::translate('If your website can be reached using more than one URL, such as <b>http://www.example.com/webtrees/</b> and <b>http://webtrees.example.com/</b>, you can specify the preferred URL.  Requests for the other URLs will be redirected to the preferred one.'); ?>
-				<?php echo I18N::translate('If you leave this setting empty, the default value will be used.'); ?>
+				<?php echo /* I18N: Help text for the "Website URL" site configuration setting */ I18N::translate('If your website can be reached using more than one URL, such as <b>http://www.example.com/webtrees/</b> and <b>http://webtrees.example.com/</b>, you can specify the preferred URL.  Requests for the other URLs will be redirected to the preferred one.') ?>
+				<?php echo I18N::translate('If you leave this setting empty, the default value will be used.') ?>
 			</p>
 		</div>
 	</div>
@@ -313,12 +313,12 @@ $controller->pageHeader();
 	<!-- SMTP_ACTIVE -->
 	<div class="form-group">
 		<label for="SMTP_ACTIVE" class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Messages'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Messages') ?>
 		</label>
 		<div class="col-sm-9">
-			<?php echo FunctionsEdit::selectEditControl('SMTP_ACTIVE', $SMTP_ACTIVE_OPTIONS, null, Site::getPreference('SMTP_ACTIVE'), 'class="form-control"'); ?>
+			<?php echo FunctionsEdit::selectEditControl('SMTP_ACTIVE', $SMTP_ACTIVE_OPTIONS, null, Site::getPreference('SMTP_ACTIVE'), 'class="form-control"') ?>
 			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the “Messages” site configuration setting */ I18N::translate('webtrees needs to send emails, such as password reminders and website notifications.  To do this, it can use this server’s built in PHP mail facility (which is not always available) or an external SMTP (mail-relay) service, for which you will need to provide the connection details.'); ?>
+				<?php echo /* I18N: Help text for the “Messages” site configuration setting */ I18N::translate('webtrees needs to send emails, such as password reminders and website notifications.  To do this, it can use this server’s built in PHP mail facility (which is not always available) or an external SMTP (mail-relay) service, for which you will need to provide the connection details.') ?>
 			</p>
 		</div>
 	</div>
@@ -326,27 +326,27 @@ $controller->pageHeader();
 	<!-- SMTP_FROM_NAME -->
 	<div class="form-group">
 		<label for="SMTP_FROM_NAME" class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Sender name'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Sender name') ?>
 		</label>
 		<div class="col-sm-9">
-			<input type="email" class="form-control" id="SMTP_FROM_NAME" name="SMTP_FROM_NAME" value="<?php echo Filter::escapeHtml(Site::getPreference('SMTP_FROM_NAME')); ?>" placeholder="no-reply@localhost" maxlength="255">
+			<input type="email" class="form-control" id="SMTP_FROM_NAME" name="SMTP_FROM_NAME" value="<?php echo Filter::escapeHtml(Site::getPreference('SMTP_FROM_NAME')) ?>" placeholder="no-reply@localhost" maxlength="255">
 			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the “Sender name” site configuration setting */ I18N::translate('This name is used in the “From” field, when sending automatic emails from this server.'); ?>
+				<?php echo /* I18N: Help text for the “Sender name” site configuration setting */ I18N::translate('This name is used in the “From” field, when sending automatic emails from this server.') ?>
 			</p>
 		</div>
 	</div>
 
-	<h2><?php echo I18N::translate('SMTP mail server'); ?></h2>
+	<h2><?php echo I18N::translate('SMTP mail server') ?></h2>
 
 	<!-- SMTP_HOST -->
 	<div class="form-group">
 		<label for="SMTP_HOST" class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Server name'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Server name') ?>
 		</label>
 		<div class="col-sm-9">
-			<input type="text" class="form-control" id="SMTP_HOST" name="SMTP_HOST" value="<?php echo Filter::escapeHtml(Site::getPreference('SMTP_HOST')); ?>" placeholder="smtp.example.com" maxlength="255" pattern="[a-z0-9-]+(\.[a-z0-9-]+)*">
+			<input type="text" class="form-control" id="SMTP_HOST" name="SMTP_HOST" value="<?php echo Filter::escapeHtml(Site::getPreference('SMTP_HOST')) ?>" placeholder="smtp.example.com" maxlength="255" pattern="[a-z0-9-]+(\.[a-z0-9-]+)*">
 			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the “Server name” site configuration setting */ I18N::translate('This is the name of the SMTP server.  “localhost” means that the mail service is running on the same computer as your web server.'); ?>
+				<?php echo /* I18N: Help text for the “Server name” site configuration setting */ I18N::translate('This is the name of the SMTP server.  “localhost” means that the mail service is running on the same computer as your web server.') ?>
 			</p>
 		</div>
 	</div>
@@ -354,12 +354,12 @@ $controller->pageHeader();
 	<!-- SMTP_PORT -->
 	<div class="form-group">
 		<label for="SMTP_PORT" class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Port number'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Port number') ?>
 		</label>
 		<div class="col-sm-9">
-			<input type="text" class="form-control" id="SMTP_PORT" name="SMTP_PORT" value="<?php echo Filter::escapeHtml(Site::getPreference('SMTP_PORT')); ?>" pattern="[0-9]*" placeholder="25" maxlength="5">
+			<input type="text" class="form-control" id="SMTP_PORT" name="SMTP_PORT" value="<?php echo Filter::escapeHtml(Site::getPreference('SMTP_PORT')) ?>" pattern="[0-9]*" placeholder="25" maxlength="5">
 			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the "Port number" site configuration setting */ I18N::translate('By default, SMTP works on port 25.'); ?>
+				<?php echo /* I18N: Help text for the "Port number" site configuration setting */ I18N::translate('By default, SMTP works on port 25.') ?>
 			</p>
 		</div>
 	</div>
@@ -367,12 +367,12 @@ $controller->pageHeader();
 	<!-- SMTP_AUTH -->
 	<fieldset class="form-group">
 		<legend class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Use password'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Use password') ?>
 		</legend>
 		<div class="col-sm-9">
-			<?php echo FunctionsEdit::editFieldYesNo('SMTP_AUTH', Site::getPreference('SMTP_AUTH'), 'class="radio-inline"'); ?>
+			<?php echo FunctionsEdit::editFieldYesNo('SMTP_AUTH', Site::getPreference('SMTP_AUTH'), 'class="radio-inline"') ?>
 			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the “Use password” site configuration setting */ I18N::translate('Most SMTP servers require a password.'); ?>
+				<?php echo /* I18N: Help text for the “Use password” site configuration setting */ I18N::translate('Most SMTP servers require a password.') ?>
 			</p>
 		</div>
 	</fieldset>
@@ -380,12 +380,12 @@ $controller->pageHeader();
 	<!-- SMTP_AUTH_USER -->
 	<div class="form-group">
 		<label for="SMTP_AUTH_USER" class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Username'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Username') ?>
 		</label>
 		<div class="col-sm-9">
-			<input type="text" class="form-control" id="SMTP_AUTH_USER" name="SMTP_AUTH_USER" value="<?php echo Filter::escapeHtml(Site::getPreference('SMTP_AUTH_USER')); ?>" maxlength="255">
+			<input type="text" class="form-control" id="SMTP_AUTH_USER" name="SMTP_AUTH_USER" value="<?php echo Filter::escapeHtml(Site::getPreference('SMTP_AUTH_USER')) ?>" maxlength="255">
 			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the "Username" site configuration setting */ I18N::translate('The user name required for authentication with the SMTP server.'); ?>
+				<?php echo /* I18N: Help text for the "Username" site configuration setting */ I18N::translate('The user name required for authentication with the SMTP server.') ?>
 			</p>
 		</div>
 	</div>
@@ -393,12 +393,12 @@ $controller->pageHeader();
 	<!-- SMTP_AUTH_PASS -->
 	<div class="form-group">
 		<label for="SMTP_AUTH_PASS" class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Password'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Password') ?>
 		</label>
 		<div class="col-sm-9">
 			<input type="password" class="form-control" id="SMTP_AUTH_PASS" name="SMTP_AUTH_PASS" value="">
 			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the "Password" site configuration setting */ I18N::translate('The password required for authentication with the SMTP server.'); ?>
+				<?php echo /* I18N: Help text for the "Password" site configuration setting */ I18N::translate('The password required for authentication with the SMTP server.') ?>
 			</p>
 		</div>
 	</div>
@@ -406,12 +406,12 @@ $controller->pageHeader();
 	<!-- SMTP_SSL -->
 	<div class="form-group">
 		<label for="SMTP_SSL" class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Secure connection'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Secure connection') ?>
 		</label>
 		<div class="col-sm-9">
-			<?php echo FunctionsEdit::selectEditControl('SMTP_SSL', $SMTP_SSL_OPTIONS, null, Site::getPreference('SMTP_SSL'), 'class="form-control"'); ?>
+			<?php echo FunctionsEdit::selectEditControl('SMTP_SSL', $SMTP_SSL_OPTIONS, null, Site::getPreference('SMTP_SSL'), 'class="form-control"') ?>
 			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the “Secure connection” site configuration setting */ I18N::translate('Most servers do not use secure connections.'); ?>
+				<?php echo /* I18N: Help text for the “Secure connection” site configuration setting */ I18N::translate('Most servers do not use secure connections.') ?>
 			</p>
 		</div>
 	</div>
@@ -419,12 +419,12 @@ $controller->pageHeader();
 	<!-- SMTP_HELO -->
 	<div class="form-group">
 		<label for="SMTP_HELO" class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Sending server name'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Sending server name') ?>
 		</label>
 		<div class="col-sm-9">
-			<input type="text" class="form-control" id="SMTP_HELO" name="SMTP_HELO" value="<?php echo Filter::escapeHtml(Site::getPreference('SMTP_HELO')); ?>" placeholder="localhost" maxlength="255" pattern="[a-z0-9-]+(\.[a-z0-9-]+)*">
+			<input type="text" class="form-control" id="SMTP_HELO" name="SMTP_HELO" value="<?php echo Filter::escapeHtml(Site::getPreference('SMTP_HELO')) ?>" placeholder="localhost" maxlength="255" pattern="[a-z0-9-]+(\.[a-z0-9-]+)*">
 			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the "Sending server name" site configuration setting */ I18N::translate('Many mail servers require that the sending server identifies itself correctly, using a valid domain name.'); ?>
+				<?php echo /* I18N: Help text for the "Sending server name" site configuration setting */ I18N::translate('Many mail servers require that the sending server identifies itself correctly, using a valid domain name.') ?>
 			</p>
 		</div>
 	</div>
@@ -432,7 +432,7 @@ $controller->pageHeader();
 	<div class="form-group">
 		<div class="col-sm-offset-3 col-sm-9">
 			<p class="small text-muted">
-				<?php echo Theme::theme()->htmlAlert(I18N::translate('To use a Google mail account, use the following settings: server=smtp.gmail.com, port=587, security=tls, username=xxxxx@gmail.com, password=[your gmail password]'), 'info', false); ?>
+				<?php echo Theme::theme()->htmlAlert(I18N::translate('To use a Google mail account, use the following settings: server=smtp.gmail.com, port=587, security=tls, username=xxxxx@gmail.com, password=[your gmail password]'), 'info', false) ?>
 			</p>
 		</div>
 	</div>
@@ -443,12 +443,12 @@ $controller->pageHeader();
 	<!-- LOGIN_URL -->
 	<div class="form-group">
 		<label for="LOGIN_URL" class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Login URL'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Login URL') ?>
 		</label>
 		<div class="col-sm-9">
-			<input type="text" class="form-control" id="LOGIN_URL" name="LOGIN_URL" value="<?php echo Filter::escapeHtml(Site::getPreference('LOGIN_URL')); ?>" maxlength="255">
+			<input type="text" class="form-control" id="LOGIN_URL" name="LOGIN_URL" value="<?php echo Filter::escapeHtml(Site::getPreference('LOGIN_URL')) ?>" maxlength="255">
 			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the "Login URL" site configuration setting */ I18N::translate('You only need to enter a Login URL if you want to redirect to a different website or location when your users login.  This is very useful if you need to switch from http to https when your users login.  Include the full URL to <i>login.php</i>.  For example, https://www.yourserver.com/webtrees/login.php .'); ?>
+				<?php echo /* I18N: Help text for the "Login URL" site configuration setting */ I18N::translate('You only need to enter a Login URL if you want to redirect to a different website or location when your users login.  This is very useful if you need to switch from http to https when your users login.  Include the full URL to <i>login.php</i>.  For example, https://www.yourserver.com/webtrees/login.php .') ?>
 			</p>
 		</div>
 	</div>
@@ -456,10 +456,10 @@ $controller->pageHeader();
 	<!-- WELCOME_TEXT_AUTH_MODE -->
 	<div class="form-group">
 		<label for="WELCOME_TEXT_AUTH_MODE" class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Welcome text on login page'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Welcome text on login page') ?>
 		</label>
 		<div class="col-sm-9">
-			<?php echo FunctionsEdit::selectEditControl('WELCOME_TEXT_AUTH_MODE', $WELCOME_TEXT_AUTH_MODE_OPTIONS, null, Site::getPreference('WELCOME_TEXT_AUTH_MODE'), 'class="form-control"'); ?>
+			<?php echo FunctionsEdit::selectEditControl('WELCOME_TEXT_AUTH_MODE', $WELCOME_TEXT_AUTH_MODE_OPTIONS, null, Site::getPreference('WELCOME_TEXT_AUTH_MODE'), 'class="form-control"') ?>
 			<p class="small text-muted">
 			</p>
 		</div>
@@ -468,12 +468,12 @@ $controller->pageHeader();
 	<!-- LOGIN_URL -->
 	<div class="form-group">
 		<label for="WELCOME_TEXT_AUTH_MODE_4" class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Custom welcome text'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Custom welcome text') ?>
 		</label>
 		<div class="col-sm-9">
-			<textarea class="form-control" maxlength="2000" id="WELCOME_TEXT_AUTH_MODE_4" name="WELCOME_TEXT_AUTH_MODE_4" rows="4"><?php echo Filter::escapeHtml(Site::getPreference('WELCOME_TEXT_AUTH_MODE_' . WT_LOCALE)); ?></textarea>
+			<textarea class="form-control" maxlength="2000" id="WELCOME_TEXT_AUTH_MODE_4" name="WELCOME_TEXT_AUTH_MODE_4" rows="4"><?php echo Filter::escapeHtml(Site::getPreference('WELCOME_TEXT_AUTH_MODE_' . WT_LOCALE)) ?></textarea>
 			<p class="small text-muted">
-				<?php echo /* I18N: Help text for the "Custom welcome text" site configuration setting */ I18N::translate('To set this text for other languages, you must switch to that language, and visit this page again.'); ?>
+				<?php echo /* I18N: Help text for the "Custom welcome text" site configuration setting */ I18N::translate('To set this text for other languages, you must switch to that language, and visit this page again.') ?>
 			</p>
 		</div>
 	</div>
@@ -481,14 +481,14 @@ $controller->pageHeader();
 	<!-- USE_REGISTRATION_MODULE -->
 	<fieldset class="form-group">
 		<legend class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Allow visitors to request a new user account'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Allow visitors to request a new user account') ?>
 		</legend>
 		<div class="col-sm-9">
-			<?php echo FunctionsEdit::editFieldYesNo('USE_REGISTRATION_MODULE', Site::getPreference('USE_REGISTRATION_MODULE'), 'class="radio-inline"'); ?>
+			<?php echo FunctionsEdit::editFieldYesNo('USE_REGISTRATION_MODULE', Site::getPreference('USE_REGISTRATION_MODULE'), 'class="radio-inline"') ?>
 			<p class="small text-muted">
-				<?php echo I18N::translate('The new user will be asked to confirm their email address before the account is created.'); ?>
-				<?php echo I18N::translate('Details of the new user will be sent to the genealogy contact for the corresponding family tree.'); ?>
-				<?php echo I18N::translate('An administrator must approve the new user account and select an access level before the user can log in.'); ?>
+				<?php echo I18N::translate('The new user will be asked to confirm their email address before the account is created.') ?>
+				<?php echo I18N::translate('Details of the new user will be sent to the genealogy contact for the corresponding family tree.') ?>
+				<?php echo I18N::translate('An administrator must approve the new user account and select an access level before the user can log in.') ?>
 			</p>
 		</div>
 	</fieldset>
@@ -496,10 +496,10 @@ $controller->pageHeader();
 	<!-- SHOW_REGISTER_CAUTION -->
 	<fieldset class="form-group">
 		<legend class="col-sm-3 control-label">
-			<?php echo /* I18N: A site configuration setting */ I18N::translate('Show acceptable use agreement on “Request new user account” page'); ?>
+			<?php echo /* I18N: A site configuration setting */ I18N::translate('Show acceptable use agreement on “Request new user account” page') ?>
 		</legend>
 		<div class="col-sm-9">
-			<?php echo FunctionsEdit::editFieldYesNo('SHOW_REGISTER_CAUTION', Site::getPreference('SHOW_REGISTER_CAUTION'), 'class="radio-inline"'); ?>
+			<?php echo FunctionsEdit::editFieldYesNo('SHOW_REGISTER_CAUTION', Site::getPreference('SHOW_REGISTER_CAUTION'), 'class="radio-inline"') ?>
 			<p class="small text-muted">
 			</p>
 		</div>
@@ -509,7 +509,7 @@ $controller->pageHeader();
 	<input type="hidden" name="action" value="tracking">
 
 		<p>
-			<?php echo I18N::translate('If you use one of the following tracking and analytics services, webtrees can add the tracking codes automatically.'); ?>
+			<?php echo I18N::translate('If you use one of the following tracking and analytics services, webtrees can add the tracking codes automatically.') ?>
 		</p>
 
 		<h2><a href="https://http://www.bing.com/toolbox/webmaster/">Bing Webmaster Tools</a></h2>
@@ -517,18 +517,18 @@ $controller->pageHeader();
 		<!-- BING_WEBMASTER_ID -->
 		<div class="form-group">
 			<label for="BING_WEBMASTER_ID" class="col-sm-3 control-label">
-				<?php echo /* I18N: A site configuration setting */ I18N::translate('Site verification code'); ?>
+				<?php echo /* I18N: A site configuration setting */ I18N::translate('Site verification code') ?>
 				<span class="sr-only">Google Webmaster Tools</span>
 			</label>
 			<div class="col-sm-9">
 				<input
 					type="text" class="form-control"
-					id="BING_WEBMASTER_ID" name="BING_WEBMASTER_ID" <?php echo dirname(parse_url(WT_BASE_URL, PHP_URL_PATH)) === '/' ? '' : 'disabled'; ?>
-					value="<?php echo Filter::escapeHtml(Site::getPreference('BING_WEBMASTER_ID')); ?>"
+					id="BING_WEBMASTER_ID" name="BING_WEBMASTER_ID" <?php echo dirname(parse_url(WT_BASE_URL, PHP_URL_PATH)) === '/' ? '' : 'disabled' ?>
+					value="<?php echo Filter::escapeHtml(Site::getPreference('BING_WEBMASTER_ID')) ?>"
 					maxlength="255" pattern="[0-9a-zA-Z+=/_:.!-]*"
 					>
 				<p class="small text-muted">
-					<?php echo /* I18N: Help text for the "Site verification code for Google Webmaster Tools" site configuration setting */ I18N::translate('Site verification codes do not work when webtrees is installed in a subfolder.'); ?>
+					<?php echo /* I18N: Help text for the "Site verification code for Google Webmaster Tools" site configuration setting */ I18N::translate('Site verification codes do not work when webtrees is installed in a subfolder.') ?>
 				</p>
 			</div>
 		</div>
@@ -538,18 +538,18 @@ $controller->pageHeader();
 		<!-- GOOGLE_WEBMASTER_ID -->
 		<div class="form-group">
 			<label for="GOOGLE_WEBMASTER_ID" class="col-sm-3 control-label">
-				<?php echo /* I18N: A site configuration setting */ I18N::translate('Site verification code'); ?>
+				<?php echo /* I18N: A site configuration setting */ I18N::translate('Site verification code') ?>
 				<span class="sr-only">Google Webmaster Tools</span>
 			</label>
 			<div class="col-sm-9">
 				<input
 					type="text" class="form-control"
-					id="GOOGLE_WEBMASTER_ID" name="GOOGLE_WEBMASTER_ID" <?php echo dirname(parse_url(WT_BASE_URL, PHP_URL_PATH)) === '/' ? '' : 'disabled'; ?>
-					value="<?php echo Filter::escapeHtml(Site::getPreference('GOOGLE_WEBMASTER_ID')); ?>"
+					id="GOOGLE_WEBMASTER_ID" name="GOOGLE_WEBMASTER_ID" <?php echo dirname(parse_url(WT_BASE_URL, PHP_URL_PATH)) === '/' ? '' : 'disabled' ?>
+					value="<?php echo Filter::escapeHtml(Site::getPreference('GOOGLE_WEBMASTER_ID')) ?>"
 					maxlength="255" pattern="[0-9a-zA-Z+=/_:.!-]*"
 				>
 				<p class="small text-muted">
-					<?php echo /* I18N: Help text for the "Site verification code for Google Webmaster Tools" site configuration setting */ I18N::translate('Site verification codes do not work when webtrees is installed in a subfolder.'); ?>
+					<?php echo /* I18N: Help text for the "Site verification code for Google Webmaster Tools" site configuration setting */ I18N::translate('Site verification codes do not work when webtrees is installed in a subfolder.') ?>
 				</p>
 			</div>
 		</div>
@@ -559,13 +559,13 @@ $controller->pageHeader();
 		<!-- GOOGLE_ANALYTICS_ID -->
 		<div class="form-group">
 			<label for="GOOGLE_ANALYTICS_ID" class="col-sm-3 control-label">
-				<?php echo /* I18N: A site configuration setting */ I18N::translate('Site identification code'); ?>
+				<?php echo /* I18N: A site configuration setting */ I18N::translate('Site identification code') ?>
 				<span class="sr-only">Google Analytics</span>
 			</label>
 			<div class="col-sm-9">
-				<input type="text" class="form-control" id="GOOGLE_ANALYTICS_ID" name="GOOGLE_ANALYTICS_ID" value="<?php echo Filter::escapeHtml(Site::getPreference('GOOGLE_ANALYTICS_ID')); ?>" placeholder="UA-12345-6" maxlength="255" pattern="UA-[0-9]+-[0-9]+">
+				<input type="text" class="form-control" id="GOOGLE_ANALYTICS_ID" name="GOOGLE_ANALYTICS_ID" value="<?php echo Filter::escapeHtml(Site::getPreference('GOOGLE_ANALYTICS_ID')) ?>" placeholder="UA-12345-6" maxlength="255" pattern="UA-[0-9]+-[0-9]+">
 				<p class="small text-muted">
-					<?php echo I18N::translate('Tracking and analytics are not added to the control panel.'); ?>
+					<?php echo I18N::translate('Tracking and analytics are not added to the control panel.') ?>
 				</p>
 			</div>
 		</div>
@@ -575,22 +575,22 @@ $controller->pageHeader();
 		<!-- PIWIK_SITE_ID -->
 		<div class="form-group">
 			<label for="PIWIK_SITE_ID" class="col-sm-3 control-label">
-				<?php echo /* I18N: A site configuration setting */ I18N::translate('Site identification code'); ?>
+				<?php echo /* I18N: A site configuration setting */ I18N::translate('Site identification code') ?>
 			</label>
 			<div class="col-sm-9">
-				<input type="text" class="form-control" id="PIWIK_SITE_ID" name="PIWIK_SITE_ID" value="<?php echo Filter::escapeHtml(Site::getPreference('PIWIK_SITE_ID')); ?>" maxlength="255" pattern="[0-9]+">
+				<input type="text" class="form-control" id="PIWIK_SITE_ID" name="PIWIK_SITE_ID" value="<?php echo Filter::escapeHtml(Site::getPreference('PIWIK_SITE_ID')) ?>" maxlength="255" pattern="[0-9]+">
 			</div>
 		</div>
 
 		<!-- PIWIK_URL -->
 		<div class="form-group">
 			<label for="PIWIK_URL" class="col-sm-3 control-label">
-				<?php echo /* I18N: A site configuration setting */ I18N::translate('URL'); ?>
+				<?php echo /* I18N: A site configuration setting */ I18N::translate('URL') ?>
 			</label>
 			<div class="col-sm-9">
-				<input type="text" class="form-control" id="PIWIK_URL" name="PIWIK_URL" value="<?php echo Filter::escapeHtml(Site::getPreference('PIWIK_URL')); ?>" placeholder="example.com/piwik" maxlength="255">
+				<input type="text" class="form-control" id="PIWIK_URL" name="PIWIK_URL" value="<?php echo Filter::escapeHtml(Site::getPreference('PIWIK_URL')) ?>" placeholder="example.com/piwik" maxlength="255">
 				<p class="small text-muted">
-					<?php echo I18N::translate('Tracking and analytics are not added to the control panel.'); ?>
+					<?php echo I18N::translate('Tracking and analytics are not added to the control panel.') ?>
 				</p>
 			</div>
 		</div>
@@ -600,22 +600,22 @@ $controller->pageHeader();
 		<!-- STATCOUNTER_PROJECT_ID -->
 		<div class="form-group">
 			<label for="STATCOUNTER_PROJECT_ID" class="col-sm-3 control-label">
-				<?php echo /* I18N: A site configuration setting */ I18N::translate('Site identification code'); ?>
+				<?php echo /* I18N: A site configuration setting */ I18N::translate('Site identification code') ?>
 			</label>
 			<div class="col-sm-9">
-				<input type="text" class="form-control" id="STATCOUNTER_PROJECT_ID" name="STATCOUNTER_PROJECT_ID" value="<?php echo Filter::escapeHtml(Site::getPreference('STATCOUNTER_PROJECT_ID')); ?>" maxlength="255" pattern="[0-9]+">
+				<input type="text" class="form-control" id="STATCOUNTER_PROJECT_ID" name="STATCOUNTER_PROJECT_ID" value="<?php echo Filter::escapeHtml(Site::getPreference('STATCOUNTER_PROJECT_ID')) ?>" maxlength="255" pattern="[0-9]+">
 			</div>
 		</div>
 
 		<!-- STATCOUNTER_SECURITY_ID -->
 		<div class="form-group">
 			<label for="STATCOUNTER_SECURITY_ID" class="col-sm-3 control-label">
-				<?php echo /* I18N: A site configuration setting */ I18N::translate('Security code'); ?>
+				<?php echo /* I18N: A site configuration setting */ I18N::translate('Security code') ?>
 			</label>
 			<div class="col-sm-9">
-				<input type="text" class="form-control" id="STATCOUNTER_SECURITY_ID" name="STATCOUNTER_SECURITY_ID" value="<?php echo Filter::escapeHtml(Site::getPreference('STATCOUNTER_SECURITY_ID')); ?>" maxlength="255" pattern="[0-9a-zA-Z]+">
+				<input type="text" class="form-control" id="STATCOUNTER_SECURITY_ID" name="STATCOUNTER_SECURITY_ID" value="<?php echo Filter::escapeHtml(Site::getPreference('STATCOUNTER_SECURITY_ID')) ?>" maxlength="255" pattern="[0-9a-zA-Z]+">
 				<p class="small text-muted">
-					<?php echo I18N::translate('Tracking and analytics are not added to the control panel.'); ?>
+					<?php echo I18N::translate('Tracking and analytics are not added to the control panel.') ?>
 				</p>
 			</div>
 		</div>
@@ -624,31 +624,31 @@ $controller->pageHeader();
 		<input type="hidden" name="action" value="languages">
 
 		<p>
-			<?php echo I18N::translate('Select the languages that will be shown in menus.'); ?>
+			<?php echo I18N::translate('Select the languages that will be shown in menus.') ?>
 		</p>
 
 		<fieldset class="form-group">
 			<legend class="col-sm-3 control-label">
-				<?php echo /* I18N: A site configuration setting */ I18N::translate('Language'); ?>
+				<?php echo /* I18N: A site configuration setting */ I18N::translate('Language') ?>
 			</legend>
 			<div class="col-sm-9" style="columns: 4 150px;-moz-columns: 4 150px;">
 				<?php foreach (I18N::installedLocales() as $installed_locale): ?>
 					<div class="checkbox">
-						<label title="<?php echo $installed_locale->languageTag(); ?>">
-							<input type="checkbox" name="LANGUAGES[]" value="<?php echo $installed_locale->languageTag(); ?>" <?php echo in_array($installed_locale->languageTag(), $language_tags) ? 'checked' : ''; ?>>
-							<?php echo $installed_locale->endonym(); ?>
+						<label title="<?php echo $installed_locale->languageTag() ?>">
+							<input type="checkbox" name="LANGUAGES[]" value="<?php echo $installed_locale->languageTag() ?>" <?php echo in_array($installed_locale->languageTag(), $language_tags) ? 'checked' : '' ?>>
+							<?php echo $installed_locale->endonym() ?>
 						</label>
 					</div>
-				<?php endforeach; ?>
+				<?php endforeach ?>
 			</div>
 		</fieldset>
 
-	<?php endif; ?>
+	<?php endif ?>
 	<div class="form-group">
 		<div class="col-sm-offset-3 col-sm-9">
 			<button type="submit" class="btn btn-primary">
 				<i class="fa fa-check"></i>
-				<?php echo I18N::translate('save'); ?>
+				<?php echo I18N::translate('save') ?>
 			</button>
 		</div>
 	</div>
diff --git a/admin_site_logs.php b/admin_site_logs.php
index 03e841af65..4231df7559 100644
--- a/admin_site_logs.php
+++ b/admin_site_logs.php
@@ -233,11 +233,11 @@ foreach (User::all() as $tmp_user) {
 
 ?>
 <ol class="breadcrumb small">
-	<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
-	<li class="active"><?php echo $controller->getPageTitle(); ?></li>
+	<li><a href="admin.php"><?php echo I18N::translate('Control panel') ?></a></li>
+	<li class="active"><?php echo $controller->getPageTitle() ?></li>
 </ol>
 
-<h1><?php echo $controller->getPageTitle(); ?></h1>
+<h1><?php echo $controller->getPageTitle() ?></h1>
 
 <form class="form" name="logs">
 	<input type="hidden" name="action" value="show">
@@ -245,73 +245,73 @@ foreach (User::all() as $tmp_user) {
 	<div class="row">
 		<div class="form-group col-xs-6 col-sm-3">
 			<label for="from">
-				<?php echo /* I18N: label for the start of a date range (from x to y) */ I18N::translate('From'); ?>
+				<?php echo /* I18N: label for the start of a date range (from x to y) */ I18N::translate('From') ?>
 			</label>
 			<div class="input-group date">
-				<input type="text" autocomplete="off" class="form-control" id="from" name="from" value="<?php echo Filter::escapeHtml($from); ?>" autocomplete="off">
+				<input type="text" autocomplete="off" class="form-control" id="from" name="from" value="<?php echo Filter::escapeHtml($from) ?>" autocomplete="off">
 				<span class="input-group-addon"><span class="fa fa-calendar"></span></span>
 			</div>
 		</div>
 
 		<div class="form-group col-xs-6 col-sm-3">
 			<label for="to">
-				<?php /* I18N: label for the end of a date range (from x to y) */ echo I18N::translate('To'); ?>
+				<?php echo /* I18N: label for the end of a date range (from x to y) */ I18N::translate('To') ?>
 			</label>
 			<div class="input-group date">
-				<input type="text" autocomplete="off" class="form-control" id="to" name="to" value="<?php echo Filter::escapeHtml($to); ?>" autocomplete="off">
+				<input type="text" autocomplete="off" class="form-control" id="to" name="to" value="<?php echo Filter::escapeHtml($to) ?>" autocomplete="off">
 				<span class="input-group-addon"><span class="fa fa-calendar"></span></span>
 			</div>
 		</div>
 
 		<div class="form-group col-xs-6 col-sm-2">
 			<label for="type">
-				<?php echo I18N::translate('Type'); ?>
+				<?php echo I18N::translate('Type') ?>
 			</label>
-			<?php echo FunctionsEdit::selectEditControl('type', array('' => '', 'auth' => 'auth', 'config' => 'config', 'debug' => 'debug', 'edit' => 'edit', 'error' => 'error', 'media' => 'media', 'search' => 'search'), null, $type, 'class="form-control"'); ?>
+			<?php echo FunctionsEdit::selectEditControl('type', array('' => '', 'auth' => 'auth', 'config' => 'config', 'debug' => 'debug', 'edit' => 'edit', 'error' => 'error', 'media' => 'media', 'search' => 'search'), null, $type, 'class="form-control"') ?>
 		</div>
 
 		<div class="form-group col-xs-6 col-sm-4">
 			<label for="ip">
-				<?php echo I18N::translate('IP address'); ?>
+				<?php echo I18N::translate('IP address') ?>
 			</label>
-			<input class="form-control" type="text" id="ip" name="ip" value="<?php echo Filter::escapeHtml($ip); ?>">
+			<input class="form-control" type="text" id="ip" name="ip" value="<?php echo Filter::escapeHtml($ip) ?>">
 		</div>
 	</div>
 
 	<div class="row">
 		<div class="form-group col-sm-4">
 			<label for="text">
-				<?php echo I18N::translate('Message'); ?>
+				<?php echo I18N::translate('Message') ?>
 			</label>
-			<input class="form-control" type="text" id="text" name="text" value="<?php echo Filter::escapeHtml($text); ?>">
+			<input class="form-control" type="text" id="text" name="text" value="<?php echo Filter::escapeHtml($text) ?>">
 		</div>
 
 		<div class="form-group col-sm-4">
 			<label for="user">
-				<?php echo I18N::translate('User'); ?>
+				<?php echo I18N::translate('User') ?>
 			</label>
-			<?php echo FunctionsEdit::selectEditControl('user', $users_array, '', $user, 'class="form-control"'); ?>
+			<?php echo FunctionsEdit::selectEditControl('user', $users_array, '', $user, 'class="form-control"') ?>
 		</div>
 
 		<div class="form-group col-sm-4">
 			<label for="gedc">
-				<?php echo I18N::translate('Family tree'); ?>
+				<?php echo I18N::translate('Family tree') ?>
 			</label>
-			<?php echo FunctionsEdit::selectEditControl('gedc', Tree::getNameList(), '', $gedc, Auth::isAdmin() ? 'class="form-control"' : 'disabled class="form-control"'); ?>
+			<?php echo FunctionsEdit::selectEditControl('gedc', Tree::getNameList(), '', $gedc, Auth::isAdmin() ? 'class="form-control"' : 'disabled class="form-control"') ?>
 		</div>
 	</div>
 
 	<div class="row text-center">
 		<button type="submit" class="btn btn-primary">
-			<?php echo I18N::translate('Filter'); ?>
+			<?php echo I18N::translate('Filter') ?>
 		</button>
 
-		<button type="submit" class="btn btn-primary" onclick="document.logs.action.value='export';return true;" <?php echo $action === 'show' ? '' : 'disabled'; ?>>
-			<?php echo I18N::translate('Export'); ?>
+		<button type="submit" class="btn btn-primary" onclick="document.logs.action.value='export';return true;" <?php echo $action === 'show' ? '' : 'disabled' ?>>
+			<?php echo I18N::translate('Export') ?>
 		</button>
 
-		<button type="submit" class="btn btn-primary" onclick="if (confirm('<?php echo I18N::translate('Permanently delete these records?'); ?>')) {document.logs.action.value='delete'; return true;} else {return false;}" <?php echo $action === 'show' ? '' : 'disabled'; ?>>
-			<?php echo I18N::translate('Delete'); ?>
+		<button type="submit" class="btn btn-primary" onclick="if (confirm('<?php echo I18N::translate('Permanently delete these records?') ?>')) {document.logs.action.value='delete'; return true;} else {return false;}" <?php echo $action === 'show' ? '' : 'disabled' ?>>
+			<?php echo I18N::translate('Delete') ?>
 		</button>
 	</div>
 </form>
@@ -319,18 +319,18 @@ foreach (User::all() as $tmp_user) {
 <?php if ($action): ?>
 <table class="table table-bordered table-condensed table-hover table-site-logs">
 	<caption class="sr-only">
-		<?php echo $controller->getPageTitle(); ?>
+		<?php echo $controller->getPageTitle() ?>
 	</caption>
 	<thead>
 		<tr>
 			<th></th>
-			<th><?php echo I18N::translate('Timestamp'); ?></th>
-			<th><?php echo I18N::translate('Type'); ?></th>
-			<th><?php echo I18N::translate('Message'); ?></th>
-			<th><?php echo I18N::translate('IP address'); ?></th>
-			<th><?php echo I18N::translate('User'); ?></th>
-			<th><?php echo I18N::translate('Family tree'); ?></th>
+			<th><?php echo I18N::translate('Timestamp') ?></th>
+			<th><?php echo I18N::translate('Type') ?></th>
+			<th><?php echo I18N::translate('Message') ?></th>
+			<th><?php echo I18N::translate('IP address') ?></th>
+			<th><?php echo I18N::translate('User') ?></th>
+			<th><?php echo I18N::translate('Family tree') ?></th>
 		</tr>
 	</thead>
 </table>
-<?php endif; ?>
+<?php endif ?>
diff --git a/app/Module/GoogleMapsModule.php b/app/Module/GoogleMapsModule.php
index 2e1824ea47..1403b62dcb 100644
--- a/app/Module/GoogleMapsModule.php
+++ b/app/Module/GoogleMapsModule.php
@@ -131,10 +131,10 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 	public function getPreLoadContent() {
 		ob_start();
 		?>
-		<script src="<?php echo $this->googleMapsScript(); ?>"></script>
+		<script src="<?php echo $this->googleMapsScript() ?>"></script>
 		<script>
-			var minZoomLevel   = <?php echo $this->getSetting('GM_MIN_ZOOM'); ?>;
-			var maxZoomLevel   = <?php echo $this->getSetting('GM_MAX_ZOOM'); ?>;
+			var minZoomLevel   = <?php echo $this->getSetting('GM_MIN_ZOOM') ?>;
+			var maxZoomLevel   = <?php echo $this->getSetting('GM_MAX_ZOOM') ?>;
 			var startZoomLevel = maxZoomLevel;
 		</script>
 		<?php
@@ -267,39 +267,39 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 
 		?>
 		<ol class="breadcrumb small">
-			<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
-			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
-			<li class="active"><?php echo $controller->getPageTitle(); ?></li>
+			<li><a href="admin.php"><?php echo I18N::translate('Control panel') ?></a></li>
+			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration') ?></a></li>
+			<li class="active"><?php echo $controller->getPageTitle() ?></li>
 		</ol>
 
 		<ul class="nav nav-tabs nav-justified" role="tablist">
 			<li role="presentation" class="active">
 				<a href="#" role="tab">
-					<?php echo I18N::translate('Google Maps™ preferences'); ?>
+					<?php echo I18N::translate('Google Maps™ preferences') ?>
 				</a>
 			</li>
 			<li role="presentation">
 				<a href="?mod=googlemap&amp;mod_action=admin_places">
-					<?php echo I18N::translate('Geographic data'); ?>
+					<?php echo I18N::translate('Geographic data') ?>
 				</a>
 			</li>
 			<li role="presentation">
 				<a href="?mod=googlemap&amp;mod_action=admin_placecheck">
-					<?php echo I18N::translate('Place check'); ?>
+					<?php echo I18N::translate('Place check') ?>
 				</a>
 			</li>
 		</ul>
 
-		<h2><?php echo I18N::translate('Google Maps™ preferences'); ?></h2>
+		<h2><?php echo I18N::translate('Google Maps™ preferences') ?></h2>
 
 		<form class="form-horizontal" method="post" name="configform" action="module.php?mod=googlemap&mod_action=admin_config">
 			<input type="hidden" name="action" value="update">
-			<h3><?php echo I18N::translate('Basic'); ?></h3>
+			<h3><?php echo I18N::translate('Basic') ?></h3>
 
 			<!-- GM_MAP_TYPE -->
 			<div class="form-group">
 				<label class="control-label col-sm-3" for="GM_MAP_TYPE">
-					<?php echo I18N::translate('Default map type'); ?>
+					<?php echo I18N::translate('Default map type') ?>
 				</label>
 				<div class="col-sm-9">
 					<?php
@@ -317,30 +317,30 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 			<!-- GM_USE_STREETVIEW -->
 			<fieldset class="form-group">
 				<legend class="control-label col-sm-3">
-					<?php echo /* I18N: http://en.wikipedia.org/wiki/Google_street_view */ I18N::translate('Google Street View™'); ?>
+					<?php echo /* I18N: http://en.wikipedia.org/wiki/Google_street_view */ I18N::translate('Google Street View™') ?>
 				</legend>
 				<div class="col-sm-9">
-					<?php echo FunctionsEdit::radioButtons('GM_USE_STREETVIEW', array(false => I18N::translate('hide'), true => I18N::translate('show')), $this->getSetting('GM_USE_STREETVIEW'), 'class="radio-inline"'); ?>
+					<?php echo FunctionsEdit::radioButtons('GM_USE_STREETVIEW', array(false => I18N::translate('hide'), true => I18N::translate('show')), $this->getSetting('GM_USE_STREETVIEW'), 'class="radio-inline"') ?>
 				</div>
 			</fieldset>
 
 			<!-- GM_XSIZE / GM_YSIZE -->
 			<fieldset class="form-group">
 				<legend class="control-label col-sm-3">
-					<?php echo I18N::translate('Size of map (in pixels)'); ?>
+					<?php echo I18N::translate('Size of map (in pixels)') ?>
 				</legend>
 				<div class="col-sm-9">
 					<div class="row">
 						<div class="col-sm-6">
 							<div class="input-group">
-								<label class="input-group-addon" for="GM_XSIZE"><?php echo I18N::translate('Width'); ?></label>
-								<input id="GM_XSIZE" class="form-control" type="text" name="GM_XSIZE" value="<?php echo $this->getSetting('GM_XSIZE'); ?>">
+								<label class="input-group-addon" for="GM_XSIZE"><?php echo I18N::translate('Width') ?></label>
+								<input id="GM_XSIZE" class="form-control" type="text" name="GM_XSIZE" value="<?php echo $this->getSetting('GM_XSIZE') ?>">
 							</div>
 						</div>
 						<div class="col-sm-6">
 							<div class="input-group">
-								<label class="input-group-addon" for="GM_YSIZE"><?php echo I18N::translate('Height'); ?></label>
-								<input id="GM_YSIZE" class="form-control" type="text" name="GM_YSIZE" value="<?php echo $this->getSetting('GM_YSIZE'); ?>">
+								<label class="input-group-addon" for="GM_YSIZE"><?php echo I18N::translate('Height') ?></label>
+								<input id="GM_YSIZE" class="form-control" type="text" name="GM_YSIZE" value="<?php echo $this->getSetting('GM_YSIZE') ?>">
 							</div>
 						</div>
 					</div>
@@ -350,59 +350,58 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 			<!-- GM_MIN_ZOOM / GM_MAX_ZOOM -->
 			<fieldset class="form-group">
 				<legend class="control-label col-sm-3">
-					<?php echo I18N::translate('Zoom level of map'); ?>
+					<?php echo I18N::translate('Zoom level of map') ?>
 				</legend>
 				<div class="col-sm-9">
 					<div class="row">
 						<div class="col-sm-6">
 							<div class="input-group">
-								<label class="input-group-addon" for="GM_MIN_ZOOM"><?php echo I18N::translate('minimum'); ?></label>
-								<?php echo FunctionsEdit::selectEditControl('GM_MIN_ZOOM', array_combine(range(1, 14), range(1, 14)), null, $this->getSetting('GM_MIN_ZOOM'), 'class="form-control"'); ?>
+								<label class="input-group-addon" for="GM_MIN_ZOOM"><?php echo I18N::translate('minimum') ?></label>
+								<?php echo FunctionsEdit::selectEditControl('GM_MIN_ZOOM', array_combine(range(1, 14), range(1, 14)), null, $this->getSetting('GM_MIN_ZOOM'), 'class="form-control"') ?>
 							</div>
 						</div>
 						<div class="col-sm-6">
 							<div class="input-group">
-								<label class="input-group-addon" for="GM_MAX_ZOOM"><?php echo I18N::translate('maximum'); ?></label>
-								<?php echo FunctionsEdit::selectEditControl('GM_MAX_ZOOM', array_combine(range(1, 20), range(1, 20)), null, $this->getSetting('GM_MAX_ZOOM'), 'class="form-control"'); ?>
+								<label class="input-group-addon" for="GM_MAX_ZOOM"><?php echo I18N::translate('maximum') ?></label>
+								<?php echo FunctionsEdit::selectEditControl('GM_MAX_ZOOM', array_combine(range(1, 20), range(1, 20)), null, $this->getSetting('GM_MAX_ZOOM'), 'class="form-control"') ?>
 							</div>
 						</div>
 					</div>
-					<p class="small text-muted"><?php echo I18N::translate('Minimum and maximum zoom level for the Google map.  1 is the full map, 15 is single house.  Note that 15 is only available in certain areas.'); ?></p>
+					<p class="small text-muted"><?php echo I18N::translate('Minimum and maximum zoom level for the Google map.  1 is the full map, 15 is single house.  Note that 15 is only available in certain areas.') ?></p>
 				</div>
 			</fieldset>
 
-			<h3><?php echo I18N::translate('Advanced'); ?></h3>
+			<h3><?php echo I18N::translate('Advanced') ?></h3>
 
 			<!-- GM_PRECISION -->
 			<fieldset class="form-group">
 				<legend class="control-label col-sm-3">
-					<?php echo I18N::translate('Precision of the latitude and longitude'); ?>
+					<?php echo I18N::translate('Precision of the latitude and longitude') ?>
 				</legend>
 				<div class="col-sm-9">
 					<div class="row">
-						<?php $label = array('Country', 'State', 'City', 'Neighborhood', 'House', 'Max'); ?>
-						<?php for ($level = 0; $level < 6; $level++): ?>
+						<?php foreach (array(I18N::translate('Country'), I18N::translate('State'), I18N::translate('City'), I18N::translate('Neighborhood'), I18N::translate('House'), I18N::translate('Max')) as $level => $label): ?>
 						<div class="col-sm-4">
 							<div class="input-group">
-								<label class="input-group-addon" for="GM_PRECISION_<?php echo $level ?>"><?php echo I18N::translate($label[$level]); ?></label>
-								<?php echo FunctionsEdit::selectEditControl('GM_PRECISION_' . $level, range(0, 9), null, $this->getSetting('GM_PRECISION_' . $level), 'class="form-control"'); ?>
+								<label class="input-group-addon" for="GM_PRECISION_<?php echo $level ?>"><?php echo $label ?></label>
+								<?php echo FunctionsEdit::selectEditControl('GM_PRECISION_' . $level, range(0, 9), null, $this->getSetting('GM_PRECISION_' . $level), 'class="form-control"') ?>
 							</div>
 						</div>
-						<?php endfor; ?>
+						<?php endforeach ?>
 					</div>
-					<p class="small text-muted"><?php echo I18N::translate('This specifies the precision of the different levels when entering new geographic locations.  For example a country will be specified with precision 0 (=0 digits after the decimal point), while a town needs 3 or 4 digits.'); ?></p>
+					<p class="small text-muted"><?php echo I18N::translate('This specifies the precision of the different levels when entering new geographic locations.  For example a country will be specified with precision 0 (=0 digits after the decimal point), while a town needs 3 or 4 digits.') ?></p>
 				</div>
 			</fieldset>
 
 			<!-- GM_PREFIX / GM_POSTFIX -->
 			<fieldset class="form-group">
 				<legend class="control-label col-sm-3">
-					<?php echo I18N::translate('Optional prefixes and suffixes'); ?>
+					<?php echo I18N::translate('Optional prefixes and suffixes') ?>
 				</legend>
 				<div class="col-sm-9">
 					<div class="row">
 						<div class ="col-sm-6">
-							<p class="form-control-static"><strong><?php echo I18N::translate('Prefixes'); ?></strong></p>
+							<p class="form-control-static"><strong><?php echo I18N::translate('Prefixes') ?></strong></p>
 							<?php for ($level = 1; $level < 10; $level++): ?>
 							<?php
 							if ($level == 1) {
@@ -412,13 +411,13 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 							}
 							?>
 							<div class="input-group">
-								<label class="input-group-addon" for="GM_PREFIX_<?php echo $level; ?>"><?php echo $label ?></label>
-								<input class="form-control" type="text" name="GM_PREFIX_<?php echo $level; ?>" value="<?php echo $this->getSetting('GM_PREFIX_' . $level); ?>">
+								<label class="input-group-addon" for="GM_PREFIX_<?php echo $level ?>"><?php echo $label ?></label>
+								<input class="form-control" type="text" name="GM_PREFIX_<?php echo $level ?>" value="<?php echo $this->getSetting('GM_PREFIX_' . $level) ?>">
 							</div>
-							<?php endfor; ?>
+							<?php endfor ?>
 						</div>
 						<div class="col-sm-6">
-							<p class="form-control-static"><strong><?php echo I18N::translate('Suffixes'); ?></strong></p>
+							<p class="form-control-static"><strong><?php echo I18N::translate('Suffixes') ?></strong></p>
 							<?php for ($level = 1; $level < 10; $level++): ?>
 							<?php
 							if ($level == 1) {
@@ -428,45 +427,45 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 							}
 							?>
 							<div class="input-group">
-								<label class="input-group-addon" for="GM_POSTFIX_<?php echo $level; ?>"><?php echo $label ?></label>
-								<input class="form-control" type="text" name="GM_POSTFIX_<?php echo $level; ?>" value="<?php echo $this->getSetting('GM_POSTFIX_' . $level); ?>">
+								<label class="input-group-addon" for="GM_POSTFIX_<?php echo $level ?>"><?php echo $label ?></label>
+								<input class="form-control" type="text" name="GM_POSTFIX_<?php echo $level ?>" value="<?php echo $this->getSetting('GM_POSTFIX_' . $level) ?>">
 							</div>
-							<?php endfor; ?>
+							<?php endfor ?>
 						</div>
 					</div>
-					<p class="small text-muted"><?php echo I18N::translate('Some place names may be written with optional prefixes and suffixes.  For example “Orange” versus “Orange County”.  If the family tree contains the full place names, but the geographic database contains the short place names, then you should specify a list of the prefixes and suffixes to be disregarded.  Multiple options should be separated with semicolons.  For example “County;County of” or “Township;Twp;Twp.”.'); ?></p>
+					<p class="small text-muted"><?php echo I18N::translate('Some place names may be written with optional prefixes and suffixes.  For example “Orange” versus “Orange County”.  If the family tree contains the full place names, but the geographic database contains the short place names, then you should specify a list of the prefixes and suffixes to be disregarded.  Multiple options should be separated with semicolons.  For example “County;County of” or “Township;Twp;Twp.”.') ?></p>
 				</div>
 			</fieldset>
 
-			<h3><?php echo I18N::translate('Place hierarchy'); ?></h3>
+			<h3><?php echo I18N::translate('Place hierarchy') ?></h3>
 
 			<!-- GM_PLACE_HIERARCHY -->
 			<fieldset class="form-group">
 				<legend class="control-label col-sm-3">
-					<?php echo I18N::translate('Use Google Maps™ for the place hierarchy'); ?>
+					<?php echo I18N::translate('Use Google Maps™ for the place hierarchy') ?>
 				</legend>
 				<div class="col-sm-9">
-					<?php echo FunctionsEdit::editFieldYesNo('GM_PLACE_HIERARCHY', $this->getSetting('GM_PLACE_HIERARCHY'), 'class="radio-inline"'); ?>
+					<?php echo FunctionsEdit::editFieldYesNo('GM_PLACE_HIERARCHY', $this->getSetting('GM_PLACE_HIERARCHY'), 'class="radio-inline"') ?>
 				</div>
 			</fieldset>
 
 			<!-- GM_PH_XSIZE / GM_PH_YSIZE -->
 			<fieldset class="form-group">
 				<legend class="control-label col-sm-3">
-					<?php echo I18N::translate('Size of map (in pixels)'); ?>
+					<?php echo I18N::translate('Size of map (in pixels)') ?>
 				</legend>
 				<div class="col-sm-9">
 					<div class="row">
 						<div class="col-sm-6">
 							<div class="input-group">
-								<label class="input-group-addon" for="GM_PH_XSIZE"><?php echo I18N::translate('Width'); ?></label>
-								<input id="GM_XSIZE" class="form-control" type="text" name="GM_PH_XSIZE" value="<?php echo $this->getSetting('GM_PH_XSIZE'); ?>">
+								<label class="input-group-addon" for="GM_PH_XSIZE"><?php echo I18N::translate('Width') ?></label>
+								<input id="GM_XSIZE" class="form-control" type="text" name="GM_PH_XSIZE" value="<?php echo $this->getSetting('GM_PH_XSIZE') ?>">
 							</div>
 						</div>
 						<div class="col-sm-6">
 							<div class="input-group">
-								<label class="input-group-addon" for="GM_PH_YSIZE"><?php echo I18N::translate('Height'); ?></label>
-								<input id="GM_YSIZE" class="form-control" type="text" name="GM_PH_YSIZE" value="<?php echo $this->getSetting('GM_PH_YSIZE'); ?>">
+								<label class="input-group-addon" for="GM_PH_YSIZE"><?php echo I18N::translate('Height') ?></label>
+								<input id="GM_YSIZE" class="form-control" type="text" name="GM_PH_YSIZE" value="<?php echo $this->getSetting('GM_PH_YSIZE') ?>">
 							</div>
 						</div>
 					</div>
@@ -476,7 +475,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 			<!-- GM_PH_MARKER -->
 			<div class="form-group">
 				<label class="control-label col-sm-3" for="GM_PH_MARKER">
-					<?php echo I18N::translate('Type of place markers in Place Hierarchy'); ?>
+					<?php echo I18N::translate('Type of place markers in Place Hierarchy') ?>
 				</label>
 				<div class="col-sm-9">
 					<?php
@@ -492,12 +491,12 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 			<!-- GM_COORD -->
 			<fieldset class="form-group">
 				<legend class="control-label col-sm-3">
-					<?php echo I18N::translate('Display map coordinates'); ?>
+					<?php echo I18N::translate('Display map coordinates') ?>
 				</legend>
 				<div class="col-sm-9">
-					<?php echo FunctionsEdit::editFieldYesNo('GM_COORD', $this->getSetting('GM_COORD'), 'class="radio-inline"'); ?>
+					<?php echo FunctionsEdit::editFieldYesNo('GM_COORD', $this->getSetting('GM_COORD'), 'class="radio-inline"') ?>
 					<p class="small text-muted">
-						<?php echo I18N::translate('This options sets whether latitude and longitude are displayed on the pop-up window attached to map markers.'); ?>
+						<?php echo I18N::translate('This options sets whether latitude and longitude are displayed on the pop-up window attached to map markers.') ?>
 					</p>
 				</div>
 			</fieldset>
@@ -507,7 +506,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 				<div class="col-sm-offset-3 col-sm-9">
 					<button type="submit" class="btn btn-primary">
 						<i class="fa fa-check"></i>
-						<?php echo I18N::translate('save'); ?>
+						<?php echo I18N::translate('save') ?>
 					</button>
 				</div>
 			</div>
@@ -584,14 +583,14 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 		?>
 			<script>
 		<?php if ($_POST['selcountry'] == 'Countries') { ?>
-					window.opener.document.editplaces.icon.value = 'places/flags/<?php echo $flags[$_POST['FLAGS']]; ?>.png';
-					window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/places/flags/<?php echo $country[$_POST['FLAGS']]; ?>.png\">&nbsp;&nbsp;<a href=\"#\" onclick=\"change_icon();return false;\"><?php echo I18N::translate('Change flag'); ?></a>&nbsp;&nbsp;<a href=\"#\" onclick=\"remove_icon();return false;\"><?php echo I18N::translate('Remove flag'); ?></a>";
+					window.opener.document.editplaces.icon.value = 'places/flags/<?php echo $flags[$_POST['FLAGS']] ?>.png';
+					window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"<?php echo WT_STATIC_URL . WT_MODULES_DIR ?>googlemap/places/flags/<?php echo $country[$_POST['FLAGS']] ?>.png\">&nbsp;&nbsp;<a href=\"#\" onclick=\"change_icon();return false;\"><?php echo I18N::translate('Change flag') ?></a>&nbsp;&nbsp;<a href=\"#\" onclick=\"remove_icon();return false;\"><?php echo I18N::translate('Remove flag') ?></a>";
 		<?php } elseif ($_POST['selstate'] != "States") { ?>
-					window.opener.document.editplaces.icon.value = 'places/<?php echo $countrySelected, '/flags/', $_POST['selstate'], '/', $flags_s[$_POST['FLAGS']]; ?>.png';
-					window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/places/<?php echo $countrySelected, "/flags/", $_POST['selstate'], "/", $flags_s[$_POST['FLAGS']]; ?>.png\">&nbsp;&nbsp;<a href=\"#\" onclick=\"change_icon();return false;\"><?php echo I18N::translate('Change flag'); ?></a>&nbsp;&nbsp;<a href=\"#\" onclick=\"remove_icon();return false;\"><?php echo I18N::translate('Remove flag'); ?></a>";
+					window.opener.document.editplaces.icon.value = 'places/<?php echo $countrySelected . '/flags/' . $_POST['selstate'] . '/' . $flags_s[$_POST['FLAGS']] ?>.png';
+					window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"<?php echo WT_STATIC_URL . WT_MODULES_DIR ?>googlemap/places/<?php echo $countrySelected . "/flags/" . $_POST['selstate'] . '/' . $flags_s[$_POST['FLAGS']] ?>.png\">&nbsp;&nbsp;<a href=\"#\" onclick=\"change_icon();return false;\"><?php echo I18N::translate('Change flag') ?></a>&nbsp;&nbsp;<a href=\"#\" onclick=\"remove_icon();return false;\"><?php echo I18N::translate('Remove flag') ?></a>";
 		<?php } else { ?>
-					window.opener.document.editplaces.icon.value = "places/<?php echo $countrySelected, "/flags/", $flags[$_POST['FLAGS']]; ?>.png";
-					window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/places/<?php echo $countrySelected, "/flags/", $flags[$_POST['FLAGS']]; ?>.png\">&nbsp;&nbsp;<a href=\"#\" onclick=\"change_icon();return false;\"><?php echo I18N::translate('Change flag'); ?></a>&nbsp;&nbsp;<a href=\"#\" onclick=\"remove_icon();return false;\"><?php echo I18N::translate('Remove flag'); ?></a>";
+					window.opener.document.editplaces.icon.value = "places/<?php echo $countrySelected . '/flags/' . $flags[$_POST['FLAGS']] ?>.png";
+					window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"<?php echo WT_STATIC_URL . WT_MODULES_DIR ?>googlemap/places/<?php echo $countrySelected . '/flags/' . $flags[$_POST['FLAGS']] ?>.png\">&nbsp;&nbsp;<a href=\"#\" onclick=\"change_icon();return false;\"><?php echo I18N::translate('Change flag') ?></a>&nbsp;&nbsp;<a href=\"#\" onclick=\"remove_icon();return false;\"><?php echo I18N::translate('Remove flag') ?></a>";
 		<?php } ?>
 					window.opener.updateMap();
 					window.close();
@@ -646,21 +645,21 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 			asort($stateList);
 		}
 		?>
-		<h4><?php echo I18N::translate('Change flag'); ?></h4>
+		<h4><?php echo I18N::translate('Change flag') ?></h4>
 
 		<p class="small text-muted">
-			<?php echo I18N::translate('Using the pull down menu it is possible to select a country, of which a flag can be selected.  If no flags are shown, then there are no flags defined for this country.'); ?>
+			<?php echo I18N::translate('Using the pull down menu it is possible to select a country, of which a flag can be selected.  If no flags are shown, then there are no flags defined for this country.') ?>
 		</p>
 
-		<form method="post" id="flags" name="flags" action="module.php?mod=googlemap&amp;mod_action=flags&amp;countrySelected=<?php echo $countrySelected; ?>&amp;stateSelected=<?php echo $stateSelected; ?>">
+		<form method="post" id="flags" name="flags" action="module.php?mod=googlemap&amp;mod_action=flags&amp;countrySelected=<?php echo $countrySelected ?>&amp;stateSelected=<?php echo $stateSelected ?>">
 			<input type="hidden" name="action" value="ChangeFlag">
-			<input type="hidden" name="selcountry" value="<?php echo $countrySelected; ?>">
-			<input type="hidden" name="selstate" value="<?php echo $stateSelected; ?>">
+			<input type="hidden" name="selcountry" value="<?php echo $countrySelected ?>">
+			<input type="hidden" name="selstate" value="<?php echo $stateSelected ?>">
 			<table class="facts_table">
 				<tr>
 					<td class="optionbox" colspan="4">
 						<select name="COUNTRYSELECT" dir="ltr" onchange="selectCountry()">
-							<option value="Countries"><?php echo I18N::translate('Countries'); ?></option>
+							<option value="Countries"><?php echo I18N::translate('Countries') ?></option>
 							<?php foreach ($countryList as $country_key => $country_name) {
 								echo '<option value="', $country_key, '" ';
 								if ($countrySelected == $country_key) {
@@ -704,7 +703,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 		?>
 					<td class="optionbox" colspan="4">
 						<select name="STATESELECT" dir="ltr" onchange="selectCountry()">
-							<option value="States"><?php echo /* I18N: Part of a country, state/region/county */ I18N::translate('Subdivision'); ?></option>
+							<option value="States"><?php echo /* I18N: Part of a country, state/region/county */ I18N::translate('Subdivision') ?></option>
 							<?php foreach ($stateList as $state_key => $state_name) {
 								echo '<option value="', $state_key, '" ';
 								if ($stateSelected == $state_key) {
@@ -732,8 +731,8 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 				</tr>
 			</table>
 			<p id="save-cancel">
-				<input type="submit" class="save" value="<?php echo I18N::translate('save'); ?>">
-				<input type="button" class="cancel" value="<?php echo I18N::translate('close'); ?>" onclick="window.close();">
+				<input type="submit" class="save" value="<?php echo I18N::translate('save') ?>">
+				<input type="button" class="cancel" value="<?php echo I18N::translate('close') ?>" onclick="window.close();">
 			</p>
 		</form>
 		<?php
@@ -771,25 +770,25 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 		// -- print the form to change the number of displayed generations
 		?>
 		<form name="people" method="get" action="?">
-			<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
+			<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml() ?>">
 			<input type="hidden" name="mod" value="googlemap">
 			<input type="hidden" name="mod_action" value="pedigree_map">
 			<table class="list_table" width="555">
 				<tr>
 					<td class="descriptionbox wrap">
-						<?php echo I18N::translate('Individual'); ?>
+						<?php echo I18N::translate('Individual') ?>
 					</td>
 					<td class="optionbox">
-						<input class="pedigree_form" data-autocomplete-type="INDI" type="text" id="rootid" name="rootid" size="3" value="<?php echo $controller->root->getXref(); ?>">
-						<?php echo FunctionsPrint::printFindIndividualLink('rootid'); ?>
+						<input class="pedigree_form" data-autocomplete-type="INDI" type="text" id="rootid" name="rootid" size="3" value="<?php echo $controller->root->getXref() ?>">
+						<?php echo FunctionsPrint::printFindIndividualLink('rootid') ?>
 					</td>
 					<td class="topbottombar" rowspan="2">
-						<input type="submit" value="<?php echo I18N::translate('View'); ?>">
+						<input type="submit" value="<?php echo I18N::translate('View') ?>">
 					</td>
 				</tr>
 				<tr>
 					<td class="descriptionbox wrap">
-						<?php echo I18N::translate('Generations'); ?>
+						<?php echo I18N::translate('Generations') ?>
 					</td>
 					<td class="optionbox">
 						<select name="PEDIGREE_GENERATIONS">
@@ -1514,25 +1513,25 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 
 		?>
 		<ol class="breadcrumb small">
-			<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
-			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
-			<li class="active"><?php echo $controller->getPageTitle(); ?></li>
+			<li><a href="admin.php"><?php echo I18N::translate('Control panel') ?></a></li>
+			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration') ?></a></li>
+			<li class="active"><?php echo $controller->getPageTitle() ?></li>
 		</ol>
 
 		<ul class="nav nav-tabs nav-justified" role="tablist">
 			<li role="presentation">
 				<a href="?mod=googlemap&amp;mod_action=admin_config" role="tab">
-					<?php echo I18N::translate('Google Maps™ preferences'); ?>
+					<?php echo I18N::translate('Google Maps™ preferences') ?>
 				</a>
 			</li>
 			<li role="presentation">
 				<a href="?mod=googlemap&amp;mod_action=admin_places">
-					<?php echo I18N::translate('Geographic data'); ?>
+					<?php echo I18N::translate('Geographic data') ?>
 				</a>
 			</li>
 			<li role="presentation" class="active">
 				<a href="#">
-					<?php echo I18N::translate('Place check'); ?>
+					<?php echo I18N::translate('Place check') ?>
 				</a>
 			</li>
 		</ul>
@@ -2310,7 +2309,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 				controlText.style.fontSize = '12px';
 				controlText.style.paddingLeft = '15px';
 				controlText.style.paddingRight = '15px';
-				controlText.innerHTML = '<b><?php echo I18N::translate('Redraw map'); ?></b>';
+				controlText.innerHTML = '<b><?php echo I18N::translate('Redraw map') ?></b>';
 				controlUI.appendChild(controlText);
 
 				// Setup the click event listeners: simply set the map to original LatLng
@@ -2324,7 +2323,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 				var mapOptions = {
 					zoom: 7,
 					center: map_center,
-					mapTypeId: google.maps.MapTypeId.<?php echo $this->getSetting('GM_MAP_TYPE'); ?>,
+					mapTypeId: google.maps.MapTypeId.<?php echo $this->getSetting('GM_MAP_TYPE') ?>,
 					mapTypeControlOptions: {
 						style: google.maps.MapTypeControlStyle.DROPDOWN_MENU  // DEFAULT, DROPDOWN_MENU, HORIZONTAL_BAR
 					},
@@ -2352,23 +2351,23 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 				// Add the markers to the map from the $gmarks array
 				var locations = [
 					<?php foreach ($gmarks as $n => $gmark) { ?>
-					<?php echo $n ? ',' : ''; ?>
+					<?php echo $n ? ',' : '' ?>
 					{
-						"event":        "<?php echo Filter::escapeJs($gmark['fact_label']); ?>",
-						"lat":          "<?php echo Filter::escapeJs($gmark['lat']); ?>",
-						"lng":          "<?php echo Filter::escapeJs($gmark['lng']); ?>",
-						"date":         "<?php echo Filter::escapeJs($gmark['date']); ?>",
-						"info":         "<?php echo Filter::escapeJs($gmark['info']); ?>",
-						"name":         "<?php echo Filter::escapeJs($gmark['name']); ?>",
-						"place":        "<?php echo Filter::escapeJs($gmark['place']); ?>",
-						"tooltip":      "<?php echo Filter::escapeJs($gmark['tooltip']); ?>",
-						"image":        "<?php echo Filter::escapeJs($gmark['image']); ?>",
-						"pl_icon":      "<?php echo Filter::escapeJs($gmark['pl_icon']); ?>",
-						"sv_lati":      "<?php echo Filter::escapeJs($gmark['sv_lati']); ?>",
-						"sv_long":      "<?php echo Filter::escapeJs($gmark['sv_long']); ?>",
-						"sv_bearing":   "<?php echo Filter::escapeJs($gmark['sv_bearing']); ?>",
-						"sv_elevation": "<?php echo Filter::escapeJs($gmark['sv_elevation']); ?>",
-						"sv_zoom":      "<?php echo Filter::escapeJs($gmark['sv_zoom']); ?>"
+						"event":        "<?php echo Filter::escapeJs($gmark['fact_label']) ?>",
+						"lat":          "<?php echo Filter::escapeJs($gmark['lat']) ?>",
+						"lng":          "<?php echo Filter::escapeJs($gmark['lng']) ?>",
+						"date":         "<?php echo Filter::escapeJs($gmark['date']) ?>",
+						"info":         "<?php echo Filter::escapeJs($gmark['info']) ?>",
+						"name":         "<?php echo Filter::escapeJs($gmark['name']) ?>",
+						"place":        "<?php echo Filter::escapeJs($gmark['place']) ?>",
+						"tooltip":      "<?php echo Filter::escapeJs($gmark['tooltip']) ?>",
+						"image":        "<?php echo Filter::escapeJs($gmark['image']) ?>",
+						"pl_icon":      "<?php echo Filter::escapeJs($gmark['pl_icon']) ?>",
+						"sv_lati":      "<?php echo Filter::escapeJs($gmark['sv_lati']) ?>",
+						"sv_long":      "<?php echo Filter::escapeJs($gmark['sv_long']) ?>",
+						"sv_bearing":   "<?php echo Filter::escapeJs($gmark['sv_bearing']) ?>",
+						"sv_elevation": "<?php echo Filter::escapeJs($gmark['sv_elevation']) ?>",
+						"sv_zoom":      "<?php echo Filter::escapeJs($gmark['sv_zoom']) ?>"
 					}
 					<?php } ?>
 				];
@@ -2409,9 +2408,9 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 					'<div class="infowindow">' +
 						'<div id="gmtabs">' +
 							'<ul class="tabs" >' +
-								'<li><a href="#event" id="EV"><?php echo I18N::translate('Events'); ?></a></li>' +
+								'<li><a href="#event" id="EV"><?php echo I18N::translate('Events') ?></a></li>' +
 								<?php if ($STREETVIEW) { ?>
-								'<li><a href="#sview" id="SV"><?php echo I18N::translate('Google Street View™'); ?></a></li>' +
+								'<li><a href="#sview" id="SV"><?php echo I18N::translate('Google Street View™') ?></a></li>' +
 								<?php } ?>
 							'</ul>' +
 							'<div class="panes">' +
@@ -2433,7 +2432,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 					var point        = new google.maps.LatLng(location.lat,     location.lng);     // Place Latitude, Longitude
 					var sv_point     = new google.maps.LatLng(location.sv_lati, location.sv_long); // StreetView Latitude and Longitide
 
-					var zoomLevel = <?php echo $GM_MAX_ZOOM; ?>;
+					var zoomLevel = <?php echo $GM_MAX_ZOOM ?>;
 					var marker    = createMarker(point, html, location.tooltip, location.sv_lati, location.sv_long, location.sv_bearing, location.sv_elevation, location.sv_zoom, sv_point, location.pl_icon);
 
 					// if streetview coordinates are available, use them for marker,
@@ -2717,7 +2716,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 
 				?>
 				<div>
-				<iframe style="background: transparent; margin-top: -3px; margin-left: 2px; width: 530px; height: 405px; padding: 0; border: 0;" src="module.php?mod=googlemap&amp;mod_action=wt_street_view&amp;x=<?php echo $sv_lng; ?>&amp;y=<?php echo $sv_lat; ?>&amp;z=18&amp;t=2&amp;c=1&amp;s=1&amp;b=<?php echo $sv_dir; ?>&amp;p=<?php echo $sv_pitch; ?>&amp;m=<?php echo $sv_zoom; ?>&amp;j=1&amp;k=1&amp;v=1" marginwidth="0" marginheight="0" frameborder="0" scrolling="no"></iframe>
+				<iframe style="background: transparent; margin-top: -3px; margin-left: 2px; width: 530px; height: 405px; padding: 0; border: 0;" src="module.php?mod=googlemap&amp;mod_action=wt_street_view&amp;x=<?php echo $sv_lng ?>&amp;y=<?php echo $sv_lat ?>&amp;z=18&amp;t=2&amp;c=1&amp;s=1&amp;b=<?php echo $sv_dir ?>&amp;p=<?php echo $sv_pitch ?>&amp;m=<?php echo $sv_zoom ?>&amp;j=1&amp;k=1&amp;v=1" marginwidth="0" marginheight="0" frameborder="0" scrolling="no"></iframe>
 				</div>
 
 				<?php
@@ -3395,18 +3394,18 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 
 		?>
 
-			<script src="<?php echo $this->googleMapsScript(); ?>"></script>
+			<script src="<?php echo $this->googleMapsScript() ?>"></script>
 			<script>
 			var map;
 			var marker;
 			var zoom;
-			var pl_name = '<?php echo Filter::escapeJs($place_name); ?>';
-			if (<?php echo $place_lati; ?> !== 0.0 && <?php echo $place_long; ?> !== 0.0) {
-				var latlng = new google.maps.LatLng(<?php echo $place_lati; ?>, <?php echo $place_long; ?>);
+			var pl_name = '<?php echo Filter::escapeJs($place_name) ?>';
+			if (<?php echo $place_lati ?> !== 0.0 && <?php echo $place_long ?> !== 0.0) {
+				var latlng = new google.maps.LatLng(<?php echo $place_lati ?>, <?php echo $place_long ?>);
 			} else {
-				var latlng = new google.maps.LatLng(<?php echo $parent_lati; ?>, <?php echo $parent_long; ?>);
+				var latlng = new google.maps.LatLng(<?php echo $parent_lati ?>, <?php echo $parent_long ?>);
 			}
-			var pl_zoom = <?php echo $zoomfactor; ?>;
+			var pl_zoom = <?php echo $zoomfactor ?>;
 			var polygon1;
 			var polygon2;
 			var geocoder;
@@ -3644,7 +3643,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 				controlText.style.fontSize = '12px';
 				controlText.style.paddingLeft = '15px';
 				controlText.style.paddingRight = '15px';
-				controlText.innerHTML = '<b><?php echo I18N::translate('Redraw map'); ?><\/b>';
+				controlText.innerHTML = '<b><?php echo I18N::translate('Redraw map') ?><\/b>';
 				controlUI.appendChild(controlText);
 
 				// Setup the click event listeners: simply set the map to original LatLng
@@ -3846,25 +3845,25 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 			}
 
 			function change_icon() {
-				window.open('module.php?mod=googlemap&mod_action=flags&countrySelected=<?php echo $selected_country; ?>', '_blank', indx_window_specs);
+				window.open('module.php?mod=googlemap&mod_action=flags&countrySelected=<?php echo $selected_country ?>', '_blank', indx_window_specs);
 				return false;
 			}
 
 			function remove_icon() {
 				document.editplaces.icon.value = '';
-				document.getElementById('flagsDiv').innerHTML = '<a href="#" onclick="change_icon();return false;"><?php echo I18N::translate('Change flag'); ?></a>';
+				document.getElementById('flagsDiv').innerHTML = '<a href="#" onclick="change_icon();return false;"><?php echo I18N::translate('Change flag') ?></a>';
 			}
 
 			function addAddressToMap(response) {
 				var bounds = new google.maps.LatLngBounds();
 				if (!response ) {
-					alert('<?php echo I18N::translate('No places found'); ?>');
+					alert('<?php echo I18N::translate('No places found') ?>');
 				} else {
 					if (response.length > 0) {
 						for (var i=0; i<response.length; i++) {
 							// 5 decimal places is approx 1 metre accuracy.
 							var name  = '<div id="gname" class="iwstyle">'+response[i].address_components[0].short_name+'<br>('+response[i].geometry.location.lng().toFixed(5)+','+response[i].geometry.location.lat().toFixed(5)+'';
-								name +=	'<br><a href="#" onclick="setLoc(' + response[i].geometry.location.lat() + ', ' + response[i].geometry.location.lng() + ');"><div id="namelink"><?php echo I18N::translate('Use this value'); ?></div></a>';
+								name +=	'<br><a href="#" onclick="setLoc(' + response[i].geometry.location.lat() + ', ' + response[i].geometry.location.lng() + ');"><div id="namelink"><?php echo I18N::translate('Use this value') ?></div></a>';
 								name += '</div>';
 							var point = response[i].geometry.location;
 							var marker = createMarker(i, point, name);
@@ -3876,19 +3875,19 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 						<?php } ?>
 						var zoomlevel = map.getZoom();
 
-						if (zoomlevel < <?php echo $this->getSetting('GM_MIN_ZOOM'); ?>) {
-							zoomlevel = <?php echo $this->getSetting('GM_MIN_ZOOM'); ?>;
+						if (zoomlevel < <?php echo $this->getSetting('GM_MIN_ZOOM') ?>) {
+							zoomlevel = <?php echo $this->getSetting('GM_MIN_ZOOM') ?>;
 						}
-						if (zoomlevel > <?php echo $this->getSetting('GM_MAX_ZOOM'); ?>) {
-							zoomlevel = <?php echo $this->getSetting('GM_MAX_ZOOM'); ?>;
+						if (zoomlevel > <?php echo $this->getSetting('GM_MAX_ZOOM') ?>) {
+							zoomlevel = <?php echo $this->getSetting('GM_MAX_ZOOM') ?>;
 						}
 						if (document.editplaces.NEW_ZOOM_FACTOR.value < zoomlevel) {
 							zoomlevel = document.editplaces.NEW_ZOOM_FACTOR.value;
-							if (zoomlevel < <?php echo $this->getSetting('GM_MIN_ZOOM'); ?>) {
-								zoomlevel = <?php echo $this->getSetting('GM_MIN_ZOOM'); ?>;
+							if (zoomlevel < <?php echo $this->getSetting('GM_MIN_ZOOM') ?>) {
+								zoomlevel = <?php echo $this->getSetting('GM_MIN_ZOOM') ?>;
 							}
-							if (zoomlevel > <?php echo $this->getSetting('GM_MAX_ZOOM'); ?>) {
-								zoomlevel = <?php echo $this->getSetting('GM_MAX_ZOOM'); ?>;
+							if (zoomlevel > <?php echo $this->getSetting('GM_MAX_ZOOM') ?>) {
+								zoomlevel = <?php echo $this->getSetting('GM_MAX_ZOOM') ?>;
 							}
 						}
 						map.setCenter(bounds.getCenter());
@@ -3898,7 +3897,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 			}
 
 			function showLocation_level(address) {
-				address += '<?php if ($level > 0) echo ', ', addslashes(implode(', ', array_reverse($where_am_i, true))); ?>';
+				address += '<?php if ($level > 0) echo ', ', addslashes(implode(', ', array_reverse($where_am_i, true))) ?>';
 				geocoder.geocode({'address': address}, addAddressToMap);
 			}
 
@@ -3915,15 +3914,15 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 		</td></tr></table>
 		</body>
 		<form method="post" id="editplaces" name="editplaces" action="module.php?mod=googlemap&amp;mod_action=places_edit">
-			<input type="hidden" name="action" value="<?php echo $action; ?>record">
-			<input type="hidden" name="placeid" value="<?php echo $placeid; ?>">
-			<input type="hidden" name="level" value="<?php echo $level; ?>">
-			<input type="hidden" name="icon" value="<?php echo $place_icon; ?>">
-			<input type="hidden" name="parent_id" value="<?php echo $parent_id; ?>">
-			<input type="hidden" name="place_long" value="<?php echo $place_long; ?>">
-			<input type="hidden" name="place_lati" value="<?php echo $place_lati; ?>">
-			<input type="hidden" name="parent_long" value="<?php echo $parent_long; ?>">
-			<input type="hidden" name="parent_lati" value="<?php echo $parent_lati; ?>">
+			<input type="hidden" name="action" value="<?php echo $action ?>record">
+			<input type="hidden" name="placeid" value="<?php echo $placeid ?>">
+			<input type="hidden" name="level" value="<?php echo $level ?>">
+			<input type="hidden" name="icon" value="<?php echo $place_icon ?>">
+			<input type="hidden" name="parent_id" value="<?php echo $parent_id ?>">
+			<input type="hidden" name="place_long" value="<?php echo $place_long ?>">
+			<input type="hidden" name="place_lati" value="<?php echo $place_lati ?>">
+			<input type="hidden" name="parent_long" value="<?php echo $parent_long ?>">
+			<input type="hidden" name="parent_lati" value="<?php echo $parent_lati ?>">
 
 			<table class="facts_table">
 			<tr>
@@ -3932,18 +3931,18 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 				</td>
 			</tr>
 			<tr>
-				<td class="descriptionbox"><?php echo GedcomTag::getLabel('PLAC'); ?></td>
-				<td class="optionbox"><input type="text" id="new_pl_name" name="NEW_PLACE_NAME" value="<?php echo Filter::escapeHtml($place_name); ?>" size="25" class="address_input">
+				<td class="descriptionbox"><?php echo GedcomTag::getLabel('PLAC') ?></td>
+				<td class="optionbox"><input type="text" id="new_pl_name" name="NEW_PLACE_NAME" value="<?php echo Filter::escapeHtml($place_name) ?>" size="25" class="address_input">
 					<div id="INDI_PLAC_pop" style="display: inline;">
-					<?php echo FunctionsPrint::printSpecialCharacterLink('new_pl_name'); ?></div></td><td class="optionbox">
-					<label for="new_pl_name"><a href="#" onclick="showLocation_all(document.getElementById('new_pl_name').value); return false">&nbsp;<?php echo I18N::translate('Search globally'); ?></a></label>
+					<?php echo FunctionsPrint::printSpecialCharacterLink('new_pl_name') ?></div></td><td class="optionbox">
+					<label for="new_pl_name"><a href="#" onclick="showLocation_all(document.getElementById('new_pl_name').value); return false">&nbsp;<?php echo I18N::translate('Search globally') ?></a></label>
 					&nbsp;&nbsp;|&nbsp;&nbsp;
-					<label for="new_pl_name"><a href="#" onclick="showLocation_level(document.getElementById('new_pl_name').value); return false">&nbsp;<?php echo I18N::translate('Search locally'); ?></a></label>
+					<label for="new_pl_name"><a href="#" onclick="showLocation_level(document.getElementById('new_pl_name').value); return false">&nbsp;<?php echo I18N::translate('Search locally') ?></a></label>
 				</td>
 			</tr>
 			<tr>
 				<td class="descriptionbox">
-					<?php echo I18N::translate('Precision'); ?>
+					<?php echo I18N::translate('Precision') ?>
 				</td>
 				<?php
 					$exp = explode(".", $place_lati);
@@ -3965,77 +3964,77 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 					}
 				?>
 				<td class="optionbox" colspan="2">
-					<input type="radio" id="new_prec_0" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_0')) echo 'checked'; ?> value="<?php echo $this->getSetting('GM_PRECISION_0'); ?>">
-					<label for="new_prec_0"><?php echo I18N::translate('Country'); ?></label>
-					<input type="radio" id="new_prec_1" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_1')) echo 'checked'; ?> value="<?php echo $this->getSetting('GM_PRECISION_1'); ?>">
-					<label for="new_prec_1"><?php echo I18N::translate('State'); ?></label>
-					<input type="radio" id="new_prec_2" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_2')) echo 'checked'; ?> value="<?php echo $this->getSetting('GM_PRECISION_2'); ?>">
-					<label for="new_prec_2"><?php echo I18N::translate('City'); ?></label>
-					<input type="radio" id="new_prec_3" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_3')) echo 'checked'; ?> value="<?php echo $this->getSetting('GM_PRECISION_3'); ?>">
-					<label for="new_prec_3"><?php echo I18N::translate('Neighborhood'); ?></label>
-					<input type="radio" id="new_prec_4" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_4')) echo 'checked'; ?> value="<?php echo $this->getSetting('GM_PRECISION_4'); ?>">
-					<label for="new_prec_4"><?php echo I18N::translate('House'); ?></label>
-					<input type="radio" id="new_prec_5" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision >= $this->getSetting('GM_PRECISION_5')) echo 'checked'; ?> value="<?php echo $this->getSetting('GM_PRECISION_5'); ?>">
-					<label for="new_prec_5"><?php echo I18N::translate('Max'); ?></label>
+					<input type="radio" id="new_prec_0" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_0')) echo 'checked' ?> value="<?php echo $this->getSetting('GM_PRECISION_0') ?>">
+					<label for="new_prec_0"><?php echo I18N::translate('Country') ?></label>
+					<input type="radio" id="new_prec_1" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_1')) echo 'checked' ?> value="<?php echo $this->getSetting('GM_PRECISION_1') ?>">
+					<label for="new_prec_1"><?php echo I18N::translate('State') ?></label>
+					<input type="radio" id="new_prec_2" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_2')) echo 'checked' ?> value="<?php echo $this->getSetting('GM_PRECISION_2') ?>">
+					<label for="new_prec_2"><?php echo I18N::translate('City') ?></label>
+					<input type="radio" id="new_prec_3" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_3')) echo 'checked' ?> value="<?php echo $this->getSetting('GM_PRECISION_3') ?>">
+					<label for="new_prec_3"><?php echo I18N::translate('Neighborhood') ?></label>
+					<input type="radio" id="new_prec_4" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_4')) echo 'checked' ?> value="<?php echo $this->getSetting('GM_PRECISION_4') ?>">
+					<label for="new_prec_4"><?php echo I18N::translate('House') ?></label>
+					<input type="radio" id="new_prec_5" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision >= $this->getSetting('GM_PRECISION_5')) echo 'checked' ?> value="<?php echo $this->getSetting('GM_PRECISION_5') ?>">
+					<label for="new_prec_5"><?php echo I18N::translate('Max') ?></label>
 					<p class="small text-muted">
-						<?php echo I18N::translate('Here you can enter the precision.  Based on this setting the number of digits that will be used in the latitude and longitude is determined.'); ?>
+						<?php echo I18N::translate('Here you can enter the precision.  Based on this setting the number of digits that will be used in the latitude and longitude is determined.') ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<td class="descriptionbox"><?php echo GedcomTag::getLabel('LATI'); ?></td>
+				<td class="descriptionbox"><?php echo GedcomTag::getLabel('LATI') ?></td>
 				<td class="optionbox" colspan="2">
-					<input type="text" id="NEW_PLACE_LATI" name="NEW_PLACE_LATI" placeholder="<?php echo /* I18N: Measure of latitude/longitude */ I18N::translate('degrees'); ?>" value="<?php echo abs($place_lati); ?>" size="20" onchange="updateMap();">
+					<input type="text" id="NEW_PLACE_LATI" name="NEW_PLACE_LATI" placeholder="<?php echo /* I18N: Measure of latitude/longitude */ I18N::translate('degrees') ?>" value="<?php echo abs($place_lati) ?>" size="20" onchange="updateMap();">
 					<select name="LATI_CONTROL" onchange="updateMap();">
-						<option value="PL_N" <?php if ($place_lati >= 0) echo "selected"; echo ">", I18N::translate('north'); ?></option>
-						<option value="PL_S" <?php if ($place_lati < 0) echo "selected"; echo ">", I18N::translate('south'); ?></option>
+						<option value="PL_N" <?php if ($place_lati >= 0) echo "selected"; echo ">", I18N::translate('north') ?></option>
+						<option value="PL_S" <?php if ($place_lati < 0) echo "selected"; echo ">", I18N::translate('south') ?></option>
 					</select>
 				</td>
 			</tr>
 			<tr>
-				<td class="descriptionbox"><?php echo GedcomTag::getLabel('LONG'); ?></td>
+				<td class="descriptionbox"><?php echo GedcomTag::getLabel('LONG') ?></td>
 				<td class="optionbox" colspan="2">
-					<input type="text" id="NEW_PLACE_LONG" name="NEW_PLACE_LONG" placeholder="<?php echo I18N::translate('degrees'); ?>" value="<?php echo abs($place_long); ?>" size="20" onchange="updateMap();">
+					<input type="text" id="NEW_PLACE_LONG" name="NEW_PLACE_LONG" placeholder="<?php echo I18N::translate('degrees') ?>" value="<?php echo abs($place_long) ?>" size="20" onchange="updateMap();">
 					<select name="LONG_CONTROL" onchange="updateMap();">
-						<option value="PL_E" <?php if ($place_long >= 0) echo "selected"; echo ">", I18N::translate('east'); ?></option>
-						<option value="PL_W" <?php if ($place_long < 0) echo "selected"; echo ">", I18N::translate('west'); ?></option>
+						<option value="PL_E" <?php if ($place_long >= 0) echo "selected"; echo ">", I18N::translate('east') ?></option>
+						<option value="PL_W" <?php if ($place_long < 0) echo "selected"; echo ">", I18N::translate('west') ?></option>
 					</select>
 				</td>
 			</tr>
 			<tr>
 				<td class="descriptionbox">
-					<?php echo I18N::translate('Zoom level'); ?>
+					<?php echo I18N::translate('Zoom level') ?>
 				</td>
 				<td class="optionbox" colspan="2">
-					<input type="text" id="NEW_ZOOM_FACTOR" name="NEW_ZOOM_FACTOR" value="<?php echo $zoomfactor; ?>" size="20" onchange="updateMap();">
+					<input type="text" id="NEW_ZOOM_FACTOR" name="NEW_ZOOM_FACTOR" value="<?php echo $zoomfactor ?>" size="20" onchange="updateMap();">
 					<p class="small text-muted">
-						<?php echo I18N::translate('Here the zoom level can be entered.  This value will be used as the minimal value when displaying this geographic location on a map.'); ?>
+						<?php echo I18N::translate('Here the zoom level can be entered.  This value will be used as the minimal value when displaying this geographic location on a map.') ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
 				<td class="descriptionbox">
-					<?php echo I18N::translate('Flag'); ?>
+					<?php echo I18N::translate('Flag') ?>
 				</td>
 				<td class="optionbox" colspan="2">
 					<div id="flagsDiv">
 						<?php if ($place_icon) { ?>
-			<img alt="<?php echo /* I18N: The emblem of a country or region */ I18N::translate('Flag'); ?>" src="<?php echo WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/', $place_icon; ?>">&nbsp;&nbsp;
-			<a href="#" onclick="change_icon();return false;"><?php echo I18N::translate('Change flag'); ?></a>&nbsp;&nbsp;
-			<a href="#" onclick="remove_icon();return false;"><?php echo I18N::translate('Remove flag'); ?></a>
+			<img alt="<?php echo /* I18N: The emblem of a country or region */ I18N::translate('Flag') ?>" src="<?php echo WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/', $place_icon ?>">&nbsp;&nbsp;
+			<a href="#" onclick="change_icon();return false;"><?php echo I18N::translate('Change flag') ?></a>&nbsp;&nbsp;
+			<a href="#" onclick="remove_icon();return false;"><?php echo I18N::translate('Remove flag') ?></a>
 						<?php } else { ?>
-			<a href="#" onclick="change_icon();return false;"><?php echo I18N::translate('Change flag'); ?></a>
+			<a href="#" onclick="change_icon();return false;"><?php echo I18N::translate('Change flag') ?></a>
 						<?php } ?>
 					</div>
 					<p class="small text-muted">
-						<?php echo I18N::translate('Here an icon can be set or removed.  Using this link a flag can be selected.  When this geographic location is shown, this flag will be displayed.'); ?>
+						<?php echo I18N::translate('Here an icon can be set or removed.  Using this link a flag can be selected.  When this geographic location is shown, this flag will be displayed.') ?>
 					</p>
 				</td>
 			</tr>
 			</table>
 			<p id="save-cancel">
-				<input type="submit" class="save" value="<?php echo I18N::translate('save'); ?>">
-				<input type="button" class="cancel" value="<?php echo I18N::translate('close'); ?>" onclick="window.close();">
+				<input type="submit" class="save" value="<?php echo I18N::translate('save') ?>">
+				<input type="button" class="cancel" value="<?php echo I18N::translate('close') ?>" onclick="window.close();">
 			</p>
 		</form>
 		<?php
@@ -4106,30 +4105,30 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 
 		?>
 		<ol class="breadcrumb small">
-			<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
-			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
-			<li class="active"><?php echo $controller->getPageTitle(); ?></li>
+			<li><a href="admin.php"><?php echo I18N::translate('Control panel') ?></a></li>
+			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration') ?></a></li>
+			<li class="active"><?php echo $controller->getPageTitle() ?></li>
 		</ol>
 
 		<ul class="nav nav-tabs nav-justified" role="tablist">
 			<li role="presentation">
 				<a href="?mod=googlemap&amp;mod_action=admin_config" role="tab">
-					<?php echo I18N::translate('Google Maps™ preferences'); ?>
+					<?php echo I18N::translate('Google Maps™ preferences') ?>
 				</a>
 			</li>
 			<li role="presentation" class="active">
 				<a href="#">
-					<?php echo I18N::translate('Geographic data'); ?>
+					<?php echo I18N::translate('Geographic data') ?>
 				</a>
 			</li>
 			<li role="presentation">
 				<a href="?mod=googlemap&amp;mod_action=admin_placecheck">
-					<?php echo I18N::translate('Place check'); ?>
+					<?php echo I18N::translate('Place check') ?>
 				</a>
 			</li>
 		</ul>
 
-		<h2><?php echo I18N::translate('Geographic data'); ?></h2>
+		<h2><?php echo I18N::translate('Geographic data') ?></h2>
 		<?php
 
 		if ($action == 'ImportGedcom') {
@@ -4261,7 +4260,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 			<!-- PLACES FILE -->
 			<div class="form-group">
 				<label class="control-label col-sm-4" for="placesfile">
-					<?php echo I18N::translate('File containing places (CSV)'); ?>
+					<?php echo I18N::translate('File containing places (CSV)') ?>
 				</label>
 				<div class="col-sm-8">
 					<div class="btn btn-default">
@@ -4274,12 +4273,12 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 			<?php if (count($placefiles) > 0): ?>
 			<div class="form-group">
 				<label class="control-label col-sm-4" for="localfile">
-					<?php echo I18N::translate('Server file containing places (CSV)'); ?>
+					<?php echo I18N::translate('Server file containing places (CSV)') ?>
 				</label>
 				<div class="col-sm-8">
 					<div class="input-group">
 						<span class="input-group-addon">
-							<?php echo WT_MODULES_DIR . 'googlemap/extra/'; ?>
+							<?php echo WT_MODULES_DIR . 'googlemap/extra/' ?>
 						</span>
 						<?php
 						foreach ($placefiles as $p => $placefile) {
@@ -4296,35 +4295,35 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 					</div>
 				</div>
 			</div>
-			<?php endif; ?>
+			<?php endif ?>
 
 			<!-- CLEAR DATABASE -->
 			<fieldset class="form-group">
 				<legend class="control-label col-sm-4">
-					<?php echo I18N::translate('Delete all existing geographic data before importing the file.'); ?>
+					<?php echo I18N::translate('Delete all existing geographic data before importing the file.') ?>
 				</legend>
 				<div class="col-sm-8">
-					<?php echo FunctionsEdit::editFieldYesNo('cleardatabase', 0, 'class="radio-inline"'); ?>
+					<?php echo FunctionsEdit::editFieldYesNo('cleardatabase', 0, 'class="radio-inline"') ?>
 				</div>
 			</fieldset>
 
 			<!-- UPDATE ONLY -->
 			<fieldset class="form-group">
 				<legend class="control-label col-sm-4">
-					<?php echo I18N::translate('Do not create new locations, just import coordinates for existing locations.'); ?>
+					<?php echo I18N::translate('Do not create new locations, just import coordinates for existing locations.') ?>
 				</legend>
 				<div class="col-sm-8">
-					<?php echo FunctionsEdit::editFieldYesNo('updateonly', 0, 'class="radio-inline"'); ?>
+					<?php echo FunctionsEdit::editFieldYesNo('updateonly', 0, 'class="radio-inline"') ?>
 				</div>
 			</fieldset>
 
 			<!-- OVERWRITE DATA -->
 			<fieldset class="form-group">
 				<legend class="control-label col-sm-4">
-					<?php echo I18N::translate('Overwrite existing coordinates.'); ?>
+					<?php echo I18N::translate('Overwrite existing coordinates.') ?>
 				</legend>
 				<div class="col-sm-8">
-					<?php echo FunctionsEdit::editFieldYesNo('overwritedata', 0, 'class="radio-inline"'); ?>
+					<?php echo FunctionsEdit::editFieldYesNo('overwritedata', 0, 'class="radio-inline"') ?>
 				</div>
 			</fieldset>
 
@@ -4333,7 +4332,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 				<div class="col-sm-offset-4 col-sm-8">
 					<button type="submit" class="btn btn-primary">
 						<i class="fa fa-check"></i>
-						<?php echo I18N::translate('Continue adding'); ?>
+						<?php echo I18N::translate('Continue adding') ?>
 					</button>
 				</div>
 			</div>
@@ -4523,7 +4522,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 		?>
 		<script>
 		function updateList(inactive) {
-			window.location.href='<?php if (strstr($_SERVER['REQUEST_URI'], '&inactive', true)) { $uri = strstr($_SERVER['REQUEST_URI'], '&inactive', true); } else { $uri = $_SERVER['REQUEST_URI']; } echo $uri, '&inactive='; ?>'+inactive;
+			window.location.href='<?php if (strstr($_SERVER['REQUEST_URI'], '&inactive', true)) { $uri = strstr($_SERVER['REQUEST_URI'], '&inactive', true); } else { $uri = $_SERVER['REQUEST_URI']; } echo $uri, '&inactive=' ?>'+inactive;
 		}
 
 		function edit_place_location(placeid) {
@@ -4537,9 +4536,9 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 		}
 
 		function delete_place(placeid) {
-			var answer=confirm('<?php echo I18N::translate('Remove this location?'); ?>');
+			var answer=confirm('<?php echo I18N::translate('Remove this location?') ?>');
 			if (answer == true) {
-				window.location = '<?php echo Functions::getQueryUrl(array('action' => 'DeleteRecord')); ?>&action=DeleteRecord&deleteRecord=' + placeid;
+				window.location = '<?php echo Functions::getQueryUrl(array('action' => 'DeleteRecord')) ?>&action=DeleteRecord&deleteRecord=' + placeid;
 			}
 		}
 		</script>
@@ -4564,19 +4563,19 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 				echo ' - ';
 			}
 			?>
-			<a href="module.php?mod=googlemap&mod_action=admin_places&parent=0&inactive=', $inactive, '"><?php echo I18N::translate('Top level'); ?></a>
+			<a href="module.php?mod=googlemap&mod_action=admin_places&parent=0&inactive=', $inactive, '"><?php echo I18N::translate('Top level') ?></a>
 		</p>
 
 		<form class="form-inline" name="active" method="post" action="module.php?mod=googlemap&mod_action=admin_places&parent=', $parent, '&inactive=', $inactive, '">
 			<div class="checkbox">
 				<label for="inactive">
-				   <?php echo FunctionsEdit::checkbox('inactive', $inactive, 'onclick="updateList(this.checked)"'); ?>
-				   <?php echo I18N::translate('Show inactive places'); ?>
+				   <?php echo FunctionsEdit::checkbox('inactive', $inactive, 'onclick="updateList(this.checked)"') ?>
+				   <?php echo I18N::translate('Show inactive places') ?>
 				</label>
 			</div>
 			<p class="small text-muted">
-				<?php echo I18N::translate('By default, the list shows only those places which can be found in your family trees.  You may have details for other places, such as those imported in bulk from an external file.  Selecting this option will show all places, including ones that are not currently used.'); ?>&nbsp;
-				<?php I18N::translate('If you have a large number of inactive places, it can be slow to generate the list.'); ?>
+				<?php echo I18N::translate('By default, the list shows only those places which can be found in your family trees.  You may have details for other places, such as those imported in bulk from an external file.  Selecting this option will show all places, including ones that are not currently used.') ?>
+				<?php echo I18N::translate('If you have a large number of inactive places, it can be slow to generate the list.') ?>
 			</p>
 		</form>
 
@@ -4619,7 +4618,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 				->execute(array($place['place_id']))
 				->fetchOne();
 			if ($noRows == 0) { ?>
-				<td><a href="#" onclick="delete_place(<?php echo $place['place_id']; ?>);return false;" class="icon-delete" title="<?php echo I18N::translate('Remove'); ?>"></a></td>
+				<td><a href="#" onclick="delete_place(<?php echo $place['place_id'] ?>);return false;" class="icon-delete" title="<?php echo I18N::translate('Remove') ?>"></a></td>
 		<?php       } else { ?>
 				<td><i class="icon-delete-grey"></i></td>
 		<?php       } ?>
@@ -4634,15 +4633,15 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 		<form class="form-horizontal" action="?" onsubmit="add_place_location(this.parent_id.options[this.parent_id.selectedIndex].value); return false;">
 			<div class="form-group">
 				<label class="form-control-static col-sm-4" for="parent_id">
-					<?php echo I18N::translate('Add a new geographic location'); ?>
+					<?php echo I18N::translate('Add a new geographic location') ?>
 				</label>
 				<div class="col-sm-8">
 					<div class="col-sm-6">
-						<?php echo FunctionsEdit::selectEditControl('parent_id', $where_am_i, I18N::translate('Top level'), $parent, 'class="form-control"'); ?>
+						<?php echo FunctionsEdit::selectEditControl('parent_id', $where_am_i, I18N::translate('Top level'), $parent, 'class="form-control"') ?>
 					</div>
 					<button type="submit" class="btn btn-default">
 						<i class="fa fa-plus"></i>
-						<?php echo I18N::translate('Add'); ?>
+						<?php echo I18N::translate('Add') ?>
 					</button>
 				</div>
 			</div>
@@ -4654,15 +4653,15 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 			<input type="hidden" name="action" value="ImportGedcom">
 			<div class="form-group">
 				<label class="form-control-static col-sm-4" for="ged">
-					<?php echo I18N::translate('Import all places from a family tree'); ?>
+					<?php echo I18N::translate('Import all places from a family tree') ?>
 				</label>
 				<div class="col-sm-8">
 					<div class="col-sm-6">
-						<?php echo FunctionsEdit::selectEditControl('ged', Tree::getNameList(), null, $WT_TREE->getName(), 'class="form-control"'); ?>
+						<?php echo FunctionsEdit::selectEditControl('ged', Tree::getNameList(), null, $WT_TREE->getName(), 'class="form-control"') ?>
 					</div>
 					<button type="submit" class="btn btn-default">
 						<i class="fa fa-upload"></i>
-						<?php echo I18N::translate('Import'); ?>
+						<?php echo I18N::translate('Import') ?>
 					</button>
 				</div>
 			</div>
@@ -4674,13 +4673,13 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 			<input type="hidden" name="action" value="ImportFile">
 			<div class="form-group">
 				<label class="form-control-static col-sm-4">
-					<?php echo I18N::translate('Upload geographic data'); ?>
+					<?php echo I18N::translate('Upload geographic data') ?>
 				</label>
 				<div class="col-sm-8">
 					<div class="col-sm-6">
 						<button type="submit" class="btn btn-default">
 							<i class="fa fa-upload"></i>
-							<?php echo I18N::translate('Upload'); ?>
+							<?php echo I18N::translate('Upload') ?>
 						</button>
 					</div>
 				</div>
@@ -4693,15 +4692,15 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 			<input type="hidden" name="action" value="ExportFile">
 			<div class="form-group">
 				<label class="form-control-static col-sm-4">
-					<?php echo I18N::translate('Download geographic data'); ?>
+					<?php echo I18N::translate('Download geographic data') ?>
 				</label>
 				<div class="col-sm-8">
 					<div class="col-sm-6">
-						<?php echo FunctionsEdit::selectEditControl('parent', $where_am_i, I18N::translate('All'), $WT_TREE->getTreeId(), 'class="form-control"'); ?>
+						<?php echo FunctionsEdit::selectEditControl('parent', $where_am_i, I18N::translate('All'), $WT_TREE->getTreeId(), 'class="form-control"') ?>
 					</div>
 					<button type="submit" class="btn btn-default">
 						<i class="fa fa-download"></i>
-						<?php echo I18N::translate('Download'); ?>
+						<?php echo I18N::translate('Download') ?>
 					</button>
 				</div>
 			</div>
@@ -4809,7 +4808,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 
 			var imageNum = Math.round(bearing/22.5) % 16;
 
-			var image = new google.maps.MarkerImage('<?php echo WT_BASE_URL . WT_MODULES_DIR; ?>googlemap/images/panda-icons/panda-' + imageNum + '.png',
+			var image = new google.maps.MarkerImage('<?php echo WT_BASE_URL . WT_MODULES_DIR ?>googlemap/images/panda-icons/panda-' + imageNum + '.png',
 				// This marker is 50 pixels wide by 50 pixels tall.
 				new google.maps.Size(50, 50),
 				// The origin for this image is 0,0.
@@ -4962,10 +4961,10 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 			var toggle = panorama.getVisible();
 			if (toggle == false) {
 				panorama.setVisible(true);
-				document.myForm.butt1.value = "<?php echo I18N::translate('Google Maps™'); ?>";
+				document.myForm.butt1.value = "<?php echo I18N::translate('Google Maps™') ?>";
 			} else {
 				panorama.setVisible(false);
-				document.myForm.butt1.value = "<?php echo I18N::translate('Google Street View™'); ?>";
+				document.myForm.butt1.value = "<?php echo I18N::translate('Google Street View™') ?>";
 			}
 		}
 
diff --git a/lifespan.php b/lifespan.php
index f59f88d1be..ecc50a4773 100644
--- a/lifespan.php
+++ b/lifespan.php
@@ -28,23 +28,23 @@ $controller
 
 ?>
 <div id="lifespan-page">
-	<h2><?php echo I18N::translate('Lifespans');?></h2>
+	<h2><?php echo I18N::translate('Lifespans') ?></h2>
 
 	<form>
 		<table class="list_table">
 			<tbody>
 				<tr>
 					<th class="descriptionbox" colspan="4">
-						<?php echo I18N::translate('Select individuals by place or date');?>
+						<?php echo I18N::translate('Select individuals by place or date') ?>
 					</th>
 					<th class="descriptionbox" colspan="2">
-						<?php echo I18N::translate('Add individuals');?>
+						<?php echo I18N::translate('Add individuals') ?>
 					</th>
 				</tr>
 				<tr>
 					<td class="optionbox">
 						<label for="place">
-							<?php echo GedcomTag::getLabel('PLAC'); ?>
+							<?php echo GedcomTag::getLabel('PLAC') ?>
 						</label>
 					</td>
 					<td class="optionbox" colspan="3">
@@ -52,18 +52,18 @@ $controller
 					</td>
 					<td class="optionbox">
 						<label for="newpid">
-							<?php echo I18N::translate('Individual'); ?>
+							<?php echo I18N::translate('Individual') ?>
 						</label>
 					</td>
 					<td class="optionbox">
-						<input id="newpid" class="pedigree_form" data-autocomplete-type="INDI" type="text" size="5" name="newpid"><?php echo FunctionsPrint::printFindIndividualLink('newpid'); ?>
+						<input id="newpid" class="pedigree_form" data-autocomplete-type="INDI" type="text" size="5" name="newpid"><?php echo FunctionsPrint::printFindIndividualLink('newpid') ?>
 
 					</td>
 				</tr>
 				<tr>
 					<td class="optionbox">
 						<label for="beginYear">
-							<?php echo /* I18N: The earliest year in a range */ I18N::translate('Start year'); ?>
+							<?php echo /* I18N: The earliest year in a range */ I18N::translate('Start year') ?>
 						</label>
 					</td>
 					<td class="optionbox">
@@ -71,7 +71,7 @@ $controller
 					</td>
 					<td class="optionbox">
 						<label for="endYear">
-							<?php echo /* I18N: The latest year in a range */ I18N::translate('End year'); ?>
+							<?php echo /* I18N: The latest year in a range */ I18N::translate('End year') ?>
 						</label>
 					</td>
 					<td class="optionbox">
@@ -80,31 +80,31 @@ $controller
 					<td class="optionbox" colspan="2">
 						<label for="addFamily">
 							<input id="addFamily" type="checkbox" value="yes" name="addFamily">
-							<?php echo I18N::translate('Include the individual’s immediate family?'); ?>
+							<?php echo I18N::translate('Include the individual’s immediate family?') ?>
 						</label>
 					</td>
 				</tr>
 				<tr>
 					<td class="optionbox">
 						<label for="calendar">
-							<?php echo I18N::translate('Calendar'); ?>
+							<?php echo I18N::translate('Calendar') ?>
 						</label>
 					</td>
 					<td class="optionbox">
 						<select id="calendar" name="calendar">
-							<?php echo $controller->getCalendarOptionList();?>
+							<?php echo $controller->getCalendarOptionList() ?>
 						</select>
 					</td>
 					<td class="optionbox" colspan="2">
 						<label for="strictDate">
 							<input id="strictDate" type="checkbox" value="yes" name="strictDate">
-							<?php echo I18N::translate('Match calendar'); ?>
+							<?php echo I18N::translate('Match calendar') ?>
 						</label>
 					</td>
 					<th class="descriptionbox" colspan="2">
 						<input id="clear" type="hidden" name="clear" value=0>
-						<input type="reset" value="<?php echo /* I18N: Button label */ I18N::translate('reset'); ?>">
-						<input type="submit" value="<?php /* I18N: Button label */ echo I18N::translate('show'); ?>">
+						<input type="reset" value="<?php echo /* I18N: Button label */ I18N::translate('reset') ?>">
+						<input type="submit" value="<?php echo /* I18N: Button label */ I18N::translate('show') ?>">
 					</th>
 				</tr>
 			</tbody>
@@ -112,12 +112,12 @@ $controller
 	</form>
 
 	<div id="lifespan-chart">
-		<h4><?php echo $controller->subtitle;?></h4>
+		<h4><?php echo $controller->subtitle ?></h4>
 		<div id="lifespan-scale">
-			<?php $controller->printTimeline(); ?>
+			<?php $controller->printTimeline() ?>
 		</div>
 		<div id="lifespan-people">
-			<?php $maxY = $controller->fillTimeline(); ?>
+			<?php $maxY = $controller->fillTimeline() ?>
 		</div>
 	</div>
 </div>
diff --git a/relationship.php b/relationship.php
index 8013c7dd9d..139810fbf1 100644
--- a/relationship.php
+++ b/relationship.php
@@ -56,48 +56,48 @@ if ($person1 && $person2) {
 }
 
 ?>
-<h2><?php echo $controller->getPageTitle(); ?></h2>
+<h2><?php echo $controller->getPageTitle() ?></h2>
 <form name="people" method="get" action="?">
-	<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
+	<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml() ?>">
 	<table class="list_table">
 		<tbody>
 			<tr>
 				<td class="descriptionbox">
-					<?php echo I18N::translate('Individual 1'); ?>
+					<?php echo I18N::translate('Individual 1') ?>
 				</td>
 				<td class="optionbox">
-					<input class="pedigree_form" data-autocomplete-type="INDI" type="text" name="pid1" id="pid1" size="3" value="<?php echo $pid1; ?>">
-					<?php echo FunctionsPrint::printFindIndividualLink('pid1'); ?>
+					<input class="pedigree_form" data-autocomplete-type="INDI" type="text" name="pid1" id="pid1" size="3" value="<?php echo $pid1 ?>">
+					<?php echo FunctionsPrint::printFindIndividualLink('pid1') ?>
 				</td>
 				<td class="optionbox">
 					<label>
-						<?php echo FunctionsEdit::twoStateCheckbox('show_full', $show_full); ?>
-						<?php echo I18N::translate('Show details'); ?>
+						<?php echo FunctionsEdit::twoStateCheckbox('show_full', $show_full) ?>
+						<?php echo I18N::translate('Show details') ?>
 					</label>
 				</td>
 				<td class="optionbox vmiddle" rowspan="2">
-					<input type="submit" value="<?php echo I18N::translate('View'); ?>">
+					<input type="submit" value="<?php echo I18N::translate('View') ?>">
 				</td>
 			</tr>
 			<tr>
 				<td class="descriptionbox">
-					<?php echo I18N::translate('Individual 2'); ?>
+					<?php echo I18N::translate('Individual 2') ?>
 				</td>
 				<td class="optionbox">
-					<input class="pedigree_form" data-autocomplete-type="INDI" type="text" name="pid2" id="pid2" size="3" value="<?php echo $pid2; ?>">
-					<?php echo FunctionsPrint::printFindIndividualLink('pid2'); ?>
+					<input class="pedigree_form" data-autocomplete-type="INDI" type="text" name="pid2" id="pid2" size="3" value="<?php echo $pid2 ?>">
+					<?php echo FunctionsPrint::printFindIndividualLink('pid2') ?>
 					<br>
-					<a href="#" onclick="var x = jQuery('#pid1').val(); jQuery('#pid1').val(jQuery('#pid2').val()); jQuery('#pid2').val(x); return false;"><?php /* I18N: Reverse the order of two individuals */ echo I18N::translate('Swap individuals'); ?></a>
+					<a href="#" onclick="var x = jQuery('#pid1').val(); jQuery('#pid1').val(jQuery('#pid2').val()); jQuery('#pid2').val(x); return false;"><?php echo /* I18N: Reverse the order of two individuals */ I18N::translate('Swap individuals') ?></a>
 				</td>
 				<td class="optionbox">
 					<label>
-						<input type="radio" name="find_all" value="0" <?php echo $find_all ? '' : 'checked'; ?>>
-						<?php echo I18N::translate('Find the closest relationships'); ?>
+						<input type="radio" name="find_all" value="0" <?php echo $find_all ? '' : 'checked' ?>>
+						<?php echo I18N::translate('Find the closest relationships') ?>
 					</label>
 					<br>
 					<label>
-						<input type="radio" name="find_all" value="1"<?php echo $find_all ? 'checked' : ''; ?>>
-						<?php echo I18N::translate('Find all possible relationships'); ?>
+						<input type="radio" name="find_all" value="1"<?php echo $find_all ? 'checked' : '' ?>>
+						<?php echo I18N::translate('Find all possible relationships') ?>
 					</label>
 				</td>
 			</tr>