fisharebest / webtrees

admin_modules.php

Indentation +55 added lines, -55 removed lines

@@ -32,85 +32,85 @@
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isAdmin())
-	->setPageTitle(I18N::translate('Module administration'));
+    ->restrictAccess(Auth::isAdmin())
+    ->setPageTitle(I18N::translate('Module administration'));
 
 $modules       = Module::getInstalledModules('disabled');
 $module_status = Database::prepare("SELECT module_name, status FROM `##module`")->fetchAssoc();
 
 uasort($modules, function (AbstractModule $x, AbstractModule $y) {
-	return I18N::strcasecmp($x->getTitle(), $y->getTitle());
+    return I18N::strcasecmp($x->getTitle(), $y->getTitle());
 });
 
 if (Filter::post('action') === 'update_mods' && Filter::checkCsrf()) {
-	foreach ($modules as $module) {
-		$new_status = Filter::post('status-' . $module->getName(), '[01]');
-		if ($new_status !== null) {
-			$new_status = $new_status ? 'enabled' : 'disabled';
-			$old_status = $module_status[$module->getName()];
-			if ($new_status !== $old_status) {
-				Database::prepare("UPDATE `##module` SET status=? WHERE module_name=?")->execute(array($new_status, $module->getName()));
-				if ($new_status === 'disabled') {
-					FlashMessages::addMessage(I18N::translate('The module “%s” has been disabled.', $module->getTitle()), 'success');
-				} else {
-					FlashMessages::addMessage(I18N::translate('The module “%s” has been enabled.', $module->getTitle()), 'success');
-				}
-			}
-		}
-	}
+    foreach ($modules as $module) {
+        $new_status = Filter::post('status-' . $module->getName(), '[01]');
+        if ($new_status !== null) {
+            $new_status = $new_status ? 'enabled' : 'disabled';
+            $old_status = $module_status[$module->getName()];
+            if ($new_status !== $old_status) {
+                Database::prepare("UPDATE `##module` SET status=? WHERE module_name=?")->execute(array($new_status, $module->getName()));
+                if ($new_status === 'disabled') {
+                    FlashMessages::addMessage(I18N::translate('The module “%s” has been disabled.', $module->getTitle()), 'success');
+                } else {
+                    FlashMessages::addMessage(I18N::translate('The module “%s” has been enabled.', $module->getTitle()), 'success');
+                }
+            }
+        }
+    }
 
-	header('Location: ' . WT_BASE_URL . 'admin_modules.php');
+    header('Location: ' . WT_BASE_URL . 'admin_modules.php');
 
-	return;
+    return;
 }
 
 if (Filter::post('action') === 'delete' && Filter::checkCsrf()) {
-	$module_name = Filter::post('module_name');
-	Database::prepare(
-		"DELETE `##block_setting`" .
-		" FROM `##block_setting`" .
-		" JOIN `##block` USING (block_id)" .
-		" JOIN `##module` USING (module_name)" .
-		" WHERE module_name=?"
-	)->execute(array($module_name));
-	Database::prepare(
-		"DELETE `##block`" .
-		" FROM `##block`" .
-		" JOIN `##module` USING (module_name)" .
-		" WHERE module_name=?"
-	)->execute(array($module_name));
-	Database::prepare("DELETE FROM `##module_setting` WHERE module_name=?")->execute(array($module_name));
-	Database::prepare("DELETE FROM `##module_privacy` WHERE module_name=?")->execute(array($module_name));
-	Database::prepare("DELETE FROM `##module` WHERE module_name=?")->execute(array($module_name));
+    $module_name = Filter::post('module_name');
+    Database::prepare(
+        "DELETE `##block_setting`" .
+        " FROM `##block_setting`" .
+        " JOIN `##block` USING (block_id)" .
+        " JOIN `##module` USING (module_name)" .
+        " WHERE module_name=?"
+    )->execute(array($module_name));
+    Database::prepare(
+        "DELETE `##block`" .
+        " FROM `##block`" .
+        " JOIN `##module` USING (module_name)" .
+        " WHERE module_name=?"
+    )->execute(array($module_name));
+    Database::prepare("DELETE FROM `##module_setting` WHERE module_name=?")->execute(array($module_name));
+    Database::prepare("DELETE FROM `##module_privacy` WHERE module_name=?")->execute(array($module_name));
+    Database::prepare("DELETE FROM `##module` WHERE module_name=?")->execute(array($module_name));
 
-	FlashMessages::addMessage(I18N::translate('The preferences for the module “%s” have been deleted.', $module_name), 'success');
+    FlashMessages::addMessage(I18N::translate('The preferences for the module “%s” have been deleted.', $module_name), 'success');
 
-	header('Location: ' . WT_BASE_URL . 'admin_modules.php');
+    header('Location: ' . WT_BASE_URL . 'admin_modules.php');
 
-	return;
+    return;
 }
 
 // The module can’t be found on disk?
 // Don't delete it automatically. It may be temporarily missing, after a re-installation, etc.
 foreach ($module_status as $module_name => $status) {
-	if (!array_key_exists($module_name, $modules)) {
-		$html =
-			I18N::translate('Preferences exist for the module “%s”, but this module no longer exists.', '<span dir="ltr">' . $module_name . '</span>') .
-			'<form method="post" class="form-inline">' .
-			Filter::getCsrf() .
-			'<input type="hidden" name="action" value="delete">' .
-			'<input type="hidden" name="module_name" value="' . $module_name . '">' .
-			'<button type="submit" class="btn btn-link">' . I18N::translate('Delete the preferences for this module.') . '</button>' .
-			'</form>';
-		FlashMessages::addMessage($html, 'warning');
-	}
+    if (!array_key_exists($module_name, $modules)) {
+        $html =
+            I18N::translate('Preferences exist for the module “%s”, but this module no longer exists.', '<span dir="ltr">' . $module_name . '</span>') .
+            '<form method="post" class="form-inline">' .
+            Filter::getCsrf() .
+            '<input type="hidden" name="action" value="delete">' .
+            '<input type="hidden" name="module_name" value="' . $module_name . '">' .
+            '<button type="submit" class="btn btn-link">' . I18N::translate('Delete the preferences for this module.') . '</button>' .
+            '</form>';
+        FlashMessages::addMessage($html, 'warning');
+    }
 }
 
 $controller
-	->pageHeader()
-	->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-	->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
-	->addInlineJavascript('
+    ->pageHeader()
+    ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+    ->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
+    ->addInlineJavascript('
 		function reindexMods(id) {
 			jQuery("#" + id + " input").each(
 				function (index, value) {

admin_site_clean.php

Indentation +46 added lines, -46 removed lines

@@ -23,45 +23,45 @@ 
 
 $to_delete = Filter::postArray('to_delete');
 if ($to_delete && Filter::checkCsrf()) {
-	foreach ($to_delete as $path) {
-		$is_dir = is_dir(WT_DATA_DIR . $path);
-		if (File::delete(WT_DATA_DIR . $path)) {
-			if ($is_dir) {
-				FlashMessages::addMessage(I18N::translate('The folder %s has been deleted.', Filter::escapeHtml($path)), 'success');
-			} else {
-				FlashMessages::addMessage(I18N::translate('The file %s has been deleted.', Filter::escapeHtml($path)), 'success');
-			}
-		} else {
-			if ($is_dir) {
-				FlashMessages::addMessage(I18N::translate('The folder %s could not be deleted.', Filter::escapeHtml($path)), 'danger');
-			} else {
-				FlashMessages::addMessage(I18N::translate('The file %s could not be deleted.', Filter::escapeHtml($path)), 'danger');
-			}
-		}
-	}
-
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
+    foreach ($to_delete as $path) {
+        $is_dir = is_dir(WT_DATA_DIR . $path);
+        if (File::delete(WT_DATA_DIR . $path)) {
+            if ($is_dir) {
+                FlashMessages::addMessage(I18N::translate('The folder %s has been deleted.', Filter::escapeHtml($path)), 'success');
+            } else {
+                FlashMessages::addMessage(I18N::translate('The file %s has been deleted.', Filter::escapeHtml($path)), 'success');
+            }
+        } else {
+            if ($is_dir) {
+                FlashMessages::addMessage(I18N::translate('The folder %s could not be deleted.', Filter::escapeHtml($path)), 'danger');
+            } else {
+                FlashMessages::addMessage(I18N::translate('The file %s could not be deleted.', Filter::escapeHtml($path)), 'danger');
+            }
+        }
+    }
+
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+    return;
 }
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isAdmin())
-	->setPageTitle(/* I18N: The “Data folder” is a configuration setting */ I18N::translate('Clean up data folder'))
-	->pageHeader();
+    ->restrictAccess(Auth::isAdmin())
+    ->setPageTitle(/* I18N: The “Data folder” is a configuration setting */ I18N::translate('Clean up data folder'))
+    ->pageHeader();
 
 $do_not_delete = array('index.php', 'config.ini.php', 'language');
 
 // If we are storing the media in the data folder (this is the default), then don’t delete it.
 foreach (Tree::getAll() as $tree) {
-	$MEDIA_DIRECTORY = $tree->getPreference('MEDIA_DIRECTORY');
+    $MEDIA_DIRECTORY = $tree->getPreference('MEDIA_DIRECTORY');
 
-	if (substr($MEDIA_DIRECTORY, 0, 3) != '../') {
-		// Just need to add the first part of the path
-		$tmp             = explode('/', $MEDIA_DIRECTORY);
-		$do_not_delete[] = $tmp[0];
-	}
+    if (substr($MEDIA_DIRECTORY, 0, 3) != '../') {
+        // Just need to add the first part of the path
+        $tmp             = explode('/', $MEDIA_DIRECTORY);
+        $do_not_delete[] = $tmp[0];
+    }
 }
 
 $locked_icon = '<i class="fa fa-ban text-danger"></i>';
@@ -69,9 +69,9 @@ 
 $dir     = dir(WT_DATA_DIR);
 $entries = array();
 while (false !== ($entry = $dir->read())) {
-	if ($entry[0] != '.') {
-		$entries[] = $entry;
-	}
+    if ($entry[0] != '.') {
+        $entries[] = $entry;
+    }
 }
 
 sort($entries);
@@ -94,20 +94,20 @@ 
 		<legend class="sr-only"><?php echo $controller->getPageTitle(); ?></legend>
 		<ul class="fa-ul">
 			<?php
-			foreach ($entries as $entry) {
-				if (in_array($entry, $do_not_delete)) {
-					echo '<li><i class="fa-li fa fa-ban text-danger"></i>', Filter::escapeHtml($entry), '</li>';
-				} else {
-					$id = 'input-' . Uuid::uuid4();
-					echo '<li><i class="fa-li fa fa-trash-o"></i>';
-					echo '<label for="', $id, '">';
-					echo '<input type="checkbox" id="', $id, '" name="to_delete[]" value="', Filter::escapeHtml($entry), '"> ';
-					echo Filter::escapeHtml($entry);
-					echo '</label></li>';
-				}
-			}
-			$dir->close();
-			?>
+            foreach ($entries as $entry) {
+                if (in_array($entry, $do_not_delete)) {
+                    echo '<li><i class="fa-li fa fa-ban text-danger"></i>', Filter::escapeHtml($entry), '</li>';
+                } else {
+                    $id = 'input-' . Uuid::uuid4();
+                    echo '<li><i class="fa-li fa fa-trash-o"></i>';
+                    echo '<label for="', $id, '">';
+                    echo '<input type="checkbox" id="', $id, '" name="to_delete[]" value="', Filter::escapeHtml($entry), '"> ';
+                    echo Filter::escapeHtml($entry);
+                    echo '</label></li>';
+                }
+            }
+            $dir->close();
+            ?>
 		</ul>
 	</fieldset>
 	<button class="btn btn-danger" type="submit">

admin_trees_places.php

Indentation +46 added lines, -46 removed lines

@@ -34,56 +34,56 @@
 $changes = array();
 
 if ($search && $replace) {
-	$rows = Database::prepare(
-		"SELECT i_id AS xref, i_gedcom AS gedcom" .
-		" FROM `##individuals`" .
-		" LEFT JOIN `##change` ON (i_id = xref AND i_file=gedcom_id AND status='pending')" .
-		" WHERE i_file = ?" .
-		" AND COALESCE(new_gedcom, i_gedcom) REGEXP CONCAT('\n2 PLAC ([^\n]*, )*', ?, '(\n|$)')"
-	)->execute(array($WT_TREE->getTreeId(), preg_quote($search)))->fetchAll();
-	foreach ($rows as $row) {
-		$record = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		foreach ($record->getFacts() as $fact) {
-			$old_place = $fact->getAttribute('PLAC');
-			if (preg_match('/(^|, )' . preg_quote($search, '/') . '$/i', $old_place)) {
-				$new_place           = preg_replace('/(^|, )' . preg_quote($search, '/') . '$/i', '$1' . $replace, $old_place);
-				$changes[$old_place] = $new_place;
-				if ($confirm == 'update') {
-					$gedcom = preg_replace('/(\n2 PLAC (?:.*, )*)' . preg_quote($search, '/') . '(\n|$)/i', '$1' . $replace . '$2', $fact->getGedcom());
-					$record->updateFact($fact->getFactId(), $gedcom, false);
-				}
-			}
-		}
-	}
-	$rows = Database::prepare(
-		"SELECT f_id AS xref, f_gedcom AS gedcom" .
-		" FROM `##families`" .
-		" LEFT JOIN `##change` ON (f_id = xref AND f_file=gedcom_id AND status='pending')" .
-		" WHERE f_file = ?" .
-		" AND COALESCE(new_gedcom, f_gedcom) REGEXP CONCAT('\n2 PLAC ([^\n]*, )*', ?, '(\n|$)')"
-	)->execute(array($WT_TREE->getTreeId(), preg_quote($search)))->fetchAll();
-	foreach ($rows as $row) {
-		$record = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		foreach ($record->getFacts() as $fact) {
-			$old_place = $fact->getAttribute('PLAC');
-			if (preg_match('/(^|, )' . preg_quote($search, '/') . '$/i', $old_place)) {
-				$new_place           = preg_replace('/(^|, )' . preg_quote($search, '/') . '$/i', '$1' . $replace, $old_place);
-				$changes[$old_place] = $new_place;
-				if ($confirm == 'update') {
-					$gedcom = preg_replace('/(\n2 PLAC (?:.*, )*)' . preg_quote($search, '/') . '(\n|$)/i', '$1' . $replace . '$2', $fact->getGedcom());
-					$record->updateFact($fact->getFactId(), $gedcom, false);
-				}
-			}
-		}
-	}
+    $rows = Database::prepare(
+        "SELECT i_id AS xref, i_gedcom AS gedcom" .
+        " FROM `##individuals`" .
+        " LEFT JOIN `##change` ON (i_id = xref AND i_file=gedcom_id AND status='pending')" .
+        " WHERE i_file = ?" .
+        " AND COALESCE(new_gedcom, i_gedcom) REGEXP CONCAT('\n2 PLAC ([^\n]*, )*', ?, '(\n|$)')"
+    )->execute(array($WT_TREE->getTreeId(), preg_quote($search)))->fetchAll();
+    foreach ($rows as $row) {
+        $record = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+        foreach ($record->getFacts() as $fact) {
+            $old_place = $fact->getAttribute('PLAC');
+            if (preg_match('/(^|, )' . preg_quote($search, '/') . '$/i', $old_place)) {
+                $new_place           = preg_replace('/(^|, )' . preg_quote($search, '/') . '$/i', '$1' . $replace, $old_place);
+                $changes[$old_place] = $new_place;
+                if ($confirm == 'update') {
+                    $gedcom = preg_replace('/(\n2 PLAC (?:.*, )*)' . preg_quote($search, '/') . '(\n|$)/i', '$1' . $replace . '$2', $fact->getGedcom());
+                    $record->updateFact($fact->getFactId(), $gedcom, false);
+                }
+            }
+        }
+    }
+    $rows = Database::prepare(
+        "SELECT f_id AS xref, f_gedcom AS gedcom" .
+        " FROM `##families`" .
+        " LEFT JOIN `##change` ON (f_id = xref AND f_file=gedcom_id AND status='pending')" .
+        " WHERE f_file = ?" .
+        " AND COALESCE(new_gedcom, f_gedcom) REGEXP CONCAT('\n2 PLAC ([^\n]*, )*', ?, '(\n|$)')"
+    )->execute(array($WT_TREE->getTreeId(), preg_quote($search)))->fetchAll();
+    foreach ($rows as $row) {
+        $record = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+        foreach ($record->getFacts() as $fact) {
+            $old_place = $fact->getAttribute('PLAC');
+            if (preg_match('/(^|, )' . preg_quote($search, '/') . '$/i', $old_place)) {
+                $new_place           = preg_replace('/(^|, )' . preg_quote($search, '/') . '$/i', '$1' . $replace, $old_place);
+                $changes[$old_place] = $new_place;
+                if ($confirm == 'update') {
+                    $gedcom = preg_replace('/(\n2 PLAC (?:.*, )*)' . preg_quote($search, '/') . '(\n|$)/i', '$1' . $replace . '$2', $fact->getGedcom());
+                    $record->updateFact($fact->getFactId(), $gedcom, false);
+                }
+            }
+        }
+    }
 }
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isManager($WT_TREE))
-	->setPageTitle(I18N::translate('Update all the place names in a family tree') . ' — ' . $WT_TREE->getTitleHtml())
-	->addInlineJavascript('autocomplete();')
-	->pageHeader();
+    ->restrictAccess(Auth::isManager($WT_TREE))
+    ->setPageTitle(I18N::translate('Update all the place names in a family tree') . ' — ' . $WT_TREE->getTitleHtml())
+    ->addInlineJavascript('autocomplete();')
+    ->pageHeader();
 ?>
 
 <ol class="breadcrumb small">

family.php

Indentation +49 added lines, -49 removed lines

@@ -33,38 +33,38 @@ 
 $controller = new FamilyController($record);
 
 if ($controller->record && $controller->record->canShow()) {
-	if ($controller->record->isPendingDeletion()) {
-		if (Auth::isModerator($controller->record->getTree())) {
-			FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
-				'This family has been deleted. You should review the deletion and then %1$s or %2$s it.',
-				'<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>',
-				'<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>'
-			) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		} elseif (Auth::isEditor($controller->record->getTree())) {
-			FlashMessages::addMessage(I18N::translate('This family has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		}
-	} elseif ($controller->record->isPendingAddtion()) {
-		if (Auth::isModerator($controller->record->getTree())) {
-			FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
-				'This family has been edited. You should review the changes and then %1$s or %2$s them.',
-				'<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>',
-				'<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>'
-			) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		} elseif (Auth::isEditor($controller->record->getTree())) {
-			FlashMessages::addMessage(I18N::translate('This family has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		}
-	}
-	$controller->pageHeader();
+    if ($controller->record->isPendingDeletion()) {
+        if (Auth::isModerator($controller->record->getTree())) {
+            FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
+                'This family has been deleted. You should review the deletion and then %1$s or %2$s it.',
+                '<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>',
+                '<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>'
+            ) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        } elseif (Auth::isEditor($controller->record->getTree())) {
+            FlashMessages::addMessage(I18N::translate('This family has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        }
+    } elseif ($controller->record->isPendingAddtion()) {
+        if (Auth::isModerator($controller->record->getTree())) {
+            FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
+                'This family has been edited. You should review the changes and then %1$s or %2$s them.',
+                '<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>',
+                '<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>'
+            ) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        } elseif (Auth::isEditor($controller->record->getTree())) {
+            FlashMessages::addMessage(I18N::translate('This family has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        }
+    }
+    $controller->pageHeader();
 } elseif ($controller->record && $controller->record->getTree()->getPreference('SHOW_PRIVATE_RELATIONSHIPS')) {
-	$controller->pageHeader();
-	// Continue - to display the children/parents/grandparents.
-	// We'll check for showing the details again later
+    $controller->pageHeader();
+    // Continue - to display the children/parents/grandparents.
+    // We'll check for showing the details again later
 } else {
-	FlashMessages::addMessage(I18N::translate('This family does not exist or you do not have permission to view it.'), 'danger');
-	http_response_code(404);
-	$controller->pageHeader();
+    FlashMessages::addMessage(I18N::translate('This family does not exist or you do not have permission to view it.'), 'danger');
+    http_response_code(404);
+    $controller->pageHeader();
 
-	return;
+    return;
 }
 
 ?>
@@ -85,32 +85,32 @@ 
 					<tr>
 						<td colspan="2">
 							<?php
-							FunctionsCharts::printFamilyParents($controller->record);
-							if (Auth::isEditor($controller->record->getTree())) {
-								$husb = $controller->record->getHusband();
-								if (!$husb) {
-									echo '<a href="#" onclick="return add_spouse_to_family(\'', $controller->record->getXref(), '\', \'HUSB\');">', I18N::translate('Add a father'), '</a><br>';
-								}
-								$wife = $controller->record->getWife();
-								if (!$wife) {
-									echo '<a href="#" onclick="return add_spouse_to_family(\'', $controller->record->getXref(), '\', \'WIFE\');">', I18N::translate('Add a mother'), '</a><br>';
-								}
-							}
-							?>
+                            FunctionsCharts::printFamilyParents($controller->record);
+                            if (Auth::isEditor($controller->record->getTree())) {
+                                $husb = $controller->record->getHusband();
+                                if (!$husb) {
+                                    echo '<a href="#" onclick="return add_spouse_to_family(\'', $controller->record->getXref(), '\', \'HUSB\');">', I18N::translate('Add a father'), '</a><br>';
+                                }
+                                $wife = $controller->record->getWife();
+                                if (!$wife) {
+                                    echo '<a href="#" onclick="return add_spouse_to_family(\'', $controller->record->getXref(), '\', \'WIFE\');">', I18N::translate('Add a mother'), '</a><br>';
+                                }
+                            }
+                            ?>
 						</td>
 					</tr>
 					<tr>
 						<td colspan="2">
 							<span class="subheaders"><?php echo I18N::translate('Family group information'); ?></span>
 							<?php
-							if ($controller->record->canShow()) {
-								echo '<table class="facts_table">';
-								$controller->printFamilyFacts();
-								echo '</table>';
-							} else {
-								echo '<p>', I18N::translate('The details of this family are private.'), '</p>';
-							}
-							?>
+                            if ($controller->record->canShow()) {
+                                echo '<table class="facts_table">';
+                                $controller->printFamilyFacts();
+                                echo '</table>';
+                            } else {
+                                echo '<p>', I18N::translate('The details of this family are private.'), '</p>';
+                            }
+                            ?>
 						</td>
 					</tr>
 				</table>

admin_site_change.php

Indentation +156 added lines, -156 removed lines

@@ -32,8 +32,8 @@ 
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isManager($WT_TREE))
-	->setPageTitle(I18N::translate('Changes'));
+    ->restrictAccess(Auth::isManager($WT_TREE))
+    ->setPageTitle(I18N::translate('Changes'));
 
 $earliest = Database::prepare("SELECT IFNULL(DATE(MIN(change_time)), CURDATE()) FROM `##change`")->execute(array())->fetchOne();
 $latest   = Database::prepare("SELECT IFNULL(DATE(MAX(change_time)), CURDATE()) FROM `##change`")->execute(array())->fetchOne();
@@ -51,197 +51,197 @@ 
 $search = isset($search['value']) ? $search['value'] : null;
 
 $statuses = array(
-	'accepted' => /* I18N: the status of an edit accepted/rejected/pending */ I18N::translate('accepted'),
-	'rejected' => /* I18N: the status of an edit accepted/rejected/pending */ I18N::translate('rejected'),
-	'pending'  => /* I18N: the status of an edit accepted/rejected/pending */ I18N::translate('pending'),
+    'accepted' => /* I18N: the status of an edit accepted/rejected/pending */ I18N::translate('accepted'),
+    'rejected' => /* I18N: the status of an edit accepted/rejected/pending */ I18N::translate('rejected'),
+    'pending'  => /* I18N: the status of an edit accepted/rejected/pending */ I18N::translate('pending'),
 );
 
 if (Auth::isAdmin()) {
-	// Administrators can see all logs
-	$gedc = Filter::get('gedc');
+    // Administrators can see all logs
+    $gedc = Filter::get('gedc');
 } else {
-	// Managers can only see logs relating to this gedcom
-	$gedc = $WT_TREE->getName();
+    // Managers can only see logs relating to this gedcom
+    $gedc = $WT_TREE->getName();
 }
 
 $sql_select =
-	"SELECT SQL_CALC_FOUND_ROWS change_id, change_time, status, xref, old_gedcom, new_gedcom, IFNULL(user_name, '<none>') AS user_name, IFNULL(gedcom_name, '<none>') AS gedcom_name" .
-	" FROM `##change`" .
-	" LEFT JOIN `##user` USING (user_id)" . // user may be deleted
-	" LEFT JOIN `##gedcom` USING (gedcom_id)"; // gedcom may be deleted
+    "SELECT SQL_CALC_FOUND_ROWS change_id, change_time, status, xref, old_gedcom, new_gedcom, IFNULL(user_name, '<none>') AS user_name, IFNULL(gedcom_name, '<none>') AS gedcom_name" .
+    " FROM `##change`" .
+    " LEFT JOIN `##user` USING (user_id)" . // user may be deleted
+    " LEFT JOIN `##gedcom` USING (gedcom_id)"; // gedcom may be deleted
 
 $where = " WHERE 1";
 $args  = array();
 if ($search) {
-	$where .= " AND (old_gedcom LIKE CONCAT('%', :search_1, '%') OR new_gedcom LIKE CONCAT('%', :search_2, '%'))";
-	$args['search_1'] = $search;
-	$args['search_2'] = $search;
+    $where .= " AND (old_gedcom LIKE CONCAT('%', :search_1, '%') OR new_gedcom LIKE CONCAT('%', :search_2, '%'))";
+    $args['search_1'] = $search;
+    $args['search_2'] = $search;
 }
 if ($from) {
-	$where .= " AND change_time >= :from";
-	$args['from'] = $from;
+    $where .= " AND change_time >= :from";
+    $args['from'] = $from;
 }
 if ($to) {
-	$where .= " AND change_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
-	$args['to'] = $to;
+    $where .= " AND change_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
+    $args['to'] = $to;
 }
 if ($type) {
-	$where .= " AND status = :status";
-	$args['status'] = $type;
+    $where .= " AND status = :status";
+    $args['status'] = $type;
 }
 if ($oldged) {
-	$where .= " AND old_gedcom LIKE CONCAT('%', :old_ged, '%')";
-	$args['old_ged'] = $oldged;
+    $where .= " AND old_gedcom LIKE CONCAT('%', :old_ged, '%')";
+    $args['old_ged'] = $oldged;
 }
 if ($newged) {
-	$where .= " AND new_gedcom LIKE CONCAT('%', :new_ged, '%')";
-	$args['new_ged'] = $newged;
+    $where .= " AND new_gedcom LIKE CONCAT('%', :new_ged, '%')";
+    $args['new_ged'] = $newged;
 }
 if ($xref) {
-	$where .= " AND xref = :xref";
-	$args['xref'] = $xref;
+    $where .= " AND xref = :xref";
+    $args['xref'] = $xref;
 }
 if ($user) {
-	$where .= " AND user_name LIKE CONCAT('%', :user, '%')";
-	$args['user'] = $user;
+    $where .= " AND user_name LIKE CONCAT('%', :user, '%')";
+    $args['user'] = $user;
 }
 if ($gedc) {
-	$where .= " AND gedcom_name LIKE CONCAT('%', :gedc, '%')";
-	$args['gedc'] = $gedc;
+    $where .= " AND gedcom_name LIKE CONCAT('%', :gedc, '%')";
+    $args['gedc'] = $gedc;
 }
 
 switch ($action) {
 case 'delete':
-	$sql_delete =
-		"DELETE `##change` FROM `##change`" .
-		" LEFT JOIN `##user` USING (user_id)" . // user may be deleted
-		" LEFT JOIN `##gedcom` USING (gedcom_id)"; // gedcom may be deleted
+    $sql_delete =
+        "DELETE `##change` FROM `##change`" .
+        " LEFT JOIN `##user` USING (user_id)" . // user may be deleted
+        " LEFT JOIN `##gedcom` USING (gedcom_id)"; // gedcom may be deleted
 
-	Database::prepare($sql_delete . $where)->execute($args);
-	break;
+    Database::prepare($sql_delete . $where)->execute($args);
+    break;
 
 case 'export':
-	header('Content-Type: text/csv');
-	header('Content-Disposition: attachment; filename="webtrees-changes.csv"');
-	$rows = Database::prepare($sql_select . $where . ' ORDER BY change_id')->execute($args)->fetchAll();
-	foreach ($rows as $row) {
-		echo
-			'"', $row->change_time, '",',
-			'"', $row->status, '",',
-			'"', $row->xref, '",',
-			'"', str_replace('"', '""', $row->old_gedcom), '",',
-			'"', str_replace('"', '""', $row->new_gedcom), '",',
-			'"', str_replace('"', '""', $row->user_name), '",',
-			'"', str_replace('"', '""', $row->gedcom_name), '"',
-			"\n";
-	}
-
-	return;
+    header('Content-Type: text/csv');
+    header('Content-Disposition: attachment; filename="webtrees-changes.csv"');
+    $rows = Database::prepare($sql_select . $where . ' ORDER BY change_id')->execute($args)->fetchAll();
+    foreach ($rows as $row) {
+        echo
+            '"', $row->change_time, '",',
+            '"', $row->status, '",',
+            '"', $row->xref, '",',
+            '"', str_replace('"', '""', $row->old_gedcom), '",',
+            '"', str_replace('"', '""', $row->new_gedcom), '",',
+            '"', str_replace('"', '""', $row->user_name), '",',
+            '"', str_replace('"', '""', $row->gedcom_name), '"',
+            "\n";
+    }
+
+    return;
 case 'load_json':
-	$start  = Filter::getInteger('start');
-	$length = Filter::getInteger('length');
-	$order  = Filter::getArray('order');
-
-	if ($order) {
-		$order_by = " ORDER BY ";
-		foreach ($order as $key => $value) {
-			if ($key > 0) {
-				$order_by .= ',';
-			}
-			// Datatables numbers columns 0, 1, 2
-			// MySQL numbers columns 1, 2, 3
-			switch ($value['dir']) {
-			case 'asc':
-				$order_by .= (1 + $value['column']) . " ASC ";
-				break;
-			case 'desc':
-				$order_by .= (1 + $value['column']) . " DESC ";
-				break;
-			}
-		}
-	} else {
-		$order_by = " ORDER BY 1 DESC";
-	}
-
-	if ($length) {
-		Auth::user()->setPreference('admin_site_change_page_size', $length);
-		$limit          = " LIMIT :limit OFFSET :offset";
-		$args['limit']  = $length;
-		$args['offset'] = $start;
-	} else {
-		$limit = "";
-	}
-
-	// This becomes a JSON list, not array, so need to fetch with numeric keys.
-	$rows = Database::prepare($sql_select . $where . $order_by . $limit)->execute($args)->fetchAll(PDO::FETCH_OBJ);
-	// Total filtered/unfiltered rows
-	$recordsFiltered = (int) Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
-	$recordsTotal    = (int) Database::prepare("SELECT COUNT(*) FROM `##change`")->fetchOne();
-
-	$data      = array();
-	$algorithm = new MyersDiff;
-
-	foreach ($rows as $row) {
-		$old_lines = preg_split('/[\n]+/', $row->old_gedcom, -1, PREG_SPLIT_NO_EMPTY);
-		$new_lines = preg_split('/[\n]+/', $row->new_gedcom, -1, PREG_SPLIT_NO_EMPTY);
-
-		$differences = $algorithm->calculate($old_lines, $new_lines);
-		$diff_lines  = array();
-
-		foreach ($differences as $difference) {
-			switch ($difference[1]) {
-			case MyersDiff::DELETE:
-				$diff_lines[] = '<del>' . $difference[0] . '</del>';
-				break;
-			case MyersDiff::INSERT:
-				$diff_lines[] = '<ins>' . $difference[0] . '</ins>';
-				break;
-			default:
-				$diff_lines[] = $difference[0];
-			}
-		}
-
-		// Only convert valid xrefs to links
-		$record = GedcomRecord::getInstance($row->xref, Tree::findByName($gedc));
-		$data[] = array(
-			$row->change_id,
-			$row->change_time,
-			I18N::translate($row->status),
-			$record ? '<a href="' . $record->getHtmlUrl() . '">' . $record->getXref() . '</a>' : $row->xref,
-			'<div class="gedcom-data" dir="ltr">' .
-				preg_replace_callback('/@(' . WT_REGEX_XREF . ')@/',
-					function ($match) use ($gedc) {
-						$record = GedcomRecord::getInstance($match[1], Tree::findByName($gedc));
-
-						return $record ? '<a href="#" onclick="return edit_raw(\'' . $match[1] . '\');">' . $match[0] . '</a>' : $match[0];
-					},
-					implode("\n", $diff_lines)
-				) .
-			'</div>',
-			$row->user_name,
-			$row->gedcom_name,
-		);
-	}
-
-	header('Content-type: application/json');
-	// See http://www.datatables.net/usage/server-side
-	echo json_encode(array(
-		'draw'            => Filter::getInteger('draw'),
-		'recordsTotal'    => $recordsTotal,
-		'recordsFiltered' => $recordsFiltered,
-		'data'            => $data,
-	));
-
-	return;
+    $start  = Filter::getInteger('start');
+    $length = Filter::getInteger('length');
+    $order  = Filter::getArray('order');
+
+    if ($order) {
+        $order_by = " ORDER BY ";
+        foreach ($order as $key => $value) {
+            if ($key > 0) {
+                $order_by .= ',';
+            }
+            // Datatables numbers columns 0, 1, 2
+            // MySQL numbers columns 1, 2, 3
+            switch ($value['dir']) {
+            case 'asc':
+                $order_by .= (1 + $value['column']) . " ASC ";
+                break;
+            case 'desc':
+                $order_by .= (1 + $value['column']) . " DESC ";
+                break;
+            }
+        }
+    } else {
+        $order_by = " ORDER BY 1 DESC";
+    }
+
+    if ($length) {
+        Auth::user()->setPreference('admin_site_change_page_size', $length);
+        $limit          = " LIMIT :limit OFFSET :offset";
+        $args['limit']  = $length;
+        $args['offset'] = $start;
+    } else {
+        $limit = "";
+    }
+
+    // This becomes a JSON list, not array, so need to fetch with numeric keys.
+    $rows = Database::prepare($sql_select . $where . $order_by . $limit)->execute($args)->fetchAll(PDO::FETCH_OBJ);
+    // Total filtered/unfiltered rows
+    $recordsFiltered = (int) Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
+    $recordsTotal    = (int) Database::prepare("SELECT COUNT(*) FROM `##change`")->fetchOne();
+
+    $data      = array();
+    $algorithm = new MyersDiff;
+
+    foreach ($rows as $row) {
+        $old_lines = preg_split('/[\n]+/', $row->old_gedcom, -1, PREG_SPLIT_NO_EMPTY);
+        $new_lines = preg_split('/[\n]+/', $row->new_gedcom, -1, PREG_SPLIT_NO_EMPTY);
+
+        $differences = $algorithm->calculate($old_lines, $new_lines);
+        $diff_lines  = array();
+
+        foreach ($differences as $difference) {
+            switch ($difference[1]) {
+            case MyersDiff::DELETE:
+                $diff_lines[] = '<del>' . $difference[0] . '</del>';
+                break;
+            case MyersDiff::INSERT:
+                $diff_lines[] = '<ins>' . $difference[0] . '</ins>';
+                break;
+            default:
+                $diff_lines[] = $difference[0];
+            }
+        }
+
+        // Only convert valid xrefs to links
+        $record = GedcomRecord::getInstance($row->xref, Tree::findByName($gedc));
+        $data[] = array(
+            $row->change_id,
+            $row->change_time,
+            I18N::translate($row->status),
+            $record ? '<a href="' . $record->getHtmlUrl() . '">' . $record->getXref() . '</a>' : $row->xref,
+            '<div class="gedcom-data" dir="ltr">' .
+                preg_replace_callback('/@(' . WT_REGEX_XREF . ')@/',
+                    function ($match) use ($gedc) {
+                        $record = GedcomRecord::getInstance($match[1], Tree::findByName($gedc));
+
+                        return $record ? '<a href="#" onclick="return edit_raw(\'' . $match[1] . '\');">' . $match[0] . '</a>' : $match[0];
+                    },
+                    implode("\n", $diff_lines)
+                ) .
+            '</div>',
+            $row->user_name,
+            $row->gedcom_name,
+        );
+    }
+
+    header('Content-type: application/json');
+    // See http://www.datatables.net/usage/server-side
+    echo json_encode(array(
+        'draw'            => Filter::getInteger('draw'),
+        'recordsTotal'    => $recordsTotal,
+        'recordsFiltered' => $recordsFiltered,
+        'data'            => $data,
+    ));
+
+    return;
 }
 
 $controller
-	->pageHeader()
-	->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-	->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
-	->addExternalJavascript(WT_MOMENT_JS_URL)
-	->addExternalJavascript(WT_BOOTSTRAP_DATETIMEPICKER_JS_URL)
-	->addInlineJavascript('
+    ->pageHeader()
+    ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+    ->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
+    ->addExternalJavascript(WT_MOMENT_JS_URL)
+    ->addExternalJavascript(WT_BOOTSTRAP_DATETIMEPICKER_JS_URL)
+    ->addInlineJavascript('
 		jQuery(".table-site-changes").dataTable( {
 			processing: true,
 			serverSide: true,
@@ -280,7 +280,7 @@ 
 
 $users_array = array();
 foreach (User::all() as $tmp_user) {
-	$users_array[$tmp_user->getUserName()] = $tmp_user->getUserName();
+    $users_array[$tmp_user->getUserName()] = $tmp_user->getUserName();
 }
 
 ?>

admin_users.php

Indentation +300 added lines, -300 removed lines

@@ -36,248 +36,248 @@ 
 
 // Valid values for form variables
 $ALL_EDIT_OPTIONS = array(
-	'none'   => /* I18N: Listbox entry; name of a role */ I18N::translate('Visitor'),
-	'access' => /* I18N: Listbox entry; name of a role */ I18N::translate('Member'),
-	'edit'   => /* I18N: Listbox entry; name of a role */ I18N::translate('Editor'),
-	'accept' => /* I18N: Listbox entry; name of a role */ I18N::translate('Moderator'),
-	'admin'  => /* I18N: Listbox entry; name of a role */ I18N::translate('Manager'),
+    'none'   => /* I18N: Listbox entry; name of a role */ I18N::translate('Visitor'),
+    'access' => /* I18N: Listbox entry; name of a role */ I18N::translate('Member'),
+    'edit'   => /* I18N: Listbox entry; name of a role */ I18N::translate('Editor'),
+    'accept' => /* I18N: Listbox entry; name of a role */ I18N::translate('Moderator'),
+    'admin'  => /* I18N: Listbox entry; name of a role */ I18N::translate('Manager'),
 );
 
 // Form actions
 switch (Filter::post('action')) {
 case 'save':
-	if (Filter::checkCsrf()) {
-		$user_id        = Filter::postInteger('user_id');
-		$user           = User::find($user_id);
-		$username       = Filter::post('username');
-		$real_name      = Filter::post('real_name');
-		$email          = Filter::postEmail('email');
-		$pass1          = Filter::post('pass1', WT_REGEX_PASSWORD);
-		$pass2          = Filter::post('pass2', WT_REGEX_PASSWORD);
-		$theme          = Filter::post('theme', implode('|', array_keys(Theme::themeNames())), '');
-		$language       = Filter::post('language');
-		$timezone       = Filter::post('timezone');
-		$contact_method = Filter::post('contact_method');
-		$comment        = Filter::post('comment');
-		$auto_accept    = Filter::postBool('auto_accept');
-		$canadmin       = Filter::postBool('canadmin');
-		$visible_online = Filter::postBool('visible_online');
-		$verified       = Filter::postBool('verified');
-		$approved       = Filter::postBool('approved');
-
-		if ($user_id === 0) {
-			// Create a new user
-			if (User::findByUserName($username)) {
-				FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
-			} elseif (User::findByEmail($email)) {
-				FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
-			} elseif ($pass1 !== $pass2) {
-				FlashMessages::addMessage(I18N::translate('The passwords do not match.'));
-			} else {
-				$user = User::create($username, $real_name, $email, $pass1);
-				$user->setPreference('reg_timestamp', date('U'))->setPreference('sessiontime', '0');
-				Log::addAuthenticationLog('User ->' . $username . '<- created');
-			}
-		} else {
-			$user = User::find($user_id);
-			if ($user && $username && $real_name) {
-				$user->setEmail($email);
-				$user->setUserName($username);
-				$user->setRealName($real_name);
-				if ($pass1 !== null && $pass1 === $pass2) {
-					$user->setPassword($pass1);
-				}
-			}
-		}
-
-		if ($user) {
-			// Approving for the first time? Send a confirmation email
-			if ($approved && !$user->getPreference('verified_by_admin') && $user->getPreference('sessiontime') == 0) {
-				I18N::init($user->getPreference('language'));
-				Mail::systemMessage(
-					$WT_TREE,
-					$user,
-					I18N::translate('Approval of account at %s', WT_BASE_URL),
-					I18N::translate('The administrator at the webtrees site %s has approved your application for an account. You may now sign in by accessing the following link: %s', WT_BASE_URL, WT_BASE_URL)
-				);
-			}
-
-			$user
-				->setPreference('theme', $theme)
-				->setPreference('language', $language)
-				->setPreference('TIMEZONE', $timezone)
-				->setPreference('contactmethod', $contact_method)
-				->setPreference('comment', $comment)
-				->setPreference('auto_accept', $auto_accept ? '1' : '0')
-				->setPreference('visibleonline', $visible_online ? '1' : '0')
-				->setPreference('verified', $verified ? '1' : '0')
-				->setPreference('verified_by_admin', $approved ? '1' : '0');
-
-			// We cannot change our own admin status. Another admin will need to do it.
-			if ($user->getUserId() !== Auth::id()) {
-				$user->setPreference('canadmin', $canadmin ? '1' : '0');
-			}
-
-			foreach (Tree::getAll() as $tree) {
-				$tree->setUserPreference($user, 'gedcomid', Filter::post('gedcomid' . $tree->getTreeId(), WT_REGEX_XREF));
-				$tree->setUserPreference($user, 'canedit', Filter::post('canedit' . $tree->getTreeId(), implode('|', array_keys($ALL_EDIT_OPTIONS))));
-				if (Filter::post('gedcomid' . $tree->getTreeId(), WT_REGEX_XREF)) {
-					$tree->setUserPreference($user, 'RELATIONSHIP_PATH_LENGTH', Filter::postInteger('RELATIONSHIP_PATH_LENGTH' . $tree->getTreeId(), 0, 10, 0));
-				} else {
-					// Do not allow a path length to be set if the individual ID is not
-					$tree->setUserPreference($user, 'RELATIONSHIP_PATH_LENGTH', null);
-				}
-			}
-		}
-	}
-
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
+    if (Filter::checkCsrf()) {
+        $user_id        = Filter::postInteger('user_id');
+        $user           = User::find($user_id);
+        $username       = Filter::post('username');
+        $real_name      = Filter::post('real_name');
+        $email          = Filter::postEmail('email');
+        $pass1          = Filter::post('pass1', WT_REGEX_PASSWORD);
+        $pass2          = Filter::post('pass2', WT_REGEX_PASSWORD);
+        $theme          = Filter::post('theme', implode('|', array_keys(Theme::themeNames())), '');
+        $language       = Filter::post('language');
+        $timezone       = Filter::post('timezone');
+        $contact_method = Filter::post('contact_method');
+        $comment        = Filter::post('comment');
+        $auto_accept    = Filter::postBool('auto_accept');
+        $canadmin       = Filter::postBool('canadmin');
+        $visible_online = Filter::postBool('visible_online');
+        $verified       = Filter::postBool('verified');
+        $approved       = Filter::postBool('approved');
+
+        if ($user_id === 0) {
+            // Create a new user
+            if (User::findByUserName($username)) {
+                FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
+            } elseif (User::findByEmail($email)) {
+                FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
+            } elseif ($pass1 !== $pass2) {
+                FlashMessages::addMessage(I18N::translate('The passwords do not match.'));
+            } else {
+                $user = User::create($username, $real_name, $email, $pass1);
+                $user->setPreference('reg_timestamp', date('U'))->setPreference('sessiontime', '0');
+                Log::addAuthenticationLog('User ->' . $username . '<- created');
+            }
+        } else {
+            $user = User::find($user_id);
+            if ($user && $username && $real_name) {
+                $user->setEmail($email);
+                $user->setUserName($username);
+                $user->setRealName($real_name);
+                if ($pass1 !== null && $pass1 === $pass2) {
+                    $user->setPassword($pass1);
+                }
+            }
+        }
+
+        if ($user) {
+            // Approving for the first time? Send a confirmation email
+            if ($approved && !$user->getPreference('verified_by_admin') && $user->getPreference('sessiontime') == 0) {
+                I18N::init($user->getPreference('language'));
+                Mail::systemMessage(
+                    $WT_TREE,
+                    $user,
+                    I18N::translate('Approval of account at %s', WT_BASE_URL),
+                    I18N::translate('The administrator at the webtrees site %s has approved your application for an account. You may now sign in by accessing the following link: %s', WT_BASE_URL, WT_BASE_URL)
+                );
+            }
+
+            $user
+                ->setPreference('theme', $theme)
+                ->setPreference('language', $language)
+                ->setPreference('TIMEZONE', $timezone)
+                ->setPreference('contactmethod', $contact_method)
+                ->setPreference('comment', $comment)
+                ->setPreference('auto_accept', $auto_accept ? '1' : '0')
+                ->setPreference('visibleonline', $visible_online ? '1' : '0')
+                ->setPreference('verified', $verified ? '1' : '0')
+                ->setPreference('verified_by_admin', $approved ? '1' : '0');
+
+            // We cannot change our own admin status. Another admin will need to do it.
+            if ($user->getUserId() !== Auth::id()) {
+                $user->setPreference('canadmin', $canadmin ? '1' : '0');
+            }
+
+            foreach (Tree::getAll() as $tree) {
+                $tree->setUserPreference($user, 'gedcomid', Filter::post('gedcomid' . $tree->getTreeId(), WT_REGEX_XREF));
+                $tree->setUserPreference($user, 'canedit', Filter::post('canedit' . $tree->getTreeId(), implode('|', array_keys($ALL_EDIT_OPTIONS))));
+                if (Filter::post('gedcomid' . $tree->getTreeId(), WT_REGEX_XREF)) {
+                    $tree->setUserPreference($user, 'RELATIONSHIP_PATH_LENGTH', Filter::postInteger('RELATIONSHIP_PATH_LENGTH' . $tree->getTreeId(), 0, 10, 0));
+                } else {
+                    // Do not allow a path length to be set if the individual ID is not
+                    $tree->setUserPreference($user, 'RELATIONSHIP_PATH_LENGTH', null);
+                }
+            }
+        }
+    }
+
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+    return;
 }
 
 switch (Filter::get('action')) {
 case 'load_json':
-	// Generate an AJAX/JSON response for datatables to load a block of rows
-	$search = Filter::postArray('search');
-	$search = $search['value'];
-	$start  = Filter::postInteger('start');
-	$length = Filter::postInteger('length');
-	$order  = Filter::postArray('order');
-
-	$sql_select =
-		"SELECT SQL_CALC_FOUND_ROWS '', u.user_id, user_name, real_name, email, us1.setting_value, us2.setting_value, NULL, us3.setting_value, NULL, us4.setting_value, us5.setting_value" .
-		" FROM `##user` u" .
-		" LEFT JOIN `##user_setting` us1 ON (u.user_id=us1.user_id AND us1.setting_name='language')" .
-		" LEFT JOIN `##user_setting` us2 ON (u.user_id=us2.user_id AND us2.setting_name='reg_timestamp')" .
-		" LEFT JOIN `##user_setting` us3 ON (u.user_id=us3.user_id AND us3.setting_name='sessiontime')" .
-		" LEFT JOIN `##user_setting` us4 ON (u.user_id=us4.user_id AND us4.setting_name='verified')" .
-		" LEFT JOIN `##user_setting` us5 ON (u.user_id=us5.user_id AND us5.setting_name='verified_by_admin')" .
-		" WHERE u.user_id > 0";
-
-	$args = array();
-
-	if ($search) {
-		$sql_select .= " AND (user_name LIKE CONCAT('%', :search_1, '%') OR real_name LIKE CONCAT('%', :search_2, '%') OR email LIKE CONCAT('%', :search_3, '%'))";
-		$args['search_1'] = $search;
-		$args['search_2'] = $search;
-		$args['search_3'] = $search;
-	}
-
-	if ($order) {
-		$sql_select .= " ORDER BY ";
-		foreach ($order as $key => $value) {
-			if ($key > 0) {
-				$sql_select .= ',';
-			}
-			// Datatables numbers columns 0, 1, 2
-			// MySQL numbers columns 1, 2, 3
-			switch ($value['dir']) {
-			case 'asc':
-				$sql_select .= (1 + $value['column']) . " ASC ";
-				break;
-			case 'desc':
-				$sql_select .= (1 + $value['column']) . " DESC ";
-				break;
-			}
-		}
-	} else {
-		$sql_select = " ORDER BY 1 ASC";
-	}
-
-	if ($length) {
-		Auth::user()->setPreference('admin_users_page_size', $length);
-		$sql_select .= " LIMIT :limit OFFSET :offset";
-		$args['limit']  = $length;
-		$args['offset'] = $start;
-	}
-
-	// This becomes a JSON list, not array, so need to fetch with numeric keys.
-	$data = Database::prepare($sql_select)->execute($args)->fetchAll(PDO::FETCH_NUM);
-
-	$installed_languages = array();
-	foreach (I18N::installedLocales() as $installed_locale) {
-		$installed_languages[$installed_locale->languageTag()] = $installed_locale->endonym();
-	}
-
-	// Reformat various columns for display
-	foreach ($data as &$datum) {
-		$user_id   = $datum[1];
-		$user_name = $datum[2];
-
-		if ($user_id != Auth::id()) {
-			$admin_options = '<li><a href="#" onclick="return masquerade(' . $user_id . ')"><i class="fa fa-fw fa-user"></i> ' . /* I18N: Pretend to be another user, by logging in as them */
-				I18N::translate('Masquerade as this user') . '</a></li>' . '<li><a href="#" onclick="delete_user(\'' . I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeJs($user_name)) . '\', \'' . Filter::escapeJs($user_id) . '\');"><i class="fa fa-fw fa-trash-o"></i> ' . I18N::translate('Delete') . '</a></li>';
-		} else {
-			// Do not delete ourself!
-			$admin_options = '';
-		}
-
-		$datum[0] = '<div class="btn-group"><button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-pencil"></i> <span class="caret"></span></button><ul class="dropdown-menu" role="menu"><li><a href="?action=edit&amp;user_id=' . $user_id . '"><i class="fa fa-fw fa-pencil"></i> ' . I18N::translate('Edit') . '</a></li><li class="divider"><li><a href="index_edit.php?user_id=' . $user_id . '"><i class="fa fa-fw fa-th-large"></i> ' . I18N::translate('Change the blocks on this user’s “My page”') . '</a></li>' . $admin_options . '</ul></div>';
-		// $datum[1] is the user ID
-		// $datum[3] is the real name
-		$datum[3] = '<span dir="auto">' . Filter::escapeHtml($datum[3]) . '</span>';
-		// $datum[4] is the email address
-		if ($user_id != Auth::id()) {
-			$datum[4] = '<a href="#" onclick="return message(\'' . Filter::escapeHtml($datum[2]) . '\', \'\', \'\');">' . Filter::escapeHtml($datum[4]) . '</i></a>';
-		}
-		// $datum[2] is the username
-		$datum[2] = '<span dir="auto">' . Filter::escapeHtml($datum[2]) . '</span>';
-		// $datum[5] is the langauge
-		if (array_key_exists($datum[5], $installed_languages)) {
-			$datum[5] = $installed_languages[$datum[5]];
-		}
-		// $datum[6] is the sortable registration timestamp
-		$datum[7] = $datum[6] ? FunctionsDate::formatTimestamp($datum[6] + WT_TIMESTAMP_OFFSET) : '';
-		if (date("U") - $datum[6] > 604800 && !$datum[10]) {
-			$datum[7] = '<span class="red">' . $datum[7] . '</span>';
-		}
-		// $datum[8] is the sortable last-login timestamp
-		if ($datum[8]) {
-			$datum[9] = FunctionsDate::formatTimestamp($datum[8] + WT_TIMESTAMP_OFFSET) . '<br>' . I18N::timeAgo(WT_TIMESTAMP - $datum[8]);
-		} else {
-			$datum[9] = I18N::translate('Never');
-		}
-		$datum[10] = $datum[10] ? I18N::translate('yes') : I18N::translate('no');
-		$datum[11] = $datum[11] ? I18N::translate('yes') : I18N::translate('no');
-	}
-
-	// Total filtered/unfiltered rows
-	$recordsFiltered = (int) Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
-	$recordsTotal    = User::count();
-
-	header('Content-type: application/json');
-	// See http://www.datatables.net/usage/server-side
-	echo json_encode(array(
-		'draw'            => Filter::getInteger('draw'),
-		'recordsTotal'    => $recordsTotal,
-		'recordsFiltered' => $recordsFiltered,
-		'data'            => $data,
-	));
-
-	return;
+    // Generate an AJAX/JSON response for datatables to load a block of rows
+    $search = Filter::postArray('search');
+    $search = $search['value'];
+    $start  = Filter::postInteger('start');
+    $length = Filter::postInteger('length');
+    $order  = Filter::postArray('order');
+
+    $sql_select =
+        "SELECT SQL_CALC_FOUND_ROWS '', u.user_id, user_name, real_name, email, us1.setting_value, us2.setting_value, NULL, us3.setting_value, NULL, us4.setting_value, us5.setting_value" .
+        " FROM `##user` u" .
+        " LEFT JOIN `##user_setting` us1 ON (u.user_id=us1.user_id AND us1.setting_name='language')" .
+        " LEFT JOIN `##user_setting` us2 ON (u.user_id=us2.user_id AND us2.setting_name='reg_timestamp')" .
+        " LEFT JOIN `##user_setting` us3 ON (u.user_id=us3.user_id AND us3.setting_name='sessiontime')" .
+        " LEFT JOIN `##user_setting` us4 ON (u.user_id=us4.user_id AND us4.setting_name='verified')" .
+        " LEFT JOIN `##user_setting` us5 ON (u.user_id=us5.user_id AND us5.setting_name='verified_by_admin')" .
+        " WHERE u.user_id > 0";
+
+    $args = array();
+
+    if ($search) {
+        $sql_select .= " AND (user_name LIKE CONCAT('%', :search_1, '%') OR real_name LIKE CONCAT('%', :search_2, '%') OR email LIKE CONCAT('%', :search_3, '%'))";
+        $args['search_1'] = $search;
+        $args['search_2'] = $search;
+        $args['search_3'] = $search;
+    }
+
+    if ($order) {
+        $sql_select .= " ORDER BY ";
+        foreach ($order as $key => $value) {
+            if ($key > 0) {
+                $sql_select .= ',';
+            }
+            // Datatables numbers columns 0, 1, 2
+            // MySQL numbers columns 1, 2, 3
+            switch ($value['dir']) {
+            case 'asc':
+                $sql_select .= (1 + $value['column']) . " ASC ";
+                break;
+            case 'desc':
+                $sql_select .= (1 + $value['column']) . " DESC ";
+                break;
+            }
+        }
+    } else {
+        $sql_select = " ORDER BY 1 ASC";
+    }
+
+    if ($length) {
+        Auth::user()->setPreference('admin_users_page_size', $length);
+        $sql_select .= " LIMIT :limit OFFSET :offset";
+        $args['limit']  = $length;
+        $args['offset'] = $start;
+    }
+
+    // This becomes a JSON list, not array, so need to fetch with numeric keys.
+    $data = Database::prepare($sql_select)->execute($args)->fetchAll(PDO::FETCH_NUM);
+
+    $installed_languages = array();
+    foreach (I18N::installedLocales() as $installed_locale) {
+        $installed_languages[$installed_locale->languageTag()] = $installed_locale->endonym();
+    }
+
+    // Reformat various columns for display
+    foreach ($data as &$datum) {
+        $user_id   = $datum[1];
+        $user_name = $datum[2];
+
+        if ($user_id != Auth::id()) {
+            $admin_options = '<li><a href="#" onclick="return masquerade(' . $user_id . ')"><i class="fa fa-fw fa-user"></i> ' . /* I18N: Pretend to be another user, by logging in as them */
+                I18N::translate('Masquerade as this user') . '</a></li>' . '<li><a href="#" onclick="delete_user(\'' . I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeJs($user_name)) . '\', \'' . Filter::escapeJs($user_id) . '\');"><i class="fa fa-fw fa-trash-o"></i> ' . I18N::translate('Delete') . '</a></li>';
+        } else {
+            // Do not delete ourself!
+            $admin_options = '';
+        }
+
+        $datum[0] = '<div class="btn-group"><button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-pencil"></i> <span class="caret"></span></button><ul class="dropdown-menu" role="menu"><li><a href="?action=edit&amp;user_id=' . $user_id . '"><i class="fa fa-fw fa-pencil"></i> ' . I18N::translate('Edit') . '</a></li><li class="divider"><li><a href="index_edit.php?user_id=' . $user_id . '"><i class="fa fa-fw fa-th-large"></i> ' . I18N::translate('Change the blocks on this user’s “My page”') . '</a></li>' . $admin_options . '</ul></div>';
+        // $datum[1] is the user ID
+        // $datum[3] is the real name
+        $datum[3] = '<span dir="auto">' . Filter::escapeHtml($datum[3]) . '</span>';
+        // $datum[4] is the email address
+        if ($user_id != Auth::id()) {
+            $datum[4] = '<a href="#" onclick="return message(\'' . Filter::escapeHtml($datum[2]) . '\', \'\', \'\');">' . Filter::escapeHtml($datum[4]) . '</i></a>';
+        }
+        // $datum[2] is the username
+        $datum[2] = '<span dir="auto">' . Filter::escapeHtml($datum[2]) . '</span>';
+        // $datum[5] is the langauge
+        if (array_key_exists($datum[5], $installed_languages)) {
+            $datum[5] = $installed_languages[$datum[5]];
+        }
+        // $datum[6] is the sortable registration timestamp
+        $datum[7] = $datum[6] ? FunctionsDate::formatTimestamp($datum[6] + WT_TIMESTAMP_OFFSET) : '';
+        if (date("U") - $datum[6] > 604800 && !$datum[10]) {
+            $datum[7] = '<span class="red">' . $datum[7] . '</span>';
+        }
+        // $datum[8] is the sortable last-login timestamp
+        if ($datum[8]) {
+            $datum[9] = FunctionsDate::formatTimestamp($datum[8] + WT_TIMESTAMP_OFFSET) . '<br>' . I18N::timeAgo(WT_TIMESTAMP - $datum[8]);
+        } else {
+            $datum[9] = I18N::translate('Never');
+        }
+        $datum[10] = $datum[10] ? I18N::translate('yes') : I18N::translate('no');
+        $datum[11] = $datum[11] ? I18N::translate('yes') : I18N::translate('no');
+    }
+
+    // Total filtered/unfiltered rows
+    $recordsFiltered = (int) Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
+    $recordsTotal    = User::count();
+
+    header('Content-type: application/json');
+    // See http://www.datatables.net/usage/server-side
+    echo json_encode(array(
+        'draw'            => Filter::getInteger('draw'),
+        'recordsTotal'    => $recordsTotal,
+        'recordsFiltered' => $recordsFiltered,
+        'data'            => $data,
+    ));
+
+    return;
 
 case 'edit':
-	$user_id = Filter::getInteger('user_id');
-
-	if ($user_id === 0) {
-		$controller->setPageTitle(I18N::translate('Add a user'));
-		$tmp            = new \stdClass;
-		$tmp->user_id   = '';
-		$tmp->user_name = '';
-		$tmp->real_name = '';
-		$tmp->email     = '';
-		$user           = new User($tmp);
-	} else {
-		$controller->setPageTitle(I18N::translate('Edit the user'));
-		$user = User::find($user_id);
-	}
-
-	$controller
-		->pageHeader()
-		->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-		->addInlineJavascript('autocomplete();')
-		->addInlineJavascript('
+    $user_id = Filter::getInteger('user_id');
+
+    if ($user_id === 0) {
+        $controller->setPageTitle(I18N::translate('Add a user'));
+        $tmp            = new \stdClass;
+        $tmp->user_id   = '';
+        $tmp->user_name = '';
+        $tmp->real_name = '';
+        $tmp->email     = '';
+        $user           = new User($tmp);
+    } else {
+        $controller->setPageTitle(I18N::translate('Edit the user'));
+        $user = User::find($user_id);
+    }
+
+    $controller
+        ->pageHeader()
+        ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+        ->addInlineJavascript('autocomplete();')
+        ->addInlineJavascript('
 			jQuery(".relpath").change(function() {
 				var fieldIDx = jQuery(this).attr("id");
 				var idNum = fieldIDx.replace("RELATIONSHIP_PATH_LENGTH","");
@@ -292,7 +292,7 @@ 
 			}
 		');
 
-	?>
+    ?>
 	<ol class="breadcrumb small">
 		<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 		<li><a href="admin_users.php"><?php echo I18N::translate('User administration'); ?></a></li>
@@ -474,7 +474,7 @@ 
 				<?php echo FunctionsEdit::editFieldContact('contact_method', $user->getPreference('contactmethod')); ?>
 				<p class="small text-muted">
 					<?php echo /* I18N: Help text for the “Preferred contact method” configuration setting */
-					I18N::translate('Site members can send each other messages. You can choose to how these messages are sent to you, or choose not receive them at all.'); ?>
+                    I18N::translate('Site members can send each other messages. You can choose to how these messages are sent to you, or choose not receive them at all.'); ?>
 				</p>
 			</div>
 		</div>
@@ -656,15 +656,15 @@ 
 	</form>
 	<?php
 
-	return;
+    return;
 
 case 'cleanup':
 
-	$controller
-		->setPageTitle(I18N::translate('Delete inactive users'))
-		->pageHeader();
+    $controller
+        ->setPageTitle(I18N::translate('Delete inactive users'))
+        ->pageHeader();
 
-	?>
+    ?>
 	<ol class="breadcrumb small">
 		<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 		<li><a href="admin_users.php"><?php echo I18N::translate('User administration'); ?></a></li>
@@ -675,30 +675,30 @@ 
 	<form method="post" action="?action=cleanup2">
 	<table class="table table-bordered">
 	<?php
-	// Check for idle users
-	$month = Filter::getInteger('month', 1, 12, 6);
-	echo '<tr><th colspan="2">', I18N::translate('Number of months since the last sign-in for a user’s account to be considered inactive: '), '</th>';
-	echo '<td><select onchange="document.location=options[selectedIndex].value;">';
-	for ($i = 1; $i <= 12; $i++) {
-		echo '<option value="admin_users.php?action=cleanup&amp;month=' . $i . '" ';
-		if ($i === $month) {
-			echo 'selected';
-		}
-		echo '>', $i, '</option>';
-	}
-	echo '</select></td></tr>';
-
-	// Check users not logged in too long
-	$ucnt = 0;
-	foreach (User::all() as $user) {
-		if ($user->getPreference('sessiontime') === '0') {
-			$datelogin = (int) $user->getPreference('reg_timestamp');
-		} else {
-			$datelogin = (int) $user->getPreference('sessiontime');
-		}
-		if (mktime(0, 0, 0, (int) date('m') - $month, (int) date('d'), (int) date('Y')) > $datelogin && $user->getPreference('verified') && $user->getPreference('verified_by_admin')) {
-			$ucnt++;
-			?>
+    // Check for idle users
+    $month = Filter::getInteger('month', 1, 12, 6);
+    echo '<tr><th colspan="2">', I18N::translate('Number of months since the last sign-in for a user’s account to be considered inactive: '), '</th>';
+    echo '<td><select onchange="document.location=options[selectedIndex].value;">';
+    for ($i = 1; $i <= 12; $i++) {
+        echo '<option value="admin_users.php?action=cleanup&amp;month=' . $i . '" ';
+        if ($i === $month) {
+            echo 'selected';
+        }
+        echo '>', $i, '</option>';
+    }
+    echo '</select></td></tr>';
+
+    // Check users not logged in too long
+    $ucnt = 0;
+    foreach (User::all() as $user) {
+        if ($user->getPreference('sessiontime') === '0') {
+            $datelogin = (int) $user->getPreference('reg_timestamp');
+        } else {
+            $datelogin = (int) $user->getPreference('sessiontime');
+        }
+        if (mktime(0, 0, 0, (int) date('m') - $month, (int) date('d'), (int) date('Y')) > $datelogin && $user->getPreference('verified') && $user->getPreference('verified_by_admin')) {
+            $ucnt++;
+            ?>
 			<tr>
 				<td>
 					<a href="?action=edit&amp;user_id=<?php echo $user->getUserId(); ?>">
@@ -715,14 +715,14 @@ 
 				</td>
 			</tr>
 		<?php
-		}
-	}
-
-	// Check unverified users
-	foreach (User::all() as $user) {
-		if (((date('U') - (int) $user->getPreference('reg_timestamp')) > 604800) && !$user->getPreference('verified')) {
-			$ucnt++;
-			?>
+        }
+    }
+
+    // Check unverified users
+    foreach (User::all() as $user) {
+        if (((date('U') - (int) $user->getPreference('reg_timestamp')) > 604800) && !$user->getPreference('verified')) {
+            $ucnt++;
+            ?>
 			<tr>
 				<td>
 					<a href="?action=edit&amp;user_id=<?php echo $user->getUserId(); ?>">
@@ -739,14 +739,14 @@ 
 				</td>
 			</tr>
 			<?php
-		}
-	}
-
-	// Check users not verified by admin
-	foreach (User::all() as $user) {
-		if ($user->getUserId() !== Auth::id() && !$user->getPreference('verified_by_admin') && $user->getPreference('verified')) {
-			$ucnt++;
-			?>
+        }
+    }
+
+    // Check users not verified by admin
+    foreach (User::all() as $user) {
+        if ($user->getUserId() !== Auth::id() && !$user->getPreference('verified_by_admin') && $user->getPreference('verified')) {
+            $ucnt++;
+            ?>
 			<tr>
 				<td>
 					<a href="?action=edit&amp;user_id=<?php echo $user->getUserId(); ?>">
@@ -763,9 +763,9 @@ 
 				</td>
 			</tr>
 			<?php
-		}
-	}
-		?>
+        }
+    }
+        ?>
 		</table>
 		<p>
 		<?php if ($ucnt): ?>
@@ -776,25 +776,25 @@ 
 		</p>
 	</form>
 	<?php
-	break;
+    break;
 
 case 'cleanup2':
-	foreach (User::all() as $user) {
-		if (Filter::post('del_' . $user->getUserId()) == '1') {
-			Log::addAuthenticationLog('Deleted user: ' . $user->getUserName());
-			$user->delete();
-			I18N::translate('The user %s has been deleted.', Filter::escapeHtml($user->getUserName()));
-		}
-	}
-
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-	break;
+    foreach (User::all() as $user) {
+        if (Filter::post('del_' . $user->getUserId()) == '1') {
+            Log::addAuthenticationLog('Deleted user: ' . $user->getUserName());
+            $user->delete();
+            I18N::translate('The user %s has been deleted.', Filter::escapeHtml($user->getUserName()));
+        }
+    }
+
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+    break;
 default:
-	$controller
-		->setPageTitle(I18N::translate('User administration'))
-		->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-		->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
-		->addInlineJavascript('
+    $controller
+        ->setPageTitle(I18N::translate('User administration'))
+        ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+        ->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
+        ->addInlineJavascript('
 			jQuery(".table-user-list").dataTable({
 				' . I18N::datatablesI18N() . ',
 				stateSave: true,
@@ -828,9 +828,9 @@ 
 			})
 			.fnFilter("' . Filter::get('filter') . '"); // View the details of a newly created user
 		')
-		->pageHeader();
+        ->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>
@@ -858,5 +858,5 @@ 
 		</tbody>
 	</table>
 	<?php
-	break;
+    break;
 }

admin_site_access.php

Indentation +192 added lines, -192 removed lines

@@ -23,218 +23,218 @@ 
 require './includes/session.php';
 
 $rules_display = array(
-	'unknown' => I18N::translate('unknown'),
-	'allow'   => /* I18N: An access rule - allow access to the site */ I18N::translate('allow'),
-	'deny'    => /* I18N: An access rule - deny access to the site */ I18N::translate('deny'),
-	'robot'   => /* I18N: http://en.wikipedia.org/wiki/Web_crawler */ I18N::translate('robot'),
+    'unknown' => I18N::translate('unknown'),
+    'allow'   => /* I18N: An access rule - allow access to the site */ I18N::translate('allow'),
+    'deny'    => /* I18N: An access rule - deny access to the site */ I18N::translate('deny'),
+    'robot'   => /* I18N: http://en.wikipedia.org/wiki/Web_crawler */ I18N::translate('robot'),
 );
 
 $rules_edit = array(
-	'unknown' => I18N::translate('unknown'),
-	'allow'   => /* I18N: An access rule - allow access to the site */ I18N::translate('allow'),
-	'deny'    => /* I18N: An access rule - deny access to the site */ I18N::translate('deny'),
-	'robot'   => /* I18N: http://en.wikipedia.org/wiki/Web_crawler */ I18N::translate('robot'),
+    'unknown' => I18N::translate('unknown'),
+    'allow'   => /* I18N: An access rule - allow access to the site */ I18N::translate('allow'),
+    'deny'    => /* I18N: An access rule - deny access to the site */ I18N::translate('deny'),
+    'robot'   => /* I18N: http://en.wikipedia.org/wiki/Web_crawler */ I18N::translate('robot'),
 );
 
 // Form actions
 switch (Filter::post('action')) {
 case 'save':
-	if (Filter::checkCsrf()) {
-		$site_access_rule_id = Filter::postInteger('site_access_rule_id');
-		$ip_address_start    = Filter::post('ip_address_start', WT_REGEX_IPV4);
-		$ip_address_end      = Filter::post('ip_address_end', WT_REGEX_IPV4);
-		$user_agent_pattern  = Filter::post('user_agent_pattern');
-		$rule                = Filter::post('rule', 'allow|deny|robot');
-		$comment             = Filter::post('comment');
-		$user_agent_string   = Filter::server('HTTP_USER_AGENT');
-		$ip_address          = WT_CLIENT_IP;
-
-		if ($ip_address_start !== null && $ip_address_end !== null && $user_agent_pattern !== null && $rule !== null) {
-			// This doesn't work with named placeholders. The :user_agent_string parameter is not recognised.
-			$oops = $rule !== 'allow' && Database::prepare(
-				"SELECT INET_ATON(:ip_address) BETWEEN INET_ATON(:ip_address_start) AND INET_ATON(:ip_address_end)" .
-				" AND :user_agent_string LIKE :user_agent_pattern"
-			)->execute(array(
-				'ip_address'         => $ip_address,
-				'ip_address_start'   => $ip_address_start,
-				'ip_address_end'     => $ip_address_end,
-				'user_agent_string'  => $user_agent_string,
-				'user_agent_pattern' => $user_agent_pattern,
-			))->fetchOne();
-
-			if ($oops) {
-				FlashMessages::addMessage(I18N::translate('You cannot create a rule which would prevent yourself from accessing the website.'), 'danger');
-			} elseif ($site_access_rule_id === null) {
-				Database::prepare(
-					"INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, rule, comment) VALUES (INET_ATON(:ip_address_start), INET_ATON(:ip_address_end), :user_agent_pattern, :rule, :comment)"
-				)->execute(array(
-					'ip_address_start'    => $ip_address_start,
-					'ip_address_end'      => $ip_address_end,
-					'user_agent_pattern'  => $user_agent_pattern,
-					'rule'                => $rule,
-					'comment'             => $comment,
-				));
-				FlashMessages::addMessage(I18N::translate('The website access rule has been created.'), 'success');
-			} else {
-				Database::prepare(
-					"UPDATE `##site_access_rule` SET ip_address_start = INET_ATON(:ip_address_start), ip_address_end = INET_ATON(:ip_address_end), user_agent_pattern = :user_agent_pattern, rule = :rule, comment = :comment WHERE site_access_rule_id = :site_access_rule_id"
-				)->execute(array(
-					'ip_address_start'    => $ip_address_start,
-					'ip_address_end'      => $ip_address_end,
-					'user_agent_pattern'  => $user_agent_pattern,
-					'rule'                => $rule,
-					'comment'             => $comment,
-					'site_access_rule_id' => $site_access_rule_id,
-				));
-				FlashMessages::addMessage(I18N::translate('The website access rule has been updated.'), 'success');
-			}
-		}
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
+    if (Filter::checkCsrf()) {
+        $site_access_rule_id = Filter::postInteger('site_access_rule_id');
+        $ip_address_start    = Filter::post('ip_address_start', WT_REGEX_IPV4);
+        $ip_address_end      = Filter::post('ip_address_end', WT_REGEX_IPV4);
+        $user_agent_pattern  = Filter::post('user_agent_pattern');
+        $rule                = Filter::post('rule', 'allow|deny|robot');
+        $comment             = Filter::post('comment');
+        $user_agent_string   = Filter::server('HTTP_USER_AGENT');
+        $ip_address          = WT_CLIENT_IP;
+
+        if ($ip_address_start !== null && $ip_address_end !== null && $user_agent_pattern !== null && $rule !== null) {
+            // This doesn't work with named placeholders. The :user_agent_string parameter is not recognised.
+            $oops = $rule !== 'allow' && Database::prepare(
+                "SELECT INET_ATON(:ip_address) BETWEEN INET_ATON(:ip_address_start) AND INET_ATON(:ip_address_end)" .
+                " AND :user_agent_string LIKE :user_agent_pattern"
+            )->execute(array(
+                'ip_address'         => $ip_address,
+                'ip_address_start'   => $ip_address_start,
+                'ip_address_end'     => $ip_address_end,
+                'user_agent_string'  => $user_agent_string,
+                'user_agent_pattern' => $user_agent_pattern,
+            ))->fetchOne();
+
+            if ($oops) {
+                FlashMessages::addMessage(I18N::translate('You cannot create a rule which would prevent yourself from accessing the website.'), 'danger');
+            } elseif ($site_access_rule_id === null) {
+                Database::prepare(
+                    "INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, rule, comment) VALUES (INET_ATON(:ip_address_start), INET_ATON(:ip_address_end), :user_agent_pattern, :rule, :comment)"
+                )->execute(array(
+                    'ip_address_start'    => $ip_address_start,
+                    'ip_address_end'      => $ip_address_end,
+                    'user_agent_pattern'  => $user_agent_pattern,
+                    'rule'                => $rule,
+                    'comment'             => $comment,
+                ));
+                FlashMessages::addMessage(I18N::translate('The website access rule has been created.'), 'success');
+            } else {
+                Database::prepare(
+                    "UPDATE `##site_access_rule` SET ip_address_start = INET_ATON(:ip_address_start), ip_address_end = INET_ATON(:ip_address_end), user_agent_pattern = :user_agent_pattern, rule = :rule, comment = :comment WHERE site_access_rule_id = :site_access_rule_id"
+                )->execute(array(
+                    'ip_address_start'    => $ip_address_start,
+                    'ip_address_end'      => $ip_address_end,
+                    'user_agent_pattern'  => $user_agent_pattern,
+                    'rule'                => $rule,
+                    'comment'             => $comment,
+                    'site_access_rule_id' => $site_access_rule_id,
+                ));
+                FlashMessages::addMessage(I18N::translate('The website access rule has been updated.'), 'success');
+            }
+        }
+    }
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+    return;
 
 case 'delete':
-	if (Filter::checkCsrf()) {
-		$site_access_rule_id = Filter::postInteger('site_access_rule_id');
-		Database::prepare(
-			"DELETE FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
-		)->execute(array(
-			'site_access_rule_id' => $site_access_rule_id,
-		));
-		FlashMessages::addMessage(I18N::translate('The website access rule has been deleted.'), 'success');
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
+    if (Filter::checkCsrf()) {
+        $site_access_rule_id = Filter::postInteger('site_access_rule_id');
+        Database::prepare(
+            "DELETE FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
+        )->execute(array(
+            'site_access_rule_id' => $site_access_rule_id,
+        ));
+        FlashMessages::addMessage(I18N::translate('The website access rule has been deleted.'), 'success');
+    }
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+    return;
 }
 
 // Delete any "unknown" visitors that are now "known".
 // This could happen every time we create/update a rule.
 Database::exec(
-	"DELETE unknown" .
-	" FROM `##site_access_rule` AS unknown" .
-	" JOIN `##site_access_rule` AS known ON (unknown.user_agent_pattern LIKE known.user_agent_pattern)" .
-	" WHERE unknown.rule='unknown' AND known.rule<>'unknown'" .
-	" AND unknown.ip_address_start BETWEEN known.ip_address_start AND known.ip_address_end"
+    "DELETE unknown" .
+    " FROM `##site_access_rule` AS unknown" .
+    " JOIN `##site_access_rule` AS known ON (unknown.user_agent_pattern LIKE known.user_agent_pattern)" .
+    " WHERE unknown.rule='unknown' AND known.rule<>'unknown'" .
+    " AND unknown.ip_address_start BETWEEN known.ip_address_start AND known.ip_address_end"
 );
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isAdmin())
-	->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-	->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
-	->setPageTitle(I18N::translate('Website access rules'));
+    ->restrictAccess(Auth::isAdmin())
+    ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+    ->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
+    ->setPageTitle(I18N::translate('Website access rules'));
 
 $action = Filter::get('action');
 switch ($action) {
 case 'load':
-	// AJAX callback for datatables
-	$search = Filter::get('search');
-	$search = $search['value'];
-	$start  = Filter::getInteger('start');
-	$length = Filter::getInteger('length');
-
-	$sql =
-		"SELECT SQL_CALC_FOUND_ROWS" .
-		" '', INET_NTOA(ip_address_start), ip_address_start, INET_NTOA(ip_address_end), ip_address_end, user_agent_pattern, rule, comment, site_access_rule_id" .
-		" FROM `##site_access_rule`";
-	$args = array();
-
-	if ($search) {
-		$sql .=
-			" WHERE (INET_ATON(:search_1) BETWEEN ip_address_start AND ip_address_end" .
-			" OR INET_NTOA(ip_address_start) LIKE CONCAT('%', :search_2, '%')" .
-			" OR INET_NTOA(ip_address_end) LIKE CONCAT('%', :search_3, '%')" .
-			" OR user_agent_pattern LIKE CONCAT('%', :search_4, '%')" .
-			" OR comment LIKE CONCAT('%', :search_5, '%'))";
-		$args['search_1'] = Filter::escapeLike($search);
-		$args['search_2'] = Filter::escapeLike($search);
-		$args['search_3'] = Filter::escapeLike($search);
-		$args['search_4'] = Filter::escapeLike($search);
-		$args['search_5'] = Filter::escapeLike($search);
-	}
-
-	$order = Filter::getArray('order');
-	$sql .= ' ORDER BY';
-	if ($order) {
-		foreach ($order as $key => $value) {
-			if ($key > 0) {
-				$sql .= ',';
-			}
-			// Datatables numbers columns 0, 1, 2
-			// MySQL numbers columns 1, 2, 3
-			switch ($value['dir']) {
-			case 'asc':
-				$sql .= " :col_" . $key . " ASC";
-				break;
-			case 'desc':
-				$sql .= " :col_" . $key . " DESC";
-				break;
-			}
-			$args['col_' . $key] = 1 + $value['column'];
-		}
-	} else {
-		$sql .= ' 1 ASC';
-	}
-
-	if ($length > 0) {
-		$sql .= " LIMIT :length OFFSET :start";
-		$args['length'] = $length;
-		$args['start']  = $start;
-	}
-
-	// This becomes a JSON list, not a JSON array, so we need numeric keys.
-	$data = Database::prepare($sql)->execute($args)->fetchAll(PDO::FETCH_NUM);
-	// Reformat the data for display
-	foreach ($data as &$datum) {
-		$site_access_rule_id = $datum[8];
-
-		$datum[0] = '<div class="btn-group"><button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-pencil"></i> <span class="caret"></span></button><ul class="dropdown-menu" role="menu"><li><a href="?action=edit&amp;site_access_rule_id=' . $site_access_rule_id . '"><i class="fa fa-fw fa-pencil"></i> ' . I18N::translate('Edit') . '</a></li><li class="divider"><li><a href="#" onclick="if (confirm(\'' . I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeJs($datum[5])) . '\')) delete_site_access_rule(' . $site_access_rule_id . '); return false;"><i class="fa fa-fw fa-trash-o"></i> ' . I18N::translate('Delete') . '</a></li></ul></div>';
-		$datum[5] = '<span dir="ltr">' . $datum[5] . '</span>';
-		$datum[6] = $rules_display[$datum[6]];
-		$datum[7] = '<span dir="auto">' . $datum[7] . '</span>';
-	}
-
-	// Total filtered/unfiltered rows
-	$recordsFiltered = Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
-	$recordsTotal    = Database::prepare("SELECT COUNT(*) FROM `##site_access_rule`")->fetchOne();
-
-	header('Content-type: application/json');
-	// See http://www.datatables.net/usage/server-side
-	echo json_encode(array(
-		'draw'            => Filter::getInteger('draw'),
-		'recordsTotal'    => $recordsTotal,
-		'recordsFiltered' => $recordsFiltered,
-		'data'            => $data,
-	));
-	break;
+    // AJAX callback for datatables
+    $search = Filter::get('search');
+    $search = $search['value'];
+    $start  = Filter::getInteger('start');
+    $length = Filter::getInteger('length');
+
+    $sql =
+        "SELECT SQL_CALC_FOUND_ROWS" .
+        " '', INET_NTOA(ip_address_start), ip_address_start, INET_NTOA(ip_address_end), ip_address_end, user_agent_pattern, rule, comment, site_access_rule_id" .
+        " FROM `##site_access_rule`";
+    $args = array();
+
+    if ($search) {
+        $sql .=
+            " WHERE (INET_ATON(:search_1) BETWEEN ip_address_start AND ip_address_end" .
+            " OR INET_NTOA(ip_address_start) LIKE CONCAT('%', :search_2, '%')" .
+            " OR INET_NTOA(ip_address_end) LIKE CONCAT('%', :search_3, '%')" .
+            " OR user_agent_pattern LIKE CONCAT('%', :search_4, '%')" .
+            " OR comment LIKE CONCAT('%', :search_5, '%'))";
+        $args['search_1'] = Filter::escapeLike($search);
+        $args['search_2'] = Filter::escapeLike($search);
+        $args['search_3'] = Filter::escapeLike($search);
+        $args['search_4'] = Filter::escapeLike($search);
+        $args['search_5'] = Filter::escapeLike($search);
+    }
+
+    $order = Filter::getArray('order');
+    $sql .= ' ORDER BY';
+    if ($order) {
+        foreach ($order as $key => $value) {
+            if ($key > 0) {
+                $sql .= ',';
+            }
+            // Datatables numbers columns 0, 1, 2
+            // MySQL numbers columns 1, 2, 3
+            switch ($value['dir']) {
+            case 'asc':
+                $sql .= " :col_" . $key . " ASC";
+                break;
+            case 'desc':
+                $sql .= " :col_" . $key . " DESC";
+                break;
+            }
+            $args['col_' . $key] = 1 + $value['column'];
+        }
+    } else {
+        $sql .= ' 1 ASC';
+    }
+
+    if ($length > 0) {
+        $sql .= " LIMIT :length OFFSET :start";
+        $args['length'] = $length;
+        $args['start']  = $start;
+    }
+
+    // This becomes a JSON list, not a JSON array, so we need numeric keys.
+    $data = Database::prepare($sql)->execute($args)->fetchAll(PDO::FETCH_NUM);
+    // Reformat the data for display
+    foreach ($data as &$datum) {
+        $site_access_rule_id = $datum[8];
+
+        $datum[0] = '<div class="btn-group"><button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-pencil"></i> <span class="caret"></span></button><ul class="dropdown-menu" role="menu"><li><a href="?action=edit&amp;site_access_rule_id=' . $site_access_rule_id . '"><i class="fa fa-fw fa-pencil"></i> ' . I18N::translate('Edit') . '</a></li><li class="divider"><li><a href="#" onclick="if (confirm(\'' . I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeJs($datum[5])) . '\')) delete_site_access_rule(' . $site_access_rule_id . '); return false;"><i class="fa fa-fw fa-trash-o"></i> ' . I18N::translate('Delete') . '</a></li></ul></div>';
+        $datum[5] = '<span dir="ltr">' . $datum[5] . '</span>';
+        $datum[6] = $rules_display[$datum[6]];
+        $datum[7] = '<span dir="auto">' . $datum[7] . '</span>';
+    }
+
+    // Total filtered/unfiltered rows
+    $recordsFiltered = Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
+    $recordsTotal    = Database::prepare("SELECT COUNT(*) FROM `##site_access_rule`")->fetchOne();
+
+    header('Content-type: application/json');
+    // See http://www.datatables.net/usage/server-side
+    echo json_encode(array(
+        'draw'            => Filter::getInteger('draw'),
+        'recordsTotal'    => $recordsTotal,
+        'recordsFiltered' => $recordsFiltered,
+        'data'            => $data,
+    ));
+    break;
 
 case 'edit':
 case 'create':
-	if (Filter::get('action') === 'edit') {
-		$controller->setPageTitle(I18N::translate('Edit a website access rule'));
-	} else {
-		$controller->setPageTitle(I18N::translate('Create a website access rule'));
-	}
-
-	$controller->pageHeader();
-
-	$site_access_rule = Database::prepare(
-		"SELECT site_access_rule_id, INET_NTOA(ip_address_start) AS ip_address_start, INET_NTOA(ip_address_end) AS ip_address_end, user_agent_pattern, rule, comment" .
-		" FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
-	)->execute(array(
-		'site_access_rule_id' => Filter::getInteger('site_access_rule_id'),
-	))->fetchOneRow();
-
-	$site_access_rule_id = $site_access_rule ? $site_access_rule->site_access_rule_id : null;
-	$ip_address_start    = $site_access_rule ? $site_access_rule->ip_address_start : '0.0.0.0';
-	$ip_address_end      = $site_access_rule ? $site_access_rule->ip_address_end : '255.255.255.255';
-	$user_agent_pattern  = $site_access_rule ? $site_access_rule->user_agent_pattern : '%';
-	$rule                = $site_access_rule ? $site_access_rule->rule : 'allow';
-	$comment             = $site_access_rule ? $site_access_rule->comment : '';
-
-	?>
+    if (Filter::get('action') === 'edit') {
+        $controller->setPageTitle(I18N::translate('Edit a website access rule'));
+    } else {
+        $controller->setPageTitle(I18N::translate('Create a website access rule'));
+    }
+
+    $controller->pageHeader();
+
+    $site_access_rule = Database::prepare(
+        "SELECT site_access_rule_id, INET_NTOA(ip_address_start) AS ip_address_start, INET_NTOA(ip_address_end) AS ip_address_end, user_agent_pattern, rule, comment" .
+        " FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
+    )->execute(array(
+        'site_access_rule_id' => Filter::getInteger('site_access_rule_id'),
+    ))->fetchOneRow();
+
+    $site_access_rule_id = $site_access_rule ? $site_access_rule->site_access_rule_id : null;
+    $ip_address_start    = $site_access_rule ? $site_access_rule->ip_address_start : '0.0.0.0';
+    $ip_address_end      = $site_access_rule ? $site_access_rule->ip_address_end : '255.255.255.255';
+    $user_agent_pattern  = $site_access_rule ? $site_access_rule->user_agent_pattern : '%';
+    $rule                = $site_access_rule ? $site_access_rule->rule : 'allow';
+    $comment             = $site_access_rule ? $site_access_rule->comment : '';
+
+    ?>
 	<ol class="breadcrumb small">
 		<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 		<li><a href="admin_site_access.php"><?php echo I18N::translate('Website access rules'); ?></a></li>
@@ -311,12 +311,12 @@ 
 	</form>
 
 	<?php
-	break;
+    break;
 
 default:
-	$controller
-		->pageHeader()
-		->addInlineJavascript('
+    $controller
+        ->pageHeader()
+        ->addInlineJavascript('
 			jQuery.fn.dataTableExt.oSort["unicode-asc" ]=function(a,b) {return a.replace(/<[^<]*>/, "").localeCompare(b.replace(/<[^<]*>/, ""))};
 			jQuery.fn.dataTableExt.oSort["unicode-desc"]=function(a,b) {return b.replace(/<[^<]*>/, "").localeCompare(a.replace(/<[^<]*>/, ""))};
 			jQuery(".table-site-access-rules").dataTable({
@@ -340,7 +340,7 @@ 
 			});
 		');
 
-	?>
+    ?>
 	<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>
@@ -381,5 +381,5 @@ 
 		}
 	</script>
 	<?php
-	break;
+    break;
 }

mediafirewall.php

Indentation +236 added lines, -236 removed lines

@@ -35,20 +35,20 @@ 
  * Send a “Not found” error as an image
  */
 function send404AsImage() {
-	$error = I18N::translate('The media file was not found in this family tree.');
+    $error = I18N::translate('The media file was not found in this family tree.');
 
-	$width  = mb_strlen($error) * 6.5 + 50;
-	$height = 60;
-	$im     = imagecreatetruecolor($width, $height); /* Create a black image */
-	$bgc    = imagecolorallocate($im, 255, 255, 255); /* set background color */
-	imagefilledrectangle($im, 2, 2, $width - 4, $height - 4, $bgc); /* create a rectangle, leaving 2 px border */
+    $width  = mb_strlen($error) * 6.5 + 50;
+    $height = 60;
+    $im     = imagecreatetruecolor($width, $height); /* Create a black image */
+    $bgc    = imagecolorallocate($im, 255, 255, 255); /* set background color */
+    imagefilledrectangle($im, 2, 2, $width - 4, $height - 4, $bgc); /* create a rectangle, leaving 2 px border */
 
-	embedText($im, $error, 100, '255, 0, 0', WT_ROOT . Config::FONT_DEJAVU_SANS_TTF, 'top', 'left');
+    embedText($im, $error, 100, '255, 0, 0', WT_ROOT . Config::FONT_DEJAVU_SANS_TTF, 'top', 'left');
 
-	http_response_code(404);
-	header('Content-Type: image/png');
-	imagepng($im);
-	imagedestroy($im);
+    http_response_code(404);
+    header('Content-Type: image/png');
+    imagepng($im);
+    imagedestroy($im);
 }
 
 /**
@@ -62,31 +62,31 @@ 
  * @return resource
  */
 function applyWatermark($im, Tree $tree) {
-	// text to watermark with
-	$word1_text = $tree->getTitle();
-	// maximum font size for “word1” ; will be automaticaly reduced to fit in the image
-	$word1_maxsize = 100;
-	// rgb color codes for text
-	$word1_color = '0,0,0';
-	// ttf font file to use
-	$word1_font = WT_ROOT . Config::FONT_DEJAVU_SANS_TTF;
-	// vertical position for the text to past; possible values are: top, middle or bottom, across
-	$word1_vpos = 'across';
-	// horizontal position for the text to past in media file; possible values are: left, right, top2bottom, bottom2top
-	// this value is used only if $word1_vpos=across
-	$word1_hpos = 'left';
-
-	$word2_text    = $_SERVER['HTTP_HOST'];
-	$word2_maxsize = 20;
-	$word2_color   = '0,0,0';
-	$word2_font    = WT_ROOT . Config::FONT_DEJAVU_SANS_TTF;
-	$word2_vpos    = 'top';
-	$word2_hpos    = 'top2bottom';
-
-	embedText($im, $word1_text, $word1_maxsize, $word1_color, $word1_font, $word1_vpos, $word1_hpos);
-	embedText($im, $word2_text, $word2_maxsize, $word2_color, $word2_font, $word2_vpos, $word2_hpos);
-
-	return $im;
+    // text to watermark with
+    $word1_text = $tree->getTitle();
+    // maximum font size for “word1” ; will be automaticaly reduced to fit in the image
+    $word1_maxsize = 100;
+    // rgb color codes for text
+    $word1_color = '0,0,0';
+    // ttf font file to use
+    $word1_font = WT_ROOT . Config::FONT_DEJAVU_SANS_TTF;
+    // vertical position for the text to past; possible values are: top, middle or bottom, across
+    $word1_vpos = 'across';
+    // horizontal position for the text to past in media file; possible values are: left, right, top2bottom, bottom2top
+    // this value is used only if $word1_vpos=across
+    $word1_hpos = 'left';
+
+    $word2_text    = $_SERVER['HTTP_HOST'];
+    $word2_maxsize = 20;
+    $word2_color   = '0,0,0';
+    $word2_font    = WT_ROOT . Config::FONT_DEJAVU_SANS_TTF;
+    $word2_vpos    = 'top';
+    $word2_hpos    = 'top2bottom';
+
+    embedText($im, $word1_text, $word1_maxsize, $word1_color, $word1_font, $word1_vpos, $word1_hpos);
+    embedText($im, $word2_text, $word2_maxsize, $word2_color, $word2_font, $word2_vpos, $word2_hpos);
+
+    return $im;
 }
 
 /**
@@ -101,96 +101,96 @@ 
  * @param string   $hpos
  */
 function embedText($im, $text, $maxsize, $color, $font, $vpos, $hpos) {
-	global $useTTF;
-
-	// there are two ways to embed text with PHP
-	// (preferred) using GD and FreeType you can embed text using any True Type font
-	// (fall back) if that is not available, you can insert basic monospaced text
-
-	$col       = explode(',', $color);
-	$textcolor = imagecolorallocate($im, $col[0], $col[1], $col[2]);
-
-	// make adjustments to settings that imagestring and imagestringup can’t handle
-	if (!$useTTF) {
-		// imagestringup only writes up, can’t use top2bottom
-		if ($hpos === 'top2bottom') {
-			$hpos = 'bottom2top';
-		}
-	}
-
-	$text       = I18N::reverseText($text);
-	$height     = imagesy($im);
-	$width      = imagesx($im);
-	$calc_angle = rad2deg(atan($height / $width));
-	$hypoth     = $height / sin(deg2rad($calc_angle));
-
-	// vertical and horizontal position of the text
-	switch ($vpos) {
-	default:
-	case 'top':
-		$taille   = textlength($maxsize, $width, $text);
-		$pos_y    = $height * 0.15 + $taille;
-		$pos_x    = $width * 0.15;
-		$rotation = 0;
-		break;
-	case 'middle':
-		$taille   = textlength($maxsize, $width, $text);
-		$pos_y    = ($height + $taille) / 2;
-		$pos_x    = $width * 0.15;
-		$rotation = 0;
-		break;
-	case 'bottom':
-		$taille   = textlength($maxsize, $width, $text);
-		$pos_y    = ($height * .85 - $taille);
-		$pos_x    = $width * 0.15;
-		$rotation = 0;
-		break;
-	case 'across':
-		switch ($hpos) {
-		default:
-		case 'left':
-			$taille   = textlength($maxsize, $hypoth, $text);
-			$pos_y    = ($height * .85 - $taille);
-			$pos_x    = $width * 0.15;
-			$rotation = $calc_angle;
-			break;
-		case 'right':
-			$taille   = textlength($maxsize, $hypoth, $text);
-			$pos_y    = ($height * .15 - $taille);
-			$pos_x    = $width * 0.85;
-			$rotation = $calc_angle + 180;
-			break;
-		case 'top2bottom':
-			$taille   = textlength($maxsize, $height, $text);
-			$pos_y    = ($height * .15 - $taille);
-			$pos_x    = ($width * .90 - $taille);
-			$rotation = -90;
-			break;
-		case 'bottom2top':
-			$taille   = textlength($maxsize, $height, $text);
-			$pos_y    = $height * 0.85;
-			$pos_x    = $width * 0.15;
-			$rotation = 90;
-			break;
-		}
-		break;
-	}
-
-	// apply the text
-	if ($useTTF) {
-		// if imagettftext throws errors, catch them with a custom error handler
-		set_error_handler('\Fisharebest\Webtrees\\imagettftextErrorHandler');
-		imagettftext($im, $taille, $rotation, $pos_x, $pos_y, $textcolor, $font, $text);
-		restore_error_handler();
-	}
-	// Don’t use an ‘else’ here since imagettftextErrorHandler may have changed the value of $useTTF from true to false
-	if (!$useTTF) {
-		if ($rotation !== 90) {
-			imagestring($im, 5, $pos_x, $pos_y, $text, $textcolor);
-		} else {
-			imagestringup($im, 5, $pos_x, $pos_y, $text, $textcolor);
-		}
-	}
+    global $useTTF;
+
+    // there are two ways to embed text with PHP
+    // (preferred) using GD and FreeType you can embed text using any True Type font
+    // (fall back) if that is not available, you can insert basic monospaced text
+
+    $col       = explode(',', $color);
+    $textcolor = imagecolorallocate($im, $col[0], $col[1], $col[2]);
+
+    // make adjustments to settings that imagestring and imagestringup can’t handle
+    if (!$useTTF) {
+        // imagestringup only writes up, can’t use top2bottom
+        if ($hpos === 'top2bottom') {
+            $hpos = 'bottom2top';
+        }
+    }
+
+    $text       = I18N::reverseText($text);
+    $height     = imagesy($im);
+    $width      = imagesx($im);
+    $calc_angle = rad2deg(atan($height / $width));
+    $hypoth     = $height / sin(deg2rad($calc_angle));
+
+    // vertical and horizontal position of the text
+    switch ($vpos) {
+    default:
+    case 'top':
+        $taille   = textlength($maxsize, $width, $text);
+        $pos_y    = $height * 0.15 + $taille;
+        $pos_x    = $width * 0.15;
+        $rotation = 0;
+        break;
+    case 'middle':
+        $taille   = textlength($maxsize, $width, $text);
+        $pos_y    = ($height + $taille) / 2;
+        $pos_x    = $width * 0.15;
+        $rotation = 0;
+        break;
+    case 'bottom':
+        $taille   = textlength($maxsize, $width, $text);
+        $pos_y    = ($height * .85 - $taille);
+        $pos_x    = $width * 0.15;
+        $rotation = 0;
+        break;
+    case 'across':
+        switch ($hpos) {
+        default:
+        case 'left':
+            $taille   = textlength($maxsize, $hypoth, $text);
+            $pos_y    = ($height * .85 - $taille);
+            $pos_x    = $width * 0.15;
+            $rotation = $calc_angle;
+            break;
+        case 'right':
+            $taille   = textlength($maxsize, $hypoth, $text);
+            $pos_y    = ($height * .15 - $taille);
+            $pos_x    = $width * 0.85;
+            $rotation = $calc_angle + 180;
+            break;
+        case 'top2bottom':
+            $taille   = textlength($maxsize, $height, $text);
+            $pos_y    = ($height * .15 - $taille);
+            $pos_x    = ($width * .90 - $taille);
+            $rotation = -90;
+            break;
+        case 'bottom2top':
+            $taille   = textlength($maxsize, $height, $text);
+            $pos_y    = $height * 0.85;
+            $pos_x    = $width * 0.15;
+            $rotation = 90;
+            break;
+        }
+        break;
+    }
+
+    // apply the text
+    if ($useTTF) {
+        // if imagettftext throws errors, catch them with a custom error handler
+        set_error_handler('\Fisharebest\Webtrees\\imagettftextErrorHandler');
+        imagettftext($im, $taille, $rotation, $pos_x, $pos_y, $textcolor, $font, $text);
+        restore_error_handler();
+    }
+    // Don’t use an ‘else’ here since imagettftextErrorHandler may have changed the value of $useTTF from true to false
+    if (!$useTTF) {
+        if ($rotation !== 90) {
+            imagestring($im, 5, $pos_x, $pos_y, $text, $textcolor);
+        } else {
+            imagestringup($im, 5, $pos_x, $pos_y, $text, $textcolor);
+        }
+    }
 
 }
 
@@ -204,16 +204,16 @@ 
  * @return int
  */
 function textlength($t, $mxl, $text) {
-	$taille_c = $t;
-	$len      = mb_strlen($text);
-	while (($taille_c - 2) * $len > $mxl) {
-		$taille_c--;
-		if ($taille_c == 2) {
-			break;
-		}
-	}
-
-	return $taille_c;
+    $taille_c = $t;
+    $len      = mb_strlen($text);
+    while (($taille_c - 2) * $len > $mxl) {
+        $taille_c--;
+        if ($taille_c == 2) {
+            break;
+        }
+    }
+
+    return $taille_c;
 }
 
 /**
@@ -226,14 +226,14 @@ 
  * @return bool
  */
 function imagettftextErrorHandler($errno, $errstr) {
-	global $useTTF, $serverFilename;
-	// log the error
-	Log::addErrorLog('Media Firewall error: >' . $errno . '/' . $errstr . '< while processing file >' . $serverFilename . '<');
+    global $useTTF, $serverFilename;
+    // log the error
+    Log::addErrorLog('Media Firewall error: >' . $errno . '/' . $errstr . '< while processing file >' . $serverFilename . '<');
 
-	// change value of useTTF to false so the fallback watermarking can be used.
-	$useTTF = false;
+    // change value of useTTF to false so the fallback watermarking can be used.
+    $useTTF = false;
 
-	return true;
+    return true;
 }
 
 /**
@@ -244,19 +244,19 @@ 
  * @return string|false
  */
 function isImageTypeSupported($reqtype) {
-	$supportByGD = array('jpg' => 'jpeg', 'jpeg' => 'jpeg', 'gif' => 'gif', 'png' => 'png');
-	$reqtype     = strtolower($reqtype);
+    $supportByGD = array('jpg' => 'jpeg', 'jpeg' => 'jpeg', 'gif' => 'gif', 'png' => 'png');
+    $reqtype     = strtolower($reqtype);
 
-	if (empty($supportByGD[$reqtype])) {
-		return false;
-	}
-	$type = $supportByGD[$reqtype];
+    if (empty($supportByGD[$reqtype])) {
+        return false;
+    }
+    $type = $supportByGD[$reqtype];
 
-	if (function_exists('imagecreatefrom' . $type) && function_exists('image' . $type)) {
-		return $type;
-	}
+    if (function_exists('imagecreatefrom' . $type) && function_exists('image' . $type)) {
+        return $type;
+    }
 
-	return false;
+    return false;
 }
 
 // this needs to be a global variable so imagettftextErrorHandler can set it
@@ -264,24 +264,24 @@ 
 
 // Media object missing/private?
 if (!$media || !$media->canShow()) {
-	send404AsImage();
+    send404AsImage();
 
-	return;
+    return;
 }
 // media file somewhere else?
 if ($media->isExternal()) {
-	header('Location: ' . $media->getFilename());
+    header('Location: ' . $media->getFilename());
 
-	return;
+    return;
 }
 
 $which          = $thumb ? 'thumb' : 'main';
 $serverFilename = $media->getServerFilename($which);
 
 if (!file_exists($serverFilename)) {
-	send404AsImage();
+    send404AsImage();
 
-	return;
+    return;
 }
 
 $mimetype       = $media->mimeType();
@@ -290,7 +290,7 @@ 
 $filetimeHeader = gmdate('D, d M Y H:i:s', $filetime) . ' GMT';
 $expireOffset   = 3600 * 24; // tell browser to cache this image for 24 hours
 if (Filter::get('cb')) {
-	$expireOffset = $expireOffset * 7;
+    $expireOffset = $expireOffset * 7;
 } // if cb parameter was sent, cache for 7 days
 $expireHeader = gmdate('D, d M Y H:i:s', WT_TIMESTAMP + $expireOffset) . ' GMT';
 
@@ -298,46 +298,46 @@ 
 $usewatermark = false;
 // if this image supports watermarks and the watermark module is intalled...
 if ($type) {
-	// if this is not a thumbnail, or WATERMARK_THUMB is true
-	if (($which === 'main') || $WT_TREE->getPreference('WATERMARK_THUMB')) {
-		// if the user’s priv’s justify it...
-		if (Auth::accessLevel($WT_TREE) > $WT_TREE->getPreference('SHOW_NO_WATERMARK')) {
-			// add a watermark
-			$usewatermark = true;
-		}
-	}
+    // if this is not a thumbnail, or WATERMARK_THUMB is true
+    if (($which === 'main') || $WT_TREE->getPreference('WATERMARK_THUMB')) {
+        // if the user’s priv’s justify it...
+        if (Auth::accessLevel($WT_TREE) > $WT_TREE->getPreference('SHOW_NO_WATERMARK')) {
+            // add a watermark
+            $usewatermark = true;
+        }
+    }
 }
 
 // determine whether we have enough memory to watermark this image
 if ($usewatermark) {
-	if (!FunctionsMedia::hasMemoryForImage($serverFilename)) {
-		// not enough memory to watermark this file
-		$usewatermark = false;
-	}
+    if (!FunctionsMedia::hasMemoryForImage($serverFilename)) {
+        // not enough memory to watermark this file
+        $usewatermark = false;
+    }
 }
 
 $watermarkfile     = '';
 $generatewatermark = false;
 
 if ($usewatermark) {
-	if ($which === 'thumb') {
-		$watermarkfile = WT_DATA_DIR . $WT_TREE->getPreference('MEDIA_DIRECTORY') . 'watermark/' . $WT_TREE->getName() . '/thumb/' . $media->getFilename();
-	} else {
-		$watermarkfile = WT_DATA_DIR . $WT_TREE->getPreference('MEDIA_DIRECTORY') . 'watermark/' . $WT_TREE->getName() . '/' . $media->getFilename();
-	}
-
-	if (!file_exists($watermarkfile)) {
-		// no saved watermark file exists
-		// generate the watermark file
-		$generatewatermark = true;
-	} else {
-		$watermarktime = filemtime($watermarkfile);
-		if ($filetime > $watermarktime) {
-			// if the original image was updated after the saved file was created
-			// generate the watermark file
-			$generatewatermark = true;
-		}
-	}
+    if ($which === 'thumb') {
+        $watermarkfile = WT_DATA_DIR . $WT_TREE->getPreference('MEDIA_DIRECTORY') . 'watermark/' . $WT_TREE->getName() . '/thumb/' . $media->getFilename();
+    } else {
+        $watermarkfile = WT_DATA_DIR . $WT_TREE->getPreference('MEDIA_DIRECTORY') . 'watermark/' . $WT_TREE->getName() . '/' . $media->getFilename();
+    }
+
+    if (!file_exists($watermarkfile)) {
+        // no saved watermark file exists
+        // generate the watermark file
+        $generatewatermark = true;
+    } else {
+        $watermarktime = filemtime($watermarkfile);
+        if ($filetime > $watermarktime) {
+            // if the original image was updated after the saved file was created
+            // generate the watermark file
+            $generatewatermark = true;
+        }
+    }
 }
 
 $etag = $media->getEtag($which);
@@ -345,13 +345,13 @@ 
 // parse IF_MODIFIED_SINCE header from client
 $if_modified_since = 'x';
 if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
-	$if_modified_since = preg_replace('/;.*$/', '', $_SERVER['HTTP_IF_MODIFIED_SINCE']);
+    $if_modified_since = preg_replace('/;.*$/', '', $_SERVER['HTTP_IF_MODIFIED_SINCE']);
 }
 
 // parse IF_NONE_MATCH header from client
 $if_none_match = 'x';
 if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
-	$if_none_match = str_replace('"', '', $_SERVER['HTTP_IF_NONE_MATCH']);
+    $if_none_match = str_replace('"', '', $_SERVER['HTTP_IF_NONE_MATCH']);
 }
 
 // add caching headers. allow browser to cache file, but not proxy
@@ -363,12 +363,12 @@ 
 // if this file is already in the user’s cache, don’t resend it
 // first check if the if_modified_since param matches
 if ($if_modified_since === $filetimeHeader) {
-	// then check if the etag matches
-	if ($if_none_match === $etag) {
-		http_response_code(304);
+    // then check if the etag matches
+    if ($if_none_match === $etag) {
+        http_response_code(304);
 
-		return;
-	}
+        return;
+    }
 }
 
 // send headers for the image
@@ -376,41 +376,41 @@ 
 header('Content-Disposition: filename="' . addslashes(basename($media->getFilename())) . '"');
 
 if ($generatewatermark) {
-	// generate the watermarked image
-	$imCreateFunc = 'imagecreatefrom' . $type;
-	$imSendFunc   = 'image' . $type;
-
-	if (function_exists($imCreateFunc) && function_exists($imSendFunc)) {
-		$im = $imCreateFunc($serverFilename);
-		$im = applyWatermark($im, $WT_TREE);
-
-		// save the image, if preferences allow
-		if ($which === 'thumb' && $WT_TREE->getPreference('SAVE_WATERMARK_THUMB') || $which === 'main' && $WT_TREE->getPreference('SAVE_WATERMARK_IMAGE')) {
-			// make sure the folder exists
-			File::mkdir(dirname($watermarkfile));
-			// save the image
-			$imSendFunc($im, $watermarkfile);
-		}
-
-		// send the image
-		$imSendFunc($im);
-		imagedestroy($im);
-
-		return;
-	} else {
-		// this image is defective. log it
-		Log::addMediaLog('Media Firewall error: >' . I18N::translate('This media file is broken and cannot be watermarked.') . '< in file >' . $serverFilename . '< memory used: ' . memory_get_usage());
-
-		// set usewatermark to false so image will simply be passed through below
-		$usewatermark = false;
-	}
+    // generate the watermarked image
+    $imCreateFunc = 'imagecreatefrom' . $type;
+    $imSendFunc   = 'image' . $type;
+
+    if (function_exists($imCreateFunc) && function_exists($imSendFunc)) {
+        $im = $imCreateFunc($serverFilename);
+        $im = applyWatermark($im, $WT_TREE);
+
+        // save the image, if preferences allow
+        if ($which === 'thumb' && $WT_TREE->getPreference('SAVE_WATERMARK_THUMB') || $which === 'main' && $WT_TREE->getPreference('SAVE_WATERMARK_IMAGE')) {
+            // make sure the folder exists
+            File::mkdir(dirname($watermarkfile));
+            // save the image
+            $imSendFunc($im, $watermarkfile);
+        }
+
+        // send the image
+        $imSendFunc($im);
+        imagedestroy($im);
+
+        return;
+    } else {
+        // this image is defective. log it
+        Log::addMediaLog('Media Firewall error: >' . I18N::translate('This media file is broken and cannot be watermarked.') . '< in file >' . $serverFilename . '< memory used: ' . memory_get_usage());
+
+        // set usewatermark to false so image will simply be passed through below
+        $usewatermark = false;
+    }
 }
 
 // pass the image through without manipulating it
 
 if ($usewatermark) {
-	// the stored watermarked image is good, lets use it
-	$serverFilename = $watermarkfile;
+    // the stored watermarked image is good, lets use it
+    $serverFilename = $watermarkfile;
 }
 
 // determine filesize of image (could be original or watermarked version)
@@ -421,15 +421,15 @@ 
 
 // Some servers disable fpassthru() and readfile()
 if (function_exists('readfile')) {
-	readfile($serverFilename);
+    readfile($serverFilename);
 } else {
-	$fp = fopen($serverFilename, 'rb');
-	if (function_exists('fpassthru')) {
-		fpassthru($fp);
-	} else {
-		while (!feof($fp)) {
-			echo fread($fp, 65536);
-		}
-	}
-	fclose($fp);
+    $fp = fopen($serverFilename, 'rb');
+    if (function_exists('fpassthru')) {
+        fpassthru($fp);
+    } else {
+        while (!feof($fp)) {
+            echo fread($fp, 65536);
+        }
+    }
+    fclose($fp);
 }

login.php

Indentation +388 added lines, -388 removed lines

@@ -31,9 +31,9 @@ 
 
 // If we are already logged in, then go to the “Home page”
 if (Auth::check() && $WT_TREE) {
-	header('Location: ' . WT_BASE_URL);
+    header('Location: ' . WT_BASE_URL);
 
-	return;
+    return;
 }
 
 $controller = new PageController;
@@ -53,104 +53,104 @@ 
 
 // These parameters may come from the URL which is emailed to users.
 if (!$action) {
-	$action = Filter::get('action');
+    $action = Filter::get('action');
 }
 if (!$user_name) {
-	$user_name = Filter::get('user_name');
+    $user_name = Filter::get('user_name');
 }
 if (!$user_hashcode) {
-	$user_hashcode = Filter::get('user_hashcode');
+    $user_hashcode = Filter::get('user_hashcode');
 }
 if (!$url) {
-	$url = Filter::get('url');
+    $url = Filter::get('url');
 }
 
 $message = '';
 
 switch ($action) {
 case 'login':
-	try {
-		if (!$_COOKIE) {
-			Log::addAuthenticationLog('Login failed (no session cookies): ' . $username);
-			throw new \Exception(I18N::translate('You cannot sign in because your browser does not accept cookies.'));
-		}
-
-		$user = User::findByIdentifier($username);
-
-		if (!$user) {
-			Log::addAuthenticationLog('Login failed (no such user/email): ' . $username);
-			throw new \Exception(I18N::translate('The username or password is incorrect.'));
-		}
-
-		if (!$user->checkPassword($password)) {
-			Log::addAuthenticationLog('Login failed (incorrect password): ' . $username);
-			throw new \Exception(I18N::translate('The username or password is incorrect.'));
-		}
-
-		if (!$user->getPreference('verified')) {
-			Log::addAuthenticationLog('Login failed (not verified by user): ' . $username);
-			throw new \Exception(I18N::translate('This account has not been verified. Please check your email for a verification message.'));
-		}
-
-		if (!$user->getPreference('verified_by_admin')) {
-			Log::addAuthenticationLog('Login failed (not approved by admin): ' . $username);
-			throw new \Exception(I18N::translate('This account has not been approved. Please wait for an administrator to approve it.'));
-		}
-
-		Auth::login($user);
-		Log::addAuthenticationLog('Login: ' . Auth::user()->getUserName() . '/' . Auth::user()->getRealName());
-		Auth::user()->setPreference('sessiontime', WT_TIMESTAMP);
-
-		Session::put('locale', Auth::user()->getPreference('language'));
-		Session::put('theme_id', Auth::user()->getPreference('theme'));
-		I18N::init(Auth::user()->getPreference('language'));
-
-		// We're logging in as an administrator
-		if (Auth::isAdmin()) {
-			// Check for updates
-			$latest_version_txt = Functions::fetchLatestVersion();
-			if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) {
-				list($latest_version, $earliest_version, $download_url) = explode('|', $latest_version_txt);
-				if (version_compare(WT_VERSION, $latest_version) < 0) {
-					FlashMessages::addMessage(
-						I18N::translate('A new version of webtrees is available.') .
-						' <a href="admin_site_upgrade.php"><b>' .
-						I18N::translate('Upgrade to webtrees %s.', '<span dir="ltr">' . $latest_version . '</span>') .
-						'</b></a>'
-					);
-				}
-			}
-		}
-
-		// If we were on a "home page", redirect to "my page"
-		if ($url === '' || strpos($url, 'index.php?ctype=gedcom') === 0) {
-			$url = 'index.php?ctype=user';
-			// Switch to a tree where we have a genealogy record (or keep to the current/default).
-			$tree = Database::prepare(
-				"SELECT gedcom_name FROM `##gedcom` JOIN `##user_gedcom_setting` USING (gedcom_id)" .
-				" WHERE setting_name = 'gedcomid' AND user_id = :user_id" .
-				" ORDER BY gedcom_id = :tree_id DESC"
-			)->execute(array(
-				'user_id' => Auth::user()->getUserId(),
-				'tree_id' => $WT_TREE->getTreeId(),
-			))->fetchOne();
-			$url .= '&ged=' . Filter::escapeUrl($tree);
-		}
-
-		// Redirect to the target URL
-		header('Location: ' . WT_BASE_URL . $url);
-
-		return;
-	} catch (\Exception $ex) {
-		$message = $ex->getMessage();
-	}
-	// No break;
+    try {
+        if (!$_COOKIE) {
+            Log::addAuthenticationLog('Login failed (no session cookies): ' . $username);
+            throw new \Exception(I18N::translate('You cannot sign in because your browser does not accept cookies.'));
+        }
+
+        $user = User::findByIdentifier($username);
+
+        if (!$user) {
+            Log::addAuthenticationLog('Login failed (no such user/email): ' . $username);
+            throw new \Exception(I18N::translate('The username or password is incorrect.'));
+        }
+
+        if (!$user->checkPassword($password)) {
+            Log::addAuthenticationLog('Login failed (incorrect password): ' . $username);
+            throw new \Exception(I18N::translate('The username or password is incorrect.'));
+        }
+
+        if (!$user->getPreference('verified')) {
+            Log::addAuthenticationLog('Login failed (not verified by user): ' . $username);
+            throw new \Exception(I18N::translate('This account has not been verified. Please check your email for a verification message.'));
+        }
+
+        if (!$user->getPreference('verified_by_admin')) {
+            Log::addAuthenticationLog('Login failed (not approved by admin): ' . $username);
+            throw new \Exception(I18N::translate('This account has not been approved. Please wait for an administrator to approve it.'));
+        }
+
+        Auth::login($user);
+        Log::addAuthenticationLog('Login: ' . Auth::user()->getUserName() . '/' . Auth::user()->getRealName());
+        Auth::user()->setPreference('sessiontime', WT_TIMESTAMP);
+
+        Session::put('locale', Auth::user()->getPreference('language'));
+        Session::put('theme_id', Auth::user()->getPreference('theme'));
+        I18N::init(Auth::user()->getPreference('language'));
+
+        // We're logging in as an administrator
+        if (Auth::isAdmin()) {
+            // Check for updates
+            $latest_version_txt = Functions::fetchLatestVersion();
+            if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) {
+                list($latest_version, $earliest_version, $download_url) = explode('|', $latest_version_txt);
+                if (version_compare(WT_VERSION, $latest_version) < 0) {
+                    FlashMessages::addMessage(
+                        I18N::translate('A new version of webtrees is available.') .
+                        ' <a href="admin_site_upgrade.php"><b>' .
+                        I18N::translate('Upgrade to webtrees %s.', '<span dir="ltr">' . $latest_version . '</span>') .
+                        '</b></a>'
+                    );
+                }
+            }
+        }
+
+        // If we were on a "home page", redirect to "my page"
+        if ($url === '' || strpos($url, 'index.php?ctype=gedcom') === 0) {
+            $url = 'index.php?ctype=user';
+            // Switch to a tree where we have a genealogy record (or keep to the current/default).
+            $tree = Database::prepare(
+                "SELECT gedcom_name FROM `##gedcom` JOIN `##user_gedcom_setting` USING (gedcom_id)" .
+                " WHERE setting_name = 'gedcomid' AND user_id = :user_id" .
+                " ORDER BY gedcom_id = :tree_id DESC"
+            )->execute(array(
+                'user_id' => Auth::user()->getUserId(),
+                'tree_id' => $WT_TREE->getTreeId(),
+            ))->fetchOne();
+            $url .= '&ged=' . Filter::escapeUrl($tree);
+        }
+
+        // Redirect to the target URL
+        header('Location: ' . WT_BASE_URL . $url);
+
+        return;
+    } catch (\Exception $ex) {
+        $message = $ex->getMessage();
+    }
+    // No break;
 
 default:
-	$controller
-		->setPageTitle(I18N::translate('Sign in'))
-		->pageHeader()
-		->addInlineJavascript('
+    $controller
+        ->setPageTitle(I18N::translate('Sign in'))
+        ->pageHeader()
+        ->addInlineJavascript('
 			jQuery("#new_passwd_form").hide();
 			jQuery("#passwd_click").click(function() {
 				jQuery("#new_passwd_form").slideToggle(100, function() {
@@ -160,247 +160,247 @@ 
 			});
 		');
 
-	echo '<div id="login-page">';
-	echo '<div id="login-text">';
-
-	echo '<p class="center"><strong>' . I18N::translate('Welcome to this genealogy website') . '</strong></p>';
-
-	switch (Site::getPreference('WELCOME_TEXT_AUTH_MODE')) {
-	case 1:
-		echo '<p>' . I18N::translate('Anyone with a user account can access this website.') . ' ' . I18N::translate('You can apply for an account using the link below.') . '</p>';
-		break;
-	case 2:
-		echo '<p>' . I18N::translate('You need to be an authorized user to access this website.') . ' ' . I18N::translate('You can apply for an account using the link below.') . '</p>';
-		break;
-	case 3:
-		echo '<p>' . I18N::translate('You need to be a family member to access this website.') . ' ' . I18N::translate('You can apply for an account using the link below.') . '</p>';
-		break;
-	case 4:
-		echo '<p style="white-space: pre-wrap;">', Site::getPreference('WELCOME_TEXT_AUTH_MODE_' . WT_LOCALE), '</p>';
-		break;
-	}
-
-	echo '</div>';
-	echo '<div id="login-box">';
-		if ($message) {
-			echo '<p class="error">', $message, '</p>';
-		}
-	echo '<form id="login-form" name="login-form" method="post" action="', WT_LOGIN_URL, '">
+    echo '<div id="login-page">';
+    echo '<div id="login-text">';
+
+    echo '<p class="center"><strong>' . I18N::translate('Welcome to this genealogy website') . '</strong></p>';
+
+    switch (Site::getPreference('WELCOME_TEXT_AUTH_MODE')) {
+    case 1:
+        echo '<p>' . I18N::translate('Anyone with a user account can access this website.') . ' ' . I18N::translate('You can apply for an account using the link below.') . '</p>';
+        break;
+    case 2:
+        echo '<p>' . I18N::translate('You need to be an authorized user to access this website.') . ' ' . I18N::translate('You can apply for an account using the link below.') . '</p>';
+        break;
+    case 3:
+        echo '<p>' . I18N::translate('You need to be a family member to access this website.') . ' ' . I18N::translate('You can apply for an account using the link below.') . '</p>';
+        break;
+    case 4:
+        echo '<p style="white-space: pre-wrap;">', Site::getPreference('WELCOME_TEXT_AUTH_MODE_' . WT_LOCALE), '</p>';
+        break;
+    }
+
+    echo '</div>';
+    echo '<div id="login-box">';
+        if ($message) {
+            echo '<p class="error">', $message, '</p>';
+        }
+    echo '<form id="login-form" name="login-form" method="post" action="', WT_LOGIN_URL, '">
 		<input type="hidden" name="action" value="login">
 		<input type="hidden" name="url" value="', Filter::escapeHtml($url), '">';
-		echo '<div>
+        echo '<div>
 			<label for="username">', I18N::translate('Username'),
-			'<input type="text" id="username" name="username" value="', Filter::escapeHtml($username), '" class="formField" autofocus>
+            '<input type="text" id="username" name="username" value="', Filter::escapeHtml($username), '" class="formField" autofocus>
 			</label>
 		</div>
 		<div>
 			<label for="password">', I18N::translate('Password'),
-				'<input type="password" id="password" name="password" class="formField">
+                '<input type="password" id="password" name="password" class="formField">
 			</label>
 		</div>
 		<div>
 			<input type="submit" value="', /* I18N: A button label. */ I18N::translate('sign in'), '">
 		</div>
 		';
-		// Emails are sent from a TREE, not from a SITE. Therefore if there is no
-		// tree available (initial setup or all trees private), then we can't send email.
-		if ($WT_TREE) {
-			echo '
+        // Emails are sent from a TREE, not from a SITE. Therefore if there is no
+        // tree available (initial setup or all trees private), then we can't send email.
+        if ($WT_TREE) {
+            echo '
 			<div>
 				<a href="#" id="passwd_click">', I18N::translate('Forgot password?'), '</a>
 			</div>';
-			if (Site::getPreference('USE_REGISTRATION_MODULE')) {
-				echo '<div><a href="' . WT_LOGIN_URL . '?action=register">', I18N::translate('Request a new user account'), '</a></div>';
-			}
-		}
-	echo '</form>';
-
-	// hidden New Password block
-	echo '<div id="new_passwd">
+            if (Site::getPreference('USE_REGISTRATION_MODULE')) {
+                echo '<div><a href="' . WT_LOGIN_URL . '?action=register">', I18N::translate('Request a new user account'), '</a></div>';
+            }
+        }
+    echo '</form>';
+
+    // hidden New Password block
+    echo '<div id="new_passwd">
 		<form id="new_passwd_form" name="new_passwd_form" action="' . WT_LOGIN_URL . '" method="post">
 		<input type="hidden" name="action" value="requestpw">
 		<h4>', I18N::translate('Request a new password'), '</h4>
 		<div>
 			<label for="new_passwd_username">', I18N::translate('Username or email address'),
-				'<input type="text" id="new_passwd_username" name="new_passwd_username" value="">
+                '<input type="text" id="new_passwd_username" name="new_passwd_username" value="">
 			</label>
 		</div>
 		<div><input type="submit" value="', /* I18N: A button label. */ I18N::translate('continue'), '"></div>
 		</form>
 	</div>';
-	echo '</div>';
+    echo '</div>';
 
-	echo '</div>';
-	break;
+    echo '</div>';
+    break;
 
 case 'requestpw':
-	$user_name = Filter::post('new_passwd_username');
-	$user      = User::findByIdentifier($user_name);
-
-	if ($user) {
-		$passchars   = 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-		$user_new_pw = '';
-		$max         = strlen($passchars) - 1;
-		for ($i = 0; $i < 8; $i++) {
-			$index = rand(0, $max);
-			$user_new_pw .= $passchars{$index};
-		}
-
-		$user->setPassword($user_new_pw);
-		Log::addAuthenticationLog('Password request was sent to user: ' . $user->getUserName());
-
-		Mail::systemMessage(
-			$WT_TREE,
-			$user,
-			I18N::translate('Lost password request'),
-			I18N::translate('Hello %s…', $user->getRealNameHtml()) . Mail::EOL . Mail::EOL .
-			I18N::translate('A new password has been requested for your username.') . Mail::EOL . Mail::EOL .
-			I18N::translate('Username') . ": " . Filter::escapeHtml($user->getUserName()) . Mail::EOL .
-			I18N::translate('Password') . ": " . $user_new_pw . Mail::EOL . Mail::EOL .
-			I18N::translate('After you have signed in, select the “My account” link under the “My pages” menu and fill in the password fields to change your password.') . Mail::EOL . Mail::EOL .
-			'<a href="' . WT_BASE_URL . 'login.php?ged=' . $WT_TREE->getNameUrl() . '">' . WT_BASE_URL . 'login.php?ged=' . $WT_TREE->getNameUrl() . '</a>'
-		);
-
-		FlashMessages::addMessage(I18N::translate('A new password has been created and emailed to %s. You can change this password after you sign in.', Filter::escapeHtml($user_name)), 'success');
-	} else {
-		FlashMessages::addMessage(I18N::translate('There is no account with the username or email “%s”.', Filter::escapeHtml($user_name)), 'danger');
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
-	break;
+    $user_name = Filter::post('new_passwd_username');
+    $user      = User::findByIdentifier($user_name);
+
+    if ($user) {
+        $passchars   = 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+        $user_new_pw = '';
+        $max         = strlen($passchars) - 1;
+        for ($i = 0; $i < 8; $i++) {
+            $index = rand(0, $max);
+            $user_new_pw .= $passchars{$index};
+        }
+
+        $user->setPassword($user_new_pw);
+        Log::addAuthenticationLog('Password request was sent to user: ' . $user->getUserName());
+
+        Mail::systemMessage(
+            $WT_TREE,
+            $user,
+            I18N::translate('Lost password request'),
+            I18N::translate('Hello %s…', $user->getRealNameHtml()) . Mail::EOL . Mail::EOL .
+            I18N::translate('A new password has been requested for your username.') . Mail::EOL . Mail::EOL .
+            I18N::translate('Username') . ": " . Filter::escapeHtml($user->getUserName()) . Mail::EOL .
+            I18N::translate('Password') . ": " . $user_new_pw . Mail::EOL . Mail::EOL .
+            I18N::translate('After you have signed in, select the “My account” link under the “My pages” menu and fill in the password fields to change your password.') . Mail::EOL . Mail::EOL .
+            '<a href="' . WT_BASE_URL . 'login.php?ged=' . $WT_TREE->getNameUrl() . '">' . WT_BASE_URL . 'login.php?ged=' . $WT_TREE->getNameUrl() . '</a>'
+        );
+
+        FlashMessages::addMessage(I18N::translate('A new password has been created and emailed to %s. You can change this password after you sign in.', Filter::escapeHtml($user_name)), 'success');
+    } else {
+        FlashMessages::addMessage(I18N::translate('There is no account with the username or email “%s”.', Filter::escapeHtml($user_name)), 'danger');
+    }
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+    return;
+    break;
 
 case 'register':
-	if (!Site::getPreference('USE_REGISTRATION_MODULE')) {
-		header('Location: ' . WT_BASE_URL);
-
-		return;
-	}
-
-	$controller->setPageTitle(I18N::translate('Request a new user account'));
-
-	// The form parameters are mandatory, and the validation errors are shown in the client.
-	if (Session::get('good_to_send') && $user_name && $user_password01 && $user_password01 == $user_password02 && $user_realname && $user_email && $user_comments) {
-
-		// These validation errors cannot be shown in the client.
-		if (User::findByUserName($user_name)) {
-			FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
-		} elseif (User::findByEmail($user_email)) {
-			FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
-		} elseif (preg_match('/(?!' . preg_quote(WT_BASE_URL, '/') . ')(((?:ftp|http|https):\/\/)[a-zA-Z0-9.-]+)/', $user_comments, $match)) {
-			FlashMessages::addMessage(
-				I18N::translate('You are not allowed to send messages that contain external links.') . ' ' .
-				I18N::translate('You should delete the “%1$s” from “%2$s” and try again.', $match[2], $match[1])
-			);
-			Log::addAuthenticationLog('Possible spam registration from "' . $user_name . '"/"' . $user_email . '" comments="' . $user_comments . '"');
-		} else {
-			// Everything looks good - create the user
-			$controller->pageHeader();
-			Log::addAuthenticationLog('User registration requested for: ' . $user_name);
-
-			$user = User::create($user_name, $user_realname, $user_email, $user_password01);
-			$user
-				->setPreference('language', WT_LOCALE)
-				->setPreference('verified', '0')
-				->setPreference('verified_by_admin', 0)
-				->setPreference('reg_timestamp', date('U'))
-				->setPreference('reg_hashcode', md5(Uuid::uuid4()))
-				->setPreference('contactmethod', 'messaging2')
-				->setPreference('comment', $user_comments)
-				->setPreference('visibleonline', '1')
-				->setPreference('auto_accept', '0')
-				->setPreference('canadmin', '0')
-				->setPreference('sessiontime', '0');
-
-			// Generate an email in the admin’s language
-			$webmaster = User::find($WT_TREE->getPreference('WEBMASTER_USER_ID'));
-			I18N::init($webmaster->getPreference('language'));
-
-			$mail1_body =
-				I18N::translate('Hello administrator…') . Mail::EOL . Mail::EOL .
-				/* I18N: %s is a server name/URL */
-				I18N::translate('A prospective user has registered with webtrees at %s.', WT_BASE_URL . ' ' . $WT_TREE->getTitleHtml()) . Mail::EOL . Mail::EOL .
-				I18N::translate('Username') . ' ' . Filter::escapeHtml($user->getUserName()) . Mail::EOL .
-				I18N::translate('Real name') . ' ' . $user->getRealNameHtml() . Mail::EOL .
-				I18N::translate('Email address') . ' ' . Filter::escapeHtml($user->getEmail()) . Mail::EOL .
-				I18N::translate('Comments') . ' ' . Filter::escapeHtml($user_comments) . Mail::EOL . Mail::EOL .
-				I18N::translate('The user has been sent an email with the information necessary to confirm the access request.') . Mail::EOL . Mail::EOL .
-				I18N::translate('You will be informed by email when this prospective user has confirmed the request. You can then complete the process by activating the username. The new user will not be able to sign in until you activate the account.');
-
-			$mail1_subject = /* I18N: %s is a server name/URL */ I18N::translate('New registration at %s', WT_BASE_URL . ' ' . $WT_TREE->getTitle());
-			I18N::init(WT_LOCALE);
-
-			echo '<div id="login-register-page">';
-
-			// Generate an email in the user’s language
-			$mail2_body =
-				I18N::translate('Hello %s…', $user->getRealNameHtml()) .
-				Mail::EOL . Mail::EOL .
-				/* I18N: %1$s is the site URL and %2$s is an email address */
-				I18N::translate('You (or someone claiming to be you) has requested an account at %1$s using the email address %2$s.', WT_BASE_URL . ' ' . $WT_TREE->getTitleHtml(), $user->getEmail()) .
-				Mail::EOL . Mail::EOL .
-				I18N::translate('Follow this link to verify your email address.') .
-				Mail::EOL . Mail::EOL .
-				'<a href="' . WT_LOGIN_URL . '?user_name=' . Filter::escapeUrl($user->getUserName()) . '&amp;user_hashcode=' . $user->getPreference('reg_hashcode') . '&amp;action=userverify&amp;ged=' . $WT_TREE->getNameUrl() . '">' .
-				WT_LOGIN_URL . "?user_name=" . Filter::escapeHtml($user->getUserName()) . "&amp;user_hashcode=" . urlencode($user->getPreference('reg_hashcode')) . '&amp;action=userverify&amp;ged=' . $WT_TREE->getNameHtml() .
-				'</a>' . Mail::EOL . Mail::EOL .
-				I18N::translate('Username') . " - " . Filter::escapeHtml($user->getUserName()) . Mail::EOL .
-				I18N::translate('Comments') . " - " . $user->getPreference('comment') . Mail::EOL .
-				I18N::translate('If you didn’t request an account, you can just delete this message.') . Mail::EOL;
-			$mail2_subject = /* I18N: %s is a server name/URL */ I18N::translate('Your registration at %s', WT_BASE_URL);
-			$mail2_to      = $user->getEmail();
-			$mail2_from    = $WT_TREE->getPreference('WEBTREES_EMAIL');
-
-			// Send user message by email only
-			Mail::send(
-				// “From:” header
-				$WT_TREE,
-				// “To:” header
-				$mail2_to,
-				$mail2_to,
-				// “Reply-To:” header
-				$mail2_from,
-				$mail2_from,
-				// Message body
-				$mail2_subject,
-				$mail2_body
-			);
-
-			// Send admin message by email and/or internal messaging
-			Mail::send(
-				// “From:” header
-				$WT_TREE,
-				// “To:” header
-				$webmaster->getEmail(),
-				$webmaster->getRealName(),
-				// “Reply-To:” header
-				$user->getEmail(),
-				$user->getRealName(),
-				// Message body
-				$mail1_subject,
-				$mail1_body
-			);
-			$mail1_method = $webmaster->getPreference('contact_method');
-			if ($mail1_method != 'messaging3' && $mail1_method != 'mailto' && $mail1_method != 'none') {
-				Database::prepare("INSERT INTO `##message` (sender, ip_address, user_id, subject, body) VALUES (? ,? ,? ,? ,?)")
-					->execute(array($user->getEmail(), WT_CLIENT_IP, $webmaster->getUserId(), $mail1_subject, Filter::unescapeHtml($mail1_body)));
-			}
-
-			echo '<div class="confirm"><p>', I18N::translate('Hello %s…<br>Thank you for your registration.', $user->getRealNameHtml()), '</p>';
-			echo '<p>', I18N::translate('We will now send a confirmation email to the address <b>%s</b>. You must verify your account request by following instructions in the confirmation email. If you do not confirm your account request within seven days, your application will be rejected automatically. You will have to apply again.<br><br>After you have followed the instructions in the confirmation email, the administrator still has to approve your request before your account can be used.<br><br>To sign in to this website, you will need to know your username and password.', $user->getEmail()), '</p>';
-			echo '</div>';
-			echo '</div>';
-
-			return;
-		}
-	}
-
-	Session::put('good_to_send', true);
-	$controller
-		->pageHeader()
-		->addInlineJavascript('function regex_quote(str) {return str.replace(/[\\\\.?+*()[\](){}|]/g, "\\\\$&");}');
-
-	?>
+    if (!Site::getPreference('USE_REGISTRATION_MODULE')) {
+        header('Location: ' . WT_BASE_URL);
+
+        return;
+    }
+
+    $controller->setPageTitle(I18N::translate('Request a new user account'));
+
+    // The form parameters are mandatory, and the validation errors are shown in the client.
+    if (Session::get('good_to_send') && $user_name && $user_password01 && $user_password01 == $user_password02 && $user_realname && $user_email && $user_comments) {
+
+        // These validation errors cannot be shown in the client.
+        if (User::findByUserName($user_name)) {
+            FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
+        } elseif (User::findByEmail($user_email)) {
+            FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
+        } elseif (preg_match('/(?!' . preg_quote(WT_BASE_URL, '/') . ')(((?:ftp|http|https):\/\/)[a-zA-Z0-9.-]+)/', $user_comments, $match)) {
+            FlashMessages::addMessage(
+                I18N::translate('You are not allowed to send messages that contain external links.') . ' ' .
+                I18N::translate('You should delete the “%1$s” from “%2$s” and try again.', $match[2], $match[1])
+            );
+            Log::addAuthenticationLog('Possible spam registration from "' . $user_name . '"/"' . $user_email . '" comments="' . $user_comments . '"');
+        } else {
+            // Everything looks good - create the user
+            $controller->pageHeader();
+            Log::addAuthenticationLog('User registration requested for: ' . $user_name);
+
+            $user = User::create($user_name, $user_realname, $user_email, $user_password01);
+            $user
+                ->setPreference('language', WT_LOCALE)
+                ->setPreference('verified', '0')
+                ->setPreference('verified_by_admin', 0)
+                ->setPreference('reg_timestamp', date('U'))
+                ->setPreference('reg_hashcode', md5(Uuid::uuid4()))
+                ->setPreference('contactmethod', 'messaging2')
+                ->setPreference('comment', $user_comments)
+                ->setPreference('visibleonline', '1')
+                ->setPreference('auto_accept', '0')
+                ->setPreference('canadmin', '0')
+                ->setPreference('sessiontime', '0');
+
+            // Generate an email in the admin’s language
+            $webmaster = User::find($WT_TREE->getPreference('WEBMASTER_USER_ID'));
+            I18N::init($webmaster->getPreference('language'));
+
+            $mail1_body =
+                I18N::translate('Hello administrator…') . Mail::EOL . Mail::EOL .
+                /* I18N: %s is a server name/URL */
+                I18N::translate('A prospective user has registered with webtrees at %s.', WT_BASE_URL . ' ' . $WT_TREE->getTitleHtml()) . Mail::EOL . Mail::EOL .
+                I18N::translate('Username') . ' ' . Filter::escapeHtml($user->getUserName()) . Mail::EOL .
+                I18N::translate('Real name') . ' ' . $user->getRealNameHtml() . Mail::EOL .
+                I18N::translate('Email address') . ' ' . Filter::escapeHtml($user->getEmail()) . Mail::EOL .
+                I18N::translate('Comments') . ' ' . Filter::escapeHtml($user_comments) . Mail::EOL . Mail::EOL .
+                I18N::translate('The user has been sent an email with the information necessary to confirm the access request.') . Mail::EOL . Mail::EOL .
+                I18N::translate('You will be informed by email when this prospective user has confirmed the request. You can then complete the process by activating the username. The new user will not be able to sign in until you activate the account.');
+
+            $mail1_subject = /* I18N: %s is a server name/URL */ I18N::translate('New registration at %s', WT_BASE_URL . ' ' . $WT_TREE->getTitle());
+            I18N::init(WT_LOCALE);
+
+            echo '<div id="login-register-page">';
+
+            // Generate an email in the user’s language
+            $mail2_body =
+                I18N::translate('Hello %s…', $user->getRealNameHtml()) .
+                Mail::EOL . Mail::EOL .
+                /* I18N: %1$s is the site URL and %2$s is an email address */
+                I18N::translate('You (or someone claiming to be you) has requested an account at %1$s using the email address %2$s.', WT_BASE_URL . ' ' . $WT_TREE->getTitleHtml(), $user->getEmail()) .
+                Mail::EOL . Mail::EOL .
+                I18N::translate('Follow this link to verify your email address.') .
+                Mail::EOL . Mail::EOL .
+                '<a href="' . WT_LOGIN_URL . '?user_name=' . Filter::escapeUrl($user->getUserName()) . '&amp;user_hashcode=' . $user->getPreference('reg_hashcode') . '&amp;action=userverify&amp;ged=' . $WT_TREE->getNameUrl() . '">' .
+                WT_LOGIN_URL . "?user_name=" . Filter::escapeHtml($user->getUserName()) . "&amp;user_hashcode=" . urlencode($user->getPreference('reg_hashcode')) . '&amp;action=userverify&amp;ged=' . $WT_TREE->getNameHtml() .
+                '</a>' . Mail::EOL . Mail::EOL .
+                I18N::translate('Username') . " - " . Filter::escapeHtml($user->getUserName()) . Mail::EOL .
+                I18N::translate('Comments') . " - " . $user->getPreference('comment') . Mail::EOL .
+                I18N::translate('If you didn’t request an account, you can just delete this message.') . Mail::EOL;
+            $mail2_subject = /* I18N: %s is a server name/URL */ I18N::translate('Your registration at %s', WT_BASE_URL);
+            $mail2_to      = $user->getEmail();
+            $mail2_from    = $WT_TREE->getPreference('WEBTREES_EMAIL');
+
+            // Send user message by email only
+            Mail::send(
+                // “From:” header
+                $WT_TREE,
+                // “To:” header
+                $mail2_to,
+                $mail2_to,
+                // “Reply-To:” header
+                $mail2_from,
+                $mail2_from,
+                // Message body
+                $mail2_subject,
+                $mail2_body
+            );
+
+            // Send admin message by email and/or internal messaging
+            Mail::send(
+                // “From:” header
+                $WT_TREE,
+                // “To:” header
+                $webmaster->getEmail(),
+                $webmaster->getRealName(),
+                // “Reply-To:” header
+                $user->getEmail(),
+                $user->getRealName(),
+                // Message body
+                $mail1_subject,
+                $mail1_body
+            );
+            $mail1_method = $webmaster->getPreference('contact_method');
+            if ($mail1_method != 'messaging3' && $mail1_method != 'mailto' && $mail1_method != 'none') {
+                Database::prepare("INSERT INTO `##message` (sender, ip_address, user_id, subject, body) VALUES (? ,? ,? ,? ,?)")
+                    ->execute(array($user->getEmail(), WT_CLIENT_IP, $webmaster->getUserId(), $mail1_subject, Filter::unescapeHtml($mail1_body)));
+            }
+
+            echo '<div class="confirm"><p>', I18N::translate('Hello %s…<br>Thank you for your registration.', $user->getRealNameHtml()), '</p>';
+            echo '<p>', I18N::translate('We will now send a confirmation email to the address <b>%s</b>. You must verify your account request by following instructions in the confirmation email. If you do not confirm your account request within seven days, your application will be rejected automatically. You will have to apply again.<br><br>After you have followed the instructions in the confirmation email, the administrator still has to approve your request before your account can be used.<br><br>To sign in to this website, you will need to know your username and password.', $user->getEmail()), '</p>';
+            echo '</div>';
+            echo '</div>';
+
+            return;
+        }
+    }
+
+    Session::put('good_to_send', true);
+    $controller
+        ->pageHeader()
+        ->addInlineJavascript('function regex_quote(str) {return str.replace(/[\\\\.?+*()[\](){}|]/g, "\\\\$&");}');
+
+    ?>
 	<div id="login-register-page">
 		<h2><?php echo $controller->getPageTitle(); ?></h2>
 
@@ -501,24 +501,24 @@ 
 		</div>
 	</div>
 	<?php
-	break;
+    break;
 
 case 'userverify':
-	if (!Site::getPreference('USE_REGISTRATION_MODULE')) {
-		header('Location: ' . WT_BASE_URL);
+    if (!Site::getPreference('USE_REGISTRATION_MODULE')) {
+        header('Location: ' . WT_BASE_URL);
 
-		return;
-	}
+        return;
+    }
 
-	// Change to the new user’s language
-	$user = User::findByUserName($user_name);
+    // Change to the new user’s language
+    $user = User::findByUserName($user_name);
 
-	I18N::init($user->getPreference('language'));
+    I18N::init($user->getPreference('language'));
 
-	$controller->setPageTitle(I18N::translate('User verification'));
-	$controller->pageHeader();
+    $controller->setPageTitle(I18N::translate('User verification'));
+    $controller->pageHeader();
 
-	echo '<div id="login-register-page">
+    echo '<div id="login-register-page">
 		<form id="verify-form" name="verify-form" method="post" action="', WT_LOGIN_URL, '">
 			<input type="hidden" name="action" value="verify_hash">
 			<h4>', I18N::translate('User verification'), '</h4>
@@ -539,87 +539,87 @@ 
 			</div>
 		</form>
 	</div>';
-	break;
+    break;
 
 case 'verify_hash':
-	if (!Site::getPreference('USE_REGISTRATION_MODULE')) {
-		header('Location: ' . WT_BASE_URL);
-
-		return;
-	}
-
-	// switch language to webmaster settings
-	$webmaster = User::find($WT_TREE->getPreference('WEBMASTER_USER_ID'));
-	I18N::init($webmaster->getPreference('language'));
-
-	$user          = User::findByUserName($user_name);
-	$edit_user_url = WT_BASE_URL . "admin_users.php?action=edit&amp;user_id=" . $user->getUserId();
-	$mail1_body    =
-		I18N::translate('Hello administrator…') .
-		Mail::EOL . Mail::EOL .
-		/* I18N: %1$s is a real-name, %2$s is a username, %3$s is an email address */ I18N::translate(
-			'A new user (%1$s) has requested an account (%2$s) and verified an email address (%3$s).',
-			$user->getRealNameHtml(),
-			Filter::escapeHtml($user->getUserName()),
-			Filter::escapeHtml($user->getEmail())
-		) .
-		Mail::EOL . Mail::EOL .
-		I18N::translate('You need to review the account details.') .
-		Mail::EOL . Mail::EOL .
-		'<a href="' . $edit_user_url . '">' . $edit_user_url . '</a>' .
-		Mail::EOL . Mail::EOL .
-		/* I18N: You need to: */ I18N::translate('Set the status to “approved”.') .
-		Mail::EOL .
-		/* I18N: You need to: */ I18N::translate('Set the access level for each tree.') .
-		Mail::EOL .
-		/* I18N: You need to: */ I18N::translate('Link the user account to an individual.');
-
-	$mail1_subject = /* I18N: %s is a server name/URL */ I18N::translate('New user at %s', WT_BASE_URL . ' ' . $WT_TREE->getTitle());
-
-	// Change to the new user’s language
-	I18N::init($user->getPreference('language'));
-
-	$controller->setPageTitle(I18N::translate('User verification'));
-	$controller->pageHeader();
-
-	echo '<div id="login-register-page">';
-	echo '<h2>' . I18N::translate('User verification') . '</h2>';
-	echo '<div id="user-verify">';
-	if ($user && $user->checkPassword($user_password) && $user->getPreference('reg_hashcode') === $user_hashcode) {
-		Mail::send(
-		// “From:” header
-			$WT_TREE,
-			// “To:” header
-			$webmaster->getEmail(),
-			$webmaster->getRealName(),
-			// “Reply-To:” header
-			$WT_TREE->getPreference('WEBTREES_EMAIL'),
-			$WT_TREE->getPreference('WEBTREES_EMAIL'),
-			// Message body
-			$mail1_subject,
-			$mail1_body
-		);
-		$mail1_method = $webmaster->getPreference('CONTACT_METHOD');
-		if ($mail1_method != 'messaging3' && $mail1_method != 'mailto' && $mail1_method != 'none') {
-			Database::prepare("INSERT INTO `##message` (sender, ip_address, user_id, subject, body) VALUES (? ,? ,? ,? ,?)")
-				->execute(array($user_name, WT_CLIENT_IP, $webmaster->getUserId(), $mail1_subject, Filter::unescapeHtml($mail1_body)));
-		}
-
-		$user
-			->setPreference('verified', '1')
-			->setPreference('reg_timestamp', date('U'))
-			->deletePreference('reg_hashcode');
-
-		Log::addAuthenticationLog('User ' . $user_name . ' verified their email address');
-
-		echo '<p>', I18N::translate('You have confirmed your request to become a registered user.'), '</p>';
-		echo '<p>', I18N::translate('The administrator has been informed. As soon as they give you permission to sign in, you can sign in with your username and password.'), '</p>';
-	} else {
-		echo '<p class="warning">';
-		echo I18N::translate('Could not verify the information you entered. Please try again or contact the site administrator for more information.');
-		echo '</p>';
-	}
-	echo '</div>';
-	echo '</div>';
-	break;
+    if (!Site::getPreference('USE_REGISTRATION_MODULE')) {
+        header('Location: ' . WT_BASE_URL);
+
+        return;
+    }
+
+    // switch language to webmaster settings
+    $webmaster = User::find($WT_TREE->getPreference('WEBMASTER_USER_ID'));
+    I18N::init($webmaster->getPreference('language'));
+
+    $user          = User::findByUserName($user_name);
+    $edit_user_url = WT_BASE_URL . "admin_users.php?action=edit&amp;user_id=" . $user->getUserId();
+    $mail1_body    =
+        I18N::translate('Hello administrator…') .
+        Mail::EOL . Mail::EOL .
+        /* I18N: %1$s is a real-name, %2$s is a username, %3$s is an email address */ I18N::translate(
+            'A new user (%1$s) has requested an account (%2$s) and verified an email address (%3$s).',
+            $user->getRealNameHtml(),
+            Filter::escapeHtml($user->getUserName()),
+            Filter::escapeHtml($user->getEmail())
+        ) .
+        Mail::EOL . Mail::EOL .
+        I18N::translate('You need to review the account details.') .
+        Mail::EOL . Mail::EOL .
+        '<a href="' . $edit_user_url . '">' . $edit_user_url . '</a>' .
+        Mail::EOL . Mail::EOL .
+        /* I18N: You need to: */ I18N::translate('Set the status to “approved”.') .
+        Mail::EOL .
+        /* I18N: You need to: */ I18N::translate('Set the access level for each tree.') .
+        Mail::EOL .
+        /* I18N: You need to: */ I18N::translate('Link the user account to an individual.');
+
+    $mail1_subject = /* I18N: %s is a server name/URL */ I18N::translate('New user at %s', WT_BASE_URL . ' ' . $WT_TREE->getTitle());
+
+    // Change to the new user’s language
+    I18N::init($user->getPreference('language'));
+
+    $controller->setPageTitle(I18N::translate('User verification'));
+    $controller->pageHeader();
+
+    echo '<div id="login-register-page">';
+    echo '<h2>' . I18N::translate('User verification') . '</h2>';
+    echo '<div id="user-verify">';
+    if ($user && $user->checkPassword($user_password) && $user->getPreference('reg_hashcode') === $user_hashcode) {
+        Mail::send(
+        // “From:” header
+            $WT_TREE,
+            // “To:” header
+            $webmaster->getEmail(),
+            $webmaster->getRealName(),
+            // “Reply-To:” header
+            $WT_TREE->getPreference('WEBTREES_EMAIL'),
+            $WT_TREE->getPreference('WEBTREES_EMAIL'),
+            // Message body
+            $mail1_subject,
+            $mail1_body
+        );
+        $mail1_method = $webmaster->getPreference('CONTACT_METHOD');
+        if ($mail1_method != 'messaging3' && $mail1_method != 'mailto' && $mail1_method != 'none') {
+            Database::prepare("INSERT INTO `##message` (sender, ip_address, user_id, subject, body) VALUES (? ,? ,? ,? ,?)")
+                ->execute(array($user_name, WT_CLIENT_IP, $webmaster->getUserId(), $mail1_subject, Filter::unescapeHtml($mail1_body)));
+        }
+
+        $user
+            ->setPreference('verified', '1')
+            ->setPreference('reg_timestamp', date('U'))
+            ->deletePreference('reg_hashcode');
+
+        Log::addAuthenticationLog('User ' . $user_name . ' verified their email address');
+
+        echo '<p>', I18N::translate('You have confirmed your request to become a registered user.'), '</p>';
+        echo '<p>', I18N::translate('The administrator has been informed. As soon as they give you permission to sign in, you can sign in with your username and password.'), '</p>';
+    } else {
+        echo '<p class="warning">';
+        echo I18N::translate('Could not verify the information you entered. Please try again or contact the site administrator for more information.');
+        echo '</p>';
+    }
+    echo '</div>';
+    echo '</div>';
+    break;
 }