fisharebest / webtrees

admin_module_reports.php

Indentation +13 added lines, -13 removed lines

@@ -24,29 +24,29 @@
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isAdmin())
-	->setPageTitle(I18N::translate('Reports'));
+    ->restrictAccess(Auth::isAdmin())
+    ->setPageTitle(I18N::translate('Reports'));
 
 $action  = Filter::post('action');
 $modules = Module::getAllModulesByComponent('report');
 
 if ($action === 'update_mods' && Filter::checkCsrf()) {
-	foreach ($modules as $module) {
-		foreach (Tree::getAll() as $tree) {
-			$access_level = Filter::post('access-' . $module->getName() . '-' . $tree->getTreeId(), WT_REGEX_INTEGER, $module->defaultAccessLevel());
-			Database::prepare(
-				"REPLACE INTO `##module_privacy` (module_name, gedcom_id, component, access_level) VALUES (?, ?, 'report', ?)"
-			)->execute(array($module->getName(), $tree->getTreeId(), $access_level));
-		}
-	}
+    foreach ($modules as $module) {
+        foreach (Tree::getAll() as $tree) {
+            $access_level = Filter::post('access-' . $module->getName() . '-' . $tree->getTreeId(), WT_REGEX_INTEGER, $module->defaultAccessLevel());
+            Database::prepare(
+                "REPLACE INTO `##module_privacy` (module_name, gedcom_id, component, access_level) VALUES (?, ?, 'report', ?)"
+            )->execute(array($module->getName(), $tree->getTreeId(), $access_level));
+        }
+    }
 
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
-	return;
+    return;
 }
 
 $controller
-	->pageHeader();
+    ->pageHeader();
 
 ?>
 <ol class="breadcrumb small">

Braces +5 added lines, -2 removed lines

@@ -74,8 +74,11 @@
 				<td class="col-xs-2">
 					<?php if ($module instanceof ModuleConfigInterface): ?>
 						<a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a>
-					<?php else: ?>
-						<?php echo $module->getTitle(); ?>
+					<?php else {
+    : ?>
+						<?php echo $module->getTitle();
+}
+?>
 					<?php endif; ?>
 				</td>
 				<td class="col-xs-5"><?php echo $module->getDescription(); ?></td>

editnews.php

Indentation +39 added lines, -39 removed lines

@@ -31,9 +31,9 @@ 
 
 $controller = new SimpleController;
 $controller
-	->setPageTitle(I18N::translate('Add/edit a journal/news entry'))
-	->restrictAccess(Auth::isMember($WT_TREE))
-	->pageHeader();
+    ->setPageTitle(I18N::translate('Add/edit a journal/news entry'))
+    ->restrictAccess(Auth::isMember($WT_TREE))
+    ->pageHeader();
 
 $action    = Filter::get('action', 'compose|save', 'compose');
 $news_id   = Filter::getInteger('news_id');
@@ -45,43 +45,43 @@ 
 
 switch ($action) {
 case 'compose':
-	if (Module::getModuleByName('ckeditor')) {
-		CkeditorModule::enableEditor($controller);
-	}
+    if (Module::getModuleByName('ckeditor')) {
+        CkeditorModule::enableEditor($controller);
+    }
 
-	echo '<h3>' . I18N::translate('Add/edit a journal/news entry') . '</h3>';
-	echo '<form style="overflow: hidden;" name="messageform" method="post" action="editnews.php?action=save&news_id=' . $news_id . '">';
-	if ($news_id) {
-		$news = Database::prepare("SELECT news_id AS id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) AS date, subject, body FROM `##news` WHERE news_id=?")->execute(array($news_id))->fetchOneRow(PDO::FETCH_ASSOC);
-	} else {
-		$news              = array();
-		$news['user_id']   = $user_id;
-		$news['gedcom_id'] = $gedcom_id;
-		$news['date']      = WT_TIMESTAMP;
-		$news['subject']   = '';
-		$news['body']      = '';
-	}
-	echo '<input type="hidden" name="user_id" value="' . $news['user_id'] . '">';
-	echo '<input type="hidden" name="gedcom_id" value="' . $news['gedcom_id'] . '">';
-	echo '<input type="hidden" name="date" value="' . $news['date'] . '">';
-	echo '<table>';
-	echo '<tr><th style="text-align:start;">' . I18N::translate('Title') . '</th><tr>';
-	echo '<tr><td><input type="text" name="title" size="50" dir="auto" autofocus value="' . $news['subject'] . '"></td></tr>';
-	echo '<tr><th style="text-align:start;">' . I18N::translate('Content') . '</th></tr>';
-	echo '<tr><td>';
-	echo '<textarea name="text" class="html-edit" cols="80" rows="10" dir="auto">' . Filter::escapeHtml($news['body']) . '</textarea>';
-	echo '</td></tr>';
-	echo '<tr><td><input type="submit" value="' . I18N::translate('save') . '"></td></tr>';
-	echo '</table>';
-	echo '</form>';
-	break;
+    echo '<h3>' . I18N::translate('Add/edit a journal/news entry') . '</h3>';
+    echo '<form style="overflow: hidden;" name="messageform" method="post" action="editnews.php?action=save&news_id=' . $news_id . '">';
+    if ($news_id) {
+        $news = Database::prepare("SELECT news_id AS id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) AS date, subject, body FROM `##news` WHERE news_id=?")->execute(array($news_id))->fetchOneRow(PDO::FETCH_ASSOC);
+    } else {
+        $news              = array();
+        $news['user_id']   = $user_id;
+        $news['gedcom_id'] = $gedcom_id;
+        $news['date']      = WT_TIMESTAMP;
+        $news['subject']   = '';
+        $news['body']      = '';
+    }
+    echo '<input type="hidden" name="user_id" value="' . $news['user_id'] . '">';
+    echo '<input type="hidden" name="gedcom_id" value="' . $news['gedcom_id'] . '">';
+    echo '<input type="hidden" name="date" value="' . $news['date'] . '">';
+    echo '<table>';
+    echo '<tr><th style="text-align:start;">' . I18N::translate('Title') . '</th><tr>';
+    echo '<tr><td><input type="text" name="title" size="50" dir="auto" autofocus value="' . $news['subject'] . '"></td></tr>';
+    echo '<tr><th style="text-align:start;">' . I18N::translate('Content') . '</th></tr>';
+    echo '<tr><td>';
+    echo '<textarea name="text" class="html-edit" cols="80" rows="10" dir="auto">' . Filter::escapeHtml($news['body']) . '</textarea>';
+    echo '</td></tr>';
+    echo '<tr><td><input type="submit" value="' . I18N::translate('save') . '"></td></tr>';
+    echo '</table>';
+    echo '</form>';
+    break;
 case 'save':
-	if ($news_id) {
-		Database::prepare("UPDATE `##news` SET subject=?, body=?, updated=FROM_UNIXTIME(?) WHERE news_id=?")->execute(array($title, $text, $date, $news_id));
-	} else {
-		Database::prepare("INSERT INTO `##news` (user_id, gedcom_id, subject, body, updated) VALUES (NULLIF(?, ''), NULLIF(?, '') ,? ,?, CURRENT_TIMESTAMP)")->execute(array($user_id, $gedcom_id, $title, $text));
-	}
+    if ($news_id) {
+        Database::prepare("UPDATE `##news` SET subject=?, body=?, updated=FROM_UNIXTIME(?) WHERE news_id=?")->execute(array($title, $text, $date, $news_id));
+    } else {
+        Database::prepare("INSERT INTO `##news` (user_id, gedcom_id, subject, body, updated) VALUES (NULLIF(?, ''), NULLIF(?, '') ,? ,?, CURRENT_TIMESTAMP)")->execute(array($user_id, $gedcom_id, $title, $text));
+    }
 
-	$controller->addInlineJavascript('window.opener.location.reload();window.close();');
-	break;
+    $controller->addInlineJavascript('window.opener.location.reload();window.close();');
+    break;
 }

Switch Indentation +38 added lines, -38 removed lines

@@ -44,44 +44,44 @@
 $text      = Filter::post('text');
 
 switch ($action) {
-case 'compose':
-	if (Module::getModuleByName('ckeditor')) {
-		CkeditorModule::enableEditor($controller);
-	}
+    case 'compose':
+	    if (Module::getModuleByName('ckeditor')) {
+		    CkeditorModule::enableEditor($controller);
+	    }
 
-	echo '<h3>' . I18N::translate('Add/edit a journal/news entry') . '</h3>';
-	echo '<form style="overflow: hidden;" name="messageform" method="post" action="editnews.php?action=save&news_id=' . $news_id . '">';
-	if ($news_id) {
-		$news = Database::prepare("SELECT news_id AS id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) AS date, subject, body FROM `##news` WHERE news_id=?")->execute(array($news_id))->fetchOneRow(PDO::FETCH_ASSOC);
-	} else {
-		$news              = array();
-		$news['user_id']   = $user_id;
-		$news['gedcom_id'] = $gedcom_id;
-		$news['date']      = WT_TIMESTAMP;
-		$news['subject']   = '';
-		$news['body']      = '';
-	}
-	echo '<input type="hidden" name="user_id" value="' . $news['user_id'] . '">';
-	echo '<input type="hidden" name="gedcom_id" value="' . $news['gedcom_id'] . '">';
-	echo '<input type="hidden" name="date" value="' . $news['date'] . '">';
-	echo '<table>';
-	echo '<tr><th style="text-align:start;">' . I18N::translate('Title') . '</th><tr>';
-	echo '<tr><td><input type="text" name="title" size="50" dir="auto" autofocus value="' . $news['subject'] . '"></td></tr>';
-	echo '<tr><th style="text-align:start;">' . I18N::translate('Content') . '</th></tr>';
-	echo '<tr><td>';
-	echo '<textarea name="text" class="html-edit" cols="80" rows="10" dir="auto">' . Filter::escapeHtml($news['body']) . '</textarea>';
-	echo '</td></tr>';
-	echo '<tr><td><input type="submit" value="' . I18N::translate('save') . '"></td></tr>';
-	echo '</table>';
-	echo '</form>';
-	break;
-case 'save':
-	if ($news_id) {
-		Database::prepare("UPDATE `##news` SET subject=?, body=?, updated=FROM_UNIXTIME(?) WHERE news_id=?")->execute(array($title, $text, $date, $news_id));
-	} else {
-		Database::prepare("INSERT INTO `##news` (user_id, gedcom_id, subject, body, updated) VALUES (NULLIF(?, ''), NULLIF(?, '') ,? ,?, CURRENT_TIMESTAMP)")->execute(array($user_id, $gedcom_id, $title, $text));
-	}
+	    echo '<h3>' . I18N::translate('Add/edit a journal/news entry') . '</h3>';
+	    echo '<form style="overflow: hidden;" name="messageform" method="post" action="editnews.php?action=save&news_id=' . $news_id . '">';
+	    if ($news_id) {
+		    $news = Database::prepare("SELECT news_id AS id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) AS date, subject, body FROM `##news` WHERE news_id=?")->execute(array($news_id))->fetchOneRow(PDO::FETCH_ASSOC);
+	    } else {
+		    $news              = array();
+		    $news['user_id']   = $user_id;
+		    $news['gedcom_id'] = $gedcom_id;
+		    $news['date']      = WT_TIMESTAMP;
+		    $news['subject']   = '';
+		    $news['body']      = '';
+	    }
+	    echo '<input type="hidden" name="user_id" value="' . $news['user_id'] . '">';
+	    echo '<input type="hidden" name="gedcom_id" value="' . $news['gedcom_id'] . '">';
+	    echo '<input type="hidden" name="date" value="' . $news['date'] . '">';
+	    echo '<table>';
+	    echo '<tr><th style="text-align:start;">' . I18N::translate('Title') . '</th><tr>';
+	    echo '<tr><td><input type="text" name="title" size="50" dir="auto" autofocus value="' . $news['subject'] . '"></td></tr>';
+	    echo '<tr><th style="text-align:start;">' . I18N::translate('Content') . '</th></tr>';
+	    echo '<tr><td>';
+	    echo '<textarea name="text" class="html-edit" cols="80" rows="10" dir="auto">' . Filter::escapeHtml($news['body']) . '</textarea>';
+	    echo '</td></tr>';
+	    echo '<tr><td><input type="submit" value="' . I18N::translate('save') . '"></td></tr>';
+	    echo '</table>';
+	    echo '</form>';
+	    break;
+    case 'save':
+	    if ($news_id) {
+		    Database::prepare("UPDATE `##news` SET subject=?, body=?, updated=FROM_UNIXTIME(?) WHERE news_id=?")->execute(array($title, $text, $date, $news_id));
+	    } else {
+		    Database::prepare("INSERT INTO `##news` (user_id, gedcom_id, subject, body, updated) VALUES (NULLIF(?, ''), NULLIF(?, '') ,? ,?, CURRENT_TIMESTAMP)")->execute(array($user_id, $gedcom_id, $title, $text));
+	    }
 
-	$controller->addInlineJavascript('window.opener.location.reload();window.close();');
-	break;
+	    $controller->addInlineJavascript('window.opener.location.reload();window.close();');
+	    break;
 }

themes/_custom/theme.php

Indentation +50 added lines, -50 removed lines

@@ -32,61 +32,61 @@
  * The rest are just examples, and should be removed in actual themes.
  */
 class MyTheme extends WebtreesTheme {
-	/**
-	 * Give your theme a unique identifier. Themes beginning with an underscore
-	 * are reserved for internal use.
-	 *
-	 * {@inheritdoc}
-	 */
-	public function themeId() {
-		return '_custom';
-	}
+    /**
+     * Give your theme a unique identifier. Themes beginning with an underscore
+     * are reserved for internal use.
+     *
+     * {@inheritdoc}
+     */
+    public function themeId() {
+        return '_custom';
+    }
 
-	/**
-	 * Give your theme a name. This is shown to the users.
-	 * Use HTML entities where appropriate. e.g. “Black & white”.
-	 *
-	 * You could use switch($this->locale) {} to provide a translated versions
-	 * of the theme name.
-	 *
-	 * {@inheritdoc}
-	 */
-	public function themeName() {
-		return 'Custom theme';
-	}
+    /**
+     * Give your theme a name. This is shown to the users.
+     * Use HTML entities where appropriate. e.g. “Black & white”.
+     *
+     * You could use switch($this->locale) {} to provide a translated versions
+     * of the theme name.
+     *
+     * {@inheritdoc}
+     */
+    public function themeName() {
+        return 'Custom theme';
+    }
 
-	/**
-	 * This is an example function which shows how to add an additional CSS file to the theme.
-	 *
-	 * {@inheritdoc}
-	 */
-	public function stylesheets() {
-		$css_files   = parent::stylesheets();
-		// Put a version number in the URL, to prevent browsers from caching old versions.
-		$css_files[] = WT_BASE_URL . 'themes/_custom/custom-v1.0.css';
+    /**
+     * This is an example function which shows how to add an additional CSS file to the theme.
+     *
+     * {@inheritdoc}
+     */
+    public function stylesheets() {
+        $css_files   = parent::stylesheets();
+        // Put a version number in the URL, to prevent browsers from caching old versions.
+        $css_files[] = WT_BASE_URL . 'themes/_custom/custom-v1.0.css';
 
-		return $css_files;
-	}
+        return $css_files;
+    }
 
-	/**
-	 * This is an example function which shows one way to remove an entry from a menu.
-	 *
-	 * @param string $surname The significant surname for the page.
-	 *
-	 * {@inheritdoc}
-	 */
-	public function menuLists($surname) {
-		// Start with the default "Lists" menu.
-		$menu = parent::menuLists($surname);
-		// Remove the "notes" sub-menu.
-		$submenus = array_filter($menu->getSubmenus(), function (Menu $menu) {
-			return $menu->getClass() !== 'menu-list-note';
-		});
-		// Replace the sub-menus
-		$menu->setSubmenus($submenus);
+    /**
+     * This is an example function which shows one way to remove an entry from a menu.
+     *
+     * @param string $surname The significant surname for the page.
+     *
+     * {@inheritdoc}
+     */
+    public function menuLists($surname) {
+        // Start with the default "Lists" menu.
+        $menu = parent::menuLists($surname);
+        // Remove the "notes" sub-menu.
+        $submenus = array_filter($menu->getSubmenus(), function (Menu $menu) {
+            return $menu->getClass() !== 'menu-list-note';
+        });
+        // Replace the sub-menus
+        $menu->setSubmenus($submenus);
 
-		return $menu;
-	}
+        return $menu;
+    }
 }
 
 return new MyTheme; // This script must return a theme object.

Braces +10 added lines, -5 removed lines

@@ -31,14 +31,16 @@ 
  * Only the first two functions are required: themeId() and themeName().
  * The rest are just examples, and should be removed in actual themes.
  */
-class MyTheme extends WebtreesTheme {
+class MyTheme extends WebtreesTheme
+{
 	/**
 	 * Give your theme a unique identifier. Themes beginning with an underscore
 	 * are reserved for internal use.
 	 *
 	 * {@inheritdoc}
 	 */
-	public function themeId() {
+	public function themeId()
+	{
 		return '_custom';
 	}
 
@@ -51,7 +53,8 @@ 
 	 *
 	 * {@inheritdoc}
 	 */
-	public function themeName() {
+	public function themeName()
+	{
 		return 'Custom theme';
 	}
 
@@ -60,7 +63,8 @@ 
 	 *
 	 * {@inheritdoc}
 	 */
-	public function stylesheets() {
+	public function stylesheets()
+	{
 		$css_files   = parent::stylesheets();
 		// Put a version number in the URL, to prevent browsers from caching old versions.
 		$css_files[] = WT_BASE_URL . 'themes/_custom/custom-v1.0.css';
@@ -75,7 +79,8 @@ 
 	 *
 	 * {@inheritdoc}
 	 */
-	public function menuLists($surname) {
+	public function menuLists($surname)
+	{
 		// Start with the default "Lists" menu.
 		$menu = parent::menuLists($surname);
 		// Remove the "notes" sub-menu.

lifespan.php

Indentation +4 added lines, -4 removed lines

@@ -25,9 +25,9 @@ 
 
 $controller = new LifespanController;
 $controller
-	->restrictAccess(Module::isActiveChart($WT_TREE, 'lifespans_chart'))
-	->pageHeader()
-	->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL);
+    ->restrictAccess(Module::isActiveChart($WT_TREE, 'lifespans_chart'))
+    ->pageHeader()
+    ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL);
 
 ?>
 <div id="lifespan-page">
@@ -126,7 +126,7 @@ 
 </div>
 <?php
 $controller
-	->addInlineJavascript("
+    ->addInlineJavascript("
 		autocomplete();
 		var scale = jQuery('#lifespan-scale'),
 			barHeight = jQuery('#lifespan-people').children().first().outerHeight();

includes/session.php

Switch Indentation +42 added lines, -42 removed lines

@@ -200,29 +200,29 @@ 
 		$frame += array('args' => array(), 'file' => 'unknown', 'line' => 'unknown');
 		array_walk($frame['args'], function (&$arg) {
 			switch (gettype($arg)) {
-			case 'boolean':
-			case 'integer':
-			case 'double':
-			case 'null':
-				$arg = var_export($arg, true);
-				break;
-			case 'string':
-				if (mb_strlen($arg) > 30) {
-					$arg = substr($arg, 0, 30) . '…';
-				}
-				$arg = var_export($arg, true);
-				break;
-			case 'object':
-				$reflection = new \ReflectionClass($arg);
-				if (is_object($arg) && method_exists($arg, '__toString')) {
-					$arg = '[' . $reflection->getShortName() . ' ' . (string) $arg . ']';
-				} else {
-					$arg = '[' . $reflection->getShortName() . ']';
-				}
-				break;
-			default:
-				$arg = '[' . gettype($arg) . ']';
-				break;
+			    case 'boolean':
+			    case 'integer':
+			    case 'double':
+			    case 'null':
+				    $arg = var_export($arg, true);
+				    break;
+			    case 'string':
+				    if (mb_strlen($arg) > 30) {
+					    $arg = substr($arg, 0, 30) . '…';
+				    }
+				    $arg = var_export($arg, true);
+				    break;
+			    case 'object':
+				    $reflection = new \ReflectionClass($arg);
+				    if (is_object($arg) && method_exists($arg, '__toString')) {
+					    $arg = '[' . $reflection->getShortName() . ' ' . (string) $arg . ']';
+				    } else {
+					    $arg = '[' . $reflection->getShortName() . ']';
+				    }
+				    break;
+			    default:
+				    $arg = '[' . gettype($arg) . ']';
+				    break;
 			}
 		});
 		$frame['file'] = str_replace(dirname(__DIR__), '', $frame['file']);
@@ -319,25 +319,25 @@ 
 )->execute(array(WT_CLIENT_IP, Filter::server('HTTP_USER_AGENT', null, '')))->fetchOne();
 
 switch ($rule) {
-case 'allow':
-	$SEARCH_SPIDER = false;
-	break;
-case 'deny':
-	http_response_code(403);
-	exit;
-case 'robot':
-case 'unknown':
-	// Search engines don’t send cookies, and so create a new session with every visit.
-	// Make sure they always use the same one
-	Session::setId('search-engine-' . str_replace('.', '-', WT_CLIENT_IP));
-	$SEARCH_SPIDER = true;
-	break;
-case '':
-	Database::prepare(
-		"INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, comment) VALUES (IFNULL(INET_ATON(?), 0), IFNULL(INET_ATON(?), 4294967295), ?, '')"
-	)->execute(array(WT_CLIENT_IP, WT_CLIENT_IP, Filter::server('HTTP_USER_AGENT', null, '')));
-	$SEARCH_SPIDER = true;
-	break;
+    case 'allow':
+	    $SEARCH_SPIDER = false;
+	    break;
+    case 'deny':
+	    http_response_code(403);
+	    exit;
+    case 'robot':
+    case 'unknown':
+	    // Search engines don’t send cookies, and so create a new session with every visit.
+	    // Make sure they always use the same one
+	    Session::setId('search-engine-' . str_replace('.', '-', WT_CLIENT_IP));
+	    $SEARCH_SPIDER = true;
+	    break;
+    case '':
+	    Database::prepare(
+		    "INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, comment) VALUES (IFNULL(INET_ATON(?), 0), IFNULL(INET_ATON(?), 4294967295), ?, '')"
+	    )->execute(array(WT_CLIENT_IP, WT_CLIENT_IP, Filter::server('HTTP_USER_AGENT', null, '')));
+	    $SEARCH_SPIDER = true;
+	    break;
 }
 
 // Store our session data in the database.

Indentation +253 added lines, -253 removed lines

@@ -25,9 +25,9 @@ 
 
 // WT_SCRIPT_NAME is defined in each script that the user is permitted to load.
 if (!defined('WT_SCRIPT_NAME')) {
-	http_response_code(403);
+    http_response_code(403);
 
-	return;
+    return;
 }
 
 /**
@@ -50,41 +50,41 @@ 
 define('WT_STATIC_URL', getenv('STATIC_URL')); // We could set this to load our own static resources from a cookie-free domain.
 
 if (getenv('USE_CDN')) {
-	// Caution, using a CDN will break support for responsive features in IE8, as respond.js
-	// needs to be on the same domain as all the CSS files.
-	define('WT_BOOTSTRAP_CSS_URL', '//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css');
-	define('WT_BOOTSTRAP_DATETIMEPICKER_CSS_URL', '//cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.min.css');
-	define('WT_BOOTSTRAP_DATETIMEPICKER_JS_URL', '//cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.min.js');
-	define('WT_BOOTSTRAP_JS_URL', '//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/js/bootstrap.min.js');
-	define('WT_BOOTSTRAP_RTL_CSS_URL', '//cdnjs.cloudflare.com/ajax/libs/bootstrap-rtl/3.2.0-rc2/css/bootstrap-rtl.min.css'); // Cloudflare is out of date
-	//define('WT_DATATABLES_BOOTSTRAP_CSS_URL', '//cdn.datatables.net/plug-ins/1.10.7/integration/bootstrap/3/dataTables.bootstrap.css');
-	define('WT_DATATABLES_BOOTSTRAP_JS_URL', '//cdn.datatables.net/plug-ins/1.10.7/integration/bootstrap/3/dataTables.bootstrap.js');
-	define('WT_FONT_AWESOME_CSS_URL', '//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.min.css');
-	define('WT_JQUERYUI_JS_URL', '//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js');
-	define('WT_JQUERYUI_TOUCH_PUNCH_URL', '//cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js');
-	define('WT_JQUERY_DATATABLES_JS_URL', '//cdnjs.cloudflare.com/ajax/libs/datatables/1.10.7/js/jquery.dataTables.min.js');
-	define('WT_JQUERY_JS_URL', '//cdnjs.cloudflare.com/ajax/libs/jquery/1.12.1/jquery.min.js');
-	define('WT_JQUERY2_JS_URL', '//cdnjs.cloudflare.com/ajax/libs/jquery/2.2.1/jquery.min.js');
-	define('WT_MODERNIZR_JS_URL', '//cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js');
-	define('WT_MOMENT_JS_URL', '//cdnjs.cloudflare.com/ajax/libs/moment.js/2.11.2/moment-with-locales.min.js');
-	define('WT_RESPOND_JS_URL', '//cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js');
+    // Caution, using a CDN will break support for responsive features in IE8, as respond.js
+    // needs to be on the same domain as all the CSS files.
+    define('WT_BOOTSTRAP_CSS_URL', '//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css');
+    define('WT_BOOTSTRAP_DATETIMEPICKER_CSS_URL', '//cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.min.css');
+    define('WT_BOOTSTRAP_DATETIMEPICKER_JS_URL', '//cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.min.js');
+    define('WT_BOOTSTRAP_JS_URL', '//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/js/bootstrap.min.js');
+    define('WT_BOOTSTRAP_RTL_CSS_URL', '//cdnjs.cloudflare.com/ajax/libs/bootstrap-rtl/3.2.0-rc2/css/bootstrap-rtl.min.css'); // Cloudflare is out of date
+    //define('WT_DATATABLES_BOOTSTRAP_CSS_URL', '//cdn.datatables.net/plug-ins/1.10.7/integration/bootstrap/3/dataTables.bootstrap.css');
+    define('WT_DATATABLES_BOOTSTRAP_JS_URL', '//cdn.datatables.net/plug-ins/1.10.7/integration/bootstrap/3/dataTables.bootstrap.js');
+    define('WT_FONT_AWESOME_CSS_URL', '//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.min.css');
+    define('WT_JQUERYUI_JS_URL', '//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js');
+    define('WT_JQUERYUI_TOUCH_PUNCH_URL', '//cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js');
+    define('WT_JQUERY_DATATABLES_JS_URL', '//cdnjs.cloudflare.com/ajax/libs/datatables/1.10.7/js/jquery.dataTables.min.js');
+    define('WT_JQUERY_JS_URL', '//cdnjs.cloudflare.com/ajax/libs/jquery/1.12.1/jquery.min.js');
+    define('WT_JQUERY2_JS_URL', '//cdnjs.cloudflare.com/ajax/libs/jquery/2.2.1/jquery.min.js');
+    define('WT_MODERNIZR_JS_URL', '//cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js');
+    define('WT_MOMENT_JS_URL', '//cdnjs.cloudflare.com/ajax/libs/moment.js/2.11.2/moment-with-locales.min.js');
+    define('WT_RESPOND_JS_URL', '//cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js');
 } else {
-	define('WT_BOOTSTRAP_CSS_URL', WT_STATIC_URL . 'packages/bootstrap-3.3.6/css/bootstrap.min.css');
-	define('WT_BOOTSTRAP_DATETIMEPICKER_CSS_URL', WT_STATIC_URL . 'packages/bootstrap-datetimepicker-4.17.37/css/bootstrap-datetimepicker.min.css');
-	define('WT_BOOTSTRAP_DATETIMEPICKER_JS_URL', WT_STATIC_URL . 'packages/bootstrap-datetimepicker-4.17.37/js/bootstrap-datetimepicker.min.js');
-	define('WT_BOOTSTRAP_JS_URL', WT_STATIC_URL . 'packages/bootstrap-3.3.6/js/bootstrap.min.js');
-	define('WT_BOOTSTRAP_RTL_CSS_URL', WT_STATIC_URL . 'packages/bootstrap-rtl-3.3.4/css/bootstrap-rtl.min.css');
-	//define('WT_DATATABLES_BOOTSTRAP_CSS_URL', WT_STATIC_URL . 'packages/datatables-1.10.7/plugins/dataTables.bootstrap.css');
-	define('WT_DATATABLES_BOOTSTRAP_JS_URL', WT_STATIC_URL . 'packages/datatables-1.10.7/plugins/dataTables.bootstrap.js');
-	define('WT_FONT_AWESOME_CSS_URL', WT_STATIC_URL . 'packages/font-awesome-4.4.0/css/font-awesome.min.css');
-	define('WT_JQUERYUI_JS_URL', WT_STATIC_URL . 'packages/jquery-ui-1.11.4/js/jquery-ui.min.js');
-	define('WT_JQUERYUI_TOUCH_PUNCH_URL', WT_STATIC_URL . 'packages/jqueryui-touch-punch-0.2.3/jquery.ui.touch-punch.min.js');
-	define('WT_JQUERY_DATATABLES_JS_URL', WT_STATIC_URL . 'packages/datatables-1.10.7/js/jquery.dataTables.min.js');
-	define('WT_JQUERY_JS_URL', WT_STATIC_URL . 'packages/jquery-1.12.1/jquery.min.js');
-	define('WT_JQUERY2_JS_URL', WT_STATIC_URL . 'packages/jquery-2.2.1/jquery.min.js');
-	define('WT_MODERNIZR_JS_URL', WT_STATIC_URL . 'packages/modernizr-2.8.3/modernizr.min.js');
-	define('WT_MOMENT_JS_URL', WT_STATIC_URL . 'packages/moment-2.11.2/moment-with-locales.min.js');
-	define('WT_RESPOND_JS_URL', WT_STATIC_URL . 'packages/respond-1.4.2/respond.min.js');
+    define('WT_BOOTSTRAP_CSS_URL', WT_STATIC_URL . 'packages/bootstrap-3.3.6/css/bootstrap.min.css');
+    define('WT_BOOTSTRAP_DATETIMEPICKER_CSS_URL', WT_STATIC_URL . 'packages/bootstrap-datetimepicker-4.17.37/css/bootstrap-datetimepicker.min.css');
+    define('WT_BOOTSTRAP_DATETIMEPICKER_JS_URL', WT_STATIC_URL . 'packages/bootstrap-datetimepicker-4.17.37/js/bootstrap-datetimepicker.min.js');
+    define('WT_BOOTSTRAP_JS_URL', WT_STATIC_URL . 'packages/bootstrap-3.3.6/js/bootstrap.min.js');
+    define('WT_BOOTSTRAP_RTL_CSS_URL', WT_STATIC_URL . 'packages/bootstrap-rtl-3.3.4/css/bootstrap-rtl.min.css');
+    //define('WT_DATATABLES_BOOTSTRAP_CSS_URL', WT_STATIC_URL . 'packages/datatables-1.10.7/plugins/dataTables.bootstrap.css');
+    define('WT_DATATABLES_BOOTSTRAP_JS_URL', WT_STATIC_URL . 'packages/datatables-1.10.7/plugins/dataTables.bootstrap.js');
+    define('WT_FONT_AWESOME_CSS_URL', WT_STATIC_URL . 'packages/font-awesome-4.4.0/css/font-awesome.min.css');
+    define('WT_JQUERYUI_JS_URL', WT_STATIC_URL . 'packages/jquery-ui-1.11.4/js/jquery-ui.min.js');
+    define('WT_JQUERYUI_TOUCH_PUNCH_URL', WT_STATIC_URL . 'packages/jqueryui-touch-punch-0.2.3/jquery.ui.touch-punch.min.js');
+    define('WT_JQUERY_DATATABLES_JS_URL', WT_STATIC_URL . 'packages/datatables-1.10.7/js/jquery.dataTables.min.js');
+    define('WT_JQUERY_JS_URL', WT_STATIC_URL . 'packages/jquery-1.12.1/jquery.min.js');
+    define('WT_JQUERY2_JS_URL', WT_STATIC_URL . 'packages/jquery-2.2.1/jquery.min.js');
+    define('WT_MODERNIZR_JS_URL', WT_STATIC_URL . 'packages/modernizr-2.8.3/modernizr.min.js');
+    define('WT_MOMENT_JS_URL', WT_STATIC_URL . 'packages/moment-2.11.2/moment-with-locales.min.js');
+    define('WT_RESPOND_JS_URL', WT_STATIC_URL . 'packages/respond-1.4.2/respond.min.js');
 }
 
 // We can't load these from a CDN, as these have been patched.
@@ -176,9 +176,9 @@ 
 
 // Ignore the default port.
 if ($protocol === 'http' && $port === '80' || $protocol === 'https' && $port === '443') {
-	$port = '';
+    $port = '';
 } else {
-	$port = ':' . $port;
+    $port = ':' . $port;
 }
 
 // REDIRECT_URL should be set when Apache is following a RedirectRule
@@ -197,98 +197,98 @@ 
 });
 
 set_exception_handler(function ($ex) {
-	$message = $ex->getFile() . ':' . $ex->getLine() . ' ' . $ex->getMessage() . PHP_EOL;
-
-	foreach ($ex->getTrace() as $level => $frame) {
-		$frame += array('args' => array(), 'file' => 'unknown', 'line' => 'unknown');
-		array_walk($frame['args'], function (&$arg) {
-			switch (gettype($arg)) {
-			case 'boolean':
-			case 'integer':
-			case 'double':
-			case 'null':
-				$arg = var_export($arg, true);
-				break;
-			case 'string':
-				if (mb_strlen($arg) > 30) {
-					$arg = substr($arg, 0, 30) . '…';
-				}
-				$arg = var_export($arg, true);
-				break;
-			case 'object':
-				$reflection = new \ReflectionClass($arg);
-				if (is_object($arg) && method_exists($arg, '__toString')) {
-					$arg = '[' . $reflection->getShortName() . ' ' . (string) $arg . ']';
-				} else {
-					$arg = '[' . $reflection->getShortName() . ']';
-				}
-				break;
-			default:
-				$arg = '[' . gettype($arg) . ']';
-				break;
-			}
-		});
-		$frame['file'] = str_replace(dirname(__DIR__), '', $frame['file']);
-		$message .= '#' . $level . ' ' . $frame['file'] . ':' . $frame['line'] . ' ';
-		if ($level) {
-			$message .= $frame['function'] . '(' . implode(', ', $frame['args']) . ')' . PHP_EOL;
-		} else {
-			$message .= get_class($ex) . '("' . $ex->getMessage() . '")' . PHP_EOL;
-		}
-	}
-
-	if (error_reporting() & $ex->getCode()) {
-		echo $message;
-	}
-
-	Log::addErrorLog($message);
+    $message = $ex->getFile() . ':' . $ex->getLine() . ' ' . $ex->getMessage() . PHP_EOL;
+
+    foreach ($ex->getTrace() as $level => $frame) {
+        $frame += array('args' => array(), 'file' => 'unknown', 'line' => 'unknown');
+        array_walk($frame['args'], function (&$arg) {
+            switch (gettype($arg)) {
+            case 'boolean':
+            case 'integer':
+            case 'double':
+            case 'null':
+                $arg = var_export($arg, true);
+                break;
+            case 'string':
+                if (mb_strlen($arg) > 30) {
+                    $arg = substr($arg, 0, 30) . '…';
+                }
+                $arg = var_export($arg, true);
+                break;
+            case 'object':
+                $reflection = new \ReflectionClass($arg);
+                if (is_object($arg) && method_exists($arg, '__toString')) {
+                    $arg = '[' . $reflection->getShortName() . ' ' . (string) $arg . ']';
+                } else {
+                    $arg = '[' . $reflection->getShortName() . ']';
+                }
+                break;
+            default:
+                $arg = '[' . gettype($arg) . ']';
+                break;
+            }
+        });
+        $frame['file'] = str_replace(dirname(__DIR__), '', $frame['file']);
+        $message .= '#' . $level . ' ' . $frame['file'] . ':' . $frame['line'] . ' ';
+        if ($level) {
+            $message .= $frame['function'] . '(' . implode(', ', $frame['args']) . ')' . PHP_EOL;
+        } else {
+            $message .= get_class($ex) . '("' . $ex->getMessage() . '")' . PHP_EOL;
+        }
+    }
+
+    if (error_reporting() & $ex->getCode()) {
+        echo $message;
+    }
+
+    Log::addErrorLog($message);
 });
 
 // Load our configuration file, so we can connect to the database
 if (file_exists(WT_ROOT . 'data/config.ini.php')) {
-	$dbconfig = parse_ini_file(WT_ROOT . 'data/config.ini.php');
-	// Invalid/unreadable config file?
-	if (!is_array($dbconfig)) {
-		header('Location: ' . WT_BASE_URL . 'site-unavailable.php');
-		exit;
-	}
-	// Down for maintenance?
-	if (file_exists(WT_ROOT . 'data/offline.txt')) {
-		header('Location: ' . WT_BASE_URL . 'site-offline.php');
-		exit;
-	}
+    $dbconfig = parse_ini_file(WT_ROOT . 'data/config.ini.php');
+    // Invalid/unreadable config file?
+    if (!is_array($dbconfig)) {
+        header('Location: ' . WT_BASE_URL . 'site-unavailable.php');
+        exit;
+    }
+    // Down for maintenance?
+    if (file_exists(WT_ROOT . 'data/offline.txt')) {
+        header('Location: ' . WT_BASE_URL . 'site-offline.php');
+        exit;
+    }
 } else {
-	// No config file. Set one up.
-	header('Location: ' . WT_BASE_URL . 'setup.php');
-	exit;
+    // No config file. Set one up.
+    header('Location: ' . WT_BASE_URL . 'setup.php');
+    exit;
 }
 
 // What is the remote client's IP address
 if (Filter::server('HTTP_CLIENT_IP') !== null) {
-	define('WT_CLIENT_IP', Filter::server('HTTP_CLIENT_IP'));
+    define('WT_CLIENT_IP', Filter::server('HTTP_CLIENT_IP'));
 } elseif (Filter::server('HTTP_X_FORWARDED_FOR') !== null) {
-	define('WT_CLIENT_IP', Filter::server('HTTP_X_FORWARDED_FOR'));
+    define('WT_CLIENT_IP', Filter::server('HTTP_X_FORWARDED_FOR'));
 } else {
-	define('WT_CLIENT_IP', Filter::server('REMOTE_ADDR', WT_REGEX_IPV4, '127.0.0.1'));
+    define('WT_CLIENT_IP', Filter::server('REMOTE_ADDR', WT_REGEX_IPV4, '127.0.0.1'));
 }
 
 // Connect to the database
 try {
-	Database::createInstance($dbconfig['dbhost'], $dbconfig['dbport'], $dbconfig['dbname'], $dbconfig['dbuser'], $dbconfig['dbpass']);
-	define('WT_TBLPREFIX', $dbconfig['tblpfx']);
-	unset($dbconfig);
-	// Some of the FAMILY JOIN HUSBAND JOIN WIFE queries can excede the MAX_JOIN_SIZE setting
-	Database::exec("SET NAMES 'utf8' COLLATE 'utf8_unicode_ci', SQL_BIG_SELECTS=1");
-	// Update the database schema
-	$updated = Database::updateSchema('\Fisharebest\Webtrees\Schema', 'WT_SCHEMA_VERSION', WT_SCHEMA_VERSION);
-	if ($updated) {
-		// updateSchema() might load custom modules - which we cannot load again.
-		header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . (isset($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : ''));
-		exit;
-	}
+    Database::createInstance($dbconfig['dbhost'], $dbconfig['dbport'], $dbconfig['dbname'], $dbconfig['dbuser'], $dbconfig['dbpass']);
+    define('WT_TBLPREFIX', $dbconfig['tblpfx']);
+    unset($dbconfig);
+    // Some of the FAMILY JOIN HUSBAND JOIN WIFE queries can excede the MAX_JOIN_SIZE setting
+    Database::exec("SET NAMES 'utf8' COLLATE 'utf8_unicode_ci', SQL_BIG_SELECTS=1");
+    // Update the database schema
+    $updated = Database::updateSchema('\Fisharebest\Webtrees\Schema', 'WT_SCHEMA_VERSION', WT_SCHEMA_VERSION);
+    if ($updated) {
+        // updateSchema() might load custom modules - which we cannot load again.
+        header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . (isset($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : ''));
+        exit;
+    }
 } catch (PDOException $ex) {
-	header('Location: ' . WT_BASE_URL . 'site-unavailable.php?message=' . rawurlencode($ex->getMessage()));
-	exit;
+    header('Location: ' . WT_BASE_URL . 'site-unavailable.php?message=' . rawurlencode($ex->getMessage()));
+    exit;
 }
 
 // The config.ini.php file must always be in a fixed location.
@@ -298,120 +298,120 @@ 
 // If we have a preferred URL (e.g. www.example.com instead of www.isp.com/~example), then redirect to it.
 $SERVER_URL = Site::getPreference('SERVER_URL');
 if ($SERVER_URL && $SERVER_URL != WT_BASE_URL) {
-	header('Location: ' . $SERVER_URL . WT_SCRIPT_NAME . (isset($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : ''), true, 301);
-	exit;
+    header('Location: ' . $SERVER_URL . WT_SCRIPT_NAME . (isset($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : ''), true, 301);
+    exit;
 }
 
 // Request more resources - if we can/want to
 if (!ini_get('safe_mode')) {
-	$memory_limit = Site::getPreference('MEMORY_LIMIT');
-	if ($memory_limit && strpos(ini_get('disable_functions'), 'ini_set') === false) {
-		ini_set('memory_limit', $memory_limit);
-	}
-	$max_execution_time = Site::getPreference('MAX_EXECUTION_TIME');
-	if ($max_execution_time && strpos(ini_get('disable_functions'), 'set_time_limit') === false) {
-		set_time_limit($max_execution_time);
-	}
+    $memory_limit = Site::getPreference('MEMORY_LIMIT');
+    if ($memory_limit && strpos(ini_get('disable_functions'), 'ini_set') === false) {
+        ini_set('memory_limit', $memory_limit);
+    }
+    $max_execution_time = Site::getPreference('MAX_EXECUTION_TIME');
+    if ($max_execution_time && strpos(ini_get('disable_functions'), 'set_time_limit') === false) {
+        set_time_limit($max_execution_time);
+    }
 }
 
 $rule = Database::prepare(
-	"SELECT rule FROM `##site_access_rule`" .
-	" WHERE IFNULL(INET_ATON(?), 0) BETWEEN ip_address_start AND ip_address_end" .
-	" AND ? LIKE user_agent_pattern" .
-	" ORDER BY ip_address_end LIMIT 1"
+    "SELECT rule FROM `##site_access_rule`" .
+    " WHERE IFNULL(INET_ATON(?), 0) BETWEEN ip_address_start AND ip_address_end" .
+    " AND ? LIKE user_agent_pattern" .
+    " ORDER BY ip_address_end LIMIT 1"
 )->execute(array(WT_CLIENT_IP, Filter::server('HTTP_USER_AGENT', null, '')))->fetchOne();
 
 switch ($rule) {
 case 'allow':
-	$SEARCH_SPIDER = false;
-	break;
+    $SEARCH_SPIDER = false;
+    break;
 case 'deny':
-	http_response_code(403);
-	exit;
+    http_response_code(403);
+    exit;
 case 'robot':
 case 'unknown':
-	// Search engines don’t send cookies, and so create a new session with every visit.
-	// Make sure they always use the same one
-	Session::setId('search-engine-' . str_replace('.', '-', WT_CLIENT_IP));
-	$SEARCH_SPIDER = true;
-	break;
+    // Search engines don’t send cookies, and so create a new session with every visit.
+    // Make sure they always use the same one
+    Session::setId('search-engine-' . str_replace('.', '-', WT_CLIENT_IP));
+    $SEARCH_SPIDER = true;
+    break;
 case '':
-	Database::prepare(
-		"INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, comment) VALUES (IFNULL(INET_ATON(?), 0), IFNULL(INET_ATON(?), 4294967295), ?, '')"
-	)->execute(array(WT_CLIENT_IP, WT_CLIENT_IP, Filter::server('HTTP_USER_AGENT', null, '')));
-	$SEARCH_SPIDER = true;
-	break;
+    Database::prepare(
+        "INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, comment) VALUES (IFNULL(INET_ATON(?), 0), IFNULL(INET_ATON(?), 4294967295), ?, '')"
+    )->execute(array(WT_CLIENT_IP, WT_CLIENT_IP, Filter::server('HTTP_USER_AGENT', null, '')));
+    $SEARCH_SPIDER = true;
+    break;
 }
 
 // Store our session data in the database.
 session_set_save_handler(
-	// open
-	function () {
-		return true;
-	},
-	// close
-	function () {
-		return true;
-	},
-	// read
-	function ($id) {
-		return (string) Database::prepare("SELECT session_data FROM `##session` WHERE session_id=?")->execute(array($id))->fetchOne();
-	},
-	// write
-	function ($id, $data) {
-		// Only update the session table once per minute, unless the session data has actually changed.
-		Database::prepare(
-			"INSERT INTO `##session` (session_id, user_id, ip_address, session_data, session_time)" .
-			" VALUES (?, ?, ?, ?, CURRENT_TIMESTAMP - SECOND(CURRENT_TIMESTAMP))" .
-			" ON DUPLICATE KEY UPDATE" .
-			" user_id      = VALUES(user_id)," .
-			" ip_address   = VALUES(ip_address)," .
-			" session_data = VALUES(session_data)," .
-			" session_time = CURRENT_TIMESTAMP - SECOND(CURRENT_TIMESTAMP)"
-		)->execute(array($id, (int) Auth::id(), WT_CLIENT_IP, $data));
-
-		return true;
-	},
-	// destroy
-	function ($id) {
-		Database::prepare("DELETE FROM `##session` WHERE session_id=?")->execute(array($id));
-
-		return true;
-	},
-	// gc
-	function ($maxlifetime) {
-		Database::prepare("DELETE FROM `##session` WHERE session_time < DATE_SUB(NOW(), INTERVAL ? SECOND)")->execute(array($maxlifetime));
-
-		return true;
-	}
+    // open
+    function () {
+        return true;
+    },
+    // close
+    function () {
+        return true;
+    },
+    // read
+    function ($id) {
+        return (string) Database::prepare("SELECT session_data FROM `##session` WHERE session_id=?")->execute(array($id))->fetchOne();
+    },
+    // write
+    function ($id, $data) {
+        // Only update the session table once per minute, unless the session data has actually changed.
+        Database::prepare(
+            "INSERT INTO `##session` (session_id, user_id, ip_address, session_data, session_time)" .
+            " VALUES (?, ?, ?, ?, CURRENT_TIMESTAMP - SECOND(CURRENT_TIMESTAMP))" .
+            " ON DUPLICATE KEY UPDATE" .
+            " user_id      = VALUES(user_id)," .
+            " ip_address   = VALUES(ip_address)," .
+            " session_data = VALUES(session_data)," .
+            " session_time = CURRENT_TIMESTAMP - SECOND(CURRENT_TIMESTAMP)"
+        )->execute(array($id, (int) Auth::id(), WT_CLIENT_IP, $data));
+
+        return true;
+    },
+    // destroy
+    function ($id) {
+        Database::prepare("DELETE FROM `##session` WHERE session_id=?")->execute(array($id));
+
+        return true;
+    },
+    // gc
+    function ($maxlifetime) {
+        Database::prepare("DELETE FROM `##session` WHERE session_time < DATE_SUB(NOW(), INTERVAL ? SECOND)")->execute(array($maxlifetime));
+
+        return true;
+    }
 );
 
 Session::start(array(
-	'gc_maxlifetime' => Site::getPreference('SESSION_TIME'),
-	'cookie_path'    => implode('/', array_map('rawurlencode', explode('/', parse_url(WT_BASE_URL, PHP_URL_PATH)))),
+    'gc_maxlifetime' => Site::getPreference('SESSION_TIME'),
+    'cookie_path'    => implode('/', array_map('rawurlencode', explode('/', parse_url(WT_BASE_URL, PHP_URL_PATH)))),
 ));
 
 if (!Auth::isSearchEngine() && !Session::get('initiated')) {
-	// A new session, so prevent session fixation attacks by choosing a new PHPSESSID.
-	Session::regenerate(true);
-	Session::put('initiated', true);
+    // A new session, so prevent session fixation attacks by choosing a new PHPSESSID.
+    Session::regenerate(true);
+    Session::put('initiated', true);
 } else {
-	// An existing session
+    // An existing session
 }
 
 // Set the tree for the page; (1) the request, (2) the session, (3) the site default, (4) any tree
 foreach (array(Filter::post('ged'), Filter::get('ged'), Session::get('GEDCOM'), Site::getPreference('DEFAULT_GEDCOM')) as $tree_name) {
-	$WT_TREE = Tree::findByName($tree_name);
-	if ($WT_TREE) {
-		Session::put('GEDCOM', $tree_name);
-		break;
-	}
+    $WT_TREE = Tree::findByName($tree_name);
+    if ($WT_TREE) {
+        Session::put('GEDCOM', $tree_name);
+        break;
+    }
 }
 // No chosen tree? Use any one.
 if (!$WT_TREE) {
-	foreach (Tree::getAll() as $WT_TREE) {
-		break;
-	}
+    foreach (Tree::getAll() as $WT_TREE) {
+        break;
+    }
 }
 
 // With no parameters, init() looks to the environment to choose a language
@@ -423,9 +423,9 @@ 
 
 // Users get their own time-zone. Visitors get the site time-zone.
 if (Auth::check()) {
-	date_default_timezone_set(Auth::user()->getPreference('TIMEZONE', 'UTC'));
+    date_default_timezone_set(Auth::user()->getPreference('TIMEZONE', 'UTC'));
 } else {
-	date_default_timezone_set(Site::getPreference('TIMEZONE') ?: 'UTC');
+    date_default_timezone_set(Site::getPreference('TIMEZONE') ?: 'UTC');
 }
 define('WT_TIMESTAMP_OFFSET', date_offset_get(new \DateTime('now')));
 
@@ -433,79 +433,79 @@ 
 
 // The login URL must be an absolute URL, and can be user-defined
 if (Site::getPreference('LOGIN_URL')) {
-	define('WT_LOGIN_URL', Site::getPreference('LOGIN_URL'));
+    define('WT_LOGIN_URL', Site::getPreference('LOGIN_URL'));
 } else {
-	define('WT_LOGIN_URL', WT_BASE_URL . 'login.php');
+    define('WT_LOGIN_URL', WT_BASE_URL . 'login.php');
 }
 
 // If there is no current tree and we need one, then redirect somewhere
 if (WT_SCRIPT_NAME != 'admin_trees_manage.php' && WT_SCRIPT_NAME != 'admin_pgv_to_wt.php' && WT_SCRIPT_NAME != 'login.php' && WT_SCRIPT_NAME != 'logout.php' && WT_SCRIPT_NAME != 'import.php' && WT_SCRIPT_NAME != 'help_text.php' && WT_SCRIPT_NAME != 'message.php' && WT_SCRIPT_NAME != 'action.php') {
-	if (!$WT_TREE || !$WT_TREE->getPreference('imported')) {
-		if (Auth::isAdmin()) {
-			header('Location: ' . WT_BASE_URL . 'admin_trees_manage.php');
-		} else {
-			// We're not an administrator, so we can only log in if there is a tree.
-			if (Auth::id()) {
-				Auth::logout();
-				FlashMessages::addMessage(
-					I18N::translate('This user account does not have access to any tree.')
-				);
-			}
-			header('Location: ' . WT_LOGIN_URL . '?url=' . rawurlencode(WT_SCRIPT_NAME . (isset($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : '')), true, 301);
-
-		}
-		exit;
-	}
+    if (!$WT_TREE || !$WT_TREE->getPreference('imported')) {
+        if (Auth::isAdmin()) {
+            header('Location: ' . WT_BASE_URL . 'admin_trees_manage.php');
+        } else {
+            // We're not an administrator, so we can only log in if there is a tree.
+            if (Auth::id()) {
+                Auth::logout();
+                FlashMessages::addMessage(
+                    I18N::translate('This user account does not have access to any tree.')
+                );
+            }
+            header('Location: ' . WT_LOGIN_URL . '?url=' . rawurlencode(WT_SCRIPT_NAME . (isset($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : '')), true, 301);
+
+        }
+        exit;
+    }
 }
 
 // Update the last-login time no more than once a minute
 if (WT_TIMESTAMP - Session::get('activity_time') >= 60) {
-	if (Session::get('masquerade') === null) {
-		Auth::user()->setPreference('sessiontime', WT_TIMESTAMP);
-	}
-	Session::put('activity_time', WT_TIMESTAMP);
+    if (Session::get('masquerade') === null) {
+        Auth::user()->setPreference('sessiontime', WT_TIMESTAMP);
+    }
+    Session::put('activity_time', WT_TIMESTAMP);
 }
 
 // Set the theme
 if (substr(WT_SCRIPT_NAME, 0, 5) === 'admin' || WT_SCRIPT_NAME === 'module.php' && substr(Filter::get('mod_action'), 0, 5) === 'admin') {
-	// Administration scripts begin with “admin” and use a special administration theme
-	Theme::theme(new AdministrationTheme)->init($WT_TREE);
+    // Administration scripts begin with “admin” and use a special administration theme
+    Theme::theme(new AdministrationTheme)->init($WT_TREE);
 } else {
-	// Last theme used?
-	$theme_id = Session::get('theme_id');
-	// Default for tree
-	if (!array_key_exists($theme_id, Theme::themeNames()) && $WT_TREE) {
-		$theme_id = $WT_TREE->getPreference('THEME_DIR');
-	}
-	// Default for site
-	if (!array_key_exists($theme_id, Theme::themeNames())) {
-		$theme_id = Site::getPreference('THEME_DIR');
-	}
-	// Default
-	if (!array_key_exists($theme_id, Theme::themeNames())) {
-		$theme_id = 'webtrees';
-	}
-	foreach (Theme::installedThemes() as $theme) {
-		if ($theme->themeId() === $theme_id) {
-			Theme::theme($theme)->init($WT_TREE);
-			// Remember this setting
-			if (Site::getPreference('ALLOW_USER_THEMES')) {
-				Session::put('theme_id', $theme_id);
-			}
-			break;
-		}
-	}
+    // Last theme used?
+    $theme_id = Session::get('theme_id');
+    // Default for tree
+    if (!array_key_exists($theme_id, Theme::themeNames()) && $WT_TREE) {
+        $theme_id = $WT_TREE->getPreference('THEME_DIR');
+    }
+    // Default for site
+    if (!array_key_exists($theme_id, Theme::themeNames())) {
+        $theme_id = Site::getPreference('THEME_DIR');
+    }
+    // Default
+    if (!array_key_exists($theme_id, Theme::themeNames())) {
+        $theme_id = 'webtrees';
+    }
+    foreach (Theme::installedThemes() as $theme) {
+        if ($theme->themeId() === $theme_id) {
+            Theme::theme($theme)->init($WT_TREE);
+            // Remember this setting
+            if (Site::getPreference('ALLOW_USER_THEMES')) {
+                Session::put('theme_id', $theme_id);
+            }
+            break;
+        }
+    }
 }
 
 // Search engines are only allowed to see certain pages.
 if (Auth::isSearchEngine() && !in_array(WT_SCRIPT_NAME, array(
-	'index.php', 'indilist.php', 'module.php', 'mediafirewall.php',
-	'individual.php', 'family.php', 'mediaviewer.php', 'note.php', 'repo.php', 'source.php',
+    'index.php', 'indilist.php', 'module.php', 'mediafirewall.php',
+    'individual.php', 'family.php', 'mediaviewer.php', 'note.php', 'repo.php', 'source.php',
 ))) {
-	http_response_code(403);
-	$controller = new PageController;
-	$controller->setPageTitle(I18N::translate('Search engine'));
-	$controller->pageHeader();
-	echo '<p class="ui-state-error">', I18N::translate('You do not have permission to view this page.'), '</p>';
-	exit;
+    http_response_code(403);
+    $controller = new PageController;
+    $controller->setPageTitle(I18N::translate('Search engine'));
+    $controller->pageHeader();
+    echo '<p class="ui-state-error">', I18N::translate('You do not have permission to view this page.'), '</p>';
+    exit;
 }

admin_module_charts.php

Indentation +13 added lines, -13 removed lines

@@ -24,29 +24,29 @@
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isAdmin())
-	->setPageTitle(I18N::translate('Charts'));
+    ->restrictAccess(Auth::isAdmin())
+    ->setPageTitle(I18N::translate('Charts'));
 
 $action  = Filter::post('action');
 $modules = Module::getAllModulesByComponent('chart');
 
 if ($action === 'update_mods' && Filter::checkCsrf()) {
-	foreach ($modules as $module) {
-		foreach (Tree::getAll() as $tree) {
-			$access_level = Filter::post('access-' . $module->getName() . '-' . $tree->getTreeId(), WT_REGEX_INTEGER, $module->defaultAccessLevel());
-			Database::prepare(
-				"REPLACE INTO `##module_privacy` (module_name, gedcom_id, component, access_level) VALUES (?, ?, 'chart', ?)"
-			)->execute(array($module->getName(), $tree->getTreeId(), $access_level));
-		}
-	}
+    foreach ($modules as $module) {
+        foreach (Tree::getAll() as $tree) {
+            $access_level = Filter::post('access-' . $module->getName() . '-' . $tree->getTreeId(), WT_REGEX_INTEGER, $module->defaultAccessLevel());
+            Database::prepare(
+                "REPLACE INTO `##module_privacy` (module_name, gedcom_id, component, access_level) VALUES (?, ?, 'chart', ?)"
+            )->execute(array($module->getName(), $tree->getTreeId(), $access_level));
+        }
+    }
 
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
-	return;
+    return;
 }
 
 $controller
-	->pageHeader();
+    ->pageHeader();
 
 ?>
 <ol class="breadcrumb small">

Braces +5 added lines, -2 removed lines

@@ -74,8 +74,11 @@
 				<td class="col-xs-2">
 					<?php if ($module instanceof ModuleConfigInterface): ?>
 						<a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a>
-					<?php else: ?>
-						<?php echo $module->getTitle(); ?>
+					<?php else {
+    : ?>
+						<?php echo $module->getTitle();
+}
+?>
 					<?php endif; ?>
 				</td>
 				<td class="col-xs-5"><?php echo $module->getDescription(); ?></td>

find.php

Indentation +376 added lines, -376 removed lines

@@ -41,66 +41,66 @@ 
 $qs        = Filter::get('tags');
 
 if ($subclick === 'all') {
-	$all = true;
+    $all = true;
 }
 
 $embed = substr($choose, 0, 1) === '1';
 
 switch ($type) {
 case 'indi':
-	$controller->setPageTitle(I18N::translate('Find an individual'));
-	break;
+    $controller->setPageTitle(I18N::translate('Find an individual'));
+    break;
 case 'fam':
-	$controller->setPageTitle(I18N::translate('Find a family'));
-	break;
+    $controller->setPageTitle(I18N::translate('Find a family'));
+    break;
 case 'media':
-	$controller->setPageTitle(I18N::translate('Find a media object'));
-	break;
+    $controller->setPageTitle(I18N::translate('Find a media object'));
+    break;
 case 'place':
-	$controller->setPageTitle(I18N::translate('Find a place'));
-	break;
+    $controller->setPageTitle(I18N::translate('Find a place'));
+    break;
 case 'repo':
-	$controller->setPageTitle(I18N::translate('Find a repository'));
-	break;
+    $controller->setPageTitle(I18N::translate('Find a repository'));
+    break;
 case 'note':
-	$controller->setPageTitle(I18N::translate('Find a shared note'));
-	break;
+    $controller->setPageTitle(I18N::translate('Find a shared note'));
+    break;
 case 'source':
-	$controller->setPageTitle(I18N::translate('Find a source'));
-	break;
+    $controller->setPageTitle(I18N::translate('Find a source'));
+    break;
 case 'specialchar':
-	$controller->setPageTitle(I18N::translate('Find a special character'));
-	break;
+    $controller->setPageTitle(I18N::translate('Find a special character'));
+    break;
 case 'factINDI':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("INDI");');
-	break;
+    $controller
+        ->setPageTitle(I18N::translate('Find a fact or event'))
+        ->addInlineJavascript('initPickFact("INDI");');
+    break;
 case 'factFAM':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("FAM");');
-	break;
+    $controller
+        ->setPageTitle(I18N::translate('Find a fact or event'))
+        ->addInlineJavascript('initPickFact("FAM");');
+    break;
 case 'factSOUR':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("SOUR");');
-	break;
+    $controller
+        ->setPageTitle(I18N::translate('Find a fact or event'))
+        ->addInlineJavascript('initPickFact("SOUR");');
+    break;
 case 'factREPO':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("REPO");');
-	break;
+    $controller
+        ->setPageTitle(I18N::translate('Find a fact or event'))
+        ->addInlineJavascript('initPickFact("REPO");');
+    break;
 case 'factNAME':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("NAME");');
-	break;
+    $controller
+        ->setPageTitle(I18N::translate('Find a fact or event'))
+        ->addInlineJavascript('initPickFact("NAME");');
+    break;
 case 'factPLAC':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("PLAC");');
-	break;
+    $controller
+        ->setPageTitle(I18N::translate('Find a fact or event'))
+        ->addInlineJavascript('initPickFact("PLAC");');
+    break;
 }
 $controller->pageHeader();
 
@@ -140,41 +140,41 @@ 
 
 // Show indi and hide the rest
 if ($type == "indi") {
-	echo '<div id="find-header">
+    echo '<div id="find-header">
 	<form name="filterindi" method="get" onsubmit="return checknames(this);" action="find.php">
 	<input type="hidden" name="callback" value="' . $callback . '">
 	<input type="hidden" name="action" value="filter">
 	<input type="hidden" name="type" value="indi">
 	<span>', /* I18N: Label for search field */ I18N::translate('Name contains'), '</span>
 	<input type="text" name="filter" value="';
-	if ($filter) {
-		echo $filter;
-	}
-	echo '" autofocus>
+    if ($filter) {
+        echo $filter;
+    }
+    echo '" autofocus>
 	<input type="submit" value="', I18N::translate('search'), '">
 	</form></div>';
 }
 
 // Show fam and hide the rest
 if ($type == "fam") {
-	echo '<div id="find-header">
+    echo '<div id="find-header">
 	<form name="filterfam" method="get" onsubmit="return checknames(this);" action="find.php">
 	<input type="hidden" name="callback" value="' . $callback . '">
 	<input type="hidden" name="action" value="filter">
 	<input type="hidden" name="type" value="fam">
 	<span>', I18N::translate('Name contains'), '</span>
 	<input type="text" name="filter" value="';
-	if ($filter) {
-		echo $filter;
-	}
-	echo '" autofocus>
+    if ($filter) {
+        echo $filter;
+    }
+    echo '" autofocus>
 	<input type="submit" value="', I18N::translate('search'), '">
 	</form></div>';
 }
 
 // Show media and hide the rest
 if ($type == 'media') {
-	echo '<div id="find-header">
+    echo '<div id="find-header">
 	<form name="filtermedia" method="get" action="find.php">
 	<input type="hidden" name="choose" value="', $choose, '">
 	<input type="hidden" name="action" value="filter">
@@ -183,17 +183,17 @@ 
 	<input type="hidden" name="subclick">
 	<span>', /* I18N: Label for search field */ I18N::translate('Media contains'), '</span>
 	<input type="text" name="filter" value="';
-	if ($filter) {
-		echo $filter;
-	}
-	echo '" autofocus>',
-	'<p><input type="submit" name="search" value="', I18N::translate('search'), '" onclick="this.form.subclick.value=this.name">
+    if ($filter) {
+        echo $filter;
+    }
+    echo '" autofocus>',
+    '<p><input type="submit" name="search" value="', I18N::translate('search'), '" onclick="this.form.subclick.value=this.name">
 	</p></form></div>';
 }
 
 // Show place and hide the rest
 if ($type == "place") {
-	echo '<div id="find-header">
+    echo '<div id="find-header">
 	<form name="filterplace" method="get" action="find.php">
 	<input type="hidden" name="action" value="filter">
 	<input type="hidden" name="type" value="place">
@@ -201,17 +201,17 @@ 
 	<input type="hidden" name="subclick">
 	<span>', /* I18N: Label for search field */ I18N::translate('Place contains'), '</span>
 	<input type="text" name="filter" value="';
-	if ($filter) {
-		echo $filter;
-	}
-	echo '" autofocus>
+    if ($filter) {
+        echo $filter;
+    }
+    echo '" autofocus>
 	<p><input type="submit" name="search" value="', I18N::translate('search'), '" onclick="this.form.subclick.value=this.name">
 	</p></form></div>';
 }
 
 // Show repo and hide the rest
 if ($type == "repo") {
-	echo '<div id="find-header">
+    echo '<div id="find-header">
 	<form name="filterrepo" method="get" action="find.php">
 	<input type="hidden" name="action" value="filter">
 	<input type="hidden" name="type" value="repo">
@@ -219,10 +219,10 @@ 
 	<input type="hidden" name="subclick">
 	<span>', /* I18N: Label for search field */ I18N::translate('Repository contains'), '</span>
 	<input type="text" name="filter" value="';
-	if ($filter) {
-		echo $filter;
-	}
-	echo '" autofocus>
+    if ($filter) {
+        echo $filter;
+    }
+    echo '" autofocus>
 	<p><input type="submit" name="search" value="', I18N::translate('search'), '" onclick="this.form.subclick.value=this.name">
 	</td></tr></table>
 	</p></form></div>';
@@ -230,7 +230,7 @@ 
 
 // Show Shared Notes and hide the rest
 if ($type == "note") {
-	echo '<div id="find-header">
+    echo '<div id="find-header">
 	<form name="filternote" method="get" action="find.php">
 	<input type="hidden" name="action" value="filter">
 	<input type="hidden" name="type" value="note">
@@ -238,17 +238,17 @@ 
 	<input type="hidden" name="subclick">
 	<span>', /* I18N: Label for search field */ I18N::translate('Shared note contains'), '</span>
 	<input type="text" name="filter" value="';
-	if ($filter) {
-		echo $filter;
-	}
-	echo '" autofocus>
+    if ($filter) {
+        echo $filter;
+    }
+    echo '" autofocus>
 	<p><input type="submit" name="search" value="', I18N::translate('search'), '" onclick="this.form.subclick.value=this.name">
 	</p></form></div>';
 }
 
 // Show source and hide the rest
 if ($type == "source") {
-	echo '<div id="find-header">
+    echo '<div id="find-header">
 	<form name="filtersource" method="get" action="find.php">
 	<input type="hidden" name="action" value="filter">
 	<input type="hidden" name="type" value="source">
@@ -256,43 +256,43 @@ 
 	<input type="hidden" name="subclick">
 	<span>', /* I18N: Label for search field */ I18N::translate('Source contains'), '</span>
 	<input type="text" name="filter" value="';
-	if ($filter) {
-		echo $filter;
-	}
-	echo '" autofocus>
+    if ($filter) {
+        echo $filter;
+    }
+    echo '" autofocus>
 	<p><input type="submit" name="search" value="', I18N::translate('search'), '" onclick="this.form.subclick.value=this.name">
 	</p></form></div>';
 }
 
 // Show specialchar and hide the rest
 if ($type == 'specialchar') {
-	$language_filter       = Filter::get('language_filter', null, Auth::user()->getPreference('default_language_filter'));
-	$specialchar_languages = SpecialChars::allLanguages();
-	if (!array_key_exists($language_filter, $specialchar_languages)) {
-		$language_filter = 'en';
-	}
-	Auth::user()->setPreference('default_language_filter', $language_filter);
-	$action = 'filter';
-	echo '<div id="find-header">
+    $language_filter       = Filter::get('language_filter', null, Auth::user()->getPreference('default_language_filter'));
+    $specialchar_languages = SpecialChars::allLanguages();
+    if (!array_key_exists($language_filter, $specialchar_languages)) {
+        $language_filter = 'en';
+    }
+    Auth::user()->setPreference('default_language_filter', $language_filter);
+    $action = 'filter';
+    echo '<div id="find-header">
 	<form name="filterspecialchar" method="get" action="find.php">
 	<input type="hidden" name="action" value="filter">
 	<input type="hidden" name="type" value="specialchar">
 	<input type="hidden" name="callback" value="' . $callback . '">
 	<p><select id="language_filter" name="language_filter" onchange="submit();">';
-	foreach (SpecialChars::allLanguages() as $lanuguage_tag => $language_name) {
-		echo '<option value="' . $lanuguage_tag . '" ';
-		if ($lanuguage_tag === $language_filter) {
-			echo 'selected';
-		}
-		echo '>', $language_name, '</option>';
-	}
-	echo '</select>
+    foreach (SpecialChars::allLanguages() as $lanuguage_tag => $language_name) {
+        echo '<option value="' . $lanuguage_tag . '" ';
+        if ($lanuguage_tag === $language_filter) {
+            echo 'selected';
+        }
+        echo '>', $language_name, '</option>';
+    }
+    echo '</select>
 	</p></form></div>';
 }
 
 // Show facts
 if ($type == "factINDI" || $type == "factFAM" || $type == "factSOUR" || $type == "factREPO" || $type == "factNAME" || $type == "factPLAC") {
-	echo '<div id="find-facts-header">
+    echo '<div id="find-facts-header">
 	<form name="filterfacts" method="get" action="find.php"
 	input type="hidden" name="type" value="facts">
 	<input type="hidden" name="tags" value="', $qs, '">
@@ -300,18 +300,18 @@ 
 	<table class="list_table width100" border="0">
 	<tr><td class="list_label" style="padding: 5px; font-weight: normal; white-space: normal;">';
 
-	$all           = strlen($qs) ? explode(',', strtoupper($qs)) : array();
-	$preselDefault = array();
-	$preselCustom  = array();
-	foreach ($all as $one) {
-		if (GedcomTag::isTag($one)) {
-			$preselDefault[] = $one;
-		} else {
-			$preselCustom[] = $one;
-		}
-	}
-
-	echo '<script>'; ?>
+    $all           = strlen($qs) ? explode(',', strtoupper($qs)) : array();
+    $preselDefault = array();
+    $preselCustom  = array();
+    foreach ($all as $one) {
+        if (GedcomTag::isTag($one)) {
+            $preselDefault[] = $one;
+        } else {
+            $preselCustom[] = $one;
+        }
+    }
+
+    echo '<script>'; ?>
 	// A class representing a default tag
 	function DefaultTag(id, name, selected) {
 		this.Id=id;
@@ -402,81 +402,81 @@ 
 		switch (factType) {
 			case "INDI":
 				DefaultTags=[<?php
-				$firstFact = true;
-				foreach (GedcomTag::getPicklistFacts('INDI') as $factId => $factName) {
-					if ($firstFact) {
-						$firstFact = false;
-					} else {
-						echo ',';
-					}
-					echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
-				}
-				?>];
+                $firstFact = true;
+                foreach (GedcomTag::getPicklistFacts('INDI') as $factId => $factName) {
+                    if ($firstFact) {
+                        $firstFact = false;
+                    } else {
+                        echo ',';
+                    }
+                    echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
+                }
+                ?>];
 				break;
 			case "FAM":
 				DefaultTags=[<?php
-				$firstFact = true;
-				foreach (GedcomTag::getPicklistFacts('FAM') as $factId => $factName) {
-					if ($firstFact) {
-						$firstFact = false;
-					} else {
-						echo ',';
-					}
-					echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
-				}
-				?>];
+                $firstFact = true;
+                foreach (GedcomTag::getPicklistFacts('FAM') as $factId => $factName) {
+                    if ($firstFact) {
+                        $firstFact = false;
+                    } else {
+                        echo ',';
+                    }
+                    echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
+                }
+                ?>];
 				break;
 			case "SOUR":
 				DefaultTags=[<?php
-				$firstFact = true;
-				foreach (GedcomTag::getPicklistFacts('SOUR') as $factId => $factName) {
-					if ($firstFact) {
-						$firstFact = false;
-					} else {
-						echo ',';
-					}
-					echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
-				}
-				?>];
+                $firstFact = true;
+                foreach (GedcomTag::getPicklistFacts('SOUR') as $factId => $factName) {
+                    if ($firstFact) {
+                        $firstFact = false;
+                    } else {
+                        echo ',';
+                    }
+                    echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
+                }
+                ?>];
 				break;
 			case "REPO":
 				DefaultTags=[<?php
-				$firstFact = true;
-				foreach (GedcomTag::getPicklistFacts('REPO') as $factId => $factName) {
-					if ($firstFact) {
-						$firstFact = false;
-					} else {
-						echo ',';
-					}
-					echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
-				}
-				?>];
+                $firstFact = true;
+                foreach (GedcomTag::getPicklistFacts('REPO') as $factId => $factName) {
+                    if ($firstFact) {
+                        $firstFact = false;
+                    } else {
+                        echo ',';
+                    }
+                    echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
+                }
+                ?>];
 				break;
 			case "PLAC":
 				DefaultTags=[<?php
-				$firstFact = true;
-				foreach (GedcomTag::getPicklistFacts('PLAC') as $factId => $factName) {
-					if ($firstFact) {
-						$firstFact = false;
-					} else {
-						echo ',';
-					}
-					echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
-				}
-				?>];
+                $firstFact = true;
+                foreach (GedcomTag::getPicklistFacts('PLAC') as $factId => $factName) {
+                    if ($firstFact) {
+                        $firstFact = false;
+                    } else {
+                        echo ',';
+                    }
+                    echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
+                }
+                ?>];
 				break;
 			case "NAME":
 				DefaultTags=[<?php
-				$firstFact = true;
-				foreach (GedcomTag::getPicklistFacts('NAME') as $factId => $factName) {
-					if ($firstFact) {
-						$firstFact = false;
-					} else {
-						echo ',';
-					}
-					echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
-				}
-				?>];
+                $firstFact = true;
+                foreach (GedcomTag::getPicklistFacts('NAME') as $factId => $factName) {
+                    if ($firstFact) {
+                        $firstFact = false;
+                    } else {
+                        echo ',';
+                    }
+                    echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
+                }
+                ?>];
 				break;
 			default:
 				DefaultTags=[];
@@ -513,7 +513,7 @@ 
 		return false;
 	}
 	<?php echo '</script>';
-	echo '<div id="layDefinedTags"><table id="tabDefinedTags">
+    echo '<div id="layDefinedTags"><table id="tabDefinedTags">
 		<thead><tr>
 			<th></th>
 			<th>', I18N::translate('Tag'), '</th>
@@ -541,221 +541,221 @@ 
 }
 
 if ($action === 'filter') {
-	$filter       = trim($filter);
-	$filter_array = explode(' ', preg_replace('/ {2,}/', ' ', $filter));
-
-	// Output Individual
-	if ($type === 'indi') {
-		echo '<div id="find-output">';
-		$myindilist = FunctionsDb::searchIndividualNames($filter_array, array($WT_TREE));
-		if ($myindilist) {
-			echo '<ul>';
-			usort($myindilist, '\Fisharebest\Webtrees\GedcomRecord::compare');
-			foreach ($myindilist as $indi) {
-				echo $indi->formatList('li', true);
-			}
-			echo '</ul>
+    $filter       = trim($filter);
+    $filter_array = explode(' ', preg_replace('/ {2,}/', ' ', $filter));
+
+    // Output Individual
+    if ($type === 'indi') {
+        echo '<div id="find-output">';
+        $myindilist = FunctionsDb::searchIndividualNames($filter_array, array($WT_TREE));
+        if ($myindilist) {
+            echo '<ul>';
+            usort($myindilist, '\Fisharebest\Webtrees\GedcomRecord::compare');
+            foreach ($myindilist as $indi) {
+                echo $indi->formatList('li', true);
+            }
+            echo '</ul>
 			<p>', I18N::translate('Total individuals: %s', count($myindilist)), '</p>';
-		} else {
-			echo '<p>', I18N::translate('No results found.'), '</p>';
-		}
-		echo '</div>';
-	}
-
-	// Output Family
-	if ($type == "fam") {
-		echo '<div id="find-output">';
-		// Get the famrecs with hits on names from the family table
-		// Get the famrecs with hits in the gedcom record from the family table
-		$myfamlist = array_unique(array_merge(
-			FunctionsDb::searchFamilyNames($filter_array, array($WT_TREE)),
-			FunctionsDb::searchFamilies($filter_array, array($WT_TREE))
-		));
-
-		if ($myfamlist) {
-			echo '<ul>';
-			usort($myfamlist, '\Fisharebest\Webtrees\GedcomRecord::compare');
-			foreach ($myfamlist as $family) {
-				echo $family->formatList('li', true);
-			}
-			echo '</ul>
+        } else {
+            echo '<p>', I18N::translate('No results found.'), '</p>';
+        }
+        echo '</div>';
+    }
+
+    // Output Family
+    if ($type == "fam") {
+        echo '<div id="find-output">';
+        // Get the famrecs with hits on names from the family table
+        // Get the famrecs with hits in the gedcom record from the family table
+        $myfamlist = array_unique(array_merge(
+            FunctionsDb::searchFamilyNames($filter_array, array($WT_TREE)),
+            FunctionsDb::searchFamilies($filter_array, array($WT_TREE))
+        ));
+
+        if ($myfamlist) {
+            echo '<ul>';
+            usort($myfamlist, '\Fisharebest\Webtrees\GedcomRecord::compare');
+            foreach ($myfamlist as $family) {
+                echo $family->formatList('li', true);
+            }
+            echo '</ul>
 			<p>', I18N::translate('Total families: %s', count($myfamlist)), '</p>';
-		} else {
-			echo '<p>', I18N::translate('No results found.'), '</p>';
-		}
-		echo '</div>';
-	}
-
-	// Output Media
-	if ($type === 'media') {
-		$medialist = QueryMedia::mediaList('', 'include', 'title', $filter, '');
-
-		echo '<div id="find-output">';
-
-		if ($medialist) {
-			foreach ($medialist as $media) {
-				echo '<div class="find-media-media">';
-				echo '<div class="find-media-thumb">', $media->displayImage(), '</div>';
-				echo '<div class="find-media-details">', $media->getFullName(), '</div>';
-				if (!$embed) {
-					echo '<p><a href="#" dir="auto" onclick="pasteid(\'', $media->getXref(), '\');">', $media->getFilename(), '</a></p>';
-				} else {
-					echo '<p><a href="#" dir="auto" onclick="pasteid(\'', $media->getXref(), '\', \'', '\', \'', Filter::escapeJs($media->getFilename()), '\');">', Filter::escapeHtml($media->getFilename()), '</a></p> ';
-				}
-				if ($media->fileExists()) {
-					$imgsize = $media->getImageAttributes();
-					echo GedcomTag::getLabelValue('__IMAGE_SIZE__', $imgsize['WxH']);
-				}
-				echo '<ul>';
-				$found = false;
-				foreach ($media->linkedIndividuals('OBJE') as $indindividual) {
-					echo '<li>', $indindividual->getFullName(), '</li>';
-					$found = true;
-				}
-				foreach ($media->linkedFamilies('OBJE') as $family) {
-					echo '<li>', $family->getFullName(), '</li>';
-					$found = true;
-				}
-				foreach ($media->linkedSources('OBJE') as $source) {
-					echo '<li>', $source->getFullName(), '</li>';
-					$found = true;
-				}
-				foreach ($media->linkedNotes('OBJE') as $note) {
-					// Invalid GEDCOM - you cannot link a NOTE to an OBJE
-					echo '<li>', $note->getFullName(), '</li>';
-					$found = true;
-				}
-				foreach ($media->linkedRepositories('OBJE') as $repository) {
-					// Invalid GEDCOM - you cannot link a REPO to an OBJE
-					echo '<li>', $repository->getFullName(), '</li>';
-					$found = true;
-				}
-				if (!$found) {
-					echo '<li>', I18N::translate('This media object is not linked to any other record.'), '</li>';
-				}
-				echo '</ul>';
-				echo '</div>'; // close div="find-media-media"
-			}
-		} else {
-			echo '<p>', I18N::translate('No results found.'), '</p>';
-		}
-		echo '</div>';
-	}
-
-	// Output Places
-	if ($type == "place") {
-		echo '<div id="find-output">';
-		if (!$filter || $all) {
-			$places = Place::allPlaces($WT_TREE);
-		} else {
-			$places = Place::findPlaces($filter, $WT_TREE);
-		}
-		if ($places) {
-			echo '<ul>';
-			foreach ($places as $place) {
-				echo '<li><a href="#" onclick="pasteid(\'', Filter::escapeJs($place->getGedcomName()), '\');">';
-				if (!$filter || $all) {
-					echo $place->getReverseName(); // When displaying all names, sort/display by the country, then region, etc.
-				} else {
-					echo $place->getFullName(); // When we’ve searched for a place, sort by this place
-				}
-				echo '</a></li>';
-			}
-			echo '</ul>
+        } else {
+            echo '<p>', I18N::translate('No results found.'), '</p>';
+        }
+        echo '</div>';
+    }
+
+    // Output Media
+    if ($type === 'media') {
+        $medialist = QueryMedia::mediaList('', 'include', 'title', $filter, '');
+
+        echo '<div id="find-output">';
+
+        if ($medialist) {
+            foreach ($medialist as $media) {
+                echo '<div class="find-media-media">';
+                echo '<div class="find-media-thumb">', $media->displayImage(), '</div>';
+                echo '<div class="find-media-details">', $media->getFullName(), '</div>';
+                if (!$embed) {
+                    echo '<p><a href="#" dir="auto" onclick="pasteid(\'', $media->getXref(), '\');">', $media->getFilename(), '</a></p>';
+                } else {
+                    echo '<p><a href="#" dir="auto" onclick="pasteid(\'', $media->getXref(), '\', \'', '\', \'', Filter::escapeJs($media->getFilename()), '\');">', Filter::escapeHtml($media->getFilename()), '</a></p> ';
+                }
+                if ($media->fileExists()) {
+                    $imgsize = $media->getImageAttributes();
+                    echo GedcomTag::getLabelValue('__IMAGE_SIZE__', $imgsize['WxH']);
+                }
+                echo '<ul>';
+                $found = false;
+                foreach ($media->linkedIndividuals('OBJE') as $indindividual) {
+                    echo '<li>', $indindividual->getFullName(), '</li>';
+                    $found = true;
+                }
+                foreach ($media->linkedFamilies('OBJE') as $family) {
+                    echo '<li>', $family->getFullName(), '</li>';
+                    $found = true;
+                }
+                foreach ($media->linkedSources('OBJE') as $source) {
+                    echo '<li>', $source->getFullName(), '</li>';
+                    $found = true;
+                }
+                foreach ($media->linkedNotes('OBJE') as $note) {
+                    // Invalid GEDCOM - you cannot link a NOTE to an OBJE
+                    echo '<li>', $note->getFullName(), '</li>';
+                    $found = true;
+                }
+                foreach ($media->linkedRepositories('OBJE') as $repository) {
+                    // Invalid GEDCOM - you cannot link a REPO to an OBJE
+                    echo '<li>', $repository->getFullName(), '</li>';
+                    $found = true;
+                }
+                if (!$found) {
+                    echo '<li>', I18N::translate('This media object is not linked to any other record.'), '</li>';
+                }
+                echo '</ul>';
+                echo '</div>'; // close div="find-media-media"
+            }
+        } else {
+            echo '<p>', I18N::translate('No results found.'), '</p>';
+        }
+        echo '</div>';
+    }
+
+    // Output Places
+    if ($type == "place") {
+        echo '<div id="find-output">';
+        if (!$filter || $all) {
+            $places = Place::allPlaces($WT_TREE);
+        } else {
+            $places = Place::findPlaces($filter, $WT_TREE);
+        }
+        if ($places) {
+            echo '<ul>';
+            foreach ($places as $place) {
+                echo '<li><a href="#" onclick="pasteid(\'', Filter::escapeJs($place->getGedcomName()), '\');">';
+                if (!$filter || $all) {
+                    echo $place->getReverseName(); // When displaying all names, sort/display by the country, then region, etc.
+                } else {
+                    echo $place->getFullName(); // When we’ve searched for a place, sort by this place
+                }
+                echo '</a></li>';
+            }
+            echo '</ul>
 			<p>', I18N::translate('Places found'), ' ', count($places), '</p>';
-		} else {
-			echo '<p>', I18N::translate('No results found.'), '</p>';
-		}
-		echo '</div>';
-	}
-
-	// Output Repositories
-	if ($type == "repo") {
-		echo '<div id="find-output">';
-		if ($filter) {
-			$repo_list = FunctionsDb::searchRepositories($filter_array, array($WT_TREE));
-		} else {
-			$repo_list = FunctionsDb::getRepositoryList($WT_TREE);
-		}
-		if ($repo_list) {
-			usort($repo_list, '\Fisharebest\Webtrees\GedcomRecord::compare');
-			echo '<ul>';
-			foreach ($repo_list as $repo) {
-				echo '<li><a href="', $repo->getHtmlUrl(), '" onclick="pasteid(\'', $repo->getXref(), '\');"><span class="list_item">', $repo->getFullName(), '</span></a></li>';
-			}
-			echo '</ul>
+        } else {
+            echo '<p>', I18N::translate('No results found.'), '</p>';
+        }
+        echo '</div>';
+    }
+
+    // Output Repositories
+    if ($type == "repo") {
+        echo '<div id="find-output">';
+        if ($filter) {
+            $repo_list = FunctionsDb::searchRepositories($filter_array, array($WT_TREE));
+        } else {
+            $repo_list = FunctionsDb::getRepositoryList($WT_TREE);
+        }
+        if ($repo_list) {
+            usort($repo_list, '\Fisharebest\Webtrees\GedcomRecord::compare');
+            echo '<ul>';
+            foreach ($repo_list as $repo) {
+                echo '<li><a href="', $repo->getHtmlUrl(), '" onclick="pasteid(\'', $repo->getXref(), '\');"><span class="list_item">', $repo->getFullName(), '</span></a></li>';
+            }
+            echo '</ul>
 			<p>', I18N::translate('Repositories found'), " ", count($repo_list), '</p>';
-		} else {
-			echo '<p>', I18N::translate('No results found.'), '</p>';
-		}
-		echo '</div>';
-	}
-
-	// Output Shared Notes
-	if ($type == "note") {
-		echo '<div id="find-output">';
-		if ($filter) {
-			$mynotelist = FunctionsDb::searchNotes($filter_array, array($WT_TREE));
-		} else {
-			$mynotelist = FunctionsDb::getNoteList($WT_TREE);
-		}
-		if ($mynotelist) {
-			usort($mynotelist, '\Fisharebest\Webtrees\GedcomRecord::compare');
-			echo '<ul>';
-			foreach ($mynotelist as $note) {
-				echo '<li><a href="', $note->getHtmlUrl(), '" onclick="pasteid(\'', $note->getXref(), '\');"><span class="list_item">', $note->getFullName(), '</span></a></li>';
-			}
-			echo '</ul>
+        } else {
+            echo '<p>', I18N::translate('No results found.'), '</p>';
+        }
+        echo '</div>';
+    }
+
+    // Output Shared Notes
+    if ($type == "note") {
+        echo '<div id="find-output">';
+        if ($filter) {
+            $mynotelist = FunctionsDb::searchNotes($filter_array, array($WT_TREE));
+        } else {
+            $mynotelist = FunctionsDb::getNoteList($WT_TREE);
+        }
+        if ($mynotelist) {
+            usort($mynotelist, '\Fisharebest\Webtrees\GedcomRecord::compare');
+            echo '<ul>';
+            foreach ($mynotelist as $note) {
+                echo '<li><a href="', $note->getHtmlUrl(), '" onclick="pasteid(\'', $note->getXref(), '\');"><span class="list_item">', $note->getFullName(), '</span></a></li>';
+            }
+            echo '</ul>
 			<p>', I18N::translate('Shared notes found'), ' ', count($mynotelist), '</p>';
-		} else {
-			echo '<p>', I18N::translate('No results found.'), '</p>';
-		}
-		echo '</div>';
-	}
-
-	// Output Sources
-	if ($type == "source") {
-		echo '<div id="find-output">';
-		if ($filter) {
-			$mysourcelist = FunctionsDb::searchSources($filter_array, array($WT_TREE));
-		} else {
-			$mysourcelist = FunctionsDb::getSourceList($WT_TREE);
-		}
-		if ($mysourcelist) {
-			usort($mysourcelist, '\Fisharebest\Webtrees\GedcomRecord::compare');
-			echo '<ul>';
-			foreach ($mysourcelist as $source) {
-				echo '<li><a href="', $source->getHtmlUrl(), '" onclick="pasteid(\'', $source->getXref(), '\', \'',
-					Filter::escapeJs($source->getFullName()), '\');"><span class="list_item">',
-					$source->getFullName(), '</span></a></li>';
-			}
-			echo '</ul>
+        } else {
+            echo '<p>', I18N::translate('No results found.'), '</p>';
+        }
+        echo '</div>';
+    }
+
+    // Output Sources
+    if ($type == "source") {
+        echo '<div id="find-output">';
+        if ($filter) {
+            $mysourcelist = FunctionsDb::searchSources($filter_array, array($WT_TREE));
+        } else {
+            $mysourcelist = FunctionsDb::getSourceList($WT_TREE);
+        }
+        if ($mysourcelist) {
+            usort($mysourcelist, '\Fisharebest\Webtrees\GedcomRecord::compare');
+            echo '<ul>';
+            foreach ($mysourcelist as $source) {
+                echo '<li><a href="', $source->getHtmlUrl(), '" onclick="pasteid(\'', $source->getXref(), '\', \'',
+                    Filter::escapeJs($source->getFullName()), '\');"><span class="list_item">',
+                    $source->getFullName(), '</span></a></li>';
+            }
+            echo '</ul>
 			<p>', I18N::translate('Total sources: %s', count($mysourcelist)), '</p>';
-		} else {
-			echo '<p>', I18N::translate('No results found.'), '</p>';
-		}
-		echo '</div>';
-	}
-
-	// Output Special Characters
-	if ($type == "specialchar") {
-		echo '<div id="find-output-special"><p>';
-		// lower case special characters
-		foreach (SpecialChars::create($language_filter)->upper() as $special_character) {
-			echo '<a class="largechars" href="#" onclick="return window.opener.paste_char(\'', $special_character, '\');">', $special_character, '</a> ';
-		}
-		echo '</p><p>';
-		//upper case special characters
-		foreach (SpecialChars::create($language_filter)->lower() as $special_character) {
-			echo '<a class="largechars" href="#" onclick="return window.opener.paste_char(\'', $special_character, '\');">', $special_character, '</a> ';
-		}
-		echo '</p><p>';
-		// other special characters (not letters)
-		foreach (SpecialChars::create($language_filter)->other() as $special_character) {
-			echo '<a class="largechars" href="#" onclick="return window.opener.paste_char(\'', $special_character, '\');">', $special_character, '</a> ';
-		}
-		echo '</p></div>';
-	}
+        } else {
+            echo '<p>', I18N::translate('No results found.'), '</p>';
+        }
+        echo '</div>';
+    }
+
+    // Output Special Characters
+    if ($type == "specialchar") {
+        echo '<div id="find-output-special"><p>';
+        // lower case special characters
+        foreach (SpecialChars::create($language_filter)->upper() as $special_character) {
+            echo '<a class="largechars" href="#" onclick="return window.opener.paste_char(\'', $special_character, '\');">', $special_character, '</a> ';
+        }
+        echo '</p><p>';
+        //upper case special characters
+        foreach (SpecialChars::create($language_filter)->lower() as $special_character) {
+            echo '<a class="largechars" href="#" onclick="return window.opener.paste_char(\'', $special_character, '\');">', $special_character, '</a> ';
+        }
+        echo '</p><p>';
+        // other special characters (not letters)
+        foreach (SpecialChars::create($language_filter)->other() as $special_character) {
+            echo '<a class="largechars" href="#" onclick="return window.opener.paste_char(\'', $special_character, '\');">', $special_character, '</a> ';
+        }
+        echo '</p></div>';
+    }
 }
 echo '<button onclick="window.close();">', I18N::translate('close'), '</button>';
 echo "</div>";

Switch Indentation +54 added lines, -54 removed lines

@@ -47,60 +47,60 @@
 $embed = substr($choose, 0, 1) === '1';
 
 switch ($type) {
-case 'indi':
-	$controller->setPageTitle(I18N::translate('Find an individual'));
-	break;
-case 'fam':
-	$controller->setPageTitle(I18N::translate('Find a family'));
-	break;
-case 'media':
-	$controller->setPageTitle(I18N::translate('Find a media object'));
-	break;
-case 'place':
-	$controller->setPageTitle(I18N::translate('Find a place'));
-	break;
-case 'repo':
-	$controller->setPageTitle(I18N::translate('Find a repository'));
-	break;
-case 'note':
-	$controller->setPageTitle(I18N::translate('Find a shared note'));
-	break;
-case 'source':
-	$controller->setPageTitle(I18N::translate('Find a source'));
-	break;
-case 'specialchar':
-	$controller->setPageTitle(I18N::translate('Find a special character'));
-	break;
-case 'factINDI':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("INDI");');
-	break;
-case 'factFAM':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("FAM");');
-	break;
-case 'factSOUR':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("SOUR");');
-	break;
-case 'factREPO':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("REPO");');
-	break;
-case 'factNAME':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("NAME");');
-	break;
-case 'factPLAC':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("PLAC");');
-	break;
+    case 'indi':
+	    $controller->setPageTitle(I18N::translate('Find an individual'));
+	    break;
+    case 'fam':
+	    $controller->setPageTitle(I18N::translate('Find a family'));
+	    break;
+    case 'media':
+	    $controller->setPageTitle(I18N::translate('Find a media object'));
+	    break;
+    case 'place':
+	    $controller->setPageTitle(I18N::translate('Find a place'));
+	    break;
+    case 'repo':
+	    $controller->setPageTitle(I18N::translate('Find a repository'));
+	    break;
+    case 'note':
+	    $controller->setPageTitle(I18N::translate('Find a shared note'));
+	    break;
+    case 'source':
+	    $controller->setPageTitle(I18N::translate('Find a source'));
+	    break;
+    case 'specialchar':
+	    $controller->setPageTitle(I18N::translate('Find a special character'));
+	    break;
+    case 'factINDI':
+	    $controller
+		    ->setPageTitle(I18N::translate('Find a fact or event'))
+		    ->addInlineJavascript('initPickFact("INDI");');
+	    break;
+    case 'factFAM':
+	    $controller
+		    ->setPageTitle(I18N::translate('Find a fact or event'))
+		    ->addInlineJavascript('initPickFact("FAM");');
+	    break;
+    case 'factSOUR':
+	    $controller
+		    ->setPageTitle(I18N::translate('Find a fact or event'))
+		    ->addInlineJavascript('initPickFact("SOUR");');
+	    break;
+    case 'factREPO':
+	    $controller
+		    ->setPageTitle(I18N::translate('Find a fact or event'))
+		    ->addInlineJavascript('initPickFact("REPO");');
+	    break;
+    case 'factNAME':
+	    $controller
+		    ->setPageTitle(I18N::translate('Find a fact or event'))
+		    ->addInlineJavascript('initPickFact("NAME");');
+	    break;
+    case 'factPLAC':
+	    $controller
+		    ->setPageTitle(I18N::translate('Find a fact or event'))
+		    ->addInlineJavascript('initPickFact("PLAC");');
+	    break;
 }
 $controller->pageHeader();
 

search.php

Indentation +3 added lines, -3 removed lines

@@ -23,9 +23,9 @@
 
 $controller = new SearchController;
 $controller
-	->pageHeader()
-	->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-	->addInlineJavascript('autocomplete();');
+    ->pageHeader()
+    ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+    ->addInlineJavascript('autocomplete();');
 
 ?>
 <script>

admin_trees_merge.php

Indentation +153 added lines, -153 removed lines

@@ -30,9 +30,9 @@ 
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isManager($WT_TREE))
-	->setPageTitle(I18N::translate('Merge family trees'))
-	->pageHeader();
+    ->restrictAccess(Auth::isManager($WT_TREE))
+    ->setPageTitle(I18N::translate('Merge family trees'))
+    ->pageHeader();
 
 ?>
 <ol class="breadcrumb small">
@@ -49,157 +49,157 @@ 
 $tree2_id = Filter::post('tree2_id');
 
 if ($tree1_id && $tree2_id != $tree1_id) {
-	// Every XREF used by both trees
-	$xrefs = Database::prepare(
-		"SELECT xref, type FROM (" .
-		" SELECT i_id AS xref, 'INDI' AS type FROM `##individuals` WHERE i_file = ?" .
-		"  UNION " .
-		" SELECT f_id AS xref, 'FAM' AS type FROM `##families` WHERE f_file = ?" .
-		"  UNION " .
-		" SELECT s_id AS xref, 'SOUR' AS type FROM `##sources` WHERE s_file = ?" .
-		"  UNION " .
-		" SELECT m_id AS xref, 'OBJE' AS type FROM `##media` WHERE m_file = ?" .
-		"  UNION " .
-		" SELECT o_id AS xref, o_type AS type FROM `##other` WHERE o_file = ? AND o_type NOT IN ('HEAD', 'TRLR')" .
-		") AS this_tree JOIN (" .
-		" SELECT xref FROM `##change` WHERE gedcom_id = ?" .
-		"  UNION " .
-		" SELECT i_id AS xref FROM `##individuals` WHERE i_file = ?" .
-		"  UNION " .
-		" SELECT f_id AS xref FROM `##families` WHERE f_file = ?" .
-		"  UNION " .
-		" SELECT s_id AS xref FROM `##sources` WHERE s_file = ?" .
-		"  UNION " .
-		" SELECT m_id AS xref FROM `##media` WHERE m_file = ?" .
-		"  UNION " .
-		" SELECT o_id AS xref FROM `##other` WHERE o_file = ? AND o_type NOT IN ('HEAD', 'TRLR')" .
-		") AS other_trees USING (xref)"
-	)->execute(array(
-		$tree1_id, $tree1_id, $tree1_id, $tree1_id, $tree1_id,
-		$tree2_id, $tree2_id, $tree2_id, $tree2_id, $tree2_id, $tree2_id,
-	))->fetchAssoc();
+    // Every XREF used by both trees
+    $xrefs = Database::prepare(
+        "SELECT xref, type FROM (" .
+        " SELECT i_id AS xref, 'INDI' AS type FROM `##individuals` WHERE i_file = ?" .
+        "  UNION " .
+        " SELECT f_id AS xref, 'FAM' AS type FROM `##families` WHERE f_file = ?" .
+        "  UNION " .
+        " SELECT s_id AS xref, 'SOUR' AS type FROM `##sources` WHERE s_file = ?" .
+        "  UNION " .
+        " SELECT m_id AS xref, 'OBJE' AS type FROM `##media` WHERE m_file = ?" .
+        "  UNION " .
+        " SELECT o_id AS xref, o_type AS type FROM `##other` WHERE o_file = ? AND o_type NOT IN ('HEAD', 'TRLR')" .
+        ") AS this_tree JOIN (" .
+        " SELECT xref FROM `##change` WHERE gedcom_id = ?" .
+        "  UNION " .
+        " SELECT i_id AS xref FROM `##individuals` WHERE i_file = ?" .
+        "  UNION " .
+        " SELECT f_id AS xref FROM `##families` WHERE f_file = ?" .
+        "  UNION " .
+        " SELECT s_id AS xref FROM `##sources` WHERE s_file = ?" .
+        "  UNION " .
+        " SELECT m_id AS xref FROM `##media` WHERE m_file = ?" .
+        "  UNION " .
+        " SELECT o_id AS xref FROM `##other` WHERE o_file = ? AND o_type NOT IN ('HEAD', 'TRLR')" .
+        ") AS other_trees USING (xref)"
+    )->execute(array(
+        $tree1_id, $tree1_id, $tree1_id, $tree1_id, $tree1_id,
+        $tree2_id, $tree2_id, $tree2_id, $tree2_id, $tree2_id, $tree2_id,
+    ))->fetchAssoc();
 
-	if ($xrefs) {
-		$tree1 = Tree::findById($tree1_id);
-		$tree2 = Tree::findById($tree2_id);
-		echo
-			'<p>', I18N::translate('In a family tree, each record has an internal reference number (called an “XREF”) such as “F123” or “R14”.'), '</p>',
-			'<p>',
-			I18N::plural(
-				/* I18N: An XREF is the identification number used in GEDCOM files. */
-				'The two family trees have %1$s record which uses the same “XREF”.',
-				'The two family trees have %1$s records which use the same “XREF”.',
-				count($xrefs), count($xrefs)
-			),
-			'</p>',
-			'<p>',
-			I18N::translate('You must renumber the records in one of the trees before you can merge them.'),
-			'</p>',
-			'<p>',
-			'<a class="current" href="admin_trees_renumber.php?ged=', $tree1->getNameUrl(), '">',
-			I18N::translate('Renumber family tree'), ' — ', $tree1->getTitleHtml(),
-			'</a>',
-			'</p>',
-			'<p>',
-			'<a class="current" href="admin_trees_renumber.php?ged=', $tree2->getNameUrl(), '">',
-			I18N::translate('Renumber family tree'), ' — ', $tree2->getTitleHtml(),
-			'</a>',
-			'</p>';
-	} else {
-		Database::beginTransaction();
-		Database::exec(
-			"LOCK TABLE" .
-			" `##individuals` WRITE," .
-			" `##individuals` AS individuals2 READ," .
-			" `##families` WRITE," .
-			" `##families` AS families2 READ," .
-			" `##sources` WRITE," .
-			" `##sources` AS sources2 READ," .
-			" `##media` WRITE," .
-			" `##media` AS media2 READ," .
-			" `##other` WRITE," .
-			" `##other` AS other2 READ," .
-			" `##name` WRITE," .
-			" `##name` AS name2 READ," .
-			" `##placelinks` WRITE," .
-			" `##placelinks` AS placelinks2 READ," .
-			" `##change` WRITE," .
-			" `##change` AS change2 READ," .
-			" `##dates` WRITE," .
-			" `##dates` AS dates2 READ," .
-			" `##default_resn` WRITE," .
-			" `##default_resn` AS default_resn2 READ," .
-			" `##hit_counter` WRITE," .
-			" `##hit_counter` AS hit_counter2 READ," .
-			" `##link` WRITE," .
-			" `##link` AS link2 READ"
-		);
-		Database::prepare(
-			"INSERT INTO `##individuals` (i_id, i_file, i_rin, i_sex, i_gedcom)" .
-			" SELECT i_id, ?, i_rin, i_sex, i_gedcom FROM `##individuals` AS individuals2 WHERE i_file = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::prepare(
-			"INSERT INTO `##families` (f_id, f_file, f_husb, f_wife, f_gedcom, f_numchil)" .
-			" SELECT f_id, ?, f_husb, f_wife, f_gedcom, f_numchil FROM `##families` AS families2 WHERE f_file = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::prepare(
-			"INSERT INTO `##sources` (s_id, s_file, s_name, s_gedcom)" .
-			" SELECT s_id, ?, s_name, s_gedcom FROM `##sources` AS sources2 WHERE s_file = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::prepare(
-			"INSERT INTO `##media` (m_id, m_ext, m_type, m_titl, m_filename, m_file, m_gedcom)" .
-			" SELECT m_id, m_ext, m_type, m_titl, m_filename, ?, m_gedcom FROM `##media` AS media2 WHERE m_file = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::prepare(
-			"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom)" .
-			" SELECT o_id, ?, o_type, o_gedcom FROM `##other` AS other2 WHERE o_file = ? AND o_type NOT IN ('HEAD', 'TRLR')"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::prepare(
-			"INSERT INTO `##name` (n_file, n_id, n_num, n_type, n_sort, n_full, n_surname, n_surn, n_givn, n_soundex_givn_std, n_soundex_surn_std, n_soundex_givn_dm, n_soundex_surn_dm)" .
-			" SELECT ?, n_id, n_num, n_type, n_sort, n_full, n_surname, n_surn, n_givn, n_soundex_givn_std, n_soundex_surn_std, n_soundex_givn_dm, n_soundex_surn_dm FROM `##name` AS name2 WHERE n_file = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::prepare(
-			"INSERT INTO `##placelinks` (pl_p_id, pl_gid, pl_file)" .
-			" SELECT pl_p_id, pl_gid, ? FROM `##placelinks` AS placelinks2 WHERE pl_file = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::prepare(
-			"INSERT INTO `##dates` (d_day, d_month, d_mon, d_year, d_julianday1, d_julianday2, d_fact, d_gid, d_file, d_type)" .
-			" SELECT d_day, d_month, d_mon, d_year, d_julianday1, d_julianday2, d_fact, d_gid, ?, d_type FROM `##dates` AS dates2 WHERE d_file = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::prepare(
-			"INSERT INTO `##default_resn` (gedcom_id, xref, tag_type, resn)" .
-			" SELECT ?, xref, tag_type, resn FROM `##default_resn` AS default_resn2 WHERE gedcom_id = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::prepare(
-			"INSERT INTO `##link` (l_file, l_from, l_type, l_to)" .
-			" SELECT ?, l_from, l_type, l_to FROM `##link` AS link2 WHERE l_file = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		// This table may contain old (deleted) references, which could clash. IGNORE these.
-		Database::prepare(
-			"INSERT IGNORE INTO `##change` (change_time, status, gedcom_id, xref, old_gedcom, new_gedcom, user_id)" .
-			" SELECT change_time, status, ?, xref, old_gedcom, new_gedcom, user_id FROM `##change` AS change2 WHERE gedcom_id = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		// This table may contain old (deleted) references, which could clash. IGNORE these.
-		Database::prepare(
-			"INSERT IGNORE INTO `##hit_counter` (gedcom_id, page_name, page_parameter, page_count)" .
-			" SELECT ?, page_name, page_parameter, page_count FROM `##hit_counter` AS hit_counter2 WHERE gedcom_id = ? AND page_name <> 'index.php'"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::exec("UNLOCK TABLES");
-		Database::commit();
-		echo '<p>', I18N::translate('The family trees have been merged successfully.'), '</p>';
-	}
+    if ($xrefs) {
+        $tree1 = Tree::findById($tree1_id);
+        $tree2 = Tree::findById($tree2_id);
+        echo
+            '<p>', I18N::translate('In a family tree, each record has an internal reference number (called an “XREF”) such as “F123” or “R14”.'), '</p>',
+            '<p>',
+            I18N::plural(
+                /* I18N: An XREF is the identification number used in GEDCOM files. */
+                'The two family trees have %1$s record which uses the same “XREF”.',
+                'The two family trees have %1$s records which use the same “XREF”.',
+                count($xrefs), count($xrefs)
+            ),
+            '</p>',
+            '<p>',
+            I18N::translate('You must renumber the records in one of the trees before you can merge them.'),
+            '</p>',
+            '<p>',
+            '<a class="current" href="admin_trees_renumber.php?ged=', $tree1->getNameUrl(), '">',
+            I18N::translate('Renumber family tree'), ' — ', $tree1->getTitleHtml(),
+            '</a>',
+            '</p>',
+            '<p>',
+            '<a class="current" href="admin_trees_renumber.php?ged=', $tree2->getNameUrl(), '">',
+            I18N::translate('Renumber family tree'), ' — ', $tree2->getTitleHtml(),
+            '</a>',
+            '</p>';
+    } else {
+        Database::beginTransaction();
+        Database::exec(
+            "LOCK TABLE" .
+            " `##individuals` WRITE," .
+            " `##individuals` AS individuals2 READ," .
+            " `##families` WRITE," .
+            " `##families` AS families2 READ," .
+            " `##sources` WRITE," .
+            " `##sources` AS sources2 READ," .
+            " `##media` WRITE," .
+            " `##media` AS media2 READ," .
+            " `##other` WRITE," .
+            " `##other` AS other2 READ," .
+            " `##name` WRITE," .
+            " `##name` AS name2 READ," .
+            " `##placelinks` WRITE," .
+            " `##placelinks` AS placelinks2 READ," .
+            " `##change` WRITE," .
+            " `##change` AS change2 READ," .
+            " `##dates` WRITE," .
+            " `##dates` AS dates2 READ," .
+            " `##default_resn` WRITE," .
+            " `##default_resn` AS default_resn2 READ," .
+            " `##hit_counter` WRITE," .
+            " `##hit_counter` AS hit_counter2 READ," .
+            " `##link` WRITE," .
+            " `##link` AS link2 READ"
+        );
+        Database::prepare(
+            "INSERT INTO `##individuals` (i_id, i_file, i_rin, i_sex, i_gedcom)" .
+            " SELECT i_id, ?, i_rin, i_sex, i_gedcom FROM `##individuals` AS individuals2 WHERE i_file = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::prepare(
+            "INSERT INTO `##families` (f_id, f_file, f_husb, f_wife, f_gedcom, f_numchil)" .
+            " SELECT f_id, ?, f_husb, f_wife, f_gedcom, f_numchil FROM `##families` AS families2 WHERE f_file = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::prepare(
+            "INSERT INTO `##sources` (s_id, s_file, s_name, s_gedcom)" .
+            " SELECT s_id, ?, s_name, s_gedcom FROM `##sources` AS sources2 WHERE s_file = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::prepare(
+            "INSERT INTO `##media` (m_id, m_ext, m_type, m_titl, m_filename, m_file, m_gedcom)" .
+            " SELECT m_id, m_ext, m_type, m_titl, m_filename, ?, m_gedcom FROM `##media` AS media2 WHERE m_file = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::prepare(
+            "INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom)" .
+            " SELECT o_id, ?, o_type, o_gedcom FROM `##other` AS other2 WHERE o_file = ? AND o_type NOT IN ('HEAD', 'TRLR')"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::prepare(
+            "INSERT INTO `##name` (n_file, n_id, n_num, n_type, n_sort, n_full, n_surname, n_surn, n_givn, n_soundex_givn_std, n_soundex_surn_std, n_soundex_givn_dm, n_soundex_surn_dm)" .
+            " SELECT ?, n_id, n_num, n_type, n_sort, n_full, n_surname, n_surn, n_givn, n_soundex_givn_std, n_soundex_surn_std, n_soundex_givn_dm, n_soundex_surn_dm FROM `##name` AS name2 WHERE n_file = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::prepare(
+            "INSERT INTO `##placelinks` (pl_p_id, pl_gid, pl_file)" .
+            " SELECT pl_p_id, pl_gid, ? FROM `##placelinks` AS placelinks2 WHERE pl_file = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::prepare(
+            "INSERT INTO `##dates` (d_day, d_month, d_mon, d_year, d_julianday1, d_julianday2, d_fact, d_gid, d_file, d_type)" .
+            " SELECT d_day, d_month, d_mon, d_year, d_julianday1, d_julianday2, d_fact, d_gid, ?, d_type FROM `##dates` AS dates2 WHERE d_file = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::prepare(
+            "INSERT INTO `##default_resn` (gedcom_id, xref, tag_type, resn)" .
+            " SELECT ?, xref, tag_type, resn FROM `##default_resn` AS default_resn2 WHERE gedcom_id = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::prepare(
+            "INSERT INTO `##link` (l_file, l_from, l_type, l_to)" .
+            " SELECT ?, l_from, l_type, l_to FROM `##link` AS link2 WHERE l_file = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        // This table may contain old (deleted) references, which could clash. IGNORE these.
+        Database::prepare(
+            "INSERT IGNORE INTO `##change` (change_time, status, gedcom_id, xref, old_gedcom, new_gedcom, user_id)" .
+            " SELECT change_time, status, ?, xref, old_gedcom, new_gedcom, user_id FROM `##change` AS change2 WHERE gedcom_id = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        // This table may contain old (deleted) references, which could clash. IGNORE these.
+        Database::prepare(
+            "INSERT IGNORE INTO `##hit_counter` (gedcom_id, page_name, page_parameter, page_count)" .
+            " SELECT ?, page_name, page_parameter, page_count FROM `##hit_counter` AS hit_counter2 WHERE gedcom_id = ? AND page_name <> 'index.php'"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::exec("UNLOCK TABLES");
+        Database::commit();
+        echo '<p>', I18N::translate('The family trees have been merged successfully.'), '</p>';
+    }
 } else {
-	echo '<form method="post">';
-	echo '<input type="hidden" name="go" value="1">';
-	echo '<p>', I18N::translate(/* I18N: Copy all the records from [family tree 1] into [family tree 2] */
-		'Copy all the records from %1$s into %2$s.',
-		FunctionsEdit::selectEditControl('tree1_id', Tree::getIdList(), '', null),
-		FunctionsEdit::selectEditControl('tree2_id', Tree::getIdList(), '', null)
-	),
-	'</p>';
+    echo '<form method="post">';
+    echo '<input type="hidden" name="go" value="1">';
+    echo '<p>', I18N::translate(/* I18N: Copy all the records from [family tree 1] into [family tree 2] */
+        'Copy all the records from %1$s into %2$s.',
+        FunctionsEdit::selectEditControl('tree1_id', Tree::getIdList(), '', null),
+        FunctionsEdit::selectEditControl('tree2_id', Tree::getIdList(), '', null)
+    ),
+    '</p>';
 
-	echo '<button type="submit" class="btn btn-primary">';
-	echo '<i class="fa fa-check"></i> ', /* I18N: A button label. */ I18N::translate('continue');
-	echo '</button>';
-	echo '</form>';
+    echo '<button type="submit" class="btn btn-primary">';
+    echo '<i class="fa fa-check"></i> ', /* I18N: A button label. */ I18N::translate('continue');
+    echo '</button>';
+    echo '</form>';
 }