fisharebest / webtrees

app/Theme/FabTheme.php

Indentation +138 added lines, -138 removed lines

@@ -22,153 +22,153 @@
  * The F.A.B. theme.
  */
 class FabTheme extends AbstractTheme implements ThemeInterface {
-	/**
-	 * Where are our CSS, JS and other assets?
-	 *
-	 * @return string A relative path, such as "themes/foo/"
-	 */
-	public function assetUrl() {
-		return 'themes/fab/css-1.7.8/';
-	}
+    /**
+     * Where are our CSS, JS and other assets?
+     *
+     * @return string A relative path, such as "themes/foo/"
+     */
+    public function assetUrl() {
+        return 'themes/fab/css-1.7.8/';
+    }
 
-	/**
-	 * Add markup to a flash message.
-	 *
-	 * @param \stdClass $message
-	 *
-	 * @return string
-	 */
-	protected function flashMessageContainer(\stdClass $message) {
-		// This theme uses jQueryUI markup.
-		switch ($message->status) {
-		case 'danger':
-			return '<p class="ui-state-error">' . $message->text . '</p>';
-		default:
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
-		}
-	}
+    /**
+     * Add markup to a flash message.
+     *
+     * @param \stdClass $message
+     *
+     * @return string
+     */
+    protected function flashMessageContainer(\stdClass $message) {
+        // This theme uses jQueryUI markup.
+        switch ($message->status) {
+        case 'danger':
+            return '<p class="ui-state-error">' . $message->text . '</p>';
+        default:
+            return '<p class="ui-state-highlight">' . $message->text . '</p>';
+        }
+    }
 
-	/**
-	 * Add markup to the secondary menu.
-	 *
-	 * @return string
-	 */
-	protected function formatSecondaryMenu() {
-		return
-			'<ul class="secondary-menu">' .
-			implode('', $this->secondaryMenu()) .
-			'<li>' .
-			$this->formQuickSearch() .
-			'</li>' .
-			'</ul>';
-	}
+    /**
+     * Add markup to the secondary menu.
+     *
+     * @return string
+     */
+    protected function formatSecondaryMenu() {
+        return
+            '<ul class="secondary-menu">' .
+            implode('', $this->secondaryMenu()) .
+            '<li>' .
+            $this->formQuickSearch() .
+            '</li>' .
+            '</ul>';
+    }
 
-	/**
-	 * Create the contents of the <header> tag.
-	 *
-	 * @return string
-	 */
-	protected function headerContent() {
-		return
-			//$this->accessibilityLinks() .
-			$this->formatTreeTitle() .
-			$this->formatSecondaryMenu();
-	}
+    /**
+     * Create the contents of the <header> tag.
+     *
+     * @return string
+     */
+    protected function headerContent() {
+        return
+            //$this->accessibilityLinks() .
+            $this->formatTreeTitle() .
+            $this->formatSecondaryMenu();
+    }
 
-	/**
-	 * Add markup to an item in the secondary menu.
-	 *
-	 * @param Menu $menu
-	 *
-	 * @return string
-	 */
-	protected function formatSecondaryMenuItem(Menu $menu) {
-		return $menu->getMenuAsList();
-	}
+    /**
+     * Add markup to an item in the secondary menu.
+     *
+     * @param Menu $menu
+     *
+     * @return string
+     */
+    protected function formatSecondaryMenuItem(Menu $menu) {
+        return $menu->getMenuAsList();
+    }
 
-	/**
-	 * Create a search field and submit button for the quick search form in the header.
-	 *
-	 * @return string
-	 */
-	protected function formQuickSearchFields() {
-		return
-			'<input type="search" name="query" size="20" placeholder="' . I18N::translate('Search') . '">';
-	}
+    /**
+     * Create a search field and submit button for the quick search form in the header.
+     *
+     * @return string
+     */
+    protected function formQuickSearchFields() {
+        return
+            '<input type="search" name="query" size="20" placeholder="' . I18N::translate('Search') . '">';
+    }
 
-	/**
-	 * Allow themes to add extra scripts to the page footer.
-	 *
-	 * @return string
-	 */
-	public function hookFooterExtraJavascript() {
-		return
-			'<script src="' . WT_JQUERY_COLORBOX_URL . '"></script>' .
-			'<script src="' . WT_JQUERY_WHEELZOOM_URL . '"></script>' .
-			'<script>' .
-			'activate_colorbox();' .
-			'jQuery.extend(jQuery.colorbox.settings, {' .
-			' width: "85%",' .
-			' height: "85%",' .
-			' transition: "none",' .
-			' slideshowStart: "' . I18N::translate('Play') . '",' .
-			' slideshowStop: "' . I18N::translate('Stop') . '",' .
-			' title: function() { return jQuery(this).data("title"); }' .
-			'});' .
-			'</script>';
-	}
+    /**
+     * Allow themes to add extra scripts to the page footer.
+     *
+     * @return string
+     */
+    public function hookFooterExtraJavascript() {
+        return
+            '<script src="' . WT_JQUERY_COLORBOX_URL . '"></script>' .
+            '<script src="' . WT_JQUERY_WHEELZOOM_URL . '"></script>' .
+            '<script>' .
+            'activate_colorbox();' .
+            'jQuery.extend(jQuery.colorbox.settings, {' .
+            ' width: "85%",' .
+            ' height: "85%",' .
+            ' transition: "none",' .
+            ' slideshowStart: "' . I18N::translate('Play') . '",' .
+            ' slideshowStop: "' . I18N::translate('Stop') . '",' .
+            ' title: function() { return jQuery(this).data("title"); }' .
+            '});' .
+            '</script>';
+    }
 
-	/**
-	 * Misecellaneous dimensions, fonts, styles, etc.
-	 *
-	 * @param string $parameter_name
-	 *
-	 * @return string|int|float
-	 */
-	public function parameter($parameter_name) {
-		$parameters = array(
-			'chart-background-f'             => 'e9daf1',
-			'chart-background-m'             => 'b1cff0',
-			'chart-box-x'                    => 260,
-			'chart-box-y'                    => 85,
-			'distribution-chart-high-values' => '9ca3d4',
-			'distribution-chart-low-values'  => 'e5e6ef',
-		);
+    /**
+     * Misecellaneous dimensions, fonts, styles, etc.
+     *
+     * @param string $parameter_name
+     *
+     * @return string|int|float
+     */
+    public function parameter($parameter_name) {
+        $parameters = array(
+            'chart-background-f'             => 'e9daf1',
+            'chart-background-m'             => 'b1cff0',
+            'chart-box-x'                    => 260,
+            'chart-box-y'                    => 85,
+            'distribution-chart-high-values' => '9ca3d4',
+            'distribution-chart-low-values'  => 'e5e6ef',
+        );
 
-		if (array_key_exists($parameter_name, $parameters)) {
-			return $parameters[$parameter_name];
-		} else {
-			return parent::parameter($parameter_name);
-		}
-	}
+        if (array_key_exists($parameter_name, $parameters)) {
+            return $parameters[$parameter_name];
+        } else {
+            return parent::parameter($parameter_name);
+        }
+    }
 
-	/**
-	 * A list of CSS files to include for this page.
-	 *
-	 * @return string[]
-	 */
-	protected function stylesheets() {
-		return array(
-			'themes/fab/jquery-ui-1.11.2/jquery-ui.css',
-			$this->assetUrl() . 'style.css',
-		);
-	}
+    /**
+     * A list of CSS files to include for this page.
+     *
+     * @return string[]
+     */
+    protected function stylesheets() {
+        return array(
+            'themes/fab/jquery-ui-1.11.2/jquery-ui.css',
+            $this->assetUrl() . 'style.css',
+        );
+    }
 
-	/**
-	 * A fixed string to identify this theme, in settings, etc.
-	 *
-	 * @return string
-	 */
-	public function themeId() {
-		return 'fab';
-	}
+    /**
+     * A fixed string to identify this theme, in settings, etc.
+     *
+     * @return string
+     */
+    public function themeId() {
+        return 'fab';
+    }
 
-	/**
-	 * What is this theme called?
-	 *
-	 * @return string
-	 */
-	public function themeName() {
-		return /* I18N: Name of a theme. */ I18N::translate('F.A.B.');
-	}
+    /**
+     * What is this theme called?
+     *
+     * @return string
+     */
+    public function themeName() {
+        return /* I18N: Name of a theme. */ I18N::translate('F.A.B.');
+    }
 }

Braces +24 added lines, -12 removed lines

@@ -21,13 +21,15 @@ 
 /**
  * The F.A.B. theme.
  */
-class FabTheme extends AbstractTheme implements ThemeInterface {
+class FabTheme extends AbstractTheme implements ThemeInterface
+{
 	/**
 	 * Where are our CSS, JS and other assets?
 	 *
 	 * @return string A relative path, such as "themes/foo/"
 	 */
-	public function assetUrl() {
+	public function assetUrl()
+	{
 		return 'themes/fab/css-1.7.8/';
 	}
 
@@ -38,7 +40,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function flashMessageContainer(\stdClass $message) {
+	protected function flashMessageContainer(\stdClass $message)
+	{
 		// This theme uses jQueryUI markup.
 		switch ($message->status) {
 		case 'danger':
@@ -53,7 +56,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatSecondaryMenu() {
+	protected function formatSecondaryMenu()
+	{
 		return
 			'<ul class="secondary-menu">' .
 			implode('', $this->secondaryMenu()) .
@@ -68,7 +72,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function headerContent() {
+	protected function headerContent()
+	{
 		return
 			//$this->accessibilityLinks() .
 			$this->formatTreeTitle() .
@@ -82,7 +87,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatSecondaryMenuItem(Menu $menu) {
+	protected function formatSecondaryMenuItem(Menu $menu)
+	{
 		return $menu->getMenuAsList();
 	}
 
@@ -91,7 +97,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formQuickSearchFields() {
+	protected function formQuickSearchFields()
+	{
 		return
 			'<input type="search" name="query" size="20" placeholder="' . I18N::translate('Search') . '">';
 	}
@@ -101,7 +108,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function hookFooterExtraJavascript() {
+	public function hookFooterExtraJavascript()
+	{
 		return
 			'<script src="' . WT_JQUERY_COLORBOX_URL . '"></script>' .
 			'<script src="' . WT_JQUERY_WHEELZOOM_URL . '"></script>' .
@@ -125,7 +133,8 @@ 
 	 *
 	 * @return string|int|float
 	 */
-	public function parameter($parameter_name) {
+	public function parameter($parameter_name)
+	{
 		$parameters = array(
 			'chart-background-f'             => 'e9daf1',
 			'chart-background-m'             => 'b1cff0',
@@ -147,7 +156,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	protected function stylesheets() {
+	protected function stylesheets()
+	{
 		return array(
 			'themes/fab/jquery-ui-1.11.2/jquery-ui.css',
 			$this->assetUrl() . 'style.css',
@@ -159,7 +169,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function themeId() {
+	public function themeId()
+	{
 		return 'fab';
 	}
 
@@ -168,7 +179,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function themeName() {
+	public function themeName()
+	{
 		return /* I18N: Name of a theme. */ I18N::translate('F.A.B.');
 	}
 }

Switch Indentation +4 added lines, -4 removed lines

@@ -42,10 +42,10 @@
 	protected function flashMessageContainer(\stdClass $message) {
 		// This theme uses jQueryUI markup.
 		switch ($message->status) {
-		case 'danger':
-			return '<p class="ui-state-error">' . $message->text . '</p>';
-		default:
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
+		    case 'danger':
+			    return '<p class="ui-state-error">' . $message->text . '</p>';
+		    default:
+			    return '<p class="ui-state-highlight">' . $message->text . '</p>';
 		}
 	}
 

app/Theme/AbstractTheme.php

Indentation +2034 added lines, -2034 removed lines

@@ -53,2038 +53,2038 @@
  * Common functions for all themes.
  */
 abstract class AbstractTheme {
-	/** @var Tree The current tree */
-	protected $tree;
-
-	/** @var string An escaped version of the "ged=XXX" URL parameter */
-	protected $tree_url;
-
-	/** @var int The number of times this page has been shown */
-	protected $page_views;
-
-	/**
-	 * Custom themes should place their initialization code in the function hookAfterInit(), not in
-	 * the constructor, as all themes get constructed - whether they are used or not.
-	 */
-	final public function __construct() {
-	}
-
-	/**
-	 * Create accessibility links for the header.
-	 *
-	 * "Skip to content" allows keyboard only users to navigate over the headers without
-	 * pressing TAB many times.
-	 *
-	 * @return string
-	 */
-	protected function accessibilityLinks() {
-		return
-			'<div class="accessibility-links">' .
-			'<a class="sr-only sr-only-focusable btn btn-info btn-sm" href="#content">' .
-			/* I18N: Skip over the headers and menus, to the main content of the page */ I18N::translate('Skip to content') .
-			'</a>' .
-			'</div>';
-	}
-
-	/**
-	 * Create scripts for analytics and tracking.
-	 *
-	 * @return string
-	 */
-	protected function analytics() {
-		if ($this->themeId() === '_administration' || !empty($_SERVER['HTTP_DNT'])) {
-			return '';
-		} else {
-			return
-				$this->analyticsBingWebmaster(
-					Site::getPreference('BING_WEBMASTER_ID')
-				) .
-				$this->analyticsGoogleWebmaster(
-					Site::getPreference('GOOGLE_WEBMASTER_ID')
-				) .
-				$this->analyticsGoogleTracker(
-					Site::getPreference('GOOGLE_ANALYTICS_ID')
-				) .
-				$this->analyticsPiwikTracker(
-					Site::getPreference('PIWIK_URL'),
-					Site::getPreference('PIWIK_SITE_ID')
-				) .
-				$this->analyticsStatcounterTracker(
-					Site::getPreference('STATCOUNTER_PROJECT_ID'),
-					Site::getPreference('STATCOUNTER_SECURITY_ID')
-				);
-		}
-	}
-
-	/**
-	 * Create the verification code for Google Webmaster Tools.
-	 *
-	 * @param string $verification_id
-	 *
-	 * @return string
-	 */
-	protected function analyticsBingWebmaster($verification_id) {
-		// Only need to add this to the home page.
-		if (WT_SCRIPT_NAME === 'index.php' && $verification_id) {
-			return '<meta name="msvalidate.01" content="' . $verification_id . '">';
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Create the verification code for Google Webmaster Tools.
-	 *
-	 * @param string $verification_id
-	 *
-	 * @return string
-	 */
-	protected function analyticsGoogleWebmaster($verification_id) {
-		// Only need to add this to the home page.
-		if (WT_SCRIPT_NAME === 'index.php' && $verification_id) {
-			return '<meta name="google-site-verification" content="' . $verification_id . '">';
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Create the tracking code for Google Analytics.
-	 *
-	 * See https://developers.google.com/analytics/devguides/collection/analyticsjs/advanced
-	 *
-	 * @param string $analytics_id
-	 *
-	 * @return string
-	 */
-	protected function analyticsGoogleTracker($analytics_id) {
-		if ($analytics_id) {
-			// Add extra dimensions (i.e. filtering categories)
-			$dimensions = (object) array(
-				'dimension1' => $this->tree ? $this->tree->getName() : '-',
-				'dimension2' => $this->tree ? Auth::accessLevel($this->tree) : '-',
-			);
-
-			return
-				'<script async src="https://www.google-analytics.com/analytics.js"></script>' .
-				'<script>' .
-				'window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;' .
-				'ga("create","' . $analytics_id . '","auto");' .
-				'ga("send", "pageview", ' . json_encode($dimensions) . ');' .
-				'</script>';
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Create the tracking code for Piwik Analytics.
-	 *
-	 * @param string $url     - The domain/path to Piwik
-	 * @param string $site_id - The Piwik site identifier
-	 *
-	 * @return string
-	 */
-	protected function analyticsPiwikTracker($url, $site_id) {
-		$url = preg_replace(array('/^https?:\/\//', '/\/$/'), '', $url);
-
-		if ($url && $site_id) {
-			return
-				'<script>' .
-				'var _paq=_paq||[];' .
-				'(function(){var u=(("https:"==document.location.protocol)?"https://' . $url . '/":"http://' . $url . '/");' .
-				'_paq.push(["setSiteId",' . $site_id . ']);' .
-				'_paq.push(["setTrackerUrl",u+"piwik.php"]);' .
-				'_paq.push(["trackPageView"]);' .
-				'_paq.push(["enableLinkTracking"]);' .
-				'var d=document,g=d.createElement("script"),s=d.getElementsByTagName("script")[0];g.defer=true;g.async=true;g.src=u+"piwik.js";' .
-				's.parentNode.insertBefore(g,s);})();' .
-				'</script>';
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Create the tracking code for Statcounter.
-	 *
-	 * @param string $project_id  - The statcounter project ID
-	 * @param string $security_id - The statcounter security ID
-	 *
-	 * @return string
-	 */
-	protected function analyticsStatcounterTracker($project_id, $security_id) {
-		if ($project_id && $security_id) {
-			return
-				'<script>' .
-				'var sc_project=' . (int) $project_id . ',sc_invisible=1,sc_security="' . $security_id .
-				'",scJsHost = (("https:"===document.location.protocol)?"https://secure.":"http://www.");' .
-				'document.write("<sc"+"ript src=\'"+scJsHost+"statcounter.com/counter/counter.js\'></"+"script>");' .
-				'</script>';
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Create the top of the <body>.
-	 *
-	 * @return string
-	 */
-	public function bodyHeader() {
-		return
-			'<body class="container">' .
-			'<header>' .
-			$this->headerContent() .
-			$this->primaryMenuContainer($this->primaryMenu()) .
-			'</header>' .
-			'<main id="content">' .
-			$this->flashMessagesContainer(FlashMessages::getMessages());
-	}
-
-	/**
-	 * Create the top of the <body> (for popup windows).
-	 *
-	 * @return string
-	 */
-	public function bodyHeaderPopupWindow() {
-		return
-			'<body class="container container-popup">' .
-			'<main id="content">' .
-			$this->flashMessagesContainer(FlashMessages::getMessages());
-	}
-
-	/**
-	 * Create a contact link for a user.
-	 *
-	 * @param User $user
-	 *
-	 * @return string
-	 */
-	public function contactLink(User $user) {
-		$method = $user->getPreference('contactmethod');
-
-		switch ($method) {
-		case 'none':
-			return '';
-		case 'mailto':
-			return '<a href="mailto:' . Filter::escapeHtml($user->getEmail()) . '">' . $user->getRealNameHtml() . '</a>';
-		default:
-			return "<a href='#' onclick='message(\"" . Filter::escapeHtml($user->getUserName()) . "\", \"" . $method . "\", \"" . WT_BASE_URL . Filter::escapeHtml(Functions::getQueryUrl()) . "\", \"\");return false;'>" . $user->getRealNameHtml() . '</a>';
-		}
-	}
-
-	/**
-	 * Create contact link for both technical and genealogy support.
-	 *
-	 * @param User $user
-	 *
-	 * @return string
-	 */
-	protected function contactLinkEverything(User $user) {
-		return I18N::translate('For technical support or genealogy questions contact %s.', $this->contactLink($user));
-	}
-
-	/**
-	 * Create contact link for genealogy support.
-	 *
-	 * @param User $user
-	 *
-	 * @return string
-	 */
-	protected function contactLinkGenealogy(User $user) {
-		return I18N::translate('For help with genealogy questions contact %s.', $this->contactLink($user));
-	}
-
-	/**
-	 * Create contact link for technical support.
-	 *
-	 * @param User $user
-	 *
-	 * @return string
-	 */
-	protected function contactLinkTechnical(User $user) {
-		return I18N::translate('For technical support and information contact %s.', $this->contactLink($user));
-	}
-
-	/**
-	 * Create contact links for the page footer.
-	 *
-	 * @return string
-	 */
-	protected function contactLinks() {
-		$contact_user   = User::find($this->tree->getPreference('CONTACT_USER_ID'));
-		$webmaster_user = User::find($this->tree->getPreference('WEBMASTER_USER_ID'));
-
-		if ($contact_user && $contact_user === $webmaster_user) {
-			return $this->contactLinkEverything($contact_user);
-		} elseif ($contact_user && $webmaster_user) {
-			return $this->contactLinkGenealogy($contact_user) . '<br>' . $this->contactLinkTechnical($webmaster_user);
-		} elseif ($contact_user) {
-			return $this->contactLinkGenealogy($contact_user);
-		} elseif ($webmaster_user) {
-			return $this->contactLinkTechnical($webmaster_user);
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Create a cookie warning.
-	 *
-	 * @return string
-	 */
-	public function cookieWarning() {
-		if (
-			empty($_SERVER['HTTP_DNT']) &&
-			empty($_COOKIE['cookie']) &&
-			(Site::getPreference('GOOGLE_ANALYTICS_ID') || Site::getPreference('PIWIK_SITE_ID') || Site::getPreference('STATCOUNTER_PROJECT_ID'))
-		) {
-			return
-				'<div class="cookie-warning">' .
-				I18N::translate('Cookies') . ' - ' .
-				I18N::translate('This website uses cookies to learn about visitor behaviour.') . ' ' .
-				'<button onclick="document.cookie=\'cookie=1\'; this.parentNode.classList.add(\'hidden\');">' . I18N::translate('continue') . '</button>' .
-				'</div>';
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Create the <DOCTYPE> tag.
-	 *
-	 * @return string
-	 */
-	public function doctype() {
-		return '<!DOCTYPE html>';
-	}
-
-	/**
-	 * HTML link to a "favorites icon".
-	 *
-	 * @return string
-	 */
-	protected function favicon() {
-		return
-			'<link rel="icon" href="' . $this->assetUrl() . 'favicon.png" type="image/png">' .
-			'<link rel="icon" type="image/png" href="' . $this->assetUrl() . 'favicon192.png" sizes="192x192">' .
-			'<link rel="apple-touch-icon" sizes="180x180" href="' . $this->assetUrl() . 'favicon180.png">';
-	}
-
-	/**
-	 * Add markup to a flash message.
-	 *
-	 * @param \stdClass $message
-	 *
-	 * @return string
-	 */
-	protected function flashMessageContainer(\stdClass $message) {
-		return $this->htmlAlert($message->text, $message->status, true);
-	}
-
-	/**
-	 * Create a container for messages that are "flashed" to the session
-	 * on one request, and displayed on another. If there are many messages,
-	 * the container may need a max-height and scroll-bar.
-	 *
-	 * @param \stdClass[] $messages
-	 *
-	 * @return string
-	 */
-	protected function flashMessagesContainer(array $messages) {
-		$html = '';
-		foreach ($messages as $message) {
-			$html .= $this->flashMessageContainer($message);
-		}
-
-		if ($html) {
-			return '<div class="flash-messages">' . $html . '</div>';
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Close the main content and create the <footer> tag.
-	 *
-	 * @return string
-	 */
-	public function footerContainer() {
-		return '</main><footer>' . $this->footerContent() . '</footer>';
-	}
-
-	/**
-	 * Close the main content.
-	 * Note that popup windows are deprecated
-	 *
-	 * @return string
-	 */
-	public function footerContainerPopupWindow() {
-		return '</main>';
-	}
-
-	/**
-	 * Create the contents of the <footer> tag.
-	 *
-	 * @return string
-	 */
-	protected function footerContent() {
-		return
-			$this->formatContactLinks() .
-			$this->logoPoweredBy() .
-			$this->formatPageViews($this->page_views) .
-			$this->cookieWarning();
-	}
-
-	/**
-	 * Format the contents of a variable-height home-page block.
-	 *
-	 * @param string $id
-	 * @param string $title
-	 * @param string $class
-	 * @param string $content
-	 *
-	 * @return string
-	 */
-	public function formatBlock($id, $title, $class, $content) {
-		return
-			'<div id="' . $id . '" class="block" >' .
-			'<div class="blockheader">' . $title . '</div>' .
-			'<div class="blockcontent ' . $class . '">' . $content . '</div>' .
-			'</div>';
-	}
-
-	/**
-	 * Add markup to the contact links.
-	 *
-	 * @return string
-	 */
-	protected function formatContactLinks() {
-		if ($this->tree) {
-			return '<div class="contact-links">' . $this->contactLinks() . '</div>';
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Add markup to the hit counter.
-	 *
-	 * @param int $count
-	 *
-	 * @return string
-	 */
-	protected function formatPageViews($count) {
-		if ($count > 0) {
-			return
-				'<div class="page-views">' .
-				I18N::plural('This page has been viewed %s time.', 'This page has been viewed %s times.', $count,
-					'<span class="odometer">' . I18N::digits($count) . '</span>') .
-				'</div>';
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Create a pending changes link for the page footer.
-	 *
-	 * @return string
-	 */
-	protected function formatPendingChangesLink() {
-		if ($this->pendingChangesExist()) {
-			return '<div class="pending-changes-link">' . $this->pendingChangesLink() . '</div>';
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Create a quick search form for the header.
-	 *
-	 * @return string
-	 */
-	protected function formQuickSearch() {
-		if ($this->tree) {
-			return
-				'<form action="search.php" class="header-search" role="search">' .
-				'<input type="hidden" name="action" value="header">' .
-				'<input type="hidden" name="ged" value="' . $this->tree->getNameHtml() . '">' .
-				$this->formQuickSearchFields() .
-				'</form>';
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Create a search field and submit button for the quick search form in the header.
-	 *
-	 * @return string
-	 */
-	protected function formQuickSearchFields() {
-		return
-			'<input type="search" name="query" size="15" placeholder="' . I18N::translate('Search') . '">' .
-			'<input type="image" src="' . $this->assetUrl() . 'images/go.png" alt="' . I18N::translate('Search') . '">';
-	}
-
-	/**
-	 * Add markup to the tree title.
-	 *
-	 * @return string
-	 */
-	protected function formatTreeTitle() {
-		if ($this->tree) {
-			return '<h1 class="header-title">' . $this->tree->getTitleHtml() . '</h1>';
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Add markup to the secondary menu.
-	 *
-	 * @return string
-	 */
-	protected function formatSecondaryMenu() {
-		return
-			'<ul class="secondary-menu">' .
-			implode('', $this->secondaryMenu()) .
-			'</ul>';
-	}
-
-	/**
-	 * Add markup to an item in the secondary menu.
-	 *
-	 * @param Menu $menu
-	 *
-	 * @return string
-	 */
-	protected function formatSecondaryMenuItem(Menu $menu) {
-		return $menu->getMenuAsList();
-	}
-
-	/**
-	 * Create the <head> tag.
-	 *
-	 * @param PageController $controller The current controller
-	 *
-	 * @return string
-	 */
-	public function head(PageController $controller) {
-		// Record this now. By the time we render the footer, $controller no longer exists.
-		$this->page_views = $this->pageViews($controller);
-
-		return
-			'<head>' .
-			$this->headContents($controller) .
-			$this->hookHeaderExtraContent() .
-			$this->analytics() .
-			'</head>';
-	}
-
-	/**
-	 * Create the contents of the <head> tag.
-	 *
-	 * @param PageController $controller The current controller
-	 *
-	 * @return string
-	 */
-	protected function headContents(PageController $controller) {
-		// The title often includes the names of records, which may include HTML markup.
-		$title = Filter::unescapeHtml($controller->getPageTitle());
-
-		// If an extra (site) title is specified, append it.
-		if ($this->tree && $this->tree->getPreference('META_TITLE')) {
-			$title .= ' – ' . $this->tree->getPreference('META_TITLE');
-		}
-
-		$html =
-			// modernizr.js and respond.js need to be loaded before the <body> to avoid FOUC
-			'<!--[if IE 8]><script src="' . WT_MODERNIZR_JS_URL . '"></script><![endif]-->' .
-			'<!--[if IE 8]><script src="' . WT_RESPOND_JS_URL . '"></script><![endif]-->' .
-			$this->metaCharset() .
-			$this->title($title) .
-			$this->favicon() .
-			$this->metaViewport() .
-			$this->metaRobots($controller->getMetaRobots()) .
-			$this->metaUaCompatible() .
-			$this->metaGenerator(WT_WEBTREES . ' ' . WT_VERSION . ' - ' . WT_WEBTREES_URL);
-
-		if ($this->tree) {
-			$html .= $this->metaDescription($this->tree->getPreference('META_DESCRIPTION'));
-		}
-
-		// CSS files
-		foreach ($this->stylesheets() as $css) {
-			$html .= '<link rel="stylesheet" type="text/css" href="' . $css . '">';
-		}
-
-		return $html;
-	}
-
-	/**
-	 * Create the contents of the <header> tag.
-	 *
-	 * @return string
-	 */
-	protected function headerContent() {
-		return
-			//$this->accessibilityLinks() .
-			$this->logoHeader() .
-			$this->secondaryMenuContainer($this->secondaryMenu()) .
-			$this->formatTreeTitle() .
-			$this->formQuickSearch();
-	}
-
-	/**
-	 * Create the <header> tag for a popup window.
-	 *
-	 * @return string
-	 */
-	protected function headerSimple() {
-		return
-			$this->flashMessagesContainer(FlashMessages::getMessages()) .
-			'<div id="content">';
-	}
-
-	/**
-	 * Allow themes to do things after initialization (since they cannot use
-	 * the constructor).
-	 */
-	public function hookAfterInit() {
-	}
-
-	/**
-	 * Allow themes to add extra scripts to the page footer.
-	 *
-	 * @return string
-	 */
-	public function hookFooterExtraJavascript() {
-		return '';
-	}
-
-	/**
-	 * Allow themes to add extra content to the page header.
-	 * Typically this will be additional CSS.
-	 *
-	 * @return string
-	 */
-	public function hookHeaderExtraContent() {
-		return '';
-	}
-
-	/**
-	 * Create the <html> tag.
-	 *
-	 * @return string
-	 */
-	public function html() {
-		return '<html ' . I18N::htmlAttributes() . '>';
-	}
-
-	/**
-	 * Add HTML markup to create an alert
-	 *
-	 * @param string $html        The content of the alert
-	 * @param string $level       One of 'success', 'info', 'warning', 'danger'
-	 * @param bool   $dismissible If true, add a close button.
-	 *
-	 * @return string
-	 */
-	public function htmlAlert($html, $level, $dismissible) {
-		if ($dismissible) {
-			return
-				'<div class="alert alert-' . $level . ' alert-dismissible" role="alert">' .
-				'<button type="button" class="close" data-dismiss="alert" aria-label="' . I18N::translate('close') . '">' .
-				'<span aria-hidden="true">&times;</span>' .
-				'</button>' .
-				$html .
-				'</div>';
-		} else {
-			return
-				'<div class="alert alert-' . $level . '" role="alert">' .
-				$html .
-				'</div>';
-		}
-	}
-
-	/**
-	 * Display an icon for this fact.
-	 *
-	 * @param Fact $fact
-	 *
-	 * @return string
-	 */
-	public function icon(Fact $fact) {
-		$icon = 'images/facts/' . $fact->getTag() . '.png';
-		$dir  = substr($this->assetUrl(), strlen(WT_STATIC_URL));
-		if (file_exists($dir . $icon)) {
-			return '<img src="' . $this->assetUrl() . $icon . '" title="' . GedcomTag::getLabel($fact->getTag()) . '">';
-		} elseif (file_exists($dir . 'images/facts/NULL.png')) {
-			// Spacer image - for alignment - until we move to a sprite.
-			return '<img src="' . Theme::theme()->assetUrl() . 'images/facts/NULL.png">';
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Display an individual in a box - for charts, etc.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return string
-	 */
-	public function individualBox(Individual $individual) {
-		$personBoxClass = array_search($individual->getSex(), array('person_box' => 'M', 'person_boxF' => 'F', 'person_boxNN' => 'U'));
-		if ($individual->canShow() && $individual->getTree()->getPreference('SHOW_HIGHLIGHT_IMAGES')) {
-			$thumbnail = $individual->displayImage();
-		} else {
-			$thumbnail = '';
-		}
-
-		$content = '<span class="namedef name1">' . $individual->getFullName() . '</span>';
-		$icons   = '';
-		if ($individual->canShow()) {
-			$content =
-				'<a href="' . $individual->getHtmlUrl() . '">' . $content . '</a>' .
-				'<div class="namedef name1">' . $individual->getAddName() . '</div>';
-			$icons   =
-				'<div class="noprint icons">' .
-				'<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' .
-				'<div class="itr"><i class="icon-pedigree"></i><div class="popup">' .
-				'<ul class="' . $personBoxClass . '">' . implode('', $this->individualBoxMenu($individual)) . '</ul>' .
-				'</div>' .
-				'</div>' .
-				'</div>';
-		}
-
-		return
-			'<div data-pid="' . $individual->getXref() . '" class="person_box_template ' . $personBoxClass . ' box-style1" style="width: ' . $this->parameter('chart-box-x') . 'px; min-height: ' . $this->parameter('chart-box-y') . 'px">' .
-			$icons .
-			'<div class="chart_textbox" style="max-height:' . $this->parameter('chart-box-y') . 'px;">' .
-			$thumbnail .
-			$content .
-			'<div class="inout2 details1">' . $this->individualBoxFacts($individual) . '</div>' .
-			'</div>' .
-			'<div class="inout"></div>' .
-			'</div>';
-	}
-
-	/**
-	 * Display an empty box - for a missing individual in a chart.
-	 *
-	 * @return string
-	 */
-	public function individualBoxEmpty() {
-		return '<div class="person_box_template person_boxNN box-style1" style="width: ' . $this->parameter('chart-box-x') . 'px; min-height: ' . $this->parameter('chart-box-y') . 'px"></div>';
-	}
-
-	/**
-	 * Display an individual in a box - for charts, etc.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return string
-	 */
-	public function individualBoxLarge(Individual $individual) {
-		$personBoxClass = array_search($individual->getSex(), array('person_box' => 'M', 'person_boxF' => 'F', 'person_boxNN' => 'U'));
-		if ($individual->getTree()->getPreference('SHOW_HIGHLIGHT_IMAGES')) {
-			$thumbnail = $individual->displayImage();
-		} else {
-			$thumbnail = '';
-		}
-
-		$content = '<span class="namedef name1">' . $individual->getFullName() . '</span>';
-		$icons   = '';
-		if ($individual->canShow()) {
-			$content =
-				'<a href="' . $individual->getHtmlUrl() . '">' . $content . '</a>' .
-				'<div class="namedef name2">' . $individual->getAddName() . '</div>';
-			$icons   =
-				'<div class="noprint icons">' .
-				'<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' .
-				'<div class="itr"><i class="icon-pedigree"></i><div class="popup">' .
-				'<ul class="' . $personBoxClass . '">' . implode('', $this->individualBoxMenu($individual)) . '</ul>' .
-				'</div>' .
-				'</div>' .
-				'</div>';
-		}
-
-		return
-			'<div data-pid="' . $individual->getXref() . '" class="person_box_template ' . $personBoxClass . ' box-style2">' .
-			$icons .
-			'<div class="chart_textbox" style="max-height:' . $this->parameter('chart-box-y') . 'px;">' .
-			$thumbnail .
-			$content .
-			'<div class="inout2 details2">' . $this->individualBoxFacts($individual) . '</div>' .
-			'</div>' .
-			'<div class="inout"></div>' .
-			'</div>';
-	}
-
-	/**
-	 * Display an individual in a box - for charts, etc.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return string
-	 */
-	public function individualBoxSmall(Individual $individual) {
-		$personBoxClass = array_search($individual->getSex(), array('person_box' => 'M', 'person_boxF' => 'F', 'person_boxNN' => 'U'));
-		if ($individual->getTree()->getPreference('SHOW_HIGHLIGHT_IMAGES')) {
-			$thumbnail = $individual->displayImage();
-		} else {
-			$thumbnail = '';
-		}
-
-		return
-			'<div data-pid="' . $individual->getXref() . '" class="person_box_template ' . $personBoxClass . ' iconz box-style0" style="width: ' . $this->parameter('compact-chart-box-x') . 'px; min-height: ' . $this->parameter('compact-chart-box-y') . 'px">' .
-			'<div class="compact_view">' .
-			$thumbnail .
-			'<a href="' . $individual->getHtmlUrl() . '">' .
-			'<span class="namedef name0">' . $individual->getFullName() . '</span>' .
-			'</a>' .
-			'<div class="inout2 details0">' . $individual->getLifeSpan() . '</div>' .
-			'</div>' .
-			'<div class="inout"></div>' .
-			'</div>';
-	}
-
-	/**
-	 * Display an individual in a box - for charts, etc.
-	 *
-	 * @return string
-	 */
-	public function individualBoxSmallEmpty() {
-		return '<div class="person_box_template person_boxNN box-style1" style="width: ' . $this->parameter('compact-chart-box-x') . 'px; min-height: ' . $this->parameter('compact-chart-box-y') . 'px"></div>';
-	}
-
-	/**
-	 * Generate the facts, for display in charts.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return string
-	 */
-	protected function individualBoxFacts(Individual $individual) {
-		$html = '';
-
-		$opt_tags = preg_split('/\W/', $individual->getTree()->getPreference('CHART_BOX_TAGS'), 0, PREG_SPLIT_NO_EMPTY);
-		// Show BIRT or equivalent event
-		foreach (explode('|', WT_EVENTS_BIRT) as $birttag) {
-			if (!in_array($birttag, $opt_tags)) {
-				$event = $individual->getFirstFact($birttag);
-				if ($event) {
-					$html .= $event->summary();
-					break;
-				}
-			}
-		}
-		// Show optional events (before death)
-		foreach ($opt_tags as $key => $tag) {
-			if (!preg_match('/^(' . WT_EVENTS_DEAT . ')$/', $tag)) {
-				$event = $individual->getFirstFact($tag);
-				if (!is_null($event)) {
-					$html .= $event->summary();
-					unset($opt_tags[$key]);
-				}
-			}
-		}
-		// Show DEAT or equivalent event
-		foreach (explode('|', WT_EVENTS_DEAT) as $deattag) {
-			$event = $individual->getFirstFact($deattag);
-			if ($event) {
-				$html .= $event->summary();
-				if (in_array($deattag, $opt_tags)) {
-					unset($opt_tags[array_search($deattag, $opt_tags)]);
-				}
-				break;
-			}
-		}
-		// Show remaining optional events (after death)
-		foreach ($opt_tags as $tag) {
-			$event = $individual->getFirstFact($tag);
-			if ($event) {
-				$html .= $event->summary();
-			}
-		}
-
-		return $html;
-	}
-
-	/**
-	 * Generate the LDS summary, for display in charts.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return string
-	 */
-	protected function individualBoxLdsSummary(Individual $individual) {
-		if ($individual->getTree()->getPreference('SHOW_LDS_AT_GLANCE')) {
-			$BAPL = $individual->getFacts('BAPL') ? 'B' : '_';
-			$ENDL = $individual->getFacts('ENDL') ? 'E' : '_';
-			$SLGC = $individual->getFacts('SLGC') ? 'C' : '_';
-			$SLGS = '_';
-
-			foreach ($individual->getSpouseFamilies() as $family) {
-				if ($family->getFacts('SLGS')) {
-					$SLGS = '';
-				}
-			}
-
-			return $BAPL . $ENDL . $SLGS . $SLGC;
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Links, to show in chart boxes;
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Menu[]
-	 */
-	public function individualBoxMenu(Individual $individual) {
-		$menus = array_merge(
-			$this->individualBoxMenuCharts($individual),
-			$this->individualBoxMenuFamilyLinks($individual)
-		);
-
-		return $menus;
-	}
-
-	/**
-	 * Chart links, to show in chart boxes;
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Menu[]
-	 */
-	protected function individualBoxMenuCharts(Individual $individual) {
-		$menus = array();
-		foreach (Module::getActiveCharts($this->tree) as $chart) {
-			$menu = $chart->getBoxChartMenu($individual);
-			if ($menu) {
-				$menus[] = $menu;
-			}
-		}
-
-		usort($menus, function (Menu $x, Menu $y) {
-			return I18N::strcasecmp($x->getLabel(), $y->getLabel());
-		});
-
-		return $menus;
-	}
-
-	/**
-	 * Family links, to show in chart boxes.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Menu[]
-	 */
-	protected function individualBoxMenuFamilyLinks(Individual $individual) {
-		$menus = array();
-
-		foreach ($individual->getSpouseFamilies() as $family) {
-			$menus[] = new Menu('<strong>' . I18N::translate('Family with spouse') . '</strong>', $family->getHtmlUrl());
-			$spouse  = $family->getSpouse($individual);
-			if ($spouse && $spouse->canShowName()) {
-				$menus[] = new Menu($spouse->getFullName(), $spouse->getHtmlUrl());
-			}
-			foreach ($family->getChildren() as $child) {
-				if ($child->canShowName()) {
-					$menus[] = new Menu($child->getFullName(), $child->getHtmlUrl());
-				}
-			}
-		}
-
-		return $menus;
-	}
-
-	/**
-	 * Create part of an individual box
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return string
-	 */
-	protected function individualBoxSexSymbol(Individual $individual) {
-		if ($individual->getTree()->getPreference('PEDIGREE_SHOW_GENDER')) {
-			return $individual->sexImage('large');
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Initialise the theme. We cannot pass these in a constructor, as the construction
-	 * happens in a theme file, and we need to be able to change it.
-	 *
-	 * @param Tree|null $tree The current tree (if there is one).
-	 */
-	final public function init(Tree $tree = null) {
-		$this->tree     = $tree;
-		$this->tree_url = $tree ? 'ged=' . $tree->getNameUrl() : '';
-
-		$this->hookAfterInit();
-	}
-
-	/**
-	 * A large webtrees logo, for the header.
-	 *
-	 * @return string
-	 */
-	protected function logoHeader() {
-		return '<div class="header-logo"></div>';
-	}
-
-	/**
-	 * A small "powered by webtrees" logo for the footer.
-	 *
-	 * @return string
-	 */
-	protected function logoPoweredBy() {
-		return '<a href="' . WT_WEBTREES_URL . '" class="powered-by-webtrees" title="' . WT_WEBTREES_URL . '"></a>';
-	}
-
-	/**
-	 * A menu for the day/month/year calendar views.
-	 *
-	 * @return Menu
-	 */
-	protected function menuCalendar() {
-		return new Menu(I18N::translate('Calendar'), '#', 'menu-calendar', array('rel' => 'nofollow'), array(
-			// Day view
-			new Menu(I18N::translate('Day'), 'calendar.php?' . $this->tree_url . '&amp;view=day', 'menu-calendar-day', array('rel' => 'nofollow')),
-			// Month view
-			new Menu(I18N::translate('Month'), 'calendar.php?' . $this->tree_url . '&amp;view=month', 'menu-calendar-month', array('rel' => 'nofollow')),
-			//Year view
-			new Menu(I18N::translate('Year'), 'calendar.php?' . $this->tree_url . '&amp;view=year', 'menu-calendar-year', array('rel' => 'nofollow')),
-		));
-	}
-
-	/**
-	 * Generate a menu item to change the blocks on the current (index.php) page.
-	 *
-	 * @return Menu|null
-	 */
-	protected function menuChangeBlocks() {
-		if (WT_SCRIPT_NAME === 'index.php' && Auth::check() && Filter::get('ctype', 'gedcom|user', 'user') === 'user') {
-			return new Menu(I18N::translate('Customize this page'), 'index_edit.php?user_id=' . Auth::id(), 'menu-change-blocks');
-		} elseif (WT_SCRIPT_NAME === 'index.php' && Auth::isManager($this->tree)) {
-			return new Menu(I18N::translate('Customize this page'), 'index_edit.php?gedcom_id=' . $this->tree->getTreeId(), 'menu-change-blocks');
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Generate a menu for each of the different charts.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Menu|null
-	 */
-	protected function menuChart(Individual $individual) {
-		$submenus = array();
-		foreach (Module::getActiveCharts($this->tree) as $chart) {
-			$menu = $chart->getChartMenu($individual);
-			if ($menu) {
-				$submenus[] = $menu;
-			}
-		}
-
-		if ($submenus) {
-			usort($submenus, function (Menu $x, Menu $y) {
-				return I18N::strcasecmp($x->getLabel(), $y->getLabel());
-			});
-
-			return new Menu(I18N::translate('Charts'), '#', 'menu-chart', array('rel' => 'nofollow'), $submenus);
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Generate a menu item for the ancestors chart.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Menu|null
-	 *
-	 * @deprecated
-	 */
-	protected function menuChartAncestors(Individual $individual) {
-		$chart = new AncestorsChartModule(WT_ROOT . WT_MODULES_DIR . 'ancestors_chart');
-
-		return $chart->getChartMenu($individual);
-	}
-
-	/**
-	 * Generate a menu item for the compact tree.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Menu|null
-	 *
-	 * @deprecated
-	 */
-	protected function menuChartCompact(Individual $individual) {
-		$chart = new CompactTreeChartModule(WT_ROOT . WT_MODULES_DIR . 'compact_tree_chart');
-
-		return $chart->getChartMenu($individual);
-	}
-
-	/**
-	 * Generate a menu item for the descendants chart.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Menu|null
-	 *
-	 * @deprecated
-	 */
-	protected function menuChartDescendants(Individual $individual) {
-		$chart = new DescendancyChartModule(WT_ROOT . WT_MODULES_DIR . 'descendancy_chart');
-
-		return $chart->getChartMenu($individual);
-	}
-
-	/**
-	 * Generate a menu item for the family-book chart.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Menu|null
-	 *
-	 * @deprecated
-	 */
-	protected function menuChartFamilyBook(Individual $individual) {
-		$chart = new FamilyBookChartModule(WT_ROOT . WT_MODULES_DIR . 'family_book_chart');
-
-		return $chart->getChartMenu($individual);
-	}
-
-	/**
-	 * Generate a menu item for the fan chart.
-	 *
-	 * We can only do this if the GD2 library is installed with TrueType support.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Menu|null
-	 *
-	 * @deprecated
-	 */
-	protected function menuChartFanChart(Individual $individual) {
-		$chart = new FanChartModule(WT_ROOT . WT_MODULES_DIR . 'fan_chart');
-
-		return $chart->getChartMenu($individual);
-	}
-
-	/**
-	 * Generate a menu item for the interactive tree.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Menu|null
-	 *
-	 * @deprecated
-	 */
-	protected function menuChartInteractiveTree(Individual $individual) {
-		$chart = new InteractiveTreeModule(WT_ROOT . WT_MODULES_DIR . 'tree');
-
-		return $chart->getChartMenu($individual);
-	}
-
-	/**
-	 * Generate a menu item for the hourglass chart.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Menu|null
-	 *
-	 * @deprecated
-	 */
-	protected function menuChartHourglass(Individual $individual) {
-		$chart = new HourglassChartModule(WT_ROOT . WT_MODULES_DIR . 'hourglass_chart');
-
-		return $chart->getChartMenu($individual);
-	}
-
-	/**
-	 * Generate a menu item for the lifepsan chart.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Menu|null
-	 *
-	 * @deprecated
-	 */
-	protected function menuChartLifespan(Individual $individual) {
-		$chart = new LifespansChartModule(WT_ROOT . WT_MODULES_DIR . 'lifespans_chart');
-
-		return $chart->getChartMenu($individual);
-	}
-
-	/**
-	 * Generate a menu item for the pedigree chart.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Menu|null
-	 *
-	 * @deprecated
-	 */
-	protected function menuChartPedigree(Individual $individual) {
-		$chart = new PedigreeChartModule(WT_ROOT . WT_MODULES_DIR . 'pedigree_chart');
-
-		return $chart->getChartMenu($individual);
-	}
-
-	/**
-	 * Generate a menu item for the pedigree map.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Menu|null
-	 *
-	 * @deprecated
-	 */
-	protected function menuChartPedigreeMap(Individual $individual) {
-		$chart = new GoogleMapsModule(WT_ROOT . WT_MODULES_DIR . 'googlemap');
-
-		return $chart->getChartMenu($individual);
-	}
-
-	/**
-	 * Generate a menu item for the relationship chart.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Menu|null
-	 *
-	 * @deprecated
-	 */
-	protected function menuChartRelationship(Individual $individual) {
-		$chart = new RelationshipsChartModule(WT_ROOT . WT_MODULES_DIR . 'relationships_chart');
-
-		return $chart->getChartMenu($individual);
-	}
-
-	/**
-	 * Generate a menu item for the statistics charts.
-	 *
-	 * @return Menu|null
-	 *
-	 * @deprecated
-	 */
-	protected function menuChartStatistics() {
-		$chart = new StatisticsChartModule(WT_ROOT . WT_MODULES_DIR . 'statistics_chart');
-
-		return $chart->getChartMenu(null);
-	}
-
-	/**
-	 * Generate a menu item for the timeline chart.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Menu|null
-	 *
-	 * @deprecated
-	 */
-	protected function menuChartTimeline(Individual $individual) {
-		$chart = new TimelineChartModule(WT_ROOT . WT_MODULES_DIR . 'timeline_chart');
-
-		return $chart->getChartMenu($individual);
-	}
-
-	/**
-	 * Generate a menu item for the control panel.
-	 *
-	 * @return Menu|null
-	 */
-	protected function menuControlPanel() {
-		if (Auth::isManager($this->tree)) {
-			return new Menu(I18N::translate('Control panel'), 'admin.php', 'menu-admin');
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Favorites menu.
-	 *
-	 * @return Menu|null
-	 */
-	protected function menuFavorites() {
-		global $controller;
-
-		$show_user_favorites = $this->tree && Module::getModuleByName('user_favorites') && Auth::check();
-		$show_tree_favorites = $this->tree && Module::getModuleByName('gedcom_favorites');
-
-		if ($show_user_favorites && $show_tree_favorites) {
-			$favorites = array_merge(
-				FamilyTreeFavoritesModule::getFavorites($this->tree->getTreeId()),
-				UserFavoritesModule::getFavorites(Auth::id())
-			);
-		} elseif ($show_user_favorites) {
-			$favorites = UserFavoritesModule::getFavorites(Auth::id());
-		} elseif ($show_tree_favorites) {
-			$favorites = FamilyTreeFavoritesModule::getFavorites($this->tree->getTreeId());
-		} else {
-			$favorites = array();
-		}
-
-		$submenus = array();
-		$records  = array();
-		foreach ($favorites as $favorite) {
-			switch ($favorite['type']) {
-			case 'URL':
-				$submenus[] = new Menu($favorite['title'], $favorite['url']);
-				break;
-			case 'INDI':
-			case 'FAM':
-			case 'SOUR':
-			case 'OBJE':
-			case 'NOTE':
-				$record = GedcomRecord::getInstance($favorite['gid'], $this->tree);
-				if ($record && $record->canShowName()) {
-					$submenus[] = new Menu($record->getFullName(), $record->getHtmlUrl());
-					$records[]  = $record;
-				}
-				break;
-			}
-		}
-
-		if ($show_user_favorites && isset($controller->record) && $controller->record instanceof GedcomRecord && !in_array($controller->record, $records)) {
-			$submenus[] = new Menu(I18N::translate('Add to favorites'), '#', '', array(
-				'onclick' => 'jQuery.post("module.php?mod=user_favorites&mod_action=menu-add-favorite", {xref:"' . $controller->record->getXref() . '"},function(){location.reload();})',
-			));
-		}
-
-		if (empty($submenus)) {
-			return null;
-		} else {
-			return new Menu(I18N::translate('Favorites'), '#', 'menu-favorites', array(), $submenus);
-		}
-	}
-
-	/**
-	 * A menu for the home (family tree) pages.
-	 *
-	 * @return Menu
-	 */
-	protected function menuHomePage() {
-		if (count(Tree::getAll()) === 1 || Site::getPreference('ALLOW_CHANGE_GEDCOM') === '0') {
-			return new Menu(I18N::translate('Family tree'), 'index.php?ctype=gedcom&amp;' . $this->tree_url, 'menu-tree');
-		} else {
-			$submenus = array();
-			foreach (Tree::getAll() as $tree) {
-				if ($tree == $this->tree) {
-					$active = 'active ';
-				} else {
-					$active = '';
-				}
-				$submenus[] = new Menu($tree->getTitleHtml(), 'index.php?ctype=gedcom&amp;ged=' . $tree->getNameUrl(), $active . 'menu-tree-' . $tree->getTreeId());
-			}
-
-			return new Menu(I18N::translate('Family trees'), '#', 'menu-tree', array(), $submenus);
-		}
-	}
-
-	/**
-	 * A menu to show a list of available languages.
-	 *
-	 * @return Menu|null
-	 */
-	protected function menuLanguages() {
-		$menu = new Menu(I18N::translate('Language'), '#', 'menu-language');
-
-		foreach (I18N::activeLocales() as $locale) {
-			$language_tag = $locale->languageTag();
-			$class        = 'menu-language-' . $language_tag . (WT_LOCALE === $language_tag ? ' active' : '');
-			$menu->addSubmenu(new Menu($locale->endonym(), '#', $class, array(
-				'onclick'       => 'return false;',
-				'data-language' => $language_tag,
-			)));
-		}
-
-		if (count($menu->getSubmenus()) > 1) {
-			return $menu;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Create a menu to show lists of individuals, families, sources, etc.
-	 *
-	 * @param string $surname The significant surname on the page
-	 *
-	 * @return Menu
-	 */
-	protected function menuLists($surname) {
-		// Do not show empty lists
-		$row = Database::prepare(
-			"SELECT" .
-			" EXISTS(SELECT 1 FROM `##sources` WHERE s_file = ?) AS sour," .
-			" EXISTS(SELECT 1 FROM `##other` WHERE o_file = ? AND o_type='REPO') AS repo," .
-			" EXISTS(SELECT 1 FROM `##other` WHERE o_file = ? AND o_type='NOTE') AS note," .
-			" EXISTS(SELECT 1 FROM `##media` WHERE m_file = ?) AS obje"
-		)->execute(array(
-			$this->tree->getTreeId(),
-			$this->tree->getTreeId(),
-			$this->tree->getTreeId(),
-			$this->tree->getTreeId(),
-		))->fetchOneRow();
-
-		$submenus = array(
-			$this->menuListsIndividuals($surname),
-			$this->menuListsFamilies($surname),
-			$this->menuListsBranches($surname),
-			$this->menuListsPlaces(),
-		);
-		if ($row->obje) {
-			$submenus[] = $this->menuListsMedia();
-		}
-		if ($row->repo) {
-			$submenus[] = $this->menuListsRepositories();
-		}
-		if ($row->sour) {
-			$submenus[] = $this->menuListsSources();
-		}
-		if ($row->note) {
-			$submenus[] = $this->menuListsNotes();
-		}
-
-		uasort($submenus, function (Menu $x, Menu $y) {
-			return I18N::strcasecmp($x->getLabel(), $y->getLabel());
-		});
-
-		return new Menu(I18N::translate('Lists'), '#', 'menu-list', array(), $submenus);
-	}
-
-	/**
-	 * A menu for the list of branches
-	 *
-	 * @param string $surname The significant surname on the page
-	 *
-	 * @return Menu
-	 */
-	protected function menuListsBranches($surname) {
-		return new Menu(I18N::translate('Branches'), 'branches.php?ged=' . $this->tree->getNameUrl() . '&amp;surname=' . rawurlencode($surname), 'menu-branches', array('rel' => 'nofollow'));
-	}
-
-	/**
-	 * A menu for the list of families
-	 *
-	 * @param string $surname The significant surname on the page
-	 *
-	 * @return Menu
-	 */
-	protected function menuListsFamilies($surname) {
-		return new Menu(I18N::translate('Families'), 'famlist.php?ged=' . $this->tree->getNameUrl() . '&amp;surname=' . rawurlencode($surname), 'menu-list-fam', array('rel' => 'nofollow'));
-	}
-
-	/**
-	 * A menu for the list of individuals
-	 *
-	 * @param string $surname The significant surname on the page
-	 *
-	 * @return Menu
-	 */
-	protected function menuListsIndividuals($surname) {
-		return new Menu(I18N::translate('Individuals'), 'indilist.php?ged=' . $this->tree->getNameUrl() . '&amp;surname=' . rawurlencode($surname), 'menu-list-indi');
-	}
-
-	/**
-	 * A menu for the list of media objects
-	 *
-	 * @return Menu
-	 */
-	protected function menuListsMedia() {
-		return new Menu(I18N::translate('Media objects'), 'medialist.php?' . $this->tree_url, 'menu-list-obje', array('rel' => 'nofollow'));
-	}
-
-	/**
-	 * A menu for the list of notes
-	 *
-	 * @return Menu
-	 */
-	protected function menuListsNotes() {
-		return new Menu(I18N::translate('Shared notes'), 'notelist.php?' . $this->tree_url, 'menu-list-note', array('rel' => 'nofollow'));
-	}
-
-	/**
-	 * A menu for the list of individuals
-	 *
-	 * @return Menu
-	 */
-	protected function menuListsPlaces() {
-		return new Menu(I18N::translate('Place hierarchy'), 'placelist.php?ged=' . $this->tree->getNameUrl(), 'menu-list-plac', array('rel' => 'nofollow'));
-	}
-
-	/**
-	 * A menu for the list of repositories
-	 *
-	 * @return Menu
-	 */
-	protected function menuListsRepositories() {
-		return new Menu(I18N::translate('Repositories'), 'repolist.php?' . $this->tree_url, 'menu-list-repo', array('rel' => 'nofollow'));
-	}
-
-	/**
-	 * A menu for the list of sources
-	 *
-	 * @return Menu
-	 */
-	protected function menuListsSources() {
-		return new Menu(I18N::translate('Sources'), 'sourcelist.php?' . $this->tree_url, 'menu-list-sour', array('rel' => 'nofollow'));
-	}
-
-	/**
-	 * A login menu option (or null if we are already logged in).
-	 *
-	 * @return Menu|null
-	 */
-	protected function menuLogin() {
-		if (Auth::check() || WT_SCRIPT_NAME === 'login.php') {
-			return null;
-		} else {
-			return new Menu(I18N::translate('Sign in'), WT_LOGIN_URL . '?url=' . rawurlencode(Functions::getQueryUrl()), 'menu-login', array('rel' => 'nofollow'));
-		}
-	}
-
-	/**
-	 * A logout menu option (or null if we are already logged out).
-	 *
-	 * @return Menu|null
-	 */
-	protected function menuLogout() {
-		if (Auth::check()) {
-			return new Menu(I18N::translate('Sign out'), 'logout.php', 'menu-logout');
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Get the additional menus created by each of the modules
-	 *
-	 * @return Menu[]
-	 */
-	protected function menuModules() {
-		$menus = array();
-		foreach (Module::getActiveMenus($this->tree) as $module) {
-			$menus[] = $module->getMenu();
-		}
-
-		return array_filter($menus);
-	}
-
-	/**
-	 * A link to allow users to edit their account settings (edituser.php).
-	 *
-	 * @return Menu|null
-	 */
-	protected function menuMyAccount() {
-		if (Auth::check()) {
-			return new Menu(I18N::translate('My account'), 'edituser.php');
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * A link to the user's individual record (individual.php).
-	 *
-	 * @return Menu|null
-	 */
-	protected function menuMyIndividualRecord() {
-		$gedcomid = $this->tree->getUserPreference(Auth::user(), 'gedcomid');
-
-		if ($gedcomid) {
-			return new Menu(I18N::translate('My individual record'), 'individual.php?pid=' . $gedcomid . '&amp;' . $this->tree_url, 'menu-myrecord');
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * A link to the user's personal home page.
-	 *
-	 * @return Menu
-	 */
-	protected function menuMyPage() {
-		return new Menu(I18N::translate('My page'), 'index.php?ctype=user&amp;' . $this->tree_url, 'menu-mypage');
-	}
-
-	/**
-	 * A menu for the user's personal pages.
-	 *
-	 * @return Menu|null
-	 */
-	protected function menuMyPages() {
-		if (Auth::id()) {
-			return new Menu(I18N::translate('My pages'), '#', 'menu-mymenu', array(), array_filter(array(
-				$this->menuMyPage(),
-				$this->menuMyIndividualRecord(),
-				$this->menuMyPedigree(),
-				$this->menuMyAccount(),
-				$this->menuControlPanel(),
-				$this->menuChangeBlocks(),
-			)));
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * A link to the user's individual record.
-	 *
-	 * @return Menu|null
-	 */
-	protected function menuMyPedigree() {
-		$gedcomid = $this->tree->getUserPreference(Auth::user(), 'gedcomid');
-
-		if ($gedcomid && Module::isActiveChart($this->tree, 'pedigree_chart')) {
-			$showFull   = $this->tree->getPreference('PEDIGREE_FULL_DETAILS') ? 1 : 0;
-			$showLayout = $this->tree->getPreference('PEDIGREE_LAYOUT') ? 1 : 0;
-
-			return new Menu(
-				I18N::translate('My pedigree'),
-				'pedigree.php?' . $this->tree_url . '&amp;rootid=' . $gedcomid . '&amp;show_full=' . $showFull . '&amp;talloffset=' . $showLayout,
-				'menu-mypedigree'
-			);
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Create a pending changes menu.
-	 *
-	 * @return Menu|null
-	 */
-	protected function menuPendingChanges() {
-		if ($this->pendingChangesExist()) {
-			$menu = new Menu(I18N::translate('Pending changes'), '#', 'menu-pending', array('onclick' => 'window.open("edit_changes.php", "_blank", chan_window_specs); return false;'));
-
-			return $menu;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * A menu with a list of reports.
-	 *
-	 * @return Menu|null
-	 */
-	protected function menuReports() {
-		$submenus = array();
-		foreach (Module::getActiveReports($this->tree) as $report) {
-			$submenus[] = $report->getReportMenu();
-		}
-
-		if ($submenus) {
-			return new Menu(I18N::translate('Reports'), '#', 'menu-report', array('rel' => 'nofollow'), $submenus);
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Create the search menu.
-	 *
-	 * @return Menu
-	 */
-	protected function menuSearch() {
-		return new Menu(I18N::translate('Search'), '#', 'menu-search', array('rel' => 'nofollow'), array_filter(array(
-			$this->menuSearchGeneral(),
-			$this->menuSearchPhonetic(),
-			$this->menuSearchAdvanced(),
-			$this->menuSearchAndReplace(),
-		)));
-	}
-
-	/**
-	 * Create the general search sub-menu.
-	 *
-	 * @return Menu
-	 */
-	protected function menuSearchGeneral() {
-		return new Menu(I18N::translate('General search'), 'search.php?' . $this->tree_url, 'menu-search-general', array('rel' => 'nofollow'));
-	}
-
-	/**
-	 * Create the phonetic search sub-menu.
-	 *
-	 * @return Menu
-	 */
-	protected function menuSearchPhonetic() {
-		return new Menu(/* I18N: search using “sounds like”, rather than exact spelling */ I18N::translate('Phonetic search'), 'search.php?' . $this->tree_url . '&amp;action=soundex', 'menu-search-soundex', array('rel' => 'nofollow'));
-	}
-
-	/**
-	 * Create the advanced search sub-menu.
-	 *
-	 * @return Menu
-	 */
-	protected function menuSearchAdvanced() {
-		return new Menu(I18N::translate('Advanced search'), 'search_advanced.php?' . $this->tree_url, 'menu-search-advanced', array('rel' => 'nofollow'));
-	}
-
-	/**
-	 * Create the advanced search sub-menu.
-	 *
-	 * @return Menu
-	 */
-	protected function menuSearchAndReplace() {
-		if (Auth::isEditor($this->tree)) {
-			return new Menu(I18N::translate('Search and replace'), 'search.php?' . $this->tree_url . '&amp;action=replace', 'menu-search-replace');
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Themes menu.
-	 *
-	 * @return Menu|null
-	 */
-	public function menuThemes() {
-		if ($this->tree && Site::getPreference('ALLOW_USER_THEMES') && $this->tree->getPreference('ALLOW_THEME_DROPDOWN')) {
-			$submenus = array();
-			foreach (Theme::installedThemes() as $theme) {
-				$class      = 'menu-theme-' . $theme->themeId() . ($theme === $this ? ' active' : '');
-				$submenus[] = new Menu($theme->themeName(), '#', $class, array(
-					'onclick'    => 'return false;',
-					'data-theme' => $theme->themeId(),
-				));
-			}
-
-			usort($submenus, function (Menu $x, Menu $y) {
-				return I18N::strcasecmp($x->getLabel(), $y->getLabel());
-			});
-
-			$menu = new Menu(I18N::translate('Theme'), '#', 'menu-theme', array(), $submenus);
-
-			return $menu;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Create the <meta charset=""> tag.
-	 *
-	 * @return string
-	 */
-	protected function metaCharset() {
-		return '<meta charset="UTF-8">';
-	}
-
-	/**
-	 * Create the <meta name="description"> tag.
-	 *
-	 * @param string $description
-	 *
-	 * @return string
-	 */
-	protected function metaDescription($description) {
-		if ($description) {
-			return '<meta name="description" content="' . $description . '">';
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Create the <meta name="generator"> tag.
-	 *
-	 * @param string $generator
-	 *
-	 * @return string
-	 */
-	protected function metaGenerator($generator) {
-		if ($generator) {
-			return '<meta name="generator" content="' . $generator . '">';
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Create the <meta name="robots"> tag.
-	 *
-	 * @param string $robots
-	 *
-	 * @return string
-	 */
-	protected function metaRobots($robots) {
-		if ($robots) {
-			return '<meta name="robots" content="' . $robots . '">';
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Create the <meta http-equiv="X-UA-Compatible"> tag.
-	 *
-	 * @return string
-	 */
-	protected function metaUaCompatible() {
-		return '<meta http-equiv="X-UA-Compatible" content="IE=edge">';
-	}
-
-	/**
-	 * Create the <meta name="viewport" content="width=device-width, initial-scale=1"> tag.
-	 *
-	 * @return string
-	 */
-	protected function metaViewport() {
-		return '<meta name="viewport" content="width=device-width, initial-scale=1">';
-	}
-
-	/**
-	 * How many times has the current page been shown?
-	 *
-	 * @param  PageController $controller
-	 *
-	 * @return int Number of views, or zero for pages that aren't logged.
-	 */
-	protected function pageViews(PageController $controller) {
-		if ($this->tree && $this->tree->getPreference('SHOW_COUNTER')) {
-			if (isset($controller->record) && $controller->record instanceof GedcomRecord) {
-				return HitCounter::countHit($this->tree, WT_SCRIPT_NAME, $controller->record->getXref());
-			} elseif (isset($controller->root) && $controller->root instanceof GedcomRecord) {
-				return HitCounter::countHit($this->tree, WT_SCRIPT_NAME, $controller->root->getXref());
-			} elseif (WT_SCRIPT_NAME === 'index.php') {
-				if (Auth::check() && Filter::get('ctype') !== 'gedcom') {
-					return HitCounter::countHit($this->tree, WT_SCRIPT_NAME, 'user:' . Auth::id());
-				} else {
-					return HitCounter::countHit($this->tree, WT_SCRIPT_NAME, 'gedcom:' . $this->tree->getTreeId());
-				}
-			}
-		}
-
-		return 0;
-	}
-
-	/**
-	 * Misecellaneous dimensions, fonts, styles, etc.
-	 *
-	 * @param string $parameter_name
-	 *
-	 * @return string|int|float
-	 */
-	public function parameter($parameter_name) {
-		$parameters = array(
-			'chart-background-f'             => 'dddddd',
-			'chart-background-m'             => 'cccccc',
-			'chart-background-u'             => 'eeeeee',
-			'chart-box-x'                    => 250,
-			'chart-box-y'                    => 80,
-			'chart-descendancy-indent'       => 15,
-			'chart-font-color'               => '000000',
-			'chart-font-name'                => WT_ROOT . 'packages/dejavu-fonts-ttf-2.35/ttf/DejaVuSans.ttf',
-			'chart-font-size'                => 7,
-			'chart-spacing-x'                => 5,
-			'chart-spacing-y'                => 10,
-			'compact-chart-box-x'            => 240,
-			'compact-chart-box-y'            => 50,
-			'distribution-chart-high-values' => '555555',
-			'distribution-chart-low-values'  => 'cccccc',
-			'distribution-chart-no-values'   => 'ffffff',
-			'distribution-chart-x'           => 440,
-			'distribution-chart-y'           => 220,
-			'line-width'                     => 1.5,
-			'shadow-blur'                    => 0,
-			'shadow-color'                   => '',
-			'shadow-offset-x'                => 0,
-			'shadow-offset-y'                => 0,
-			'stats-small-chart-x'            => 440,
-			'stats-small-chart-y'            => 125,
-			'stats-large-chart-x'            => 900,
-			'image-dline'                    => $this->assetUrl() . 'images/dline.png',
-			'image-dline2'                   => $this->assetUrl() . 'images/dline2.png',
-			'image-hline'                    => $this->assetUrl() . 'images/hline.png',
-			'image-spacer'                   => $this->assetUrl() . 'images/spacer.png',
-			'image-vline'                    => $this->assetUrl() . 'images/vline.png',
-			'image-minus'                    => $this->assetUrl() . 'images/minus.png',
-			'image-plus'                     => $this->assetUrl() . 'images/plus.png',
-		);
-
-		if (array_key_exists($parameter_name, $parameters)) {
-			return $parameters[$parameter_name];
-		} else {
-			throw new \InvalidArgumentException($parameter_name);
-		}
-	}
-
-	/**
-	 * Are there any pending changes for us to approve?
-	 *
-	 * @return bool
-	 */
-	protected function pendingChangesExist() {
-		return $this->tree && $this->tree->hasPendingEdit() && Auth::isModerator($this->tree);
-	}
-
-	/**
-	 * Create a pending changes link. Some themes prefer an alert/banner to a menu.
-	 *
-	 * @return string
-	 */
-	protected function pendingChangesLink() {
-		return
-			'<a href="#" onclick="window.open(\'edit_changes.php\', \'_blank\', chan_window_specs); return false;">' .
-			$this->pendingChangesLinkText() .
-			'</a>';
-	}
-
-	/**
-	 * Text to use in the pending changes link.
-	 *
-	 * @return string
-	 */
-	protected function pendingChangesLinkText() {
-		return I18N::translate('There are pending changes for you to moderate.');
-	}
-
-	/**
-	 * Generate a list of items for the main menu.
-	 *
-	 * @return Menu[]
-	 */
-	protected function primaryMenu() {
-		global $controller;
-
-		if ($this->tree) {
-			$individual = $controller->getSignificantIndividual();
-
-			return array_filter(array_merge(array(
-				$this->menuHomePage(),
-				$this->menuChart($individual),
-				$this->menuLists($controller->getSignificantSurname()),
-				$this->menuCalendar(),
-				$this->menuReports(),
-				$this->menuSearch(),
-			), $this->menuModules()));
-		} else {
-			// No public trees? No genealogy menu!
-			return array();
-		}
-	}
-
-	/**
-	 * Add markup to the primary menu.
-	 *
-	 * @param Menu[] $menus
-	 *
-	 * @return string
-	 */
-	protected function primaryMenuContainer(array $menus) {
-		return '<nav><ul class="primary-menu">' . $this->primaryMenuContent($menus) . '</ul></nav>';
-	}
-
-	/**
-	 * Create the primary menu.
-	 *
-	 * @param Menu[] $menus
-	 *
-	 * @return string
-	 */
-	protected function primaryMenuContent(array $menus) {
-		return implode('', array_map(function (Menu $menu) {
-			return $menu->getMenuAsList();
-		}, $menus));
-	}
-
-	/**
-	 * Generate a list of items for the user menu.
-	 *
-	 * @return Menu[]
-	 */
-	protected function secondaryMenu() {
-		return array_filter(array(
-			$this->menuPendingChanges(),
-			$this->menuMyPages(),
-			$this->menuFavorites(),
-			$this->menuThemes(),
-			$this->menuLanguages(),
-			$this->menuLogin(),
-			$this->menuLogout(),
-		));
-	}
-
-	/**
-	 * Add markup to the secondary menu.
-	 *
-	 * @param Menu[] $menus
-	 *
-	 * @return string
-	 */
-	protected function secondaryMenuContainer(array $menus) {
-		return '<ul class="nav nav-pills secondary-menu">' . $this->secondaryMenuContent($menus) . '</ul>';
-	}
-
-	/**
-	 * Format the secondary menu.
-	 *
-	 * @param Menu[] $menus
-	 *
-	 * @return string
-	 */
-	protected function secondaryMenuContent(array $menus) {
-		return implode('', array_map(function (Menu $menu) {
-			return $menu->getMenuAsList();
-		}, $menus));
-	}
-
-	/**
-	 * Send any HTTP headers.
-	 */
-	public function sendHeaders() {
-		header('Content-Type: text/html; charset=UTF-8');
-	}
-
-	/**
-	 * A list of CSS files to include for this page.
-	 *
-	 * @return string[]
-	 */
-	protected function stylesheets() {
-		$stylesheets = array(
-			WT_BOOTSTRAP_CSS_URL,
-			WT_FONT_AWESOME_CSS_URL,
-			WT_FONT_AWESOME_RTL_CSS_URL,
-		);
-
-		if (I18N::direction() === 'rtl') {
-			$stylesheets[] = WT_BOOTSTRAP_RTL_CSS_URL;
-		}
-
-		return $stylesheets;
-	}
-
-	/**
-	 * Create the <title> tag.
-	 *
-	 * @param string $title
-	 *
-	 * @return string
-	 */
-	protected function title($title) {
-		return '<title>' . Filter::escapeHtml($title) . '</title>';
-	}
+    /** @var Tree The current tree */
+    protected $tree;
+
+    /** @var string An escaped version of the "ged=XXX" URL parameter */
+    protected $tree_url;
+
+    /** @var int The number of times this page has been shown */
+    protected $page_views;
+
+    /**
+     * Custom themes should place their initialization code in the function hookAfterInit(), not in
+     * the constructor, as all themes get constructed - whether they are used or not.
+     */
+    final public function __construct() {
+    }
+
+    /**
+     * Create accessibility links for the header.
+     *
+     * "Skip to content" allows keyboard only users to navigate over the headers without
+     * pressing TAB many times.
+     *
+     * @return string
+     */
+    protected function accessibilityLinks() {
+        return
+            '<div class="accessibility-links">' .
+            '<a class="sr-only sr-only-focusable btn btn-info btn-sm" href="#content">' .
+            /* I18N: Skip over the headers and menus, to the main content of the page */ I18N::translate('Skip to content') .
+            '</a>' .
+            '</div>';
+    }
+
+    /**
+     * Create scripts for analytics and tracking.
+     *
+     * @return string
+     */
+    protected function analytics() {
+        if ($this->themeId() === '_administration' || !empty($_SERVER['HTTP_DNT'])) {
+            return '';
+        } else {
+            return
+                $this->analyticsBingWebmaster(
+                    Site::getPreference('BING_WEBMASTER_ID')
+                ) .
+                $this->analyticsGoogleWebmaster(
+                    Site::getPreference('GOOGLE_WEBMASTER_ID')
+                ) .
+                $this->analyticsGoogleTracker(
+                    Site::getPreference('GOOGLE_ANALYTICS_ID')
+                ) .
+                $this->analyticsPiwikTracker(
+                    Site::getPreference('PIWIK_URL'),
+                    Site::getPreference('PIWIK_SITE_ID')
+                ) .
+                $this->analyticsStatcounterTracker(
+                    Site::getPreference('STATCOUNTER_PROJECT_ID'),
+                    Site::getPreference('STATCOUNTER_SECURITY_ID')
+                );
+        }
+    }
+
+    /**
+     * Create the verification code for Google Webmaster Tools.
+     *
+     * @param string $verification_id
+     *
+     * @return string
+     */
+    protected function analyticsBingWebmaster($verification_id) {
+        // Only need to add this to the home page.
+        if (WT_SCRIPT_NAME === 'index.php' && $verification_id) {
+            return '<meta name="msvalidate.01" content="' . $verification_id . '">';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Create the verification code for Google Webmaster Tools.
+     *
+     * @param string $verification_id
+     *
+     * @return string
+     */
+    protected function analyticsGoogleWebmaster($verification_id) {
+        // Only need to add this to the home page.
+        if (WT_SCRIPT_NAME === 'index.php' && $verification_id) {
+            return '<meta name="google-site-verification" content="' . $verification_id . '">';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Create the tracking code for Google Analytics.
+     *
+     * See https://developers.google.com/analytics/devguides/collection/analyticsjs/advanced
+     *
+     * @param string $analytics_id
+     *
+     * @return string
+     */
+    protected function analyticsGoogleTracker($analytics_id) {
+        if ($analytics_id) {
+            // Add extra dimensions (i.e. filtering categories)
+            $dimensions = (object) array(
+                'dimension1' => $this->tree ? $this->tree->getName() : '-',
+                'dimension2' => $this->tree ? Auth::accessLevel($this->tree) : '-',
+            );
+
+            return
+                '<script async src="https://www.google-analytics.com/analytics.js"></script>' .
+                '<script>' .
+                'window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;' .
+                'ga("create","' . $analytics_id . '","auto");' .
+                'ga("send", "pageview", ' . json_encode($dimensions) . ');' .
+                '</script>';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Create the tracking code for Piwik Analytics.
+     *
+     * @param string $url     - The domain/path to Piwik
+     * @param string $site_id - The Piwik site identifier
+     *
+     * @return string
+     */
+    protected function analyticsPiwikTracker($url, $site_id) {
+        $url = preg_replace(array('/^https?:\/\//', '/\/$/'), '', $url);
+
+        if ($url && $site_id) {
+            return
+                '<script>' .
+                'var _paq=_paq||[];' .
+                '(function(){var u=(("https:"==document.location.protocol)?"https://' . $url . '/":"http://' . $url . '/");' .
+                '_paq.push(["setSiteId",' . $site_id . ']);' .
+                '_paq.push(["setTrackerUrl",u+"piwik.php"]);' .
+                '_paq.push(["trackPageView"]);' .
+                '_paq.push(["enableLinkTracking"]);' .
+                'var d=document,g=d.createElement("script"),s=d.getElementsByTagName("script")[0];g.defer=true;g.async=true;g.src=u+"piwik.js";' .
+                's.parentNode.insertBefore(g,s);})();' .
+                '</script>';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Create the tracking code for Statcounter.
+     *
+     * @param string $project_id  - The statcounter project ID
+     * @param string $security_id - The statcounter security ID
+     *
+     * @return string
+     */
+    protected function analyticsStatcounterTracker($project_id, $security_id) {
+        if ($project_id && $security_id) {
+            return
+                '<script>' .
+                'var sc_project=' . (int) $project_id . ',sc_invisible=1,sc_security="' . $security_id .
+                '",scJsHost = (("https:"===document.location.protocol)?"https://secure.":"http://www.");' .
+                'document.write("<sc"+"ript src=\'"+scJsHost+"statcounter.com/counter/counter.js\'></"+"script>");' .
+                '</script>';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Create the top of the <body>.
+     *
+     * @return string
+     */
+    public function bodyHeader() {
+        return
+            '<body class="container">' .
+            '<header>' .
+            $this->headerContent() .
+            $this->primaryMenuContainer($this->primaryMenu()) .
+            '</header>' .
+            '<main id="content">' .
+            $this->flashMessagesContainer(FlashMessages::getMessages());
+    }
+
+    /**
+     * Create the top of the <body> (for popup windows).
+     *
+     * @return string
+     */
+    public function bodyHeaderPopupWindow() {
+        return
+            '<body class="container container-popup">' .
+            '<main id="content">' .
+            $this->flashMessagesContainer(FlashMessages::getMessages());
+    }
+
+    /**
+     * Create a contact link for a user.
+     *
+     * @param User $user
+     *
+     * @return string
+     */
+    public function contactLink(User $user) {
+        $method = $user->getPreference('contactmethod');
+
+        switch ($method) {
+        case 'none':
+            return '';
+        case 'mailto':
+            return '<a href="mailto:' . Filter::escapeHtml($user->getEmail()) . '">' . $user->getRealNameHtml() . '</a>';
+        default:
+            return "<a href='#' onclick='message(\"" . Filter::escapeHtml($user->getUserName()) . "\", \"" . $method . "\", \"" . WT_BASE_URL . Filter::escapeHtml(Functions::getQueryUrl()) . "\", \"\");return false;'>" . $user->getRealNameHtml() . '</a>';
+        }
+    }
+
+    /**
+     * Create contact link for both technical and genealogy support.
+     *
+     * @param User $user
+     *
+     * @return string
+     */
+    protected function contactLinkEverything(User $user) {
+        return I18N::translate('For technical support or genealogy questions contact %s.', $this->contactLink($user));
+    }
+
+    /**
+     * Create contact link for genealogy support.
+     *
+     * @param User $user
+     *
+     * @return string
+     */
+    protected function contactLinkGenealogy(User $user) {
+        return I18N::translate('For help with genealogy questions contact %s.', $this->contactLink($user));
+    }
+
+    /**
+     * Create contact link for technical support.
+     *
+     * @param User $user
+     *
+     * @return string
+     */
+    protected function contactLinkTechnical(User $user) {
+        return I18N::translate('For technical support and information contact %s.', $this->contactLink($user));
+    }
+
+    /**
+     * Create contact links for the page footer.
+     *
+     * @return string
+     */
+    protected function contactLinks() {
+        $contact_user   = User::find($this->tree->getPreference('CONTACT_USER_ID'));
+        $webmaster_user = User::find($this->tree->getPreference('WEBMASTER_USER_ID'));
+
+        if ($contact_user && $contact_user === $webmaster_user) {
+            return $this->contactLinkEverything($contact_user);
+        } elseif ($contact_user && $webmaster_user) {
+            return $this->contactLinkGenealogy($contact_user) . '<br>' . $this->contactLinkTechnical($webmaster_user);
+        } elseif ($contact_user) {
+            return $this->contactLinkGenealogy($contact_user);
+        } elseif ($webmaster_user) {
+            return $this->contactLinkTechnical($webmaster_user);
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Create a cookie warning.
+     *
+     * @return string
+     */
+    public function cookieWarning() {
+        if (
+            empty($_SERVER['HTTP_DNT']) &&
+            empty($_COOKIE['cookie']) &&
+            (Site::getPreference('GOOGLE_ANALYTICS_ID') || Site::getPreference('PIWIK_SITE_ID') || Site::getPreference('STATCOUNTER_PROJECT_ID'))
+        ) {
+            return
+                '<div class="cookie-warning">' .
+                I18N::translate('Cookies') . ' - ' .
+                I18N::translate('This website uses cookies to learn about visitor behaviour.') . ' ' .
+                '<button onclick="document.cookie=\'cookie=1\'; this.parentNode.classList.add(\'hidden\');">' . I18N::translate('continue') . '</button>' .
+                '</div>';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Create the <DOCTYPE> tag.
+     *
+     * @return string
+     */
+    public function doctype() {
+        return '<!DOCTYPE html>';
+    }
+
+    /**
+     * HTML link to a "favorites icon".
+     *
+     * @return string
+     */
+    protected function favicon() {
+        return
+            '<link rel="icon" href="' . $this->assetUrl() . 'favicon.png" type="image/png">' .
+            '<link rel="icon" type="image/png" href="' . $this->assetUrl() . 'favicon192.png" sizes="192x192">' .
+            '<link rel="apple-touch-icon" sizes="180x180" href="' . $this->assetUrl() . 'favicon180.png">';
+    }
+
+    /**
+     * Add markup to a flash message.
+     *
+     * @param \stdClass $message
+     *
+     * @return string
+     */
+    protected function flashMessageContainer(\stdClass $message) {
+        return $this->htmlAlert($message->text, $message->status, true);
+    }
+
+    /**
+     * Create a container for messages that are "flashed" to the session
+     * on one request, and displayed on another. If there are many messages,
+     * the container may need a max-height and scroll-bar.
+     *
+     * @param \stdClass[] $messages
+     *
+     * @return string
+     */
+    protected function flashMessagesContainer(array $messages) {
+        $html = '';
+        foreach ($messages as $message) {
+            $html .= $this->flashMessageContainer($message);
+        }
+
+        if ($html) {
+            return '<div class="flash-messages">' . $html . '</div>';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Close the main content and create the <footer> tag.
+     *
+     * @return string
+     */
+    public function footerContainer() {
+        return '</main><footer>' . $this->footerContent() . '</footer>';
+    }
+
+    /**
+     * Close the main content.
+     * Note that popup windows are deprecated
+     *
+     * @return string
+     */
+    public function footerContainerPopupWindow() {
+        return '</main>';
+    }
+
+    /**
+     * Create the contents of the <footer> tag.
+     *
+     * @return string
+     */
+    protected function footerContent() {
+        return
+            $this->formatContactLinks() .
+            $this->logoPoweredBy() .
+            $this->formatPageViews($this->page_views) .
+            $this->cookieWarning();
+    }
+
+    /**
+     * Format the contents of a variable-height home-page block.
+     *
+     * @param string $id
+     * @param string $title
+     * @param string $class
+     * @param string $content
+     *
+     * @return string
+     */
+    public function formatBlock($id, $title, $class, $content) {
+        return
+            '<div id="' . $id . '" class="block" >' .
+            '<div class="blockheader">' . $title . '</div>' .
+            '<div class="blockcontent ' . $class . '">' . $content . '</div>' .
+            '</div>';
+    }
+
+    /**
+     * Add markup to the contact links.
+     *
+     * @return string
+     */
+    protected function formatContactLinks() {
+        if ($this->tree) {
+            return '<div class="contact-links">' . $this->contactLinks() . '</div>';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Add markup to the hit counter.
+     *
+     * @param int $count
+     *
+     * @return string
+     */
+    protected function formatPageViews($count) {
+        if ($count > 0) {
+            return
+                '<div class="page-views">' .
+                I18N::plural('This page has been viewed %s time.', 'This page has been viewed %s times.', $count,
+                    '<span class="odometer">' . I18N::digits($count) . '</span>') .
+                '</div>';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Create a pending changes link for the page footer.
+     *
+     * @return string
+     */
+    protected function formatPendingChangesLink() {
+        if ($this->pendingChangesExist()) {
+            return '<div class="pending-changes-link">' . $this->pendingChangesLink() . '</div>';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Create a quick search form for the header.
+     *
+     * @return string
+     */
+    protected function formQuickSearch() {
+        if ($this->tree) {
+            return
+                '<form action="search.php" class="header-search" role="search">' .
+                '<input type="hidden" name="action" value="header">' .
+                '<input type="hidden" name="ged" value="' . $this->tree->getNameHtml() . '">' .
+                $this->formQuickSearchFields() .
+                '</form>';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Create a search field and submit button for the quick search form in the header.
+     *
+     * @return string
+     */
+    protected function formQuickSearchFields() {
+        return
+            '<input type="search" name="query" size="15" placeholder="' . I18N::translate('Search') . '">' .
+            '<input type="image" src="' . $this->assetUrl() . 'images/go.png" alt="' . I18N::translate('Search') . '">';
+    }
+
+    /**
+     * Add markup to the tree title.
+     *
+     * @return string
+     */
+    protected function formatTreeTitle() {
+        if ($this->tree) {
+            return '<h1 class="header-title">' . $this->tree->getTitleHtml() . '</h1>';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Add markup to the secondary menu.
+     *
+     * @return string
+     */
+    protected function formatSecondaryMenu() {
+        return
+            '<ul class="secondary-menu">' .
+            implode('', $this->secondaryMenu()) .
+            '</ul>';
+    }
+
+    /**
+     * Add markup to an item in the secondary menu.
+     *
+     * @param Menu $menu
+     *
+     * @return string
+     */
+    protected function formatSecondaryMenuItem(Menu $menu) {
+        return $menu->getMenuAsList();
+    }
+
+    /**
+     * Create the <head> tag.
+     *
+     * @param PageController $controller The current controller
+     *
+     * @return string
+     */
+    public function head(PageController $controller) {
+        // Record this now. By the time we render the footer, $controller no longer exists.
+        $this->page_views = $this->pageViews($controller);
+
+        return
+            '<head>' .
+            $this->headContents($controller) .
+            $this->hookHeaderExtraContent() .
+            $this->analytics() .
+            '</head>';
+    }
+
+    /**
+     * Create the contents of the <head> tag.
+     *
+     * @param PageController $controller The current controller
+     *
+     * @return string
+     */
+    protected function headContents(PageController $controller) {
+        // The title often includes the names of records, which may include HTML markup.
+        $title = Filter::unescapeHtml($controller->getPageTitle());
+
+        // If an extra (site) title is specified, append it.
+        if ($this->tree && $this->tree->getPreference('META_TITLE')) {
+            $title .= ' – ' . $this->tree->getPreference('META_TITLE');
+        }
+
+        $html =
+            // modernizr.js and respond.js need to be loaded before the <body> to avoid FOUC
+            '<!--[if IE 8]><script src="' . WT_MODERNIZR_JS_URL . '"></script><![endif]-->' .
+            '<!--[if IE 8]><script src="' . WT_RESPOND_JS_URL . '"></script><![endif]-->' .
+            $this->metaCharset() .
+            $this->title($title) .
+            $this->favicon() .
+            $this->metaViewport() .
+            $this->metaRobots($controller->getMetaRobots()) .
+            $this->metaUaCompatible() .
+            $this->metaGenerator(WT_WEBTREES . ' ' . WT_VERSION . ' - ' . WT_WEBTREES_URL);
+
+        if ($this->tree) {
+            $html .= $this->metaDescription($this->tree->getPreference('META_DESCRIPTION'));
+        }
+
+        // CSS files
+        foreach ($this->stylesheets() as $css) {
+            $html .= '<link rel="stylesheet" type="text/css" href="' . $css . '">';
+        }
+
+        return $html;
+    }
+
+    /**
+     * Create the contents of the <header> tag.
+     *
+     * @return string
+     */
+    protected function headerContent() {
+        return
+            //$this->accessibilityLinks() .
+            $this->logoHeader() .
+            $this->secondaryMenuContainer($this->secondaryMenu()) .
+            $this->formatTreeTitle() .
+            $this->formQuickSearch();
+    }
+
+    /**
+     * Create the <header> tag for a popup window.
+     *
+     * @return string
+     */
+    protected function headerSimple() {
+        return
+            $this->flashMessagesContainer(FlashMessages::getMessages()) .
+            '<div id="content">';
+    }
+
+    /**
+     * Allow themes to do things after initialization (since they cannot use
+     * the constructor).
+     */
+    public function hookAfterInit() {
+    }
+
+    /**
+     * Allow themes to add extra scripts to the page footer.
+     *
+     * @return string
+     */
+    public function hookFooterExtraJavascript() {
+        return '';
+    }
+
+    /**
+     * Allow themes to add extra content to the page header.
+     * Typically this will be additional CSS.
+     *
+     * @return string
+     */
+    public function hookHeaderExtraContent() {
+        return '';
+    }
+
+    /**
+     * Create the <html> tag.
+     *
+     * @return string
+     */
+    public function html() {
+        return '<html ' . I18N::htmlAttributes() . '>';
+    }
+
+    /**
+     * Add HTML markup to create an alert
+     *
+     * @param string $html        The content of the alert
+     * @param string $level       One of 'success', 'info', 'warning', 'danger'
+     * @param bool   $dismissible If true, add a close button.
+     *
+     * @return string
+     */
+    public function htmlAlert($html, $level, $dismissible) {
+        if ($dismissible) {
+            return
+                '<div class="alert alert-' . $level . ' alert-dismissible" role="alert">' .
+                '<button type="button" class="close" data-dismiss="alert" aria-label="' . I18N::translate('close') . '">' .
+                '<span aria-hidden="true">&times;</span>' .
+                '</button>' .
+                $html .
+                '</div>';
+        } else {
+            return
+                '<div class="alert alert-' . $level . '" role="alert">' .
+                $html .
+                '</div>';
+        }
+    }
+
+    /**
+     * Display an icon for this fact.
+     *
+     * @param Fact $fact
+     *
+     * @return string
+     */
+    public function icon(Fact $fact) {
+        $icon = 'images/facts/' . $fact->getTag() . '.png';
+        $dir  = substr($this->assetUrl(), strlen(WT_STATIC_URL));
+        if (file_exists($dir . $icon)) {
+            return '<img src="' . $this->assetUrl() . $icon . '" title="' . GedcomTag::getLabel($fact->getTag()) . '">';
+        } elseif (file_exists($dir . 'images/facts/NULL.png')) {
+            // Spacer image - for alignment - until we move to a sprite.
+            return '<img src="' . Theme::theme()->assetUrl() . 'images/facts/NULL.png">';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Display an individual in a box - for charts, etc.
+     *
+     * @param Individual $individual
+     *
+     * @return string
+     */
+    public function individualBox(Individual $individual) {
+        $personBoxClass = array_search($individual->getSex(), array('person_box' => 'M', 'person_boxF' => 'F', 'person_boxNN' => 'U'));
+        if ($individual->canShow() && $individual->getTree()->getPreference('SHOW_HIGHLIGHT_IMAGES')) {
+            $thumbnail = $individual->displayImage();
+        } else {
+            $thumbnail = '';
+        }
+
+        $content = '<span class="namedef name1">' . $individual->getFullName() . '</span>';
+        $icons   = '';
+        if ($individual->canShow()) {
+            $content =
+                '<a href="' . $individual->getHtmlUrl() . '">' . $content . '</a>' .
+                '<div class="namedef name1">' . $individual->getAddName() . '</div>';
+            $icons   =
+                '<div class="noprint icons">' .
+                '<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' .
+                '<div class="itr"><i class="icon-pedigree"></i><div class="popup">' .
+                '<ul class="' . $personBoxClass . '">' . implode('', $this->individualBoxMenu($individual)) . '</ul>' .
+                '</div>' .
+                '</div>' .
+                '</div>';
+        }
+
+        return
+            '<div data-pid="' . $individual->getXref() . '" class="person_box_template ' . $personBoxClass . ' box-style1" style="width: ' . $this->parameter('chart-box-x') . 'px; min-height: ' . $this->parameter('chart-box-y') . 'px">' .
+            $icons .
+            '<div class="chart_textbox" style="max-height:' . $this->parameter('chart-box-y') . 'px;">' .
+            $thumbnail .
+            $content .
+            '<div class="inout2 details1">' . $this->individualBoxFacts($individual) . '</div>' .
+            '</div>' .
+            '<div class="inout"></div>' .
+            '</div>';
+    }
+
+    /**
+     * Display an empty box - for a missing individual in a chart.
+     *
+     * @return string
+     */
+    public function individualBoxEmpty() {
+        return '<div class="person_box_template person_boxNN box-style1" style="width: ' . $this->parameter('chart-box-x') . 'px; min-height: ' . $this->parameter('chart-box-y') . 'px"></div>';
+    }
+
+    /**
+     * Display an individual in a box - for charts, etc.
+     *
+     * @param Individual $individual
+     *
+     * @return string
+     */
+    public function individualBoxLarge(Individual $individual) {
+        $personBoxClass = array_search($individual->getSex(), array('person_box' => 'M', 'person_boxF' => 'F', 'person_boxNN' => 'U'));
+        if ($individual->getTree()->getPreference('SHOW_HIGHLIGHT_IMAGES')) {
+            $thumbnail = $individual->displayImage();
+        } else {
+            $thumbnail = '';
+        }
+
+        $content = '<span class="namedef name1">' . $individual->getFullName() . '</span>';
+        $icons   = '';
+        if ($individual->canShow()) {
+            $content =
+                '<a href="' . $individual->getHtmlUrl() . '">' . $content . '</a>' .
+                '<div class="namedef name2">' . $individual->getAddName() . '</div>';
+            $icons   =
+                '<div class="noprint icons">' .
+                '<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' .
+                '<div class="itr"><i class="icon-pedigree"></i><div class="popup">' .
+                '<ul class="' . $personBoxClass . '">' . implode('', $this->individualBoxMenu($individual)) . '</ul>' .
+                '</div>' .
+                '</div>' .
+                '</div>';
+        }
+
+        return
+            '<div data-pid="' . $individual->getXref() . '" class="person_box_template ' . $personBoxClass . ' box-style2">' .
+            $icons .
+            '<div class="chart_textbox" style="max-height:' . $this->parameter('chart-box-y') . 'px;">' .
+            $thumbnail .
+            $content .
+            '<div class="inout2 details2">' . $this->individualBoxFacts($individual) . '</div>' .
+            '</div>' .
+            '<div class="inout"></div>' .
+            '</div>';
+    }
+
+    /**
+     * Display an individual in a box - for charts, etc.
+     *
+     * @param Individual $individual
+     *
+     * @return string
+     */
+    public function individualBoxSmall(Individual $individual) {
+        $personBoxClass = array_search($individual->getSex(), array('person_box' => 'M', 'person_boxF' => 'F', 'person_boxNN' => 'U'));
+        if ($individual->getTree()->getPreference('SHOW_HIGHLIGHT_IMAGES')) {
+            $thumbnail = $individual->displayImage();
+        } else {
+            $thumbnail = '';
+        }
+
+        return
+            '<div data-pid="' . $individual->getXref() . '" class="person_box_template ' . $personBoxClass . ' iconz box-style0" style="width: ' . $this->parameter('compact-chart-box-x') . 'px; min-height: ' . $this->parameter('compact-chart-box-y') . 'px">' .
+            '<div class="compact_view">' .
+            $thumbnail .
+            '<a href="' . $individual->getHtmlUrl() . '">' .
+            '<span class="namedef name0">' . $individual->getFullName() . '</span>' .
+            '</a>' .
+            '<div class="inout2 details0">' . $individual->getLifeSpan() . '</div>' .
+            '</div>' .
+            '<div class="inout"></div>' .
+            '</div>';
+    }
+
+    /**
+     * Display an individual in a box - for charts, etc.
+     *
+     * @return string
+     */
+    public function individualBoxSmallEmpty() {
+        return '<div class="person_box_template person_boxNN box-style1" style="width: ' . $this->parameter('compact-chart-box-x') . 'px; min-height: ' . $this->parameter('compact-chart-box-y') . 'px"></div>';
+    }
+
+    /**
+     * Generate the facts, for display in charts.
+     *
+     * @param Individual $individual
+     *
+     * @return string
+     */
+    protected function individualBoxFacts(Individual $individual) {
+        $html = '';
+
+        $opt_tags = preg_split('/\W/', $individual->getTree()->getPreference('CHART_BOX_TAGS'), 0, PREG_SPLIT_NO_EMPTY);
+        // Show BIRT or equivalent event
+        foreach (explode('|', WT_EVENTS_BIRT) as $birttag) {
+            if (!in_array($birttag, $opt_tags)) {
+                $event = $individual->getFirstFact($birttag);
+                if ($event) {
+                    $html .= $event->summary();
+                    break;
+                }
+            }
+        }
+        // Show optional events (before death)
+        foreach ($opt_tags as $key => $tag) {
+            if (!preg_match('/^(' . WT_EVENTS_DEAT . ')$/', $tag)) {
+                $event = $individual->getFirstFact($tag);
+                if (!is_null($event)) {
+                    $html .= $event->summary();
+                    unset($opt_tags[$key]);
+                }
+            }
+        }
+        // Show DEAT or equivalent event
+        foreach (explode('|', WT_EVENTS_DEAT) as $deattag) {
+            $event = $individual->getFirstFact($deattag);
+            if ($event) {
+                $html .= $event->summary();
+                if (in_array($deattag, $opt_tags)) {
+                    unset($opt_tags[array_search($deattag, $opt_tags)]);
+                }
+                break;
+            }
+        }
+        // Show remaining optional events (after death)
+        foreach ($opt_tags as $tag) {
+            $event = $individual->getFirstFact($tag);
+            if ($event) {
+                $html .= $event->summary();
+            }
+        }
+
+        return $html;
+    }
+
+    /**
+     * Generate the LDS summary, for display in charts.
+     *
+     * @param Individual $individual
+     *
+     * @return string
+     */
+    protected function individualBoxLdsSummary(Individual $individual) {
+        if ($individual->getTree()->getPreference('SHOW_LDS_AT_GLANCE')) {
+            $BAPL = $individual->getFacts('BAPL') ? 'B' : '_';
+            $ENDL = $individual->getFacts('ENDL') ? 'E' : '_';
+            $SLGC = $individual->getFacts('SLGC') ? 'C' : '_';
+            $SLGS = '_';
+
+            foreach ($individual->getSpouseFamilies() as $family) {
+                if ($family->getFacts('SLGS')) {
+                    $SLGS = '';
+                }
+            }
+
+            return $BAPL . $ENDL . $SLGS . $SLGC;
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Links, to show in chart boxes;
+     *
+     * @param Individual $individual
+     *
+     * @return Menu[]
+     */
+    public function individualBoxMenu(Individual $individual) {
+        $menus = array_merge(
+            $this->individualBoxMenuCharts($individual),
+            $this->individualBoxMenuFamilyLinks($individual)
+        );
+
+        return $menus;
+    }
+
+    /**
+     * Chart links, to show in chart boxes;
+     *
+     * @param Individual $individual
+     *
+     * @return Menu[]
+     */
+    protected function individualBoxMenuCharts(Individual $individual) {
+        $menus = array();
+        foreach (Module::getActiveCharts($this->tree) as $chart) {
+            $menu = $chart->getBoxChartMenu($individual);
+            if ($menu) {
+                $menus[] = $menu;
+            }
+        }
+
+        usort($menus, function (Menu $x, Menu $y) {
+            return I18N::strcasecmp($x->getLabel(), $y->getLabel());
+        });
+
+        return $menus;
+    }
+
+    /**
+     * Family links, to show in chart boxes.
+     *
+     * @param Individual $individual
+     *
+     * @return Menu[]
+     */
+    protected function individualBoxMenuFamilyLinks(Individual $individual) {
+        $menus = array();
+
+        foreach ($individual->getSpouseFamilies() as $family) {
+            $menus[] = new Menu('<strong>' . I18N::translate('Family with spouse') . '</strong>', $family->getHtmlUrl());
+            $spouse  = $family->getSpouse($individual);
+            if ($spouse && $spouse->canShowName()) {
+                $menus[] = new Menu($spouse->getFullName(), $spouse->getHtmlUrl());
+            }
+            foreach ($family->getChildren() as $child) {
+                if ($child->canShowName()) {
+                    $menus[] = new Menu($child->getFullName(), $child->getHtmlUrl());
+                }
+            }
+        }
+
+        return $menus;
+    }
+
+    /**
+     * Create part of an individual box
+     *
+     * @param Individual $individual
+     *
+     * @return string
+     */
+    protected function individualBoxSexSymbol(Individual $individual) {
+        if ($individual->getTree()->getPreference('PEDIGREE_SHOW_GENDER')) {
+            return $individual->sexImage('large');
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Initialise the theme. We cannot pass these in a constructor, as the construction
+     * happens in a theme file, and we need to be able to change it.
+     *
+     * @param Tree|null $tree The current tree (if there is one).
+     */
+    final public function init(Tree $tree = null) {
+        $this->tree     = $tree;
+        $this->tree_url = $tree ? 'ged=' . $tree->getNameUrl() : '';
+
+        $this->hookAfterInit();
+    }
+
+    /**
+     * A large webtrees logo, for the header.
+     *
+     * @return string
+     */
+    protected function logoHeader() {
+        return '<div class="header-logo"></div>';
+    }
+
+    /**
+     * A small "powered by webtrees" logo for the footer.
+     *
+     * @return string
+     */
+    protected function logoPoweredBy() {
+        return '<a href="' . WT_WEBTREES_URL . '" class="powered-by-webtrees" title="' . WT_WEBTREES_URL . '"></a>';
+    }
+
+    /**
+     * A menu for the day/month/year calendar views.
+     *
+     * @return Menu
+     */
+    protected function menuCalendar() {
+        return new Menu(I18N::translate('Calendar'), '#', 'menu-calendar', array('rel' => 'nofollow'), array(
+            // Day view
+            new Menu(I18N::translate('Day'), 'calendar.php?' . $this->tree_url . '&amp;view=day', 'menu-calendar-day', array('rel' => 'nofollow')),
+            // Month view
+            new Menu(I18N::translate('Month'), 'calendar.php?' . $this->tree_url . '&amp;view=month', 'menu-calendar-month', array('rel' => 'nofollow')),
+            //Year view
+            new Menu(I18N::translate('Year'), 'calendar.php?' . $this->tree_url . '&amp;view=year', 'menu-calendar-year', array('rel' => 'nofollow')),
+        ));
+    }
+
+    /**
+     * Generate a menu item to change the blocks on the current (index.php) page.
+     *
+     * @return Menu|null
+     */
+    protected function menuChangeBlocks() {
+        if (WT_SCRIPT_NAME === 'index.php' && Auth::check() && Filter::get('ctype', 'gedcom|user', 'user') === 'user') {
+            return new Menu(I18N::translate('Customize this page'), 'index_edit.php?user_id=' . Auth::id(), 'menu-change-blocks');
+        } elseif (WT_SCRIPT_NAME === 'index.php' && Auth::isManager($this->tree)) {
+            return new Menu(I18N::translate('Customize this page'), 'index_edit.php?gedcom_id=' . $this->tree->getTreeId(), 'menu-change-blocks');
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Generate a menu for each of the different charts.
+     *
+     * @param Individual $individual
+     *
+     * @return Menu|null
+     */
+    protected function menuChart(Individual $individual) {
+        $submenus = array();
+        foreach (Module::getActiveCharts($this->tree) as $chart) {
+            $menu = $chart->getChartMenu($individual);
+            if ($menu) {
+                $submenus[] = $menu;
+            }
+        }
+
+        if ($submenus) {
+            usort($submenus, function (Menu $x, Menu $y) {
+                return I18N::strcasecmp($x->getLabel(), $y->getLabel());
+            });
+
+            return new Menu(I18N::translate('Charts'), '#', 'menu-chart', array('rel' => 'nofollow'), $submenus);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Generate a menu item for the ancestors chart.
+     *
+     * @param Individual $individual
+     *
+     * @return Menu|null
+     *
+     * @deprecated
+     */
+    protected function menuChartAncestors(Individual $individual) {
+        $chart = new AncestorsChartModule(WT_ROOT . WT_MODULES_DIR . 'ancestors_chart');
+
+        return $chart->getChartMenu($individual);
+    }
+
+    /**
+     * Generate a menu item for the compact tree.
+     *
+     * @param Individual $individual
+     *
+     * @return Menu|null
+     *
+     * @deprecated
+     */
+    protected function menuChartCompact(Individual $individual) {
+        $chart = new CompactTreeChartModule(WT_ROOT . WT_MODULES_DIR . 'compact_tree_chart');
+
+        return $chart->getChartMenu($individual);
+    }
+
+    /**
+     * Generate a menu item for the descendants chart.
+     *
+     * @param Individual $individual
+     *
+     * @return Menu|null
+     *
+     * @deprecated
+     */
+    protected function menuChartDescendants(Individual $individual) {
+        $chart = new DescendancyChartModule(WT_ROOT . WT_MODULES_DIR . 'descendancy_chart');
+
+        return $chart->getChartMenu($individual);
+    }
+
+    /**
+     * Generate a menu item for the family-book chart.
+     *
+     * @param Individual $individual
+     *
+     * @return Menu|null
+     *
+     * @deprecated
+     */
+    protected function menuChartFamilyBook(Individual $individual) {
+        $chart = new FamilyBookChartModule(WT_ROOT . WT_MODULES_DIR . 'family_book_chart');
+
+        return $chart->getChartMenu($individual);
+    }
+
+    /**
+     * Generate a menu item for the fan chart.
+     *
+     * We can only do this if the GD2 library is installed with TrueType support.
+     *
+     * @param Individual $individual
+     *
+     * @return Menu|null
+     *
+     * @deprecated
+     */
+    protected function menuChartFanChart(Individual $individual) {
+        $chart = new FanChartModule(WT_ROOT . WT_MODULES_DIR . 'fan_chart');
+
+        return $chart->getChartMenu($individual);
+    }
+
+    /**
+     * Generate a menu item for the interactive tree.
+     *
+     * @param Individual $individual
+     *
+     * @return Menu|null
+     *
+     * @deprecated
+     */
+    protected function menuChartInteractiveTree(Individual $individual) {
+        $chart = new InteractiveTreeModule(WT_ROOT . WT_MODULES_DIR . 'tree');
+
+        return $chart->getChartMenu($individual);
+    }
+
+    /**
+     * Generate a menu item for the hourglass chart.
+     *
+     * @param Individual $individual
+     *
+     * @return Menu|null
+     *
+     * @deprecated
+     */
+    protected function menuChartHourglass(Individual $individual) {
+        $chart = new HourglassChartModule(WT_ROOT . WT_MODULES_DIR . 'hourglass_chart');
+
+        return $chart->getChartMenu($individual);
+    }
+
+    /**
+     * Generate a menu item for the lifepsan chart.
+     *
+     * @param Individual $individual
+     *
+     * @return Menu|null
+     *
+     * @deprecated
+     */
+    protected function menuChartLifespan(Individual $individual) {
+        $chart = new LifespansChartModule(WT_ROOT . WT_MODULES_DIR . 'lifespans_chart');
+
+        return $chart->getChartMenu($individual);
+    }
+
+    /**
+     * Generate a menu item for the pedigree chart.
+     *
+     * @param Individual $individual
+     *
+     * @return Menu|null
+     *
+     * @deprecated
+     */
+    protected function menuChartPedigree(Individual $individual) {
+        $chart = new PedigreeChartModule(WT_ROOT . WT_MODULES_DIR . 'pedigree_chart');
+
+        return $chart->getChartMenu($individual);
+    }
+
+    /**
+     * Generate a menu item for the pedigree map.
+     *
+     * @param Individual $individual
+     *
+     * @return Menu|null
+     *
+     * @deprecated
+     */
+    protected function menuChartPedigreeMap(Individual $individual) {
+        $chart = new GoogleMapsModule(WT_ROOT . WT_MODULES_DIR . 'googlemap');
+
+        return $chart->getChartMenu($individual);
+    }
+
+    /**
+     * Generate a menu item for the relationship chart.
+     *
+     * @param Individual $individual
+     *
+     * @return Menu|null
+     *
+     * @deprecated
+     */
+    protected function menuChartRelationship(Individual $individual) {
+        $chart = new RelationshipsChartModule(WT_ROOT . WT_MODULES_DIR . 'relationships_chart');
+
+        return $chart->getChartMenu($individual);
+    }
+
+    /**
+     * Generate a menu item for the statistics charts.
+     *
+     * @return Menu|null
+     *
+     * @deprecated
+     */
+    protected function menuChartStatistics() {
+        $chart = new StatisticsChartModule(WT_ROOT . WT_MODULES_DIR . 'statistics_chart');
+
+        return $chart->getChartMenu(null);
+    }
+
+    /**
+     * Generate a menu item for the timeline chart.
+     *
+     * @param Individual $individual
+     *
+     * @return Menu|null
+     *
+     * @deprecated
+     */
+    protected function menuChartTimeline(Individual $individual) {
+        $chart = new TimelineChartModule(WT_ROOT . WT_MODULES_DIR . 'timeline_chart');
+
+        return $chart->getChartMenu($individual);
+    }
+
+    /**
+     * Generate a menu item for the control panel.
+     *
+     * @return Menu|null
+     */
+    protected function menuControlPanel() {
+        if (Auth::isManager($this->tree)) {
+            return new Menu(I18N::translate('Control panel'), 'admin.php', 'menu-admin');
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Favorites menu.
+     *
+     * @return Menu|null
+     */
+    protected function menuFavorites() {
+        global $controller;
+
+        $show_user_favorites = $this->tree && Module::getModuleByName('user_favorites') && Auth::check();
+        $show_tree_favorites = $this->tree && Module::getModuleByName('gedcom_favorites');
+
+        if ($show_user_favorites && $show_tree_favorites) {
+            $favorites = array_merge(
+                FamilyTreeFavoritesModule::getFavorites($this->tree->getTreeId()),
+                UserFavoritesModule::getFavorites(Auth::id())
+            );
+        } elseif ($show_user_favorites) {
+            $favorites = UserFavoritesModule::getFavorites(Auth::id());
+        } elseif ($show_tree_favorites) {
+            $favorites = FamilyTreeFavoritesModule::getFavorites($this->tree->getTreeId());
+        } else {
+            $favorites = array();
+        }
+
+        $submenus = array();
+        $records  = array();
+        foreach ($favorites as $favorite) {
+            switch ($favorite['type']) {
+            case 'URL':
+                $submenus[] = new Menu($favorite['title'], $favorite['url']);
+                break;
+            case 'INDI':
+            case 'FAM':
+            case 'SOUR':
+            case 'OBJE':
+            case 'NOTE':
+                $record = GedcomRecord::getInstance($favorite['gid'], $this->tree);
+                if ($record && $record->canShowName()) {
+                    $submenus[] = new Menu($record->getFullName(), $record->getHtmlUrl());
+                    $records[]  = $record;
+                }
+                break;
+            }
+        }
+
+        if ($show_user_favorites && isset($controller->record) && $controller->record instanceof GedcomRecord && !in_array($controller->record, $records)) {
+            $submenus[] = new Menu(I18N::translate('Add to favorites'), '#', '', array(
+                'onclick' => 'jQuery.post("module.php?mod=user_favorites&mod_action=menu-add-favorite", {xref:"' . $controller->record->getXref() . '"},function(){location.reload();})',
+            ));
+        }
+
+        if (empty($submenus)) {
+            return null;
+        } else {
+            return new Menu(I18N::translate('Favorites'), '#', 'menu-favorites', array(), $submenus);
+        }
+    }
+
+    /**
+     * A menu for the home (family tree) pages.
+     *
+     * @return Menu
+     */
+    protected function menuHomePage() {
+        if (count(Tree::getAll()) === 1 || Site::getPreference('ALLOW_CHANGE_GEDCOM') === '0') {
+            return new Menu(I18N::translate('Family tree'), 'index.php?ctype=gedcom&amp;' . $this->tree_url, 'menu-tree');
+        } else {
+            $submenus = array();
+            foreach (Tree::getAll() as $tree) {
+                if ($tree == $this->tree) {
+                    $active = 'active ';
+                } else {
+                    $active = '';
+                }
+                $submenus[] = new Menu($tree->getTitleHtml(), 'index.php?ctype=gedcom&amp;ged=' . $tree->getNameUrl(), $active . 'menu-tree-' . $tree->getTreeId());
+            }
+
+            return new Menu(I18N::translate('Family trees'), '#', 'menu-tree', array(), $submenus);
+        }
+    }
+
+    /**
+     * A menu to show a list of available languages.
+     *
+     * @return Menu|null
+     */
+    protected function menuLanguages() {
+        $menu = new Menu(I18N::translate('Language'), '#', 'menu-language');
+
+        foreach (I18N::activeLocales() as $locale) {
+            $language_tag = $locale->languageTag();
+            $class        = 'menu-language-' . $language_tag . (WT_LOCALE === $language_tag ? ' active' : '');
+            $menu->addSubmenu(new Menu($locale->endonym(), '#', $class, array(
+                'onclick'       => 'return false;',
+                'data-language' => $language_tag,
+            )));
+        }
+
+        if (count($menu->getSubmenus()) > 1) {
+            return $menu;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Create a menu to show lists of individuals, families, sources, etc.
+     *
+     * @param string $surname The significant surname on the page
+     *
+     * @return Menu
+     */
+    protected function menuLists($surname) {
+        // Do not show empty lists
+        $row = Database::prepare(
+            "SELECT" .
+            " EXISTS(SELECT 1 FROM `##sources` WHERE s_file = ?) AS sour," .
+            " EXISTS(SELECT 1 FROM `##other` WHERE o_file = ? AND o_type='REPO') AS repo," .
+            " EXISTS(SELECT 1 FROM `##other` WHERE o_file = ? AND o_type='NOTE') AS note," .
+            " EXISTS(SELECT 1 FROM `##media` WHERE m_file = ?) AS obje"
+        )->execute(array(
+            $this->tree->getTreeId(),
+            $this->tree->getTreeId(),
+            $this->tree->getTreeId(),
+            $this->tree->getTreeId(),
+        ))->fetchOneRow();
+
+        $submenus = array(
+            $this->menuListsIndividuals($surname),
+            $this->menuListsFamilies($surname),
+            $this->menuListsBranches($surname),
+            $this->menuListsPlaces(),
+        );
+        if ($row->obje) {
+            $submenus[] = $this->menuListsMedia();
+        }
+        if ($row->repo) {
+            $submenus[] = $this->menuListsRepositories();
+        }
+        if ($row->sour) {
+            $submenus[] = $this->menuListsSources();
+        }
+        if ($row->note) {
+            $submenus[] = $this->menuListsNotes();
+        }
+
+        uasort($submenus, function (Menu $x, Menu $y) {
+            return I18N::strcasecmp($x->getLabel(), $y->getLabel());
+        });
+
+        return new Menu(I18N::translate('Lists'), '#', 'menu-list', array(), $submenus);
+    }
+
+    /**
+     * A menu for the list of branches
+     *
+     * @param string $surname The significant surname on the page
+     *
+     * @return Menu
+     */
+    protected function menuListsBranches($surname) {
+        return new Menu(I18N::translate('Branches'), 'branches.php?ged=' . $this->tree->getNameUrl() . '&amp;surname=' . rawurlencode($surname), 'menu-branches', array('rel' => 'nofollow'));
+    }
+
+    /**
+     * A menu for the list of families
+     *
+     * @param string $surname The significant surname on the page
+     *
+     * @return Menu
+     */
+    protected function menuListsFamilies($surname) {
+        return new Menu(I18N::translate('Families'), 'famlist.php?ged=' . $this->tree->getNameUrl() . '&amp;surname=' . rawurlencode($surname), 'menu-list-fam', array('rel' => 'nofollow'));
+    }
+
+    /**
+     * A menu for the list of individuals
+     *
+     * @param string $surname The significant surname on the page
+     *
+     * @return Menu
+     */
+    protected function menuListsIndividuals($surname) {
+        return new Menu(I18N::translate('Individuals'), 'indilist.php?ged=' . $this->tree->getNameUrl() . '&amp;surname=' . rawurlencode($surname), 'menu-list-indi');
+    }
+
+    /**
+     * A menu for the list of media objects
+     *
+     * @return Menu
+     */
+    protected function menuListsMedia() {
+        return new Menu(I18N::translate('Media objects'), 'medialist.php?' . $this->tree_url, 'menu-list-obje', array('rel' => 'nofollow'));
+    }
+
+    /**
+     * A menu for the list of notes
+     *
+     * @return Menu
+     */
+    protected function menuListsNotes() {
+        return new Menu(I18N::translate('Shared notes'), 'notelist.php?' . $this->tree_url, 'menu-list-note', array('rel' => 'nofollow'));
+    }
+
+    /**
+     * A menu for the list of individuals
+     *
+     * @return Menu
+     */
+    protected function menuListsPlaces() {
+        return new Menu(I18N::translate('Place hierarchy'), 'placelist.php?ged=' . $this->tree->getNameUrl(), 'menu-list-plac', array('rel' => 'nofollow'));
+    }
+
+    /**
+     * A menu for the list of repositories
+     *
+     * @return Menu
+     */
+    protected function menuListsRepositories() {
+        return new Menu(I18N::translate('Repositories'), 'repolist.php?' . $this->tree_url, 'menu-list-repo', array('rel' => 'nofollow'));
+    }
+
+    /**
+     * A menu for the list of sources
+     *
+     * @return Menu
+     */
+    protected function menuListsSources() {
+        return new Menu(I18N::translate('Sources'), 'sourcelist.php?' . $this->tree_url, 'menu-list-sour', array('rel' => 'nofollow'));
+    }
+
+    /**
+     * A login menu option (or null if we are already logged in).
+     *
+     * @return Menu|null
+     */
+    protected function menuLogin() {
+        if (Auth::check() || WT_SCRIPT_NAME === 'login.php') {
+            return null;
+        } else {
+            return new Menu(I18N::translate('Sign in'), WT_LOGIN_URL . '?url=' . rawurlencode(Functions::getQueryUrl()), 'menu-login', array('rel' => 'nofollow'));
+        }
+    }
+
+    /**
+     * A logout menu option (or null if we are already logged out).
+     *
+     * @return Menu|null
+     */
+    protected function menuLogout() {
+        if (Auth::check()) {
+            return new Menu(I18N::translate('Sign out'), 'logout.php', 'menu-logout');
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Get the additional menus created by each of the modules
+     *
+     * @return Menu[]
+     */
+    protected function menuModules() {
+        $menus = array();
+        foreach (Module::getActiveMenus($this->tree) as $module) {
+            $menus[] = $module->getMenu();
+        }
+
+        return array_filter($menus);
+    }
+
+    /**
+     * A link to allow users to edit their account settings (edituser.php).
+     *
+     * @return Menu|null
+     */
+    protected function menuMyAccount() {
+        if (Auth::check()) {
+            return new Menu(I18N::translate('My account'), 'edituser.php');
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * A link to the user's individual record (individual.php).
+     *
+     * @return Menu|null
+     */
+    protected function menuMyIndividualRecord() {
+        $gedcomid = $this->tree->getUserPreference(Auth::user(), 'gedcomid');
+
+        if ($gedcomid) {
+            return new Menu(I18N::translate('My individual record'), 'individual.php?pid=' . $gedcomid . '&amp;' . $this->tree_url, 'menu-myrecord');
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * A link to the user's personal home page.
+     *
+     * @return Menu
+     */
+    protected function menuMyPage() {
+        return new Menu(I18N::translate('My page'), 'index.php?ctype=user&amp;' . $this->tree_url, 'menu-mypage');
+    }
+
+    /**
+     * A menu for the user's personal pages.
+     *
+     * @return Menu|null
+     */
+    protected function menuMyPages() {
+        if (Auth::id()) {
+            return new Menu(I18N::translate('My pages'), '#', 'menu-mymenu', array(), array_filter(array(
+                $this->menuMyPage(),
+                $this->menuMyIndividualRecord(),
+                $this->menuMyPedigree(),
+                $this->menuMyAccount(),
+                $this->menuControlPanel(),
+                $this->menuChangeBlocks(),
+            )));
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * A link to the user's individual record.
+     *
+     * @return Menu|null
+     */
+    protected function menuMyPedigree() {
+        $gedcomid = $this->tree->getUserPreference(Auth::user(), 'gedcomid');
+
+        if ($gedcomid && Module::isActiveChart($this->tree, 'pedigree_chart')) {
+            $showFull   = $this->tree->getPreference('PEDIGREE_FULL_DETAILS') ? 1 : 0;
+            $showLayout = $this->tree->getPreference('PEDIGREE_LAYOUT') ? 1 : 0;
+
+            return new Menu(
+                I18N::translate('My pedigree'),
+                'pedigree.php?' . $this->tree_url . '&amp;rootid=' . $gedcomid . '&amp;show_full=' . $showFull . '&amp;talloffset=' . $showLayout,
+                'menu-mypedigree'
+            );
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Create a pending changes menu.
+     *
+     * @return Menu|null
+     */
+    protected function menuPendingChanges() {
+        if ($this->pendingChangesExist()) {
+            $menu = new Menu(I18N::translate('Pending changes'), '#', 'menu-pending', array('onclick' => 'window.open("edit_changes.php", "_blank", chan_window_specs); return false;'));
+
+            return $menu;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * A menu with a list of reports.
+     *
+     * @return Menu|null
+     */
+    protected function menuReports() {
+        $submenus = array();
+        foreach (Module::getActiveReports($this->tree) as $report) {
+            $submenus[] = $report->getReportMenu();
+        }
+
+        if ($submenus) {
+            return new Menu(I18N::translate('Reports'), '#', 'menu-report', array('rel' => 'nofollow'), $submenus);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Create the search menu.
+     *
+     * @return Menu
+     */
+    protected function menuSearch() {
+        return new Menu(I18N::translate('Search'), '#', 'menu-search', array('rel' => 'nofollow'), array_filter(array(
+            $this->menuSearchGeneral(),
+            $this->menuSearchPhonetic(),
+            $this->menuSearchAdvanced(),
+            $this->menuSearchAndReplace(),
+        )));
+    }
+
+    /**
+     * Create the general search sub-menu.
+     *
+     * @return Menu
+     */
+    protected function menuSearchGeneral() {
+        return new Menu(I18N::translate('General search'), 'search.php?' . $this->tree_url, 'menu-search-general', array('rel' => 'nofollow'));
+    }
+
+    /**
+     * Create the phonetic search sub-menu.
+     *
+     * @return Menu
+     */
+    protected function menuSearchPhonetic() {
+        return new Menu(/* I18N: search using “sounds like”, rather than exact spelling */ I18N::translate('Phonetic search'), 'search.php?' . $this->tree_url . '&amp;action=soundex', 'menu-search-soundex', array('rel' => 'nofollow'));
+    }
+
+    /**
+     * Create the advanced search sub-menu.
+     *
+     * @return Menu
+     */
+    protected function menuSearchAdvanced() {
+        return new Menu(I18N::translate('Advanced search'), 'search_advanced.php?' . $this->tree_url, 'menu-search-advanced', array('rel' => 'nofollow'));
+    }
+
+    /**
+     * Create the advanced search sub-menu.
+     *
+     * @return Menu
+     */
+    protected function menuSearchAndReplace() {
+        if (Auth::isEditor($this->tree)) {
+            return new Menu(I18N::translate('Search and replace'), 'search.php?' . $this->tree_url . '&amp;action=replace', 'menu-search-replace');
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Themes menu.
+     *
+     * @return Menu|null
+     */
+    public function menuThemes() {
+        if ($this->tree && Site::getPreference('ALLOW_USER_THEMES') && $this->tree->getPreference('ALLOW_THEME_DROPDOWN')) {
+            $submenus = array();
+            foreach (Theme::installedThemes() as $theme) {
+                $class      = 'menu-theme-' . $theme->themeId() . ($theme === $this ? ' active' : '');
+                $submenus[] = new Menu($theme->themeName(), '#', $class, array(
+                    'onclick'    => 'return false;',
+                    'data-theme' => $theme->themeId(),
+                ));
+            }
+
+            usort($submenus, function (Menu $x, Menu $y) {
+                return I18N::strcasecmp($x->getLabel(), $y->getLabel());
+            });
+
+            $menu = new Menu(I18N::translate('Theme'), '#', 'menu-theme', array(), $submenus);
+
+            return $menu;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Create the <meta charset=""> tag.
+     *
+     * @return string
+     */
+    protected function metaCharset() {
+        return '<meta charset="UTF-8">';
+    }
+
+    /**
+     * Create the <meta name="description"> tag.
+     *
+     * @param string $description
+     *
+     * @return string
+     */
+    protected function metaDescription($description) {
+        if ($description) {
+            return '<meta name="description" content="' . $description . '">';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Create the <meta name="generator"> tag.
+     *
+     * @param string $generator
+     *
+     * @return string
+     */
+    protected function metaGenerator($generator) {
+        if ($generator) {
+            return '<meta name="generator" content="' . $generator . '">';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Create the <meta name="robots"> tag.
+     *
+     * @param string $robots
+     *
+     * @return string
+     */
+    protected function metaRobots($robots) {
+        if ($robots) {
+            return '<meta name="robots" content="' . $robots . '">';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Create the <meta http-equiv="X-UA-Compatible"> tag.
+     *
+     * @return string
+     */
+    protected function metaUaCompatible() {
+        return '<meta http-equiv="X-UA-Compatible" content="IE=edge">';
+    }
+
+    /**
+     * Create the <meta name="viewport" content="width=device-width, initial-scale=1"> tag.
+     *
+     * @return string
+     */
+    protected function metaViewport() {
+        return '<meta name="viewport" content="width=device-width, initial-scale=1">';
+    }
+
+    /**
+     * How many times has the current page been shown?
+     *
+     * @param  PageController $controller
+     *
+     * @return int Number of views, or zero for pages that aren't logged.
+     */
+    protected function pageViews(PageController $controller) {
+        if ($this->tree && $this->tree->getPreference('SHOW_COUNTER')) {
+            if (isset($controller->record) && $controller->record instanceof GedcomRecord) {
+                return HitCounter::countHit($this->tree, WT_SCRIPT_NAME, $controller->record->getXref());
+            } elseif (isset($controller->root) && $controller->root instanceof GedcomRecord) {
+                return HitCounter::countHit($this->tree, WT_SCRIPT_NAME, $controller->root->getXref());
+            } elseif (WT_SCRIPT_NAME === 'index.php') {
+                if (Auth::check() && Filter::get('ctype') !== 'gedcom') {
+                    return HitCounter::countHit($this->tree, WT_SCRIPT_NAME, 'user:' . Auth::id());
+                } else {
+                    return HitCounter::countHit($this->tree, WT_SCRIPT_NAME, 'gedcom:' . $this->tree->getTreeId());
+                }
+            }
+        }
+
+        return 0;
+    }
+
+    /**
+     * Misecellaneous dimensions, fonts, styles, etc.
+     *
+     * @param string $parameter_name
+     *
+     * @return string|int|float
+     */
+    public function parameter($parameter_name) {
+        $parameters = array(
+            'chart-background-f'             => 'dddddd',
+            'chart-background-m'             => 'cccccc',
+            'chart-background-u'             => 'eeeeee',
+            'chart-box-x'                    => 250,
+            'chart-box-y'                    => 80,
+            'chart-descendancy-indent'       => 15,
+            'chart-font-color'               => '000000',
+            'chart-font-name'                => WT_ROOT . 'packages/dejavu-fonts-ttf-2.35/ttf/DejaVuSans.ttf',
+            'chart-font-size'                => 7,
+            'chart-spacing-x'                => 5,
+            'chart-spacing-y'                => 10,
+            'compact-chart-box-x'            => 240,
+            'compact-chart-box-y'            => 50,
+            'distribution-chart-high-values' => '555555',
+            'distribution-chart-low-values'  => 'cccccc',
+            'distribution-chart-no-values'   => 'ffffff',
+            'distribution-chart-x'           => 440,
+            'distribution-chart-y'           => 220,
+            'line-width'                     => 1.5,
+            'shadow-blur'                    => 0,
+            'shadow-color'                   => '',
+            'shadow-offset-x'                => 0,
+            'shadow-offset-y'                => 0,
+            'stats-small-chart-x'            => 440,
+            'stats-small-chart-y'            => 125,
+            'stats-large-chart-x'            => 900,
+            'image-dline'                    => $this->assetUrl() . 'images/dline.png',
+            'image-dline2'                   => $this->assetUrl() . 'images/dline2.png',
+            'image-hline'                    => $this->assetUrl() . 'images/hline.png',
+            'image-spacer'                   => $this->assetUrl() . 'images/spacer.png',
+            'image-vline'                    => $this->assetUrl() . 'images/vline.png',
+            'image-minus'                    => $this->assetUrl() . 'images/minus.png',
+            'image-plus'                     => $this->assetUrl() . 'images/plus.png',
+        );
+
+        if (array_key_exists($parameter_name, $parameters)) {
+            return $parameters[$parameter_name];
+        } else {
+            throw new \InvalidArgumentException($parameter_name);
+        }
+    }
+
+    /**
+     * Are there any pending changes for us to approve?
+     *
+     * @return bool
+     */
+    protected function pendingChangesExist() {
+        return $this->tree && $this->tree->hasPendingEdit() && Auth::isModerator($this->tree);
+    }
+
+    /**
+     * Create a pending changes link. Some themes prefer an alert/banner to a menu.
+     *
+     * @return string
+     */
+    protected function pendingChangesLink() {
+        return
+            '<a href="#" onclick="window.open(\'edit_changes.php\', \'_blank\', chan_window_specs); return false;">' .
+            $this->pendingChangesLinkText() .
+            '</a>';
+    }
+
+    /**
+     * Text to use in the pending changes link.
+     *
+     * @return string
+     */
+    protected function pendingChangesLinkText() {
+        return I18N::translate('There are pending changes for you to moderate.');
+    }
+
+    /**
+     * Generate a list of items for the main menu.
+     *
+     * @return Menu[]
+     */
+    protected function primaryMenu() {
+        global $controller;
+
+        if ($this->tree) {
+            $individual = $controller->getSignificantIndividual();
+
+            return array_filter(array_merge(array(
+                $this->menuHomePage(),
+                $this->menuChart($individual),
+                $this->menuLists($controller->getSignificantSurname()),
+                $this->menuCalendar(),
+                $this->menuReports(),
+                $this->menuSearch(),
+            ), $this->menuModules()));
+        } else {
+            // No public trees? No genealogy menu!
+            return array();
+        }
+    }
+
+    /**
+     * Add markup to the primary menu.
+     *
+     * @param Menu[] $menus
+     *
+     * @return string
+     */
+    protected function primaryMenuContainer(array $menus) {
+        return '<nav><ul class="primary-menu">' . $this->primaryMenuContent($menus) . '</ul></nav>';
+    }
+
+    /**
+     * Create the primary menu.
+     *
+     * @param Menu[] $menus
+     *
+     * @return string
+     */
+    protected function primaryMenuContent(array $menus) {
+        return implode('', array_map(function (Menu $menu) {
+            return $menu->getMenuAsList();
+        }, $menus));
+    }
+
+    /**
+     * Generate a list of items for the user menu.
+     *
+     * @return Menu[]
+     */
+    protected function secondaryMenu() {
+        return array_filter(array(
+            $this->menuPendingChanges(),
+            $this->menuMyPages(),
+            $this->menuFavorites(),
+            $this->menuThemes(),
+            $this->menuLanguages(),
+            $this->menuLogin(),
+            $this->menuLogout(),
+        ));
+    }
+
+    /**
+     * Add markup to the secondary menu.
+     *
+     * @param Menu[] $menus
+     *
+     * @return string
+     */
+    protected function secondaryMenuContainer(array $menus) {
+        return '<ul class="nav nav-pills secondary-menu">' . $this->secondaryMenuContent($menus) . '</ul>';
+    }
+
+    /**
+     * Format the secondary menu.
+     *
+     * @param Menu[] $menus
+     *
+     * @return string
+     */
+    protected function secondaryMenuContent(array $menus) {
+        return implode('', array_map(function (Menu $menu) {
+            return $menu->getMenuAsList();
+        }, $menus));
+    }
+
+    /**
+     * Send any HTTP headers.
+     */
+    public function sendHeaders() {
+        header('Content-Type: text/html; charset=UTF-8');
+    }
+
+    /**
+     * A list of CSS files to include for this page.
+     *
+     * @return string[]
+     */
+    protected function stylesheets() {
+        $stylesheets = array(
+            WT_BOOTSTRAP_CSS_URL,
+            WT_FONT_AWESOME_CSS_URL,
+            WT_FONT_AWESOME_RTL_CSS_URL,
+        );
+
+        if (I18N::direction() === 'rtl') {
+            $stylesheets[] = WT_BOOTSTRAP_RTL_CSS_URL;
+        }
+
+        return $stylesheets;
+    }
+
+    /**
+     * Create the <title> tag.
+     *
+     * @param string $title
+     *
+     * @return string
+     */
+    protected function title($title) {
+        return '<title>' . Filter::escapeHtml($title) . '</title>';
+    }
 }

Switch Indentation +20 added lines, -20 removed lines

@@ -265,12 +265,12 @@ 
 		$method = $user->getPreference('contactmethod');
 
 		switch ($method) {
-		case 'none':
-			return '';
-		case 'mailto':
-			return '<a href="mailto:' . Filter::escapeHtml($user->getEmail()) . '">' . $user->getRealNameHtml() . '</a>';
-		default:
-			return "<a href='#' onclick='message(\"" . Filter::escapeHtml($user->getUserName()) . "\", \"" . $method . "\", \"" . WT_BASE_URL . Filter::escapeHtml(Functions::getQueryUrl()) . "\", \"\");return false;'>" . $user->getRealNameHtml() . '</a>';
+		    case 'none':
+			    return '';
+		    case 'mailto':
+			    return '<a href="mailto:' . Filter::escapeHtml($user->getEmail()) . '">' . $user->getRealNameHtml() . '</a>';
+		    default:
+			    return "<a href='#' onclick='message(\"" . Filter::escapeHtml($user->getUserName()) . "\", \"" . $method . "\", \"" . WT_BASE_URL . Filter::escapeHtml(Functions::getQueryUrl()) . "\", \"\");return false;'>" . $user->getRealNameHtml() . '</a>';
 		}
 	}
 
@@ -1346,20 +1346,20 @@ 
 		$records  = array();
 		foreach ($favorites as $favorite) {
 			switch ($favorite['type']) {
-			case 'URL':
-				$submenus[] = new Menu($favorite['title'], $favorite['url']);
-				break;
-			case 'INDI':
-			case 'FAM':
-			case 'SOUR':
-			case 'OBJE':
-			case 'NOTE':
-				$record = GedcomRecord::getInstance($favorite['gid'], $this->tree);
-				if ($record && $record->canShowName()) {
-					$submenus[] = new Menu($record->getFullName(), $record->getHtmlUrl());
-					$records[]  = $record;
-				}
-				break;
+			    case 'URL':
+				    $submenus[] = new Menu($favorite['title'], $favorite['url']);
+				    break;
+			    case 'INDI':
+			    case 'FAM':
+			    case 'SOUR':
+			    case 'OBJE':
+			    case 'NOTE':
+				    $record = GedcomRecord::getInstance($favorite['gid'], $this->tree);
+				    if ($record && $record->canShowName()) {
+					    $submenus[] = new Menu($record->getFullName(), $record->getHtmlUrl());
+					    $records[]  = $record;
+				    }
+				    break;
 			}
 		}
 

Braces +244 added lines, -122 removed lines

@@ -52,7 +52,8 @@ 
 /**
  * Common functions for all themes.
  */
-abstract class AbstractTheme {
+abstract class AbstractTheme
+{
 	/** @var Tree The current tree */
 	protected $tree;
 
@@ -66,7 +67,8 @@ 
 	 * Custom themes should place their initialization code in the function hookAfterInit(), not in
 	 * the constructor, as all themes get constructed - whether they are used or not.
 	 */
-	final public function __construct() {
+	final public function __construct()
+	{
 	}
 
 	/**
@@ -77,7 +79,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function accessibilityLinks() {
+	protected function accessibilityLinks()
+	{
 		return
 			'<div class="accessibility-links">' .
 			'<a class="sr-only sr-only-focusable btn btn-info btn-sm" href="#content">' .
@@ -91,7 +94,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function analytics() {
+	protected function analytics()
+	{
 		if ($this->themeId() === '_administration' || !empty($_SERVER['HTTP_DNT'])) {
 			return '';
 		} else {
@@ -123,7 +127,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function analyticsBingWebmaster($verification_id) {
+	protected function analyticsBingWebmaster($verification_id)
+	{
 		// Only need to add this to the home page.
 		if (WT_SCRIPT_NAME === 'index.php' && $verification_id) {
 			return '<meta name="msvalidate.01" content="' . $verification_id . '">';
@@ -139,7 +144,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function analyticsGoogleWebmaster($verification_id) {
+	protected function analyticsGoogleWebmaster($verification_id)
+	{
 		// Only need to add this to the home page.
 		if (WT_SCRIPT_NAME === 'index.php' && $verification_id) {
 			return '<meta name="google-site-verification" content="' . $verification_id . '">';
@@ -157,7 +163,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function analyticsGoogleTracker($analytics_id) {
+	protected function analyticsGoogleTracker($analytics_id)
+	{
 		if ($analytics_id) {
 			// Add extra dimensions (i.e. filtering categories)
 			$dimensions = (object) array(
@@ -185,7 +192,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function analyticsPiwikTracker($url, $site_id) {
+	protected function analyticsPiwikTracker($url, $site_id)
+	{
 		$url = preg_replace(array('/^https?:\/\//', '/\/$/'), '', $url);
 
 		if ($url && $site_id) {
@@ -213,7 +221,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function analyticsStatcounterTracker($project_id, $security_id) {
+	protected function analyticsStatcounterTracker($project_id, $security_id)
+	{
 		if ($project_id && $security_id) {
 			return
 				'<script>' .
@@ -231,7 +240,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function bodyHeader() {
+	public function bodyHeader()
+	{
 		return
 			'<body class="container">' .
 			'<header>' .
@@ -247,7 +257,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function bodyHeaderPopupWindow() {
+	public function bodyHeaderPopupWindow()
+	{
 		return
 			'<body class="container container-popup">' .
 			'<main id="content">' .
@@ -261,7 +272,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function contactLink(User $user) {
+	public function contactLink(User $user)
+	{
 		$method = $user->getPreference('contactmethod');
 
 		switch ($method) {
@@ -281,7 +293,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function contactLinkEverything(User $user) {
+	protected function contactLinkEverything(User $user)
+	{
 		return I18N::translate('For technical support or genealogy questions contact %s.', $this->contactLink($user));
 	}
 
@@ -292,7 +305,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function contactLinkGenealogy(User $user) {
+	protected function contactLinkGenealogy(User $user)
+	{
 		return I18N::translate('For help with genealogy questions contact %s.', $this->contactLink($user));
 	}
 
@@ -303,7 +317,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function contactLinkTechnical(User $user) {
+	protected function contactLinkTechnical(User $user)
+	{
 		return I18N::translate('For technical support and information contact %s.', $this->contactLink($user));
 	}
 
@@ -312,7 +327,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function contactLinks() {
+	protected function contactLinks()
+	{
 		$contact_user   = User::find($this->tree->getPreference('CONTACT_USER_ID'));
 		$webmaster_user = User::find($this->tree->getPreference('WEBMASTER_USER_ID'));
 
@@ -334,7 +350,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function cookieWarning() {
+	public function cookieWarning()
+	{
 		if (
 			empty($_SERVER['HTTP_DNT']) &&
 			empty($_COOKIE['cookie']) &&
@@ -356,7 +373,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function doctype() {
+	public function doctype()
+	{
 		return '<!DOCTYPE html>';
 	}
 
@@ -365,7 +383,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function favicon() {
+	protected function favicon()
+	{
 		return
 			'<link rel="icon" href="' . $this->assetUrl() . 'favicon.png" type="image/png">' .
 			'<link rel="icon" type="image/png" href="' . $this->assetUrl() . 'favicon192.png" sizes="192x192">' .
@@ -379,7 +398,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function flashMessageContainer(\stdClass $message) {
+	protected function flashMessageContainer(\stdClass $message)
+	{
 		return $this->htmlAlert($message->text, $message->status, true);
 	}
 
@@ -392,7 +412,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function flashMessagesContainer(array $messages) {
+	protected function flashMessagesContainer(array $messages)
+	{
 		$html = '';
 		foreach ($messages as $message) {
 			$html .= $this->flashMessageContainer($message);
@@ -410,7 +431,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function footerContainer() {
+	public function footerContainer()
+	{
 		return '</main><footer>' . $this->footerContent() . '</footer>';
 	}
 
@@ -420,7 +442,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function footerContainerPopupWindow() {
+	public function footerContainerPopupWindow()
+	{
 		return '</main>';
 	}
 
@@ -429,7 +452,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function footerContent() {
+	protected function footerContent()
+	{
 		return
 			$this->formatContactLinks() .
 			$this->logoPoweredBy() .
@@ -447,7 +471,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function formatBlock($id, $title, $class, $content) {
+	public function formatBlock($id, $title, $class, $content)
+	{
 		return
 			'<div id="' . $id . '" class="block" >' .
 			'<div class="blockheader">' . $title . '</div>' .
@@ -460,7 +485,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatContactLinks() {
+	protected function formatContactLinks()
+	{
 		if ($this->tree) {
 			return '<div class="contact-links">' . $this->contactLinks() . '</div>';
 		} else {
@@ -475,7 +501,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatPageViews($count) {
+	protected function formatPageViews($count)
+	{
 		if ($count > 0) {
 			return
 				'<div class="page-views">' .
@@ -492,7 +519,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatPendingChangesLink() {
+	protected function formatPendingChangesLink()
+	{
 		if ($this->pendingChangesExist()) {
 			return '<div class="pending-changes-link">' . $this->pendingChangesLink() . '</div>';
 		} else {
@@ -505,7 +533,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formQuickSearch() {
+	protected function formQuickSearch()
+	{
 		if ($this->tree) {
 			return
 				'<form action="search.php" class="header-search" role="search">' .
@@ -523,7 +552,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formQuickSearchFields() {
+	protected function formQuickSearchFields()
+	{
 		return
 			'<input type="search" name="query" size="15" placeholder="' . I18N::translate('Search') . '">' .
 			'<input type="image" src="' . $this->assetUrl() . 'images/go.png" alt="' . I18N::translate('Search') . '">';
@@ -534,7 +564,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatTreeTitle() {
+	protected function formatTreeTitle()
+	{
 		if ($this->tree) {
 			return '<h1 class="header-title">' . $this->tree->getTitleHtml() . '</h1>';
 		} else {
@@ -547,7 +578,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatSecondaryMenu() {
+	protected function formatSecondaryMenu()
+	{
 		return
 			'<ul class="secondary-menu">' .
 			implode('', $this->secondaryMenu()) .
@@ -561,7 +593,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatSecondaryMenuItem(Menu $menu) {
+	protected function formatSecondaryMenuItem(Menu $menu)
+	{
 		return $menu->getMenuAsList();
 	}
 
@@ -572,7 +605,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function head(PageController $controller) {
+	public function head(PageController $controller)
+	{
 		// Record this now. By the time we render the footer, $controller no longer exists.
 		$this->page_views = $this->pageViews($controller);
 
@@ -591,7 +625,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function headContents(PageController $controller) {
+	protected function headContents(PageController $controller)
+	{
 		// The title often includes the names of records, which may include HTML markup.
 		$title = Filter::unescapeHtml($controller->getPageTitle());
 
@@ -629,7 +664,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function headerContent() {
+	protected function headerContent()
+	{
 		return
 			//$this->accessibilityLinks() .
 			$this->logoHeader() .
@@ -643,7 +679,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function headerSimple() {
+	protected function headerSimple()
+	{
 		return
 			$this->flashMessagesContainer(FlashMessages::getMessages()) .
 			'<div id="content">';
@@ -653,7 +690,8 @@ 
 	 * Allow themes to do things after initialization (since they cannot use
 	 * the constructor).
 	 */
-	public function hookAfterInit() {
+	public function hookAfterInit()
+	{
 	}
 
 	/**
@@ -661,7 +699,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function hookFooterExtraJavascript() {
+	public function hookFooterExtraJavascript()
+	{
 		return '';
 	}
 
@@ -671,7 +710,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function hookHeaderExtraContent() {
+	public function hookHeaderExtraContent()
+	{
 		return '';
 	}
 
@@ -680,7 +720,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function html() {
+	public function html()
+	{
 		return '<html ' . I18N::htmlAttributes() . '>';
 	}
 
@@ -693,7 +734,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function htmlAlert($html, $level, $dismissible) {
+	public function htmlAlert($html, $level, $dismissible)
+	{
 		if ($dismissible) {
 			return
 				'<div class="alert alert-' . $level . ' alert-dismissible" role="alert">' .
@@ -717,7 +759,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function icon(Fact $fact) {
+	public function icon(Fact $fact)
+	{
 		$icon = 'images/facts/' . $fact->getTag() . '.png';
 		$dir  = substr($this->assetUrl(), strlen(WT_STATIC_URL));
 		if (file_exists($dir . $icon)) {
@@ -737,7 +780,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function individualBox(Individual $individual) {
+	public function individualBox(Individual $individual)
+	{
 		$personBoxClass = array_search($individual->getSex(), array('person_box' => 'M', 'person_boxF' => 'F', 'person_boxNN' => 'U'));
 		if ($individual->canShow() && $individual->getTree()->getPreference('SHOW_HIGHLIGHT_IMAGES')) {
 			$thumbnail = $individual->displayImage();
@@ -778,7 +822,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function individualBoxEmpty() {
+	public function individualBoxEmpty()
+	{
 		return '<div class="person_box_template person_boxNN box-style1" style="width: ' . $this->parameter('chart-box-x') . 'px; min-height: ' . $this->parameter('chart-box-y') . 'px"></div>';
 	}
 
@@ -789,7 +834,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function individualBoxLarge(Individual $individual) {
+	public function individualBoxLarge(Individual $individual)
+	{
 		$personBoxClass = array_search($individual->getSex(), array('person_box' => 'M', 'person_boxF' => 'F', 'person_boxNN' => 'U'));
 		if ($individual->getTree()->getPreference('SHOW_HIGHLIGHT_IMAGES')) {
 			$thumbnail = $individual->displayImage();
@@ -832,7 +878,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function individualBoxSmall(Individual $individual) {
+	public function individualBoxSmall(Individual $individual)
+	{
 		$personBoxClass = array_search($individual->getSex(), array('person_box' => 'M', 'person_boxF' => 'F', 'person_boxNN' => 'U'));
 		if ($individual->getTree()->getPreference('SHOW_HIGHLIGHT_IMAGES')) {
 			$thumbnail = $individual->displayImage();
@@ -858,7 +905,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function individualBoxSmallEmpty() {
+	public function individualBoxSmallEmpty()
+	{
 		return '<div class="person_box_template person_boxNN box-style1" style="width: ' . $this->parameter('compact-chart-box-x') . 'px; min-height: ' . $this->parameter('compact-chart-box-y') . 'px"></div>';
 	}
 
@@ -869,7 +917,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function individualBoxFacts(Individual $individual) {
+	protected function individualBoxFacts(Individual $individual)
+	{
 		$html = '';
 
 		$opt_tags = preg_split('/\W/', $individual->getTree()->getPreference('CHART_BOX_TAGS'), 0, PREG_SPLIT_NO_EMPTY);
@@ -922,7 +971,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function individualBoxLdsSummary(Individual $individual) {
+	protected function individualBoxLdsSummary(Individual $individual)
+	{
 		if ($individual->getTree()->getPreference('SHOW_LDS_AT_GLANCE')) {
 			$BAPL = $individual->getFacts('BAPL') ? 'B' : '_';
 			$ENDL = $individual->getFacts('ENDL') ? 'E' : '_';
@@ -948,7 +998,8 @@ 
 	 *
 	 * @return Menu[]
 	 */
-	public function individualBoxMenu(Individual $individual) {
+	public function individualBoxMenu(Individual $individual)
+	{
 		$menus = array_merge(
 			$this->individualBoxMenuCharts($individual),
 			$this->individualBoxMenuFamilyLinks($individual)
@@ -964,7 +1015,8 @@ 
 	 *
 	 * @return Menu[]
 	 */
-	protected function individualBoxMenuCharts(Individual $individual) {
+	protected function individualBoxMenuCharts(Individual $individual)
+	{
 		$menus = array();
 		foreach (Module::getActiveCharts($this->tree) as $chart) {
 			$menu = $chart->getBoxChartMenu($individual);
@@ -987,7 +1039,8 @@ 
 	 *
 	 * @return Menu[]
 	 */
-	protected function individualBoxMenuFamilyLinks(Individual $individual) {
+	protected function individualBoxMenuFamilyLinks(Individual $individual)
+	{
 		$menus = array();
 
 		foreach ($individual->getSpouseFamilies() as $family) {
@@ -1013,7 +1066,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function individualBoxSexSymbol(Individual $individual) {
+	protected function individualBoxSexSymbol(Individual $individual)
+	{
 		if ($individual->getTree()->getPreference('PEDIGREE_SHOW_GENDER')) {
 			return $individual->sexImage('large');
 		} else {
@@ -1027,7 +1081,8 @@ 
 	 *
 	 * @param Tree|null $tree The current tree (if there is one).
 	 */
-	final public function init(Tree $tree = null) {
+	final public function init(Tree $tree = null)
+	{
 		$this->tree     = $tree;
 		$this->tree_url = $tree ? 'ged=' . $tree->getNameUrl() : '';
 
@@ -1039,7 +1094,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function logoHeader() {
+	protected function logoHeader()
+	{
 		return '<div class="header-logo"></div>';
 	}
 
@@ -1048,7 +1104,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function logoPoweredBy() {
+	protected function logoPoweredBy()
+	{
 		return '<a href="' . WT_WEBTREES_URL . '" class="powered-by-webtrees" title="' . WT_WEBTREES_URL . '"></a>';
 	}
 
@@ -1057,7 +1114,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuCalendar() {
+	protected function menuCalendar()
+	{
 		return new Menu(I18N::translate('Calendar'), '#', 'menu-calendar', array('rel' => 'nofollow'), array(
 			// Day view
 			new Menu(I18N::translate('Day'), 'calendar.php?' . $this->tree_url . '&amp;view=day', 'menu-calendar-day', array('rel' => 'nofollow')),
@@ -1073,7 +1131,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	protected function menuChangeBlocks() {
+	protected function menuChangeBlocks()
+	{
 		if (WT_SCRIPT_NAME === 'index.php' && Auth::check() && Filter::get('ctype', 'gedcom|user', 'user') === 'user') {
 			return new Menu(I18N::translate('Customize this page'), 'index_edit.php?user_id=' . Auth::id(), 'menu-change-blocks');
 		} elseif (WT_SCRIPT_NAME === 'index.php' && Auth::isManager($this->tree)) {
@@ -1090,7 +1149,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	protected function menuChart(Individual $individual) {
+	protected function menuChart(Individual $individual)
+	{
 		$submenus = array();
 		foreach (Module::getActiveCharts($this->tree) as $chart) {
 			$menu = $chart->getChartMenu($individual);
@@ -1119,7 +1179,8 @@ 
 	 *
 	 * @deprecated
 	 */
-	protected function menuChartAncestors(Individual $individual) {
+	protected function menuChartAncestors(Individual $individual)
+	{
 		$chart = new AncestorsChartModule(WT_ROOT . WT_MODULES_DIR . 'ancestors_chart');
 
 		return $chart->getChartMenu($individual);
@@ -1134,7 +1195,8 @@ 
 	 *
 	 * @deprecated
 	 */
-	protected function menuChartCompact(Individual $individual) {
+	protected function menuChartCompact(Individual $individual)
+	{
 		$chart = new CompactTreeChartModule(WT_ROOT . WT_MODULES_DIR . 'compact_tree_chart');
 
 		return $chart->getChartMenu($individual);
@@ -1149,7 +1211,8 @@ 
 	 *
 	 * @deprecated
 	 */
-	protected function menuChartDescendants(Individual $individual) {
+	protected function menuChartDescendants(Individual $individual)
+	{
 		$chart = new DescendancyChartModule(WT_ROOT . WT_MODULES_DIR . 'descendancy_chart');
 
 		return $chart->getChartMenu($individual);
@@ -1164,7 +1227,8 @@ 
 	 *
 	 * @deprecated
 	 */
-	protected function menuChartFamilyBook(Individual $individual) {
+	protected function menuChartFamilyBook(Individual $individual)
+	{
 		$chart = new FamilyBookChartModule(WT_ROOT . WT_MODULES_DIR . 'family_book_chart');
 
 		return $chart->getChartMenu($individual);
@@ -1181,7 +1245,8 @@ 
 	 *
 	 * @deprecated
 	 */
-	protected function menuChartFanChart(Individual $individual) {
+	protected function menuChartFanChart(Individual $individual)
+	{
 		$chart = new FanChartModule(WT_ROOT . WT_MODULES_DIR . 'fan_chart');
 
 		return $chart->getChartMenu($individual);
@@ -1196,7 +1261,8 @@ 
 	 *
 	 * @deprecated
 	 */
-	protected function menuChartInteractiveTree(Individual $individual) {
+	protected function menuChartInteractiveTree(Individual $individual)
+	{
 		$chart = new InteractiveTreeModule(WT_ROOT . WT_MODULES_DIR . 'tree');
 
 		return $chart->getChartMenu($individual);
@@ -1211,7 +1277,8 @@ 
 	 *
 	 * @deprecated
 	 */
-	protected function menuChartHourglass(Individual $individual) {
+	protected function menuChartHourglass(Individual $individual)
+	{
 		$chart = new HourglassChartModule(WT_ROOT . WT_MODULES_DIR . 'hourglass_chart');
 
 		return $chart->getChartMenu($individual);
@@ -1226,7 +1293,8 @@ 
 	 *
 	 * @deprecated
 	 */
-	protected function menuChartLifespan(Individual $individual) {
+	protected function menuChartLifespan(Individual $individual)
+	{
 		$chart = new LifespansChartModule(WT_ROOT . WT_MODULES_DIR . 'lifespans_chart');
 
 		return $chart->getChartMenu($individual);
@@ -1241,7 +1309,8 @@ 
 	 *
 	 * @deprecated
 	 */
-	protected function menuChartPedigree(Individual $individual) {
+	protected function menuChartPedigree(Individual $individual)
+	{
 		$chart = new PedigreeChartModule(WT_ROOT . WT_MODULES_DIR . 'pedigree_chart');
 
 		return $chart->getChartMenu($individual);
@@ -1256,7 +1325,8 @@ 
 	 *
 	 * @deprecated
 	 */
-	protected function menuChartPedigreeMap(Individual $individual) {
+	protected function menuChartPedigreeMap(Individual $individual)
+	{
 		$chart = new GoogleMapsModule(WT_ROOT . WT_MODULES_DIR . 'googlemap');
 
 		return $chart->getChartMenu($individual);
@@ -1271,7 +1341,8 @@ 
 	 *
 	 * @deprecated
 	 */
-	protected function menuChartRelationship(Individual $individual) {
+	protected function menuChartRelationship(Individual $individual)
+	{
 		$chart = new RelationshipsChartModule(WT_ROOT . WT_MODULES_DIR . 'relationships_chart');
 
 		return $chart->getChartMenu($individual);
@@ -1284,7 +1355,8 @@ 
 	 *
 	 * @deprecated
 	 */
-	protected function menuChartStatistics() {
+	protected function menuChartStatistics()
+	{
 		$chart = new StatisticsChartModule(WT_ROOT . WT_MODULES_DIR . 'statistics_chart');
 
 		return $chart->getChartMenu(null);
@@ -1299,7 +1371,8 @@ 
 	 *
 	 * @deprecated
 	 */
-	protected function menuChartTimeline(Individual $individual) {
+	protected function menuChartTimeline(Individual $individual)
+	{
 		$chart = new TimelineChartModule(WT_ROOT . WT_MODULES_DIR . 'timeline_chart');
 
 		return $chart->getChartMenu($individual);
@@ -1310,7 +1383,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	protected function menuControlPanel() {
+	protected function menuControlPanel()
+	{
 		if (Auth::isManager($this->tree)) {
 			return new Menu(I18N::translate('Control panel'), 'admin.php', 'menu-admin');
 		} else {
@@ -1323,7 +1397,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	protected function menuFavorites() {
+	protected function menuFavorites()
+	{
 		global $controller;
 
 		$show_user_favorites = $this->tree && Module::getModuleByName('user_favorites') && Auth::check();
@@ -1381,7 +1456,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuHomePage() {
+	protected function menuHomePage()
+	{
 		if (count(Tree::getAll()) === 1 || Site::getPreference('ALLOW_CHANGE_GEDCOM') === '0') {
 			return new Menu(I18N::translate('Family tree'), 'index.php?ctype=gedcom&amp;' . $this->tree_url, 'menu-tree');
 		} else {
@@ -1404,7 +1480,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	protected function menuLanguages() {
+	protected function menuLanguages()
+	{
 		$menu = new Menu(I18N::translate('Language'), '#', 'menu-language');
 
 		foreach (I18N::activeLocales() as $locale) {
@@ -1430,7 +1507,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuLists($surname) {
+	protected function menuLists($surname)
+	{
 		// Do not show empty lists
 		$row = Database::prepare(
 			"SELECT" .
@@ -1478,7 +1556,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuListsBranches($surname) {
+	protected function menuListsBranches($surname)
+	{
 		return new Menu(I18N::translate('Branches'), 'branches.php?ged=' . $this->tree->getNameUrl() . '&amp;surname=' . rawurlencode($surname), 'menu-branches', array('rel' => 'nofollow'));
 	}
 
@@ -1489,7 +1568,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuListsFamilies($surname) {
+	protected function menuListsFamilies($surname)
+	{
 		return new Menu(I18N::translate('Families'), 'famlist.php?ged=' . $this->tree->getNameUrl() . '&amp;surname=' . rawurlencode($surname), 'menu-list-fam', array('rel' => 'nofollow'));
 	}
 
@@ -1500,7 +1580,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuListsIndividuals($surname) {
+	protected function menuListsIndividuals($surname)
+	{
 		return new Menu(I18N::translate('Individuals'), 'indilist.php?ged=' . $this->tree->getNameUrl() . '&amp;surname=' . rawurlencode($surname), 'menu-list-indi');
 	}
 
@@ -1509,7 +1590,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuListsMedia() {
+	protected function menuListsMedia()
+	{
 		return new Menu(I18N::translate('Media objects'), 'medialist.php?' . $this->tree_url, 'menu-list-obje', array('rel' => 'nofollow'));
 	}
 
@@ -1518,7 +1600,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuListsNotes() {
+	protected function menuListsNotes()
+	{
 		return new Menu(I18N::translate('Shared notes'), 'notelist.php?' . $this->tree_url, 'menu-list-note', array('rel' => 'nofollow'));
 	}
 
@@ -1527,7 +1610,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuListsPlaces() {
+	protected function menuListsPlaces()
+	{
 		return new Menu(I18N::translate('Place hierarchy'), 'placelist.php?ged=' . $this->tree->getNameUrl(), 'menu-list-plac', array('rel' => 'nofollow'));
 	}
 
@@ -1536,7 +1620,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuListsRepositories() {
+	protected function menuListsRepositories()
+	{
 		return new Menu(I18N::translate('Repositories'), 'repolist.php?' . $this->tree_url, 'menu-list-repo', array('rel' => 'nofollow'));
 	}
 
@@ -1545,7 +1630,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuListsSources() {
+	protected function menuListsSources()
+	{
 		return new Menu(I18N::translate('Sources'), 'sourcelist.php?' . $this->tree_url, 'menu-list-sour', array('rel' => 'nofollow'));
 	}
 
@@ -1554,7 +1640,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	protected function menuLogin() {
+	protected function menuLogin()
+	{
 		if (Auth::check() || WT_SCRIPT_NAME === 'login.php') {
 			return null;
 		} else {
@@ -1567,7 +1654,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	protected function menuLogout() {
+	protected function menuLogout()
+	{
 		if (Auth::check()) {
 			return new Menu(I18N::translate('Sign out'), 'logout.php', 'menu-logout');
 		} else {
@@ -1580,7 +1668,8 @@ 
 	 *
 	 * @return Menu[]
 	 */
-	protected function menuModules() {
+	protected function menuModules()
+	{
 		$menus = array();
 		foreach (Module::getActiveMenus($this->tree) as $module) {
 			$menus[] = $module->getMenu();
@@ -1594,7 +1683,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	protected function menuMyAccount() {
+	protected function menuMyAccount()
+	{
 		if (Auth::check()) {
 			return new Menu(I18N::translate('My account'), 'edituser.php');
 		} else {
@@ -1607,7 +1697,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	protected function menuMyIndividualRecord() {
+	protected function menuMyIndividualRecord()
+	{
 		$gedcomid = $this->tree->getUserPreference(Auth::user(), 'gedcomid');
 
 		if ($gedcomid) {
@@ -1622,7 +1713,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuMyPage() {
+	protected function menuMyPage()
+	{
 		return new Menu(I18N::translate('My page'), 'index.php?ctype=user&amp;' . $this->tree_url, 'menu-mypage');
 	}
 
@@ -1631,7 +1723,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	protected function menuMyPages() {
+	protected function menuMyPages()
+	{
 		if (Auth::id()) {
 			return new Menu(I18N::translate('My pages'), '#', 'menu-mymenu', array(), array_filter(array(
 				$this->menuMyPage(),
@@ -1651,7 +1744,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	protected function menuMyPedigree() {
+	protected function menuMyPedigree()
+	{
 		$gedcomid = $this->tree->getUserPreference(Auth::user(), 'gedcomid');
 
 		if ($gedcomid && Module::isActiveChart($this->tree, 'pedigree_chart')) {
@@ -1673,7 +1767,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	protected function menuPendingChanges() {
+	protected function menuPendingChanges()
+	{
 		if ($this->pendingChangesExist()) {
 			$menu = new Menu(I18N::translate('Pending changes'), '#', 'menu-pending', array('onclick' => 'window.open("edit_changes.php", "_blank", chan_window_specs); return false;'));
 
@@ -1688,7 +1783,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	protected function menuReports() {
+	protected function menuReports()
+	{
 		$submenus = array();
 		foreach (Module::getActiveReports($this->tree) as $report) {
 			$submenus[] = $report->getReportMenu();
@@ -1706,7 +1802,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuSearch() {
+	protected function menuSearch()
+	{
 		return new Menu(I18N::translate('Search'), '#', 'menu-search', array('rel' => 'nofollow'), array_filter(array(
 			$this->menuSearchGeneral(),
 			$this->menuSearchPhonetic(),
@@ -1720,7 +1817,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuSearchGeneral() {
+	protected function menuSearchGeneral()
+	{
 		return new Menu(I18N::translate('General search'), 'search.php?' . $this->tree_url, 'menu-search-general', array('rel' => 'nofollow'));
 	}
 
@@ -1729,7 +1827,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuSearchPhonetic() {
+	protected function menuSearchPhonetic()
+	{
 		return new Menu(/* I18N: search using “sounds like”, rather than exact spelling */ I18N::translate('Phonetic search'), 'search.php?' . $this->tree_url . '&amp;action=soundex', 'menu-search-soundex', array('rel' => 'nofollow'));
 	}
 
@@ -1738,7 +1837,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuSearchAdvanced() {
+	protected function menuSearchAdvanced()
+	{
 		return new Menu(I18N::translate('Advanced search'), 'search_advanced.php?' . $this->tree_url, 'menu-search-advanced', array('rel' => 'nofollow'));
 	}
 
@@ -1747,7 +1847,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuSearchAndReplace() {
+	protected function menuSearchAndReplace()
+	{
 		if (Auth::isEditor($this->tree)) {
 			return new Menu(I18N::translate('Search and replace'), 'search.php?' . $this->tree_url . '&amp;action=replace', 'menu-search-replace');
 		} else {
@@ -1760,7 +1861,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function menuThemes() {
+	public function menuThemes()
+	{
 		if ($this->tree && Site::getPreference('ALLOW_USER_THEMES') && $this->tree->getPreference('ALLOW_THEME_DROPDOWN')) {
 			$submenus = array();
 			foreach (Theme::installedThemes() as $theme) {
@@ -1788,7 +1890,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function metaCharset() {
+	protected function metaCharset()
+	{
 		return '<meta charset="UTF-8">';
 	}
 
@@ -1799,7 +1902,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function metaDescription($description) {
+	protected function metaDescription($description)
+	{
 		if ($description) {
 			return '<meta name="description" content="' . $description . '">';
 		} else {
@@ -1814,7 +1918,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function metaGenerator($generator) {
+	protected function metaGenerator($generator)
+	{
 		if ($generator) {
 			return '<meta name="generator" content="' . $generator . '">';
 		} else {
@@ -1829,7 +1934,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function metaRobots($robots) {
+	protected function metaRobots($robots)
+	{
 		if ($robots) {
 			return '<meta name="robots" content="' . $robots . '">';
 		} else {
@@ -1842,7 +1948,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function metaUaCompatible() {
+	protected function metaUaCompatible()
+	{
 		return '<meta http-equiv="X-UA-Compatible" content="IE=edge">';
 	}
 
@@ -1851,7 +1958,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function metaViewport() {
+	protected function metaViewport()
+	{
 		return '<meta name="viewport" content="width=device-width, initial-scale=1">';
 	}
 
@@ -1862,7 +1970,8 @@ 
 	 *
 	 * @return int Number of views, or zero for pages that aren't logged.
 	 */
-	protected function pageViews(PageController $controller) {
+	protected function pageViews(PageController $controller)
+	{
 		if ($this->tree && $this->tree->getPreference('SHOW_COUNTER')) {
 			if (isset($controller->record) && $controller->record instanceof GedcomRecord) {
 				return HitCounter::countHit($this->tree, WT_SCRIPT_NAME, $controller->record->getXref());
@@ -1887,7 +1996,8 @@ 
 	 *
 	 * @return string|int|float
 	 */
-	public function parameter($parameter_name) {
+	public function parameter($parameter_name)
+	{
 		$parameters = array(
 			'chart-background-f'             => 'dddddd',
 			'chart-background-m'             => 'cccccc',
@@ -1936,7 +2046,8 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function pendingChangesExist() {
+	protected function pendingChangesExist()
+	{
 		return $this->tree && $this->tree->hasPendingEdit() && Auth::isModerator($this->tree);
 	}
 
@@ -1945,7 +2056,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function pendingChangesLink() {
+	protected function pendingChangesLink()
+	{
 		return
 			'<a href="#" onclick="window.open(\'edit_changes.php\', \'_blank\', chan_window_specs); return false;">' .
 			$this->pendingChangesLinkText() .
@@ -1957,7 +2069,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function pendingChangesLinkText() {
+	protected function pendingChangesLinkText()
+	{
 		return I18N::translate('There are pending changes for you to moderate.');
 	}
 
@@ -1966,7 +2079,8 @@ 
 	 *
 	 * @return Menu[]
 	 */
-	protected function primaryMenu() {
+	protected function primaryMenu()
+	{
 		global $controller;
 
 		if ($this->tree) {
@@ -1993,7 +2107,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function primaryMenuContainer(array $menus) {
+	protected function primaryMenuContainer(array $menus)
+	{
 		return '<nav><ul class="primary-menu">' . $this->primaryMenuContent($menus) . '</ul></nav>';
 	}
 
@@ -2004,7 +2119,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function primaryMenuContent(array $menus) {
+	protected function primaryMenuContent(array $menus)
+	{
 		return implode('', array_map(function (Menu $menu) {
 			return $menu->getMenuAsList();
 		}, $menus));
@@ -2015,7 +2131,8 @@ 
 	 *
 	 * @return Menu[]
 	 */
-	protected function secondaryMenu() {
+	protected function secondaryMenu()
+	{
 		return array_filter(array(
 			$this->menuPendingChanges(),
 			$this->menuMyPages(),
@@ -2034,7 +2151,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function secondaryMenuContainer(array $menus) {
+	protected function secondaryMenuContainer(array $menus)
+	{
 		return '<ul class="nav nav-pills secondary-menu">' . $this->secondaryMenuContent($menus) . '</ul>';
 	}
 
@@ -2045,7 +2163,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function secondaryMenuContent(array $menus) {
+	protected function secondaryMenuContent(array $menus)
+	{
 		return implode('', array_map(function (Menu $menu) {
 			return $menu->getMenuAsList();
 		}, $menus));
@@ -2054,7 +2173,8 @@ 
 	/**
 	 * Send any HTTP headers.
 	 */
-	public function sendHeaders() {
+	public function sendHeaders()
+	{
 		header('Content-Type: text/html; charset=UTF-8');
 	}
 
@@ -2063,7 +2183,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	protected function stylesheets() {
+	protected function stylesheets()
+	{
 		$stylesheets = array(
 			WT_BOOTSTRAP_CSS_URL,
 			WT_FONT_AWESOME_CSS_URL,
@@ -2084,7 +2205,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function title($title) {
+	protected function title($title)
+	{
 		return '<title>' . Filter::escapeHtml($title) . '</title>';
 	}
 }

app/Theme/WebtreesTheme.php

Indentation +102 added lines, -102 removed lines

@@ -22,114 +22,114 @@
  * The webtrees (default) theme.
  */
 class WebtreesTheme extends AbstractTheme implements ThemeInterface {
-	/**
-	 * Where are our CSS, JS and other assets?
-	 *
-	 * @return string A relative path, such as "themes/foo/"
-	 */
-	public function assetUrl() {
-		return 'themes/webtrees/css-1.7.8/';
-	}
+    /**
+     * Where are our CSS, JS and other assets?
+     *
+     * @return string A relative path, such as "themes/foo/"
+     */
+    public function assetUrl() {
+        return 'themes/webtrees/css-1.7.8/';
+    }
 
-	/**
-	 * Add markup to a flash message.
-	 *
-	 * @param \stdClass $message
-	 *
-	 * @return string
-	 */
-	protected function flashMessageContainer(\stdClass $message) {
-		// This theme uses jQueryUI markup.
-		switch ($message->status) {
-		case 'danger':
-			return '<p class="ui-state-error">' . $message->text . '</p>';
-		default:
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
-		}
-	}
+    /**
+     * Add markup to a flash message.
+     *
+     * @param \stdClass $message
+     *
+     * @return string
+     */
+    protected function flashMessageContainer(\stdClass $message) {
+        // This theme uses jQueryUI markup.
+        switch ($message->status) {
+        case 'danger':
+            return '<p class="ui-state-error">' . $message->text . '</p>';
+        default:
+            return '<p class="ui-state-highlight">' . $message->text . '</p>';
+        }
+    }
 
-	/**
-	 * Create a search field and submit button for the quick search form in the header.
-	 *
-	 * @return string
-	 */
-	protected function formQuickSearchFields() {
-		return
-			'<input type="search" name="query" size="25" placeholder="' . I18N::translate('Search') . '">' .
-			'<input type="image" class="image" src="' . $this->assetUrl() . 'images/search.png" alt="' . I18N::translate('Search') . '" title="' . I18N::translate('Search') . '">';
-	}
+    /**
+     * Create a search field and submit button for the quick search form in the header.
+     *
+     * @return string
+     */
+    protected function formQuickSearchFields() {
+        return
+            '<input type="search" name="query" size="25" placeholder="' . I18N::translate('Search') . '">' .
+            '<input type="image" class="image" src="' . $this->assetUrl() . 'images/search.png" alt="' . I18N::translate('Search') . '" title="' . I18N::translate('Search') . '">';
+    }
 
-	/**
-	 * Allow themes to add extra scripts to the page footer.
-	 *
-	 * @return string
-	 */
-	public function hookFooterExtraJavascript() {
-		return
-			'<script src="' . WT_JQUERY_COLORBOX_URL . '"></script>' .
-			'<script src="' . WT_JQUERY_WHEELZOOM_URL . '"></script>' .
-			'<script>' .
-			'activate_colorbox();' .
-			'jQuery.extend(jQuery.colorbox.settings, {' .
-			' width:"85%",' .
-			' height:"85%",' .
-			' transition:"none",' .
-			' slideshowStart:"' . I18N::translate('Play') . '",' .
-			' slideshowStop:"' . I18N::translate('Stop') . '",' .
-			' title: function() { return jQuery(this).data("title"); }' .
-			'});' .
-			'</script>';
-	}
+    /**
+     * Allow themes to add extra scripts to the page footer.
+     *
+     * @return string
+     */
+    public function hookFooterExtraJavascript() {
+        return
+            '<script src="' . WT_JQUERY_COLORBOX_URL . '"></script>' .
+            '<script src="' . WT_JQUERY_WHEELZOOM_URL . '"></script>' .
+            '<script>' .
+            'activate_colorbox();' .
+            'jQuery.extend(jQuery.colorbox.settings, {' .
+            ' width:"85%",' .
+            ' height:"85%",' .
+            ' transition:"none",' .
+            ' slideshowStart:"' . I18N::translate('Play') . '",' .
+            ' slideshowStop:"' . I18N::translate('Stop') . '",' .
+            ' title: function() { return jQuery(this).data("title"); }' .
+            '});' .
+            '</script>';
+    }
 
-	/**
-	 * Misecellaneous dimensions, fonts, styles, etc.
-	 *
-	 * @param string $parameter_name
-	 *
-	 * @return string|int|float
-	 */
-	public function parameter($parameter_name) {
-		$parameters = array(
-			'chart-background-f'             => 'e9daf1',
-			'chart-background-m'             => 'b1cff0',
-			'distribution-chart-high-values' => '84beff',
-			'distribution-chart-low-values'  => 'c3dfff',
-		);
+    /**
+     * Misecellaneous dimensions, fonts, styles, etc.
+     *
+     * @param string $parameter_name
+     *
+     * @return string|int|float
+     */
+    public function parameter($parameter_name) {
+        $parameters = array(
+            'chart-background-f'             => 'e9daf1',
+            'chart-background-m'             => 'b1cff0',
+            'distribution-chart-high-values' => '84beff',
+            'distribution-chart-low-values'  => 'c3dfff',
+        );
 
-		if (array_key_exists($parameter_name, $parameters)) {
-			return $parameters[$parameter_name];
-		} else {
-			return parent::parameter($parameter_name);
-		}
-	}
+        if (array_key_exists($parameter_name, $parameters)) {
+            return $parameters[$parameter_name];
+        } else {
+            return parent::parameter($parameter_name);
+        }
+    }
 
-	/**
-	 * A list of CSS files to include for this page.
-	 *
-	 * @return string[]
-	 */
-	protected function stylesheets() {
-		return array(
-			'themes/webtrees/jquery-ui-1.11.2/jquery-ui.css',
-			$this->assetUrl() . 'style.css',
-		);
-	}
+    /**
+     * A list of CSS files to include for this page.
+     *
+     * @return string[]
+     */
+    protected function stylesheets() {
+        return array(
+            'themes/webtrees/jquery-ui-1.11.2/jquery-ui.css',
+            $this->assetUrl() . 'style.css',
+        );
+    }
 
-	/**
-	 * A fixed string to identify this theme, in settings, etc.
-	 *
-	 * @return string
-	 */
-	public function themeId() {
-		return 'webtrees';
-	}
+    /**
+     * A fixed string to identify this theme, in settings, etc.
+     *
+     * @return string
+     */
+    public function themeId() {
+        return 'webtrees';
+    }
 
-	/**
-	 * What is this theme called?
-	 *
-	 * @return string
-	 */
-	public function themeName() {
-		return I18N::translate('webtrees');
-	}
+    /**
+     * What is this theme called?
+     *
+     * @return string
+     */
+    public function themeName() {
+        return I18N::translate('webtrees');
+    }
 }

Braces +18 added lines, -9 removed lines

@@ -21,13 +21,15 @@ 
 /**
  * The webtrees (default) theme.
  */
-class WebtreesTheme extends AbstractTheme implements ThemeInterface {
+class WebtreesTheme extends AbstractTheme implements ThemeInterface
+{
 	/**
 	 * Where are our CSS, JS and other assets?
 	 *
 	 * @return string A relative path, such as "themes/foo/"
 	 */
-	public function assetUrl() {
+	public function assetUrl()
+	{
 		return 'themes/webtrees/css-1.7.8/';
 	}
 
@@ -38,7 +40,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function flashMessageContainer(\stdClass $message) {
+	protected function flashMessageContainer(\stdClass $message)
+	{
 		// This theme uses jQueryUI markup.
 		switch ($message->status) {
 		case 'danger':
@@ -53,7 +56,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formQuickSearchFields() {
+	protected function formQuickSearchFields()
+	{
 		return
 			'<input type="search" name="query" size="25" placeholder="' . I18N::translate('Search') . '">' .
 			'<input type="image" class="image" src="' . $this->assetUrl() . 'images/search.png" alt="' . I18N::translate('Search') . '" title="' . I18N::translate('Search') . '">';
@@ -64,7 +68,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function hookFooterExtraJavascript() {
+	public function hookFooterExtraJavascript()
+	{
 		return
 			'<script src="' . WT_JQUERY_COLORBOX_URL . '"></script>' .
 			'<script src="' . WT_JQUERY_WHEELZOOM_URL . '"></script>' .
@@ -88,7 +93,8 @@ 
 	 *
 	 * @return string|int|float
 	 */
-	public function parameter($parameter_name) {
+	public function parameter($parameter_name)
+	{
 		$parameters = array(
 			'chart-background-f'             => 'e9daf1',
 			'chart-background-m'             => 'b1cff0',
@@ -108,7 +114,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	protected function stylesheets() {
+	protected function stylesheets()
+	{
 		return array(
 			'themes/webtrees/jquery-ui-1.11.2/jquery-ui.css',
 			$this->assetUrl() . 'style.css',
@@ -120,7 +127,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function themeId() {
+	public function themeId()
+	{
 		return 'webtrees';
 	}
 
@@ -129,7 +137,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function themeName() {
+	public function themeName()
+	{
 		return I18N::translate('webtrees');
 	}
 }

Switch Indentation +4 added lines, -4 removed lines

@@ -42,10 +42,10 @@
 	protected function flashMessageContainer(\stdClass $message) {
 		// This theme uses jQueryUI markup.
 		switch ($message->status) {
-		case 'danger':
-			return '<p class="ui-state-error">' . $message->text . '</p>';
-		default:
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
+		    case 'danger':
+			    return '<p class="ui-state-error">' . $message->text . '</p>';
+		    default:
+			    return '<p class="ui-state-highlight">' . $message->text . '</p>';
 		}
 	}
 

app/Theme/AdministrationTheme.php

Indentation +258 added lines, -258 removed lines

@@ -24,283 +24,283 @@
  * The theme for the control panel.
  */
 class AdministrationTheme extends AbstractTheme implements ThemeInterface {
-	/**
-	 * A list of CSS files to include for this page.
-	 *
-	 * @return string[]
-	 */
-	protected function stylesheets() {
-		$stylesheets   = parent::stylesheets();
-		$stylesheets[] = WT_DATATABLES_BOOTSTRAP_CSS_URL;
-		$stylesheets[] = WT_BOOTSTRAP_DATETIMEPICKER_CSS_URL;
-		$stylesheets[] = $this->assetUrl() . 'style.css';
+    /**
+     * A list of CSS files to include for this page.
+     *
+     * @return string[]
+     */
+    protected function stylesheets() {
+        $stylesheets   = parent::stylesheets();
+        $stylesheets[] = WT_DATATABLES_BOOTSTRAP_CSS_URL;
+        $stylesheets[] = WT_BOOTSTRAP_DATETIMEPICKER_CSS_URL;
+        $stylesheets[] = $this->assetUrl() . 'style.css';
 
-		return $stylesheets;
-	}
+        return $stylesheets;
+    }
 
-	/**
-	 * Where are our CSS, JS and other assets?
-	 *
-	 * @return string A relative path, such as "themes/foo/"
-	 */
-	public function assetUrl() {
-		return 'themes/_administration/css-1.7.5/';
-	}
+    /**
+     * Where are our CSS, JS and other assets?
+     *
+     * @return string A relative path, such as "themes/foo/"
+     */
+    public function assetUrl() {
+        return 'themes/_administration/css-1.7.5/';
+    }
 
-	/**
-	 * HTML link to a "favorites icon".
-	 *
-	 * @return string
-	 */
-	protected function favicon() {
-		return '<link rel="icon" href="favicon.ico" type="image/x-icon">';
-	}
-	/**
-	 * Create the contents of the <footer> tag.
-	 *
-	 * @return string
-	 */
-	protected function footerContent() {
-		return '';
-	}
+    /**
+     * HTML link to a "favorites icon".
+     *
+     * @return string
+     */
+    protected function favicon() {
+        return '<link rel="icon" href="favicon.ico" type="image/x-icon">';
+    }
+    /**
+     * Create the contents of the <footer> tag.
+     *
+     * @return string
+     */
+    protected function footerContent() {
+        return '';
+    }
 
-	/**
-	 * Create the contents of the <header> tag.
-	 *
-	 * @return string
-	 */
-	protected function headerContent() {
-		return
-			$this->accessibilityLinks() .
-			$this->secondaryMenuContainer($this->secondaryMenu());
-	}
+    /**
+     * Create the contents of the <header> tag.
+     *
+     * @return string
+     */
+    protected function headerContent() {
+        return
+            $this->accessibilityLinks() .
+            $this->secondaryMenuContainer($this->secondaryMenu());
+    }
 
-	/**
-	 * Allow themes to add extra scripts to the page footer.
-	 *
-	 * @return string
-	 */
-	public function hookFooterExtraJavascript() {
-		return
-			'<script src="' . WT_BOOTSTRAP_JS_URL . '"></script>';
-	}
+    /**
+     * Allow themes to add extra scripts to the page footer.
+     *
+     * @return string
+     */
+    public function hookFooterExtraJavascript() {
+        return
+            '<script src="' . WT_BOOTSTRAP_JS_URL . '"></script>';
+    }
 
-	/**
-	 * Site administration functions.
-	 *
-	 * @return Menu
-	 */
-	protected function menuAdminSite() {
-		return new Menu(/* I18N: Menu entry*/ I18N::translate('Website'), '#', '', array(), array(
-			new Menu(/* I18N: Menu entry */ I18N::translate('Website preferences'), 'admin_site_config.php?action=site'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('Sending email'), 'admin_site_config.php?action=email'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('Sign-in and registration'), 'admin_site_config.php?action=login'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('Languages'), 'admin_site_config.php?action=languages'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('Tracking and analytics'), 'admin_site_config.php?action=tracking'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('Website logs'), 'admin_site_logs.php'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('Website access rules'), 'admin_site_access.php'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('Clean up data folder'), 'admin_site_clean.php'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('Server information'), 'admin_site_info.php'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('README documentation'), 'admin_site_readme.php'),
-		));
-	}
+    /**
+     * Site administration functions.
+     *
+     * @return Menu
+     */
+    protected function menuAdminSite() {
+        return new Menu(/* I18N: Menu entry*/ I18N::translate('Website'), '#', '', array(), array(
+            new Menu(/* I18N: Menu entry */ I18N::translate('Website preferences'), 'admin_site_config.php?action=site'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('Sending email'), 'admin_site_config.php?action=email'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('Sign-in and registration'), 'admin_site_config.php?action=login'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('Languages'), 'admin_site_config.php?action=languages'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('Tracking and analytics'), 'admin_site_config.php?action=tracking'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('Website logs'), 'admin_site_logs.php'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('Website access rules'), 'admin_site_access.php'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('Clean up data folder'), 'admin_site_clean.php'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('Server information'), 'admin_site_info.php'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('README documentation'), 'admin_site_readme.php'),
+        ));
+    }
 
-	/**
-	 * Tree administration menu.
-	 *
-	 * @return Menu
-	 */
-	protected function menuAdminTrees() {
-		return new Menu(/* I18N: Menu entry */ I18N::translate('Family trees'), '#', '', array(), array_filter(array(
-			$this->menuAdminTreesManage(),
-			$this->menuAdminTreesSetDefault(),
-			$this->menuAdminTreesMerge(),
-		)));
-	}
+    /**
+     * Tree administration menu.
+     *
+     * @return Menu
+     */
+    protected function menuAdminTrees() {
+        return new Menu(/* I18N: Menu entry */ I18N::translate('Family trees'), '#', '', array(), array_filter(array(
+            $this->menuAdminTreesManage(),
+            $this->menuAdminTreesSetDefault(),
+            $this->menuAdminTreesMerge(),
+        )));
+    }
 
-	/**
-	 * Manage trees menu.
-	 *
-	 * @return Menu
-	 */
-	protected function menuAdminTreesManage() {
-		return new Menu(/* I18N: Menu entry */ I18N::translate('Manage family trees'), 'admin_trees_manage.php');
-	}
+    /**
+     * Manage trees menu.
+     *
+     * @return Menu
+     */
+    protected function menuAdminTreesManage() {
+        return new Menu(/* I18N: Menu entry */ I18N::translate('Manage family trees'), 'admin_trees_manage.php');
+    }
 
-	/**
-	 * Merge trees menu.
-	 *
-	 * @return Menu|null
-	 */
-	protected function menuAdminTreesMerge() {
-		if (Auth::isAdmin() && count(Tree::getAll()) > 1) {
-			return new Menu(/* I18N: Menu entry */ I18N::translate('Merge family trees'), 'admin_trees_merge.php');
-		} else {
-			return null;
-		}
-	}
+    /**
+     * Merge trees menu.
+     *
+     * @return Menu|null
+     */
+    protected function menuAdminTreesMerge() {
+        if (Auth::isAdmin() && count(Tree::getAll()) > 1) {
+            return new Menu(/* I18N: Menu entry */ I18N::translate('Merge family trees'), 'admin_trees_merge.php');
+        } else {
+            return null;
+        }
+    }
 
-	/**
-	 * Set default blocks menu.
-	 *
-	 * @return Menu|null
-	 */
-	protected function menuAdminTreesSetDefault() {
-		if (Auth::isAdmin() && count(Tree::getAll()) > 1) {
-			return new Menu(/* I18N: Menu entry */ I18N::translate('Set the default blocks for new family trees'), 'index_edit.php?gedcom_id=-1');
-		} else {
-			return null;
-		}
-	}
+    /**
+     * Set default blocks menu.
+     *
+     * @return Menu|null
+     */
+    protected function menuAdminTreesSetDefault() {
+        if (Auth::isAdmin() && count(Tree::getAll()) > 1) {
+            return new Menu(/* I18N: Menu entry */ I18N::translate('Set the default blocks for new family trees'), 'index_edit.php?gedcom_id=-1');
+        } else {
+            return null;
+        }
+    }
 
-	/**
-	 * User administration menu.
-	 *
-	 * @return Menu
-	 */
-	protected function menuAdminUsers() {
-		return new Menu(/* I18N: Menu entry */ I18N::translate('Users'), '#', '', array(), array(
-			new Menu(/* I18N: Menu entry */ I18N::translate('User administration'), 'admin_users.php'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('Add a user'), 'admin_users.php?action=edit'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('Send broadcast messages'), 'admin_users_bulk.php'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('Delete inactive users'), 'admin_users.php?action=cleanup'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('Set the default blocks for new users'), 'index_edit.php?user_id=-1'),
-		));
-	}
+    /**
+     * User administration menu.
+     *
+     * @return Menu
+     */
+    protected function menuAdminUsers() {
+        return new Menu(/* I18N: Menu entry */ I18N::translate('Users'), '#', '', array(), array(
+            new Menu(/* I18N: Menu entry */ I18N::translate('User administration'), 'admin_users.php'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('Add a user'), 'admin_users.php?action=edit'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('Send broadcast messages'), 'admin_users_bulk.php'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('Delete inactive users'), 'admin_users.php?action=cleanup'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('Set the default blocks for new users'), 'index_edit.php?user_id=-1'),
+        ));
+    }
 
-	/**
-	 * Media administration menu.
-	 *
-	 * @return Menu
-	 */
-	protected function menuAdminMedia() {
-		return new Menu(/* I18N: Menu entry */ I18N::translate('Media'), '#', '', array(), array(
-			new Menu(/* I18N: Menu entry */ I18N::translate('Manage media'), 'admin_media.php'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('Upload media files'), 'admin_media_upload.php'),
-		));
-	}
+    /**
+     * Media administration menu.
+     *
+     * @return Menu
+     */
+    protected function menuAdminMedia() {
+        return new Menu(/* I18N: Menu entry */ I18N::translate('Media'), '#', '', array(), array(
+            new Menu(/* I18N: Menu entry */ I18N::translate('Manage media'), 'admin_media.php'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('Upload media files'), 'admin_media_upload.php'),
+        ));
+    }
 
-	/**
-	 * Module administration menu.
-	 *
-	 * @return Menu
-	 */
-	protected function menuAdminModules() {
-		return new Menu(/* I18N: Menu entry */ I18N::translate('Modules'), '#', '', array(), array(
-			new Menu(/* I18N: Menu entry */ I18N::translate('Module administration'), 'admin_modules.php'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('Menus'), 'admin_module_menus.php'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('Tabs'), 'admin_module_tabs.php'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('Blocks'), 'admin_module_blocks.php'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('Sidebars'), 'admin_module_sidebar.php'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('Charts'), 'admin_module_charts.php'),
-			new Menu(/* I18N: Menu entry */ I18N::translate('Reports'), 'admin_module_reports.php'),
-		));
-	}
+    /**
+     * Module administration menu.
+     *
+     * @return Menu
+     */
+    protected function menuAdminModules() {
+        return new Menu(/* I18N: Menu entry */ I18N::translate('Modules'), '#', '', array(), array(
+            new Menu(/* I18N: Menu entry */ I18N::translate('Module administration'), 'admin_modules.php'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('Menus'), 'admin_module_menus.php'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('Tabs'), 'admin_module_tabs.php'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('Blocks'), 'admin_module_blocks.php'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('Sidebars'), 'admin_module_sidebar.php'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('Charts'), 'admin_module_charts.php'),
+            new Menu(/* I18N: Menu entry */ I18N::translate('Reports'), 'admin_module_reports.php'),
+        ));
+    }
 
-	/**
-	 * Generate a list of items for the main menu.
-	 *
-	 * @return Menu[]
-	 */
-	protected function primaryMenu() {
-		if (Auth::isAdmin()) {
-			return array(
-				$this->menuAdminSite(),
-				$this->menuAdminTrees(),
-				$this->menuAdminUsers(),
-				$this->menuAdminMedia(),
-				$this->menuAdminModules(),
-			);
-		} else {
-			return array(
-				$this->menuAdminTrees(),
-			);
-		}
-	}
+    /**
+     * Generate a list of items for the main menu.
+     *
+     * @return Menu[]
+     */
+    protected function primaryMenu() {
+        if (Auth::isAdmin()) {
+            return array(
+                $this->menuAdminSite(),
+                $this->menuAdminTrees(),
+                $this->menuAdminUsers(),
+                $this->menuAdminMedia(),
+                $this->menuAdminModules(),
+            );
+        } else {
+            return array(
+                $this->menuAdminTrees(),
+            );
+        }
+    }
 
-	/**
-	 * Add markup to the primary menu.
-	 *
-	 * @param Menu[] $menus
-	 *
-	 * @return string
-	 */
-	protected function primaryMenuContainer(array $menus) {
-		$html = '';
-		foreach ($menus as $menu) {
-			$html .= $menu->bootstrap();
-		}
+    /**
+     * Add markup to the primary menu.
+     *
+     * @param Menu[] $menus
+     *
+     * @return string
+     */
+    protected function primaryMenuContainer(array $menus) {
+        $html = '';
+        foreach ($menus as $menu) {
+            $html .= $menu->bootstrap();
+        }
 
-		return
-			'<nav class="navbar navbar-default">' .
-			'<div class="navbar-header">' .
-			'<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#primary-navbar-collapse">' .
-			'<span class="sr-only">Toggle navigation</span>' .
-			'<span class="icon-bar"></span>' .
-			'<span class="icon-bar"></span>' .
-			'<span class="icon-bar"></span>' .
-			'</button>' .
-			'<a class="navbar-brand" href="admin.php">' . I18N::translate('Control panel') . '</a>' .
-			'</div>' .
-			'<div class="collapse navbar-collapse" id="primary-navbar-collapse">' .
-			'<ul class="nav navbar-nav">' .
-			$html .
-			'</ul>' .
-			'</div>' .
-			'</nav>';
-	}
+        return
+            '<nav class="navbar navbar-default">' .
+            '<div class="navbar-header">' .
+            '<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#primary-navbar-collapse">' .
+            '<span class="sr-only">Toggle navigation</span>' .
+            '<span class="icon-bar"></span>' .
+            '<span class="icon-bar"></span>' .
+            '<span class="icon-bar"></span>' .
+            '</button>' .
+            '<a class="navbar-brand" href="admin.php">' . I18N::translate('Control panel') . '</a>' .
+            '</div>' .
+            '<div class="collapse navbar-collapse" id="primary-navbar-collapse">' .
+            '<ul class="nav navbar-nav">' .
+            $html .
+            '</ul>' .
+            '</div>' .
+            '</nav>';
+    }
 
-	/**
-	 * Generate a list of items for the user menu.
-	 *
-	 * @return Menu[]
-	 */
-	protected function secondaryMenu() {
-		return array_filter(array(
-			$this->menuPendingChanges(),
-			$this->menuMyPage(),
-			$this->menuLanguages(),
-			$this->menuLogout(),
-		));
-	}
+    /**
+     * Generate a list of items for the user menu.
+     *
+     * @return Menu[]
+     */
+    protected function secondaryMenu() {
+        return array_filter(array(
+            $this->menuPendingChanges(),
+            $this->menuMyPage(),
+            $this->menuLanguages(),
+            $this->menuLogout(),
+        ));
+    }
 
-	/**
-	 * Add markup to the secondary menu.
-	 *
-	 * @param Menu[] $menus
-	 *
-	 * @return string
-	 */
-	protected function secondaryMenuContainer(array $menus) {
-		return '<div class="clearfix"><ul class="nav nav-pills small pull-right flip" role="menu">' . $this->secondaryMenuContent($menus) . '</ul></div>';
-	}
+    /**
+     * Add markup to the secondary menu.
+     *
+     * @param Menu[] $menus
+     *
+     * @return string
+     */
+    protected function secondaryMenuContainer(array $menus) {
+        return '<div class="clearfix"><ul class="nav nav-pills small pull-right flip" role="menu">' . $this->secondaryMenuContent($menus) . '</ul></div>';
+    }
 
-	/**
-	 * Format the secondary menu.
-	 *
-	 * @param Menu[] $menus
-	 *
-	 * @return string
-	 */
-	protected function secondaryMenuContent(array $menus) {
-		return implode('', array_map(function (Menu $menu) { return $menu->bootstrap(); }, $menus));
-	}
+    /**
+     * Format the secondary menu.
+     *
+     * @param Menu[] $menus
+     *
+     * @return string
+     */
+    protected function secondaryMenuContent(array $menus) {
+        return implode('', array_map(function (Menu $menu) { return $menu->bootstrap(); }, $menus));
+    }
 
-	/**
-	 * A fixed string to identify this theme, in settings, etc.
-	 *
-	 * @return string
-	 */
-	public function themeId() {
-		return '_administration';
-	}
+    /**
+     * A fixed string to identify this theme, in settings, etc.
+     *
+     * @return string
+     */
+    public function themeId() {
+        return '_administration';
+    }
 
-	/**
-	 * What is this theme called?
-	 *
-	 * @return string
-	 */
-	public function themeName() {
-		return 'administration';
-	}
+    /**
+     * What is this theme called?
+     *
+     * @return string
+     */
+    public function themeName() {
+        return 'administration';
+    }
 }

Braces +44 added lines, -22 removed lines

@@ -23,13 +23,15 @@ 
 /**
  * The theme for the control panel.
  */
-class AdministrationTheme extends AbstractTheme implements ThemeInterface {
+class AdministrationTheme extends AbstractTheme implements ThemeInterface
+{
 	/**
 	 * A list of CSS files to include for this page.
 	 *
 	 * @return string[]
 	 */
-	protected function stylesheets() {
+	protected function stylesheets()
+	{
 		$stylesheets   = parent::stylesheets();
 		$stylesheets[] = WT_DATATABLES_BOOTSTRAP_CSS_URL;
 		$stylesheets[] = WT_BOOTSTRAP_DATETIMEPICKER_CSS_URL;
@@ -43,7 +45,8 @@ 
 	 *
 	 * @return string A relative path, such as "themes/foo/"
 	 */
-	public function assetUrl() {
+	public function assetUrl()
+	{
 		return 'themes/_administration/css-1.7.5/';
 	}
 
@@ -52,7 +55,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function favicon() {
+	protected function favicon()
+	{
 		return '<link rel="icon" href="favicon.ico" type="image/x-icon">';
 	}
 	/**
@@ -60,7 +64,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function footerContent() {
+	protected function footerContent()
+	{
 		return '';
 	}
 
@@ -69,7 +74,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function headerContent() {
+	protected function headerContent()
+	{
 		return
 			$this->accessibilityLinks() .
 			$this->secondaryMenuContainer($this->secondaryMenu());
@@ -80,7 +86,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function hookFooterExtraJavascript() {
+	public function hookFooterExtraJavascript()
+	{
 		return
 			'<script src="' . WT_BOOTSTRAP_JS_URL . '"></script>';
 	}
@@ -90,7 +97,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuAdminSite() {
+	protected function menuAdminSite()
+	{
 		return new Menu(/* I18N: Menu entry*/ I18N::translate('Website'), '#', '', array(), array(
 			new Menu(/* I18N: Menu entry */ I18N::translate('Website preferences'), 'admin_site_config.php?action=site'),
 			new Menu(/* I18N: Menu entry */ I18N::translate('Sending email'), 'admin_site_config.php?action=email'),
@@ -110,7 +118,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuAdminTrees() {
+	protected function menuAdminTrees()
+	{
 		return new Menu(/* I18N: Menu entry */ I18N::translate('Family trees'), '#', '', array(), array_filter(array(
 			$this->menuAdminTreesManage(),
 			$this->menuAdminTreesSetDefault(),
@@ -123,7 +132,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuAdminTreesManage() {
+	protected function menuAdminTreesManage()
+	{
 		return new Menu(/* I18N: Menu entry */ I18N::translate('Manage family trees'), 'admin_trees_manage.php');
 	}
 
@@ -132,7 +142,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	protected function menuAdminTreesMerge() {
+	protected function menuAdminTreesMerge()
+	{
 		if (Auth::isAdmin() && count(Tree::getAll()) > 1) {
 			return new Menu(/* I18N: Menu entry */ I18N::translate('Merge family trees'), 'admin_trees_merge.php');
 		} else {
@@ -145,7 +156,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	protected function menuAdminTreesSetDefault() {
+	protected function menuAdminTreesSetDefault()
+	{
 		if (Auth::isAdmin() && count(Tree::getAll()) > 1) {
 			return new Menu(/* I18N: Menu entry */ I18N::translate('Set the default blocks for new family trees'), 'index_edit.php?gedcom_id=-1');
 		} else {
@@ -158,7 +170,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuAdminUsers() {
+	protected function menuAdminUsers()
+	{
 		return new Menu(/* I18N: Menu entry */ I18N::translate('Users'), '#', '', array(), array(
 			new Menu(/* I18N: Menu entry */ I18N::translate('User administration'), 'admin_users.php'),
 			new Menu(/* I18N: Menu entry */ I18N::translate('Add a user'), 'admin_users.php?action=edit'),
@@ -173,7 +186,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuAdminMedia() {
+	protected function menuAdminMedia()
+	{
 		return new Menu(/* I18N: Menu entry */ I18N::translate('Media'), '#', '', array(), array(
 			new Menu(/* I18N: Menu entry */ I18N::translate('Manage media'), 'admin_media.php'),
 			new Menu(/* I18N: Menu entry */ I18N::translate('Upload media files'), 'admin_media_upload.php'),
@@ -185,7 +199,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuAdminModules() {
+	protected function menuAdminModules()
+	{
 		return new Menu(/* I18N: Menu entry */ I18N::translate('Modules'), '#', '', array(), array(
 			new Menu(/* I18N: Menu entry */ I18N::translate('Module administration'), 'admin_modules.php'),
 			new Menu(/* I18N: Menu entry */ I18N::translate('Menus'), 'admin_module_menus.php'),
@@ -202,7 +217,8 @@ 
 	 *
 	 * @return Menu[]
 	 */
-	protected function primaryMenu() {
+	protected function primaryMenu()
+	{
 		if (Auth::isAdmin()) {
 			return array(
 				$this->menuAdminSite(),
@@ -225,7 +241,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function primaryMenuContainer(array $menus) {
+	protected function primaryMenuContainer(array $menus)
+	{
 		$html = '';
 		foreach ($menus as $menu) {
 			$html .= $menu->bootstrap();
@@ -255,7 +272,8 @@ 
 	 *
 	 * @return Menu[]
 	 */
-	protected function secondaryMenu() {
+	protected function secondaryMenu()
+	{
 		return array_filter(array(
 			$this->menuPendingChanges(),
 			$this->menuMyPage(),
@@ -271,7 +289,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function secondaryMenuContainer(array $menus) {
+	protected function secondaryMenuContainer(array $menus)
+	{
 		return '<div class="clearfix"><ul class="nav nav-pills small pull-right flip" role="menu">' . $this->secondaryMenuContent($menus) . '</ul></div>';
 	}
 
@@ -282,7 +301,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function secondaryMenuContent(array $menus) {
+	protected function secondaryMenuContent(array $menus)
+	{
 		return implode('', array_map(function (Menu $menu) { return $menu->bootstrap(); }, $menus));
 	}
 
@@ -291,7 +311,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function themeId() {
+	public function themeId()
+	{
 		return '_administration';
 	}
 
@@ -300,7 +321,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function themeName() {
+	public function themeName()
+	{
 		return 'administration';
 	}
 }

app/Theme/ThemeInterface.php

Indentation +213 added lines, -213 removed lines

@@ -26,217 +26,217 @@
  * Specification for a theme.
  */
 interface ThemeInterface {
-	/**
-	 * Where are our CSS, JS and other assets?
-	 *
-	 * @return string A relative path, such as "themes/foo/"
-	 */
-	public function assetUrl();
-
-	/**
-	 * Create the top of the <body>.
-	 *
-	 * @return string
-	 */
-	public function bodyHeader();
-
-	/**
-	 * Create the top of the <body> (for popup windows).
-	 *
-	 * @return string
-	 */
-	public function bodyHeaderPopupWindow();
-
-	/**
-	 * Create a contact link for a user.
-	 *
-	 * @param User $user
-	 *
-	 * @return string
-	 */
-	public function contactLink(User $user);
-
-	/**
-	 * Create the <DOCTYPE> tag.
-	 *
-	 * @return string
-	 */
-	public function doctype();
-
-	/**
-	 * Close the main content and create the <footer> tag.
-	 *
-	 * @return string
-	 */
-	public function footerContainer();
-
-	/**
-	 * Close the main content.
-	 * Note that popup windows are deprecated
-	 *
-	 * @return string
-	 */
-	public function footerContainerPopupWindow();
-
-	/**
-	 * Format the contents of a variable-height home-page block.
-	 *
-	 * @param string $id
-	 * @param string $title
-	 * @param string $class
-	 * @param string $content
-	 *
-	 * @return string
-	 */
-	public function formatBlock($id, $title, $class, $content);
-
-	/**
-	 * Create the <head> tag.
-	 *
-	 * @param PageController $controller The current controller
-	 *
-	 * @return string
-	 */
-	public function head(PageController $controller);
-
-	/**
-	 * Allow themes to do things after initialization (since they cannot use
-	 * the constructor).
-	 */
-	public function hookAfterInit();
-
-	/**
-	 * Allow themes to add extra scripts to the page footer.
-	 *
-	 * @return string
-	 */
-	public function hookFooterExtraJavascript();
-
-	/**
-	 * Allow themes to add extra content to the page header.
-	 * Typically this will be additional CSS.
-	 *
-	 * @return string
-	 */
-	public function hookHeaderExtraContent();
-
-	/**
-	 * Create the <html> tag.
-	 *
-	 * @return string
-	 */
-	public function html();
-
-	/**
-	 * Add HTML markup to create an alert
-	 *
-	 * @param string $html        The content of the alert
-	 * @param string $level       One of 'success', 'info', 'warning', 'danger'
-	 * @param bool   $dismissible If true, add a close button.
-	 *
-	 * @return string
-	 */
-	public function htmlAlert($html, $level, $dismissible);
-
-	/**
-	 * Display an icon for this fact.
-	 *
-	 * @param Fact $fact
-	 *
-	 * @return string
-	 */
-	public function icon(Fact $fact);
-
-	/**
-	 * Display an individual in a box - for charts, etc.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return string
-	 */
-	public function individualBox(Individual $individual);
-
-	/**
-	 * Display an empty box - for a missing individual in a chart.
-	 *
-	 * @return string
-	 */
-	public function individualBoxEmpty();
-
-	/**
-	 * Display an individual in a box - for charts, etc.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return string
-	 */
-	public function individualBoxLarge(Individual $individual);
-
-	/**
-	 * Display an individual in a box - for charts, etc.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return string
-	 */
-	public function individualBoxSmall(Individual $individual);
-
-	/**
-	 * Display an individual in a box - for charts, etc.
-	 *
-	 * @return string
-	 */
-	public function individualBoxSmallEmpty();
-
-	/**
-	 * Initialise the theme. We cannot pass these in a constructor, as the construction
-	 * happens in a theme file, and we need to be able to change it.
-	 *
-	 * @param Tree|null $tree The current tree (if there is one).
-	 */
-	public function init(Tree $tree = null);
-
-	/**
-	 * Links, to show in chart boxes;
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return Menu[]
-	 */
-	public function individualBoxMenu(Individual $individual);
-
-	/**
-	 * Themes menu.
-	 *
-	 * @return Menu|null
-	 */
-	public function menuThemes();
-
-	/**
-	 * Misecellaneous dimensions, fonts, styles, etc.
-	 *
-	 * @param string $parameter_name
-	 *
-	 * @return string|int|float
-	 */
-	public function parameter($parameter_name);
-
-	/**
-	 * Send any HTTP headers.
-	 */
-	public function sendHeaders();
-
-	/**
-	 * A fixed string to identify this theme, in settings, etc.
-	 *
-	 * @return string
-	 */
-	public function themeId();
-
-	/**
-	 * What is this theme called?
-	 *
-	 * @return string
-	 */
-	public function themeName();
+    /**
+     * Where are our CSS, JS and other assets?
+     *
+     * @return string A relative path, such as "themes/foo/"
+     */
+    public function assetUrl();
+
+    /**
+     * Create the top of the <body>.
+     *
+     * @return string
+     */
+    public function bodyHeader();
+
+    /**
+     * Create the top of the <body> (for popup windows).
+     *
+     * @return string
+     */
+    public function bodyHeaderPopupWindow();
+
+    /**
+     * Create a contact link for a user.
+     *
+     * @param User $user
+     *
+     * @return string
+     */
+    public function contactLink(User $user);
+
+    /**
+     * Create the <DOCTYPE> tag.
+     *
+     * @return string
+     */
+    public function doctype();
+
+    /**
+     * Close the main content and create the <footer> tag.
+     *
+     * @return string
+     */
+    public function footerContainer();
+
+    /**
+     * Close the main content.
+     * Note that popup windows are deprecated
+     *
+     * @return string
+     */
+    public function footerContainerPopupWindow();
+
+    /**
+     * Format the contents of a variable-height home-page block.
+     *
+     * @param string $id
+     * @param string $title
+     * @param string $class
+     * @param string $content
+     *
+     * @return string
+     */
+    public function formatBlock($id, $title, $class, $content);
+
+    /**
+     * Create the <head> tag.
+     *
+     * @param PageController $controller The current controller
+     *
+     * @return string
+     */
+    public function head(PageController $controller);
+
+    /**
+     * Allow themes to do things after initialization (since they cannot use
+     * the constructor).
+     */
+    public function hookAfterInit();
+
+    /**
+     * Allow themes to add extra scripts to the page footer.
+     *
+     * @return string
+     */
+    public function hookFooterExtraJavascript();
+
+    /**
+     * Allow themes to add extra content to the page header.
+     * Typically this will be additional CSS.
+     *
+     * @return string
+     */
+    public function hookHeaderExtraContent();
+
+    /**
+     * Create the <html> tag.
+     *
+     * @return string
+     */
+    public function html();
+
+    /**
+     * Add HTML markup to create an alert
+     *
+     * @param string $html        The content of the alert
+     * @param string $level       One of 'success', 'info', 'warning', 'danger'
+     * @param bool   $dismissible If true, add a close button.
+     *
+     * @return string
+     */
+    public function htmlAlert($html, $level, $dismissible);
+
+    /**
+     * Display an icon for this fact.
+     *
+     * @param Fact $fact
+     *
+     * @return string
+     */
+    public function icon(Fact $fact);
+
+    /**
+     * Display an individual in a box - for charts, etc.
+     *
+     * @param Individual $individual
+     *
+     * @return string
+     */
+    public function individualBox(Individual $individual);
+
+    /**
+     * Display an empty box - for a missing individual in a chart.
+     *
+     * @return string
+     */
+    public function individualBoxEmpty();
+
+    /**
+     * Display an individual in a box - for charts, etc.
+     *
+     * @param Individual $individual
+     *
+     * @return string
+     */
+    public function individualBoxLarge(Individual $individual);
+
+    /**
+     * Display an individual in a box - for charts, etc.
+     *
+     * @param Individual $individual
+     *
+     * @return string
+     */
+    public function individualBoxSmall(Individual $individual);
+
+    /**
+     * Display an individual in a box - for charts, etc.
+     *
+     * @return string
+     */
+    public function individualBoxSmallEmpty();
+
+    /**
+     * Initialise the theme. We cannot pass these in a constructor, as the construction
+     * happens in a theme file, and we need to be able to change it.
+     *
+     * @param Tree|null $tree The current tree (if there is one).
+     */
+    public function init(Tree $tree = null);
+
+    /**
+     * Links, to show in chart boxes;
+     *
+     * @param Individual $individual
+     *
+     * @return Menu[]
+     */
+    public function individualBoxMenu(Individual $individual);
+
+    /**
+     * Themes menu.
+     *
+     * @return Menu|null
+     */
+    public function menuThemes();
+
+    /**
+     * Misecellaneous dimensions, fonts, styles, etc.
+     *
+     * @param string $parameter_name
+     *
+     * @return string|int|float
+     */
+    public function parameter($parameter_name);
+
+    /**
+     * Send any HTTP headers.
+     */
+    public function sendHeaders();
+
+    /**
+     * A fixed string to identify this theme, in settings, etc.
+     *
+     * @return string
+     */
+    public function themeId();
+
+    /**
+     * What is this theme called?
+     *
+     * @return string
+     */
+    public function themeName();
 }

Braces +2 added lines, -1 removed lines

@@ -25,7 +25,8 @@
 /**
  * Specification for a theme.
  */
-interface ThemeInterface {
+interface ThemeInterface
+{
 	/**
 	 * Where are our CSS, JS and other assets?
 	 *

app/Theme/MinimalTheme.php

Indentation +134 added lines, -134 removed lines

@@ -21,149 +21,149 @@
  * The Minimal theme.
  */
 class MinimalTheme extends AbstractTheme implements ThemeInterface {
-	/**
-	 * Where are our CSS, JS and other assets?
-	 *
-	 * @return string A relative path, such as "themes/foo/"
-	 */
-	public function assetUrl() {
-		return 'themes/minimal/css-1.7.8/';
-	}
+    /**
+     * Where are our CSS, JS and other assets?
+     *
+     * @return string A relative path, such as "themes/foo/"
+     */
+    public function assetUrl() {
+        return 'themes/minimal/css-1.7.8/';
+    }
 
-	/**
-	 * Add markup to a flash message.
-	 *
-	 * @param \stdClass $message
-	 *
-	 * @return string
-	 */
-	protected function flashMessageContainer(\stdClass $message) {
-		// This theme uses jQueryUI markup.
-		switch ($message->status) {
-		case 'danger':
-			return '<p class="ui-state-error">' . $message->text . '</p>';
-		default:
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
-		}
-	}
+    /**
+     * Add markup to a flash message.
+     *
+     * @param \stdClass $message
+     *
+     * @return string
+     */
+    protected function flashMessageContainer(\stdClass $message) {
+        // This theme uses jQueryUI markup.
+        switch ($message->status) {
+        case 'danger':
+            return '<p class="ui-state-error">' . $message->text . '</p>';
+        default:
+            return '<p class="ui-state-highlight">' . $message->text . '</p>';
+        }
+    }
 
-	/**
-	 * Create a search field and submit button for the quick search form in the header.
-	 *
-	 * @return string
-	 */
-	protected function formQuickSearchFields() {
-		return
-			'<input type="search" name="query" size="20" placeholder="' . I18N::translate('Search') . '">';
-	}
+    /**
+     * Create a search field and submit button for the quick search form in the header.
+     *
+     * @return string
+     */
+    protected function formQuickSearchFields() {
+        return
+            '<input type="search" name="query" size="20" placeholder="' . I18N::translate('Search') . '">';
+    }
 
-	/**
-	 * Add markup to the secondary menu.
-	 *
-	 * @return string
-	 */
-	protected function formatSecondaryMenu() {
-		return
-			'<ul class="secondary-menu">' .
-			implode('', $this->secondaryMenu()) .
-			'<li>' .
-			$this->formQuickSearch() .
-			'</li>' .
-			'</ul>';
-	}
+    /**
+     * Add markup to the secondary menu.
+     *
+     * @return string
+     */
+    protected function formatSecondaryMenu() {
+        return
+            '<ul class="secondary-menu">' .
+            implode('', $this->secondaryMenu()) .
+            '<li>' .
+            $this->formQuickSearch() .
+            '</li>' .
+            '</ul>';
+    }
 
-	/**
-	 * Create the contents of the <header> tag.
-	 *
-	 * @return string
-	 */
-	protected function headerContent() {
-		return
-			//$this->accessibilityLinks() .
-			$this->formatTreeTitle() .
-			$this->formatSecondaryMenu();
-	}
+    /**
+     * Create the contents of the <header> tag.
+     *
+     * @return string
+     */
+    protected function headerContent() {
+        return
+            //$this->accessibilityLinks() .
+            $this->formatTreeTitle() .
+            $this->formatSecondaryMenu();
+    }
 
-	/**
-	 * A small "powered by webtrees" logo for the footer.
-	 *
-	 * @return string
-	 */
-	protected function logoPoweredBy() {
-		return '<a href="' . WT_WEBTREES_URL . '" class="powered-by-webtrees" title="' . WT_WEBTREES_URL . '">' . WT_WEBTREES . '</a>';
-	}
+    /**
+     * A small "powered by webtrees" logo for the footer.
+     *
+     * @return string
+     */
+    protected function logoPoweredBy() {
+        return '<a href="' . WT_WEBTREES_URL . '" class="powered-by-webtrees" title="' . WT_WEBTREES_URL . '">' . WT_WEBTREES . '</a>';
+    }
 
-	/**
-	 * Allow themes to add extra scripts to the page footer.
-	 *
-	 * @return string
-	 */
-	public function hookFooterExtraJavascript() {
-		return
-			'<script src="' . WT_JQUERY_COLORBOX_URL . '"></script>' .
-			'<script src="' . WT_JQUERY_WHEELZOOM_URL . '"></script>' .
-			'<script>' .
-			'activate_colorbox();' .
-			'jQuery.extend(jQuery.colorbox.settings, {' .
-			' width: "85%",' .
-			' height: "85%",' .
-			' transition: "none",' .
-			' slideshowStart: "' . I18N::translate('Play') . '",' .
-			' slideshowStop: "' . I18N::translate('Stop') . '",' .
-			' title: function() { return jQuery(this).data("title"); }' .
-			'});' .
-			'</script>';
-	}
+    /**
+     * Allow themes to add extra scripts to the page footer.
+     *
+     * @return string
+     */
+    public function hookFooterExtraJavascript() {
+        return
+            '<script src="' . WT_JQUERY_COLORBOX_URL . '"></script>' .
+            '<script src="' . WT_JQUERY_WHEELZOOM_URL . '"></script>' .
+            '<script>' .
+            'activate_colorbox();' .
+            'jQuery.extend(jQuery.colorbox.settings, {' .
+            ' width: "85%",' .
+            ' height: "85%",' .
+            ' transition: "none",' .
+            ' slideshowStart: "' . I18N::translate('Play') . '",' .
+            ' slideshowStop: "' . I18N::translate('Stop') . '",' .
+            ' title: function() { return jQuery(this).data("title"); }' .
+            '});' .
+            '</script>';
+    }
 
-	/**
-	 * Misecellaneous dimensions, fonts, styles, etc.
-	 *
-	 * @param string $parameter_name
-	 *
-	 * @return string|int|float
-	 */
-	public function parameter($parameter_name) {
-		$parameters = array(
-			'chart-background-f'             => 'dddddd',
-			'chart-background-m'             => 'cccccc',
-			'distribution-chart-low-values'  => 'cccccc',
-			'distribution-chart-no-values'   => 'ffffff',
-		);
+    /**
+     * Misecellaneous dimensions, fonts, styles, etc.
+     *
+     * @param string $parameter_name
+     *
+     * @return string|int|float
+     */
+    public function parameter($parameter_name) {
+        $parameters = array(
+            'chart-background-f'             => 'dddddd',
+            'chart-background-m'             => 'cccccc',
+            'distribution-chart-low-values'  => 'cccccc',
+            'distribution-chart-no-values'   => 'ffffff',
+        );
 
-		if (array_key_exists($parameter_name, $parameters)) {
-			return $parameters[$parameter_name];
-		} else {
-			return parent::parameter($parameter_name);
-		}
-	}
+        if (array_key_exists($parameter_name, $parameters)) {
+            return $parameters[$parameter_name];
+        } else {
+            return parent::parameter($parameter_name);
+        }
+    }
 
-	/**
-	 * A list of CSS files to include for this page.
-	 *
-	 * @return string[]
-	 */
-	protected function stylesheets() {
-		return array(
-			'themes/minimal/jquery-ui-1.11.2/jquery-ui.css',
-			$this->assetUrl() . 'style.css',
-		);
-	}
+    /**
+     * A list of CSS files to include for this page.
+     *
+     * @return string[]
+     */
+    protected function stylesheets() {
+        return array(
+            'themes/minimal/jquery-ui-1.11.2/jquery-ui.css',
+            $this->assetUrl() . 'style.css',
+        );
+    }
 
-	/**
-	 * A fixed string to identify this theme, in settings, etc.
-	 *
-	 * @return string
-	 */
-	public function themeId() {
-		return 'minimal';
-	}
+    /**
+     * A fixed string to identify this theme, in settings, etc.
+     *
+     * @return string
+     */
+    public function themeId() {
+        return 'minimal';
+    }
 
-	/**
-	 * What is this theme called?
-	 *
-	 * @return string
-	 */
-	public function themeName() {
-		return /* I18N: Name of a theme. */ I18N::translate('minimal');
-	}
+    /**
+     * What is this theme called?
+     *
+     * @return string
+     */
+    public function themeName() {
+        return /* I18N: Name of a theme. */ I18N::translate('minimal');
+    }
 }

Braces +24 added lines, -12 removed lines

@@ -20,13 +20,15 @@ 
 /**
  * The Minimal theme.
  */
-class MinimalTheme extends AbstractTheme implements ThemeInterface {
+class MinimalTheme extends AbstractTheme implements ThemeInterface
+{
 	/**
 	 * Where are our CSS, JS and other assets?
 	 *
 	 * @return string A relative path, such as "themes/foo/"
 	 */
-	public function assetUrl() {
+	public function assetUrl()
+	{
 		return 'themes/minimal/css-1.7.8/';
 	}
 
@@ -37,7 +39,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function flashMessageContainer(\stdClass $message) {
+	protected function flashMessageContainer(\stdClass $message)
+	{
 		// This theme uses jQueryUI markup.
 		switch ($message->status) {
 		case 'danger':
@@ -52,7 +55,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formQuickSearchFields() {
+	protected function formQuickSearchFields()
+	{
 		return
 			'<input type="search" name="query" size="20" placeholder="' . I18N::translate('Search') . '">';
 	}
@@ -62,7 +66,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatSecondaryMenu() {
+	protected function formatSecondaryMenu()
+	{
 		return
 			'<ul class="secondary-menu">' .
 			implode('', $this->secondaryMenu()) .
@@ -77,7 +82,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function headerContent() {
+	protected function headerContent()
+	{
 		return
 			//$this->accessibilityLinks() .
 			$this->formatTreeTitle() .
@@ -89,7 +95,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function logoPoweredBy() {
+	protected function logoPoweredBy()
+	{
 		return '<a href="' . WT_WEBTREES_URL . '" class="powered-by-webtrees" title="' . WT_WEBTREES_URL . '">' . WT_WEBTREES . '</a>';
 	}
 
@@ -98,7 +105,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function hookFooterExtraJavascript() {
+	public function hookFooterExtraJavascript()
+	{
 		return
 			'<script src="' . WT_JQUERY_COLORBOX_URL . '"></script>' .
 			'<script src="' . WT_JQUERY_WHEELZOOM_URL . '"></script>' .
@@ -122,7 +130,8 @@ 
 	 *
 	 * @return string|int|float
 	 */
-	public function parameter($parameter_name) {
+	public function parameter($parameter_name)
+	{
 		$parameters = array(
 			'chart-background-f'             => 'dddddd',
 			'chart-background-m'             => 'cccccc',
@@ -142,7 +151,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	protected function stylesheets() {
+	protected function stylesheets()
+	{
 		return array(
 			'themes/minimal/jquery-ui-1.11.2/jquery-ui.css',
 			$this->assetUrl() . 'style.css',
@@ -154,7 +164,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function themeId() {
+	public function themeId()
+	{
 		return 'minimal';
 	}
 
@@ -163,7 +174,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function themeName() {
+	public function themeName()
+	{
 		return /* I18N: Name of a theme. */ I18N::translate('minimal');
 	}
 }

Switch Indentation +4 added lines, -4 removed lines

@@ -42,10 +42,10 @@
 	protected function flashMessageContainer(\stdClass $message) {
 		// This theme uses jQueryUI markup.
 		switch ($message->status) {
-		case 'danger':
-			return '<p class="ui-state-error">' . $message->text . '</p>';
-		default:
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
+		    case 'danger':
+			    return '<p class="ui-state-error">' . $message->text . '</p>';
+		    default:
+			    return '<p class="ui-state-highlight">' . $message->text . '</p>';
 		}
 	}
 

app/Media.php

Indentation +595 added lines, -595 removed lines

@@ -23,599 +23,599 @@
  * A GEDCOM media (OBJE) object.
  */
 class Media extends GedcomRecord {
-	const RECORD_TYPE = 'OBJE';
-	const URL_PREFIX  = 'mediaviewer.php?mid=';
-
-	/** @var string The "TITL" value from the GEDCOM */
-	private $title = '';
-
-	/** @var string The "FILE" value from the GEDCOM */
-	private $file = '';
-
-	/**
-	 * Create a GedcomRecord object from raw GEDCOM data.
-	 *
-	 * @param string      $xref
-	 * @param string      $gedcom  an empty string for new/pending records
-	 * @param string|null $pending null for a record with no pending edits,
-	 *                             empty string for records with pending deletions
-	 * @param Tree        $tree
-	 */
-	public function __construct($xref, $gedcom, $pending, $tree) {
-		parent::__construct($xref, $gedcom, $pending, $tree);
-
-		if (preg_match('/\n1 FILE (.+)/', $gedcom . $pending, $match)) {
-			$this->file = $match[1];
-		}
-		if (preg_match('/\n\d TITL (.+)/', $gedcom . $pending, $match)) {
-			$this->title = $match[1];
-		}
-	}
-
-	/**
-	 * Each object type may have its own special rules, and re-implement this function.
-	 *
-	 * @param int $access_level
-	 *
-	 * @return bool
-	 */
-	protected function canShowByType($access_level) {
-		// Hide media objects if they are attached to private records
-		$linked_ids = Database::prepare(
-			"SELECT l_from FROM `##link` WHERE l_to = ? AND l_file = ?"
-		)->execute(array(
-			$this->xref, $this->tree->getTreeId(),
-		))->fetchOneColumn();
-		foreach ($linked_ids as $linked_id) {
-			$linked_record = GedcomRecord::getInstance($linked_id, $this->tree);
-			if ($linked_record && !$linked_record->canShow($access_level)) {
-				return false;
-			}
-		}
-
-		// ... otherwise apply default behaviour
-		return parent::canShowByType($access_level);
-	}
-
-	/**
-	 * Fetch data from the database
-	 *
-	 * @param string $xref
-	 * @param int    $tree_id
-	 *
-	 * @return null|string
-	 */
-	protected static function fetchGedcomRecord($xref, $tree_id) {
-		return Database::prepare(
-			"SELECT m_gedcom FROM `##media` WHERE m_id = :xref AND m_file = :tree_id"
-		)->execute(array(
-			'xref'    => $xref,
-			'tree_id' => $tree_id,
-		))->fetchOne();
-	}
-
-	/**
-	 * Get the first note attached to this media object
-	 *
-	 * @return null|string
-	 */
-	public function getNote() {
-		$note = $this->getFirstFact('NOTE');
-		if ($note) {
-			$text = $note->getValue();
-			if (preg_match('/^@' . WT_REGEX_XREF . '@$/', $text)) {
-				$text = $note->getTarget()->getNote();
-			}
-
-			return $text;
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Get the main media filename
-	 *
-	 * @return string
-	 */
-	public function getFilename() {
-		return $this->file;
-	}
-
-	/**
-	 * Get the media's title (name)
-	 *
-	 * @return string
-	 */
-	public function getTitle() {
-		return $this->title;
-	}
-
-	/**
-	 * Get the filename on the server - for those (very few!) functions which actually
-	 * need the filename, such as mediafirewall.php and the PDF reports.
-	 *
-	 * @param string $which
-	 *
-	 * @return string
-	 */
-	public function getServerFilename($which = 'main') {
-		$MEDIA_DIRECTORY = $this->tree->getPreference('MEDIA_DIRECTORY');
-		$THUMBNAIL_WIDTH = $this->tree->getPreference('THUMBNAIL_WIDTH');
-
-		if ($this->isExternal() || !$this->file) {
-			// External image, or (in the case of corrupt GEDCOM data) no image at all
-			return $this->file;
-		} elseif ($which == 'main') {
-			// Main image
-			return WT_DATA_DIR . $MEDIA_DIRECTORY . $this->file;
-		} else {
-			// Thumbnail
-			$file = WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $this->file;
-			// Does the thumbnail exist?
-			if (file_exists($file)) {
-				return $file;
-			}
-			// Does a user-generated thumbnail exist?
-			$user_thumb = preg_replace('/\.[a-z0-9]{3,5}$/i', '.png', $file);
-			if (file_exists($user_thumb)) {
-				return $user_thumb;
-			}
-			// Does the folder exist for this thumbnail?
-			if (!is_dir(dirname($file)) && !File::mkdir(dirname($file))) {
-				Log::addMediaLog('The folder ' . dirname($file) . ' could not be created for ' . $this->getXref());
-
-				return $file;
-			}
-			// Is there a corresponding main image?
-			$main_file = WT_DATA_DIR . $MEDIA_DIRECTORY . $this->file;
-			if (!file_exists($main_file)) {
-				Log::addMediaLog('The file ' . $main_file . ' does not exist for ' . $this->getXref());
-
-				return $file;
-			}
-			// Try to create a thumbnail automatically
-
-			try {
-				$imgsize = getimagesize($main_file);
-				// Image small enough to be its own thumbnail?
-				if ($imgsize[0] > 0 && $imgsize[0] <= $THUMBNAIL_WIDTH) {
-					try {
-						copy($main_file, $file);
-						Log::addMediaLog('Thumbnail created for ' . $main_file . ' (copy of main image)');
-					} catch (\ErrorException $ex) {
-						Log::addMediaLog('Thumbnail could not be created for ' . $main_file . ' (copy of main image)');
-					}
-				} else {
-					if (FunctionsMedia::hasMemoryForImage($main_file)) {
-						try {
-							switch ($imgsize['mime']) {
-							case 'image/png':
-								$main_image = imagecreatefrompng($main_file);
-								break;
-							case 'image/gif':
-								$main_image = imagecreatefromgif($main_file);
-								break;
-							case 'image/jpeg':
-								$main_image = imagecreatefromjpeg($main_file);
-								break;
-							default:
-								return $file; // Nothing else we can do :-(
-							}
-							if ($main_image) {
-								// How big should the thumbnail be?
-								$width       = $THUMBNAIL_WIDTH;
-								$height      = round($imgsize[1] * ($width / $imgsize[0]));
-								$thumb_image = imagecreatetruecolor($width, $height);
-								// Create a transparent background, instead of the default black one
-								imagesavealpha($thumb_image, true);
-								imagefill($thumb_image, 0, 0, imagecolorallocatealpha($thumb_image, 0, 0, 0, 127));
-								// Shrink the image
-								imagecopyresampled($thumb_image, $main_image, 0, 0, 0, 0, $width, $height, $imgsize[0], $imgsize[1]);
-								switch ($imgsize['mime']) {
-								case 'image/png':
-									imagepng($thumb_image, $file);
-									break;
-								case 'image/gif':
-									imagegif($thumb_image, $file);
-									break;
-								case 'image/jpeg':
-									imagejpeg($thumb_image, $file);
-									break;
-								}
-								imagedestroy($main_image);
-								imagedestroy($thumb_image);
-								Log::addMediaLog('Thumbnail created for ' . $main_file);
-							}
-						} catch (\ErrorException $ex) {
-							Log::addMediaLog('Failed to create thumbnail for ' . $main_file . ' (' . $ex . ')');
-						}
-					} else {
-						Log::addMediaLog('Not enough memory to create thumbnail for ' . $main_file);
-					}
-				}
-			} catch (\ErrorException $ex) {
-				// Not an image, or not a valid image?
-			}
-
-			return $file;
-		}
-	}
-
-	/**
-	 * check if the file exists on this server
-	 *
-	 * @param string $which specify either 'main' or 'thumb'
-	 *
-	 * @return bool
-	 */
-	public function fileExists($which = 'main') {
-		return file_exists($this->getServerFilename($which));
-	}
-
-	/**
-	 * Determine if the file is an external url
-	 *
-	 * @return bool
-	 */
-	public function isExternal() {
-		return strpos($this->file, '://') !== false;
-	}
-
-	/**
-	 * get the media file size in KB
-	 *
-	 * @param string $which specify either 'main' or 'thumb'
-	 *
-	 * @return string
-	 */
-	public function getFilesize($which = 'main') {
-		$size = $this->getFilesizeraw($which);
-		// Round up to the nearest KB.
-		$size = (int) (($size + 1023) / 1024);
-
-		return /* I18N: size of file in KB */ I18N::translate('%s KB', I18N::number($size));
-	}
-
-	/**
-	 * get the media file size, unformatted
-	 *
-	 * @param string $which specify either 'main' or 'thumb'
-	 *
-	 * @return int
-	 */
-	public function getFilesizeraw($which = 'main') {
-		try {
-			return filesize($this->getServerFilename($which));
-		} catch (\ErrorException $ex) {
-			return 0;
-		}
-	}
-
-	/**
-	 * get filemtime for the media file
-	 *
-	 * @param string $which specify either 'main' or 'thumb'
-	 *
-	 * @return int
-	 */
-	public function getFiletime($which = 'main') {
-		try {
-			return filemtime($this->getServerFilename($which));
-		} catch (\ErrorException $ex) {
-			return 0;
-		}
-	}
-
-	/**
-	 * Generate an etag specific to this media item and the current user
-	 *
-	 * @param string $which - specify either 'main' or 'thumb'
-	 *
-	 * @return string
-	 */
-	public function getEtag($which = 'main') {
-		if ($this->isExternal()) {
-			// etag not really defined for external media
-
-			return '';
-		}
-		$etag_string = basename($this->getServerFilename($which)) . $this->getFiletime($which) . $this->tree->getName() . Auth::accessLevel($this->tree) . $this->tree->getPreference('SHOW_NO_WATERMARK');
-		$etag_string = dechex(crc32($etag_string));
-
-		return $etag_string;
-	}
-
-	/**
-	 * Deprecated? This does not need to be a function here.
-	 *
-	 * @return string
-	 */
-	public function getMediaType() {
-		if (preg_match('/\n\d TYPE (.+)/', $this->gedcom, $match)) {
-			return strtolower($match[1]);
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Is this object marked as a highlighted image?
-	 *
-	 * @return string
-	 */
-	public function isPrimary() {
-		if (preg_match('/\n\d _PRIM ([YN])/', $this->getGedcom(), $match)) {
-			return $match[1];
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * get image properties
-	 *
-	 * @param string $which     specify either 'main' or 'thumb'
-	 * @param int    $addWidth  amount to add to width
-	 * @param int    $addHeight amount to add to height
-	 *
-	 * @return array
-	 */
-	public function getImageAttributes($which = 'main', $addWidth = 0, $addHeight = 0) {
-		$THUMBNAIL_WIDTH = $this->tree->getPreference('THUMBNAIL_WIDTH');
-
-		$var = $which . 'imagesize';
-		if (!empty($this->$var)) {
-			return $this->$var;
-		}
-		$imgsize = array();
-		if ($this->fileExists($which)) {
-
-			try {
-				$imgsize = getimagesize($this->getServerFilename($which));
-				if (is_array($imgsize) && !empty($imgsize['0'])) {
-					// this is an image
-					$imgsize[0]      = $imgsize[0] + 0;
-					$imgsize[1]      = $imgsize[1] + 0;
-					$imgsize['adjW'] = $imgsize[0] + $addWidth; // adjusted width
-					$imgsize['adjH'] = $imgsize[1] + $addHeight; // adjusted height
-					$imageTypes      = array('', 'GIF', 'JPG', 'PNG', 'SWF', 'PSD', 'BMP', 'TIFF', 'TIFF', 'JPC', 'JP2', 'JPX', 'JB2', 'SWC', 'IFF', 'WBMP', 'XBM');
-					$imgsize['ext']  = $imageTypes[0 + $imgsize[2]];
-					// this is for display purposes, always show non-adjusted info
-					$imgsize['WxH']   =
-						/* I18N: image dimensions, width × height */
-						I18N::translate('%1$s × %2$s pixels', I18N::number($imgsize['0']), I18N::number($imgsize['1']));
-					$imgsize['imgWH'] = ' width="' . $imgsize['adjW'] . '" height="' . $imgsize['adjH'] . '" ';
-					if (($which == 'thumb') && ($imgsize['0'] > $THUMBNAIL_WIDTH)) {
-						// don’t let large images break the dislay
-						$imgsize['imgWH'] = ' width="' . $THUMBNAIL_WIDTH . '" ';
-					}
-				}
-			} catch (\ErrorException $ex) {
-				// Not an image, or not a valid image?
-				$imgsize = false;
-			}
-		}
-
-		if (!is_array($imgsize) || empty($imgsize['0'])) {
-			// this is not an image, OR the file doesn’t exist OR it is a url
-			$imgsize[0]       = 0;
-			$imgsize[1]       = 0;
-			$imgsize['adjW']  = 0;
-			$imgsize['adjH']  = 0;
-			$imgsize['ext']   = '';
-			$imgsize['mime']  = '';
-			$imgsize['WxH']   = '';
-			$imgsize['imgWH'] = '';
-			if ($this->isExternal()) {
-				// don’t let large external images break the dislay
-				$imgsize['imgWH'] = ' width="' . $THUMBNAIL_WIDTH . '" ';
-			}
-		}
-
-		if (empty($imgsize['mime'])) {
-			// this is not an image, OR the file doesn’t exist OR it is a url
-			// set file type equal to the file extension - can’t use parse_url because this may not be a full url
-			$exp            = explode('?', $this->file);
-			$imgsize['ext'] = strtoupper(pathinfo($exp[0], PATHINFO_EXTENSION));
-			// all mimetypes we wish to serve with the media firewall must be added to this array.
-			$mime = array(
-				'DOC' => 'application/msword',
-				'MOV' => 'video/quicktime',
-				'MP3' => 'audio/mpeg',
-				'PDF' => 'application/pdf',
-				'PPT' => 'application/vnd.ms-powerpoint',
-				'RTF' => 'text/rtf',
-				'SID' => 'image/x-mrsid',
-				'TXT' => 'text/plain',
-				'XLS' => 'application/vnd.ms-excel',
-				'WMV' => 'video/x-ms-wmv',
-			);
-			if (empty($mime[$imgsize['ext']])) {
-				// if we don’t know what the mimetype is, use something ambiguous
-				$imgsize['mime'] = 'application/octet-stream';
-				if ($this->fileExists($which)) {
-					// alert the admin if we cannot determine the mime type of an existing file
-					// as the media firewall will be unable to serve this file properly
-					Log::addMediaLog('Media Firewall error: >Unknown Mimetype< for file >' . $this->file . '<');
-				}
-			} else {
-				$imgsize['mime'] = $mime[$imgsize['ext']];
-			}
-		}
-		$this->$var = $imgsize;
-
-		return $this->$var;
-	}
-
-	/**
-	 * Generate a URL directly to the media file
-	 *
-	 * @param string $which
-	 * @param bool   $download
-	 *
-	 * @return string
-	 */
-	public function getHtmlUrlDirect($which = 'main', $download = false) {
-		// “cb” is “cache buster”, so clients will make new request if anything significant about the user or the file changes
-		// The extension is there so that image viewers (e.g. colorbox) can do something sensible
-		$thumbstr    = ($which == 'thumb') ? '&amp;thumb=1' : '';
-		$downloadstr = ($download) ? '&dl=1' : '';
-
-		return
-			'mediafirewall.php?mid=' . $this->getXref() . $thumbstr . $downloadstr .
-			'&amp;ged=' . $this->tree->getNameUrl() .
-			'&amp;cb=' . $this->getEtag($which);
-	}
-
-	/**
-	 * What file extension is used by this file?
-	 *
-	 * @return string
-	 */
-	public function extension() {
-		if (preg_match('/\.([a-zA-Z0-9]+)$/', $this->file, $match)) {
-			return strtolower($match[1]);
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * What is the mime-type of this object?
-	 * For simplicity and efficiency, use the extension, rather than the contents.
-	 *
-	 * @return string
-	 */
-	public function mimeType() {
-		// Themes contain icon definitions for some/all of these mime-types
-		switch ($this->extension()) {
-		case 'bmp':
-			return 'image/bmp';
-		case 'doc':
-			return 'application/msword';
-		case 'docx':
-			return 'application/msword';
-		case 'ged':
-			return 'text/x-gedcom';
-		case 'gif':
-			return 'image/gif';
-		case 'htm':
-			return 'text/html';
-		case 'html':
-			return 'text/html';
-		case 'jpeg':
-			return 'image/jpeg';
-		case 'jpg':
-			return 'image/jpeg';
-		case 'mov':
-			return 'video/quicktime';
-		case 'mp3':
-			return 'audio/mpeg';
-		case 'ogv':
-			return 'video/ogg';
-		case 'pdf':
-			return 'application/pdf';
-		case 'png':
-			return 'image/png';
-		case 'rar':
-			return 'application/x-rar-compressed';
-		case 'swf':
-			return 'application/x-shockwave-flash';
-		case 'svg':
-			return 'image/svg';
-		case 'tif':
-			return 'image/tiff';
-		case 'tiff':
-			return 'image/tiff';
-		case 'xls':
-			return 'application/vnd-ms-excel';
-		case 'xlsx':
-			return 'application/vnd-ms-excel';
-		case 'wmv':
-			return 'video/x-ms-wmv';
-		case 'zip':
-			return 'application/zip';
-		default:
-			return 'application/octet-stream';
-		}
-	}
-
-	/**
-	 * Display an image-thumbnail or a media-icon, and add markup for image viewers such as colorbox.
-	 *
-	 * @return string
-	 */
-	public function displayImage() {
-		// Default image for external, missing or corrupt images.
-		$image =
-			'<i' .
-			' dir="' . 'auto' . '"' . // For the tool-tip
-			' class="' . 'icon-mime-' . str_replace('/', '-', $this->mimeType()) . '"' .
-			' title="' . strip_tags($this->getFullName()) . '"' .
-			'></i>';
-
-		// Use a thumbnail image.
-		if (!$this->isExternal()) {
-			try {
-				$imgsize = getimagesize($this->getServerFilename('thumb'));
-				$image   =
-					'<img' .
-					' dir="' . 'auto' . '"' . // For the tool-tip
-					' src="' . $this->getHtmlUrlDirect('thumb') . '"' .
-					' alt="' . strip_tags($this->getFullName()) . '"' .
-					' title="' . strip_tags($this->getFullName()) . '"' .
-					' ' . $imgsize[3] . // height="yyy" width="xxx"
-					'>';
-			} catch (Exception $ex) {
-				// Image file unreadable or Corrupt.
-			}
-		}
-
-		return
-			'<a' .
-			' class="' . 'gallery' . '"' .
-			' href="' . $this->getHtmlUrlDirect('main') . '"' .
-			' type="' . $this->mimeType() . '"' .
-			' data-obje-url="' . $this->getHtmlUrl() . '"' .
-			' data-obje-note="' . Filter::escapeHtml($this->getNote()) . '"' .
-			' data-title="' . Filter::escapeHtml($this->getFullName()) . '"' .
-			'>' . $image . '</a>';
-	}
-
-	/**
-	 * If this object has no name, what do we call it?
-	 *
-	 * @return string
-	 */
-	public function getFallBackName() {
-		if ($this->canShow()) {
-			return basename($this->file);
-		} else {
-			return $this->getXref();
-		}
-	}
-
-	/**
-	 * Extract names from the GEDCOM record.
-	 */
-	public function extractNames() {
-		// Earlier gedcom versions had level 1 titles
-		// Later gedcom versions had level 2 titles
-		$this->extractNamesFromFacts(2, 'TITL', $this->getFacts('FILE'));
-		$this->extractNamesFromFacts(1, 'TITL', $this->getFacts('TITL'));
-	}
-
-	/**
-	 * This function should be redefined in derived classes to show any major
-	 * identifying characteristics of this record.
-	 *
-	 * @return string
-	 */
-	public function formatListDetails() {
-		ob_start();
-		FunctionsPrintFacts::printMediaLinks('1 OBJE @' . $this->getXref() . '@', 1);
-
-		return ob_get_clean();
-	}
+    const RECORD_TYPE = 'OBJE';
+    const URL_PREFIX  = 'mediaviewer.php?mid=';
+
+    /** @var string The "TITL" value from the GEDCOM */
+    private $title = '';
+
+    /** @var string The "FILE" value from the GEDCOM */
+    private $file = '';
+
+    /**
+     * Create a GedcomRecord object from raw GEDCOM data.
+     *
+     * @param string      $xref
+     * @param string      $gedcom  an empty string for new/pending records
+     * @param string|null $pending null for a record with no pending edits,
+     *                             empty string for records with pending deletions
+     * @param Tree        $tree
+     */
+    public function __construct($xref, $gedcom, $pending, $tree) {
+        parent::__construct($xref, $gedcom, $pending, $tree);
+
+        if (preg_match('/\n1 FILE (.+)/', $gedcom . $pending, $match)) {
+            $this->file = $match[1];
+        }
+        if (preg_match('/\n\d TITL (.+)/', $gedcom . $pending, $match)) {
+            $this->title = $match[1];
+        }
+    }
+
+    /**
+     * Each object type may have its own special rules, and re-implement this function.
+     *
+     * @param int $access_level
+     *
+     * @return bool
+     */
+    protected function canShowByType($access_level) {
+        // Hide media objects if they are attached to private records
+        $linked_ids = Database::prepare(
+            "SELECT l_from FROM `##link` WHERE l_to = ? AND l_file = ?"
+        )->execute(array(
+            $this->xref, $this->tree->getTreeId(),
+        ))->fetchOneColumn();
+        foreach ($linked_ids as $linked_id) {
+            $linked_record = GedcomRecord::getInstance($linked_id, $this->tree);
+            if ($linked_record && !$linked_record->canShow($access_level)) {
+                return false;
+            }
+        }
+
+        // ... otherwise apply default behaviour
+        return parent::canShowByType($access_level);
+    }
+
+    /**
+     * Fetch data from the database
+     *
+     * @param string $xref
+     * @param int    $tree_id
+     *
+     * @return null|string
+     */
+    protected static function fetchGedcomRecord($xref, $tree_id) {
+        return Database::prepare(
+            "SELECT m_gedcom FROM `##media` WHERE m_id = :xref AND m_file = :tree_id"
+        )->execute(array(
+            'xref'    => $xref,
+            'tree_id' => $tree_id,
+        ))->fetchOne();
+    }
+
+    /**
+     * Get the first note attached to this media object
+     *
+     * @return null|string
+     */
+    public function getNote() {
+        $note = $this->getFirstFact('NOTE');
+        if ($note) {
+            $text = $note->getValue();
+            if (preg_match('/^@' . WT_REGEX_XREF . '@$/', $text)) {
+                $text = $note->getTarget()->getNote();
+            }
+
+            return $text;
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Get the main media filename
+     *
+     * @return string
+     */
+    public function getFilename() {
+        return $this->file;
+    }
+
+    /**
+     * Get the media's title (name)
+     *
+     * @return string
+     */
+    public function getTitle() {
+        return $this->title;
+    }
+
+    /**
+     * Get the filename on the server - for those (very few!) functions which actually
+     * need the filename, such as mediafirewall.php and the PDF reports.
+     *
+     * @param string $which
+     *
+     * @return string
+     */
+    public function getServerFilename($which = 'main') {
+        $MEDIA_DIRECTORY = $this->tree->getPreference('MEDIA_DIRECTORY');
+        $THUMBNAIL_WIDTH = $this->tree->getPreference('THUMBNAIL_WIDTH');
+
+        if ($this->isExternal() || !$this->file) {
+            // External image, or (in the case of corrupt GEDCOM data) no image at all
+            return $this->file;
+        } elseif ($which == 'main') {
+            // Main image
+            return WT_DATA_DIR . $MEDIA_DIRECTORY . $this->file;
+        } else {
+            // Thumbnail
+            $file = WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $this->file;
+            // Does the thumbnail exist?
+            if (file_exists($file)) {
+                return $file;
+            }
+            // Does a user-generated thumbnail exist?
+            $user_thumb = preg_replace('/\.[a-z0-9]{3,5}$/i', '.png', $file);
+            if (file_exists($user_thumb)) {
+                return $user_thumb;
+            }
+            // Does the folder exist for this thumbnail?
+            if (!is_dir(dirname($file)) && !File::mkdir(dirname($file))) {
+                Log::addMediaLog('The folder ' . dirname($file) . ' could not be created for ' . $this->getXref());
+
+                return $file;
+            }
+            // Is there a corresponding main image?
+            $main_file = WT_DATA_DIR . $MEDIA_DIRECTORY . $this->file;
+            if (!file_exists($main_file)) {
+                Log::addMediaLog('The file ' . $main_file . ' does not exist for ' . $this->getXref());
+
+                return $file;
+            }
+            // Try to create a thumbnail automatically
+
+            try {
+                $imgsize = getimagesize($main_file);
+                // Image small enough to be its own thumbnail?
+                if ($imgsize[0] > 0 && $imgsize[0] <= $THUMBNAIL_WIDTH) {
+                    try {
+                        copy($main_file, $file);
+                        Log::addMediaLog('Thumbnail created for ' . $main_file . ' (copy of main image)');
+                    } catch (\ErrorException $ex) {
+                        Log::addMediaLog('Thumbnail could not be created for ' . $main_file . ' (copy of main image)');
+                    }
+                } else {
+                    if (FunctionsMedia::hasMemoryForImage($main_file)) {
+                        try {
+                            switch ($imgsize['mime']) {
+                            case 'image/png':
+                                $main_image = imagecreatefrompng($main_file);
+                                break;
+                            case 'image/gif':
+                                $main_image = imagecreatefromgif($main_file);
+                                break;
+                            case 'image/jpeg':
+                                $main_image = imagecreatefromjpeg($main_file);
+                                break;
+                            default:
+                                return $file; // Nothing else we can do :-(
+                            }
+                            if ($main_image) {
+                                // How big should the thumbnail be?
+                                $width       = $THUMBNAIL_WIDTH;
+                                $height      = round($imgsize[1] * ($width / $imgsize[0]));
+                                $thumb_image = imagecreatetruecolor($width, $height);
+                                // Create a transparent background, instead of the default black one
+                                imagesavealpha($thumb_image, true);
+                                imagefill($thumb_image, 0, 0, imagecolorallocatealpha($thumb_image, 0, 0, 0, 127));
+                                // Shrink the image
+                                imagecopyresampled($thumb_image, $main_image, 0, 0, 0, 0, $width, $height, $imgsize[0], $imgsize[1]);
+                                switch ($imgsize['mime']) {
+                                case 'image/png':
+                                    imagepng($thumb_image, $file);
+                                    break;
+                                case 'image/gif':
+                                    imagegif($thumb_image, $file);
+                                    break;
+                                case 'image/jpeg':
+                                    imagejpeg($thumb_image, $file);
+                                    break;
+                                }
+                                imagedestroy($main_image);
+                                imagedestroy($thumb_image);
+                                Log::addMediaLog('Thumbnail created for ' . $main_file);
+                            }
+                        } catch (\ErrorException $ex) {
+                            Log::addMediaLog('Failed to create thumbnail for ' . $main_file . ' (' . $ex . ')');
+                        }
+                    } else {
+                        Log::addMediaLog('Not enough memory to create thumbnail for ' . $main_file);
+                    }
+                }
+            } catch (\ErrorException $ex) {
+                // Not an image, or not a valid image?
+            }
+
+            return $file;
+        }
+    }
+
+    /**
+     * check if the file exists on this server
+     *
+     * @param string $which specify either 'main' or 'thumb'
+     *
+     * @return bool
+     */
+    public function fileExists($which = 'main') {
+        return file_exists($this->getServerFilename($which));
+    }
+
+    /**
+     * Determine if the file is an external url
+     *
+     * @return bool
+     */
+    public function isExternal() {
+        return strpos($this->file, '://') !== false;
+    }
+
+    /**
+     * get the media file size in KB
+     *
+     * @param string $which specify either 'main' or 'thumb'
+     *
+     * @return string
+     */
+    public function getFilesize($which = 'main') {
+        $size = $this->getFilesizeraw($which);
+        // Round up to the nearest KB.
+        $size = (int) (($size + 1023) / 1024);
+
+        return /* I18N: size of file in KB */ I18N::translate('%s KB', I18N::number($size));
+    }
+
+    /**
+     * get the media file size, unformatted
+     *
+     * @param string $which specify either 'main' or 'thumb'
+     *
+     * @return int
+     */
+    public function getFilesizeraw($which = 'main') {
+        try {
+            return filesize($this->getServerFilename($which));
+        } catch (\ErrorException $ex) {
+            return 0;
+        }
+    }
+
+    /**
+     * get filemtime for the media file
+     *
+     * @param string $which specify either 'main' or 'thumb'
+     *
+     * @return int
+     */
+    public function getFiletime($which = 'main') {
+        try {
+            return filemtime($this->getServerFilename($which));
+        } catch (\ErrorException $ex) {
+            return 0;
+        }
+    }
+
+    /**
+     * Generate an etag specific to this media item and the current user
+     *
+     * @param string $which - specify either 'main' or 'thumb'
+     *
+     * @return string
+     */
+    public function getEtag($which = 'main') {
+        if ($this->isExternal()) {
+            // etag not really defined for external media
+
+            return '';
+        }
+        $etag_string = basename($this->getServerFilename($which)) . $this->getFiletime($which) . $this->tree->getName() . Auth::accessLevel($this->tree) . $this->tree->getPreference('SHOW_NO_WATERMARK');
+        $etag_string = dechex(crc32($etag_string));
+
+        return $etag_string;
+    }
+
+    /**
+     * Deprecated? This does not need to be a function here.
+     *
+     * @return string
+     */
+    public function getMediaType() {
+        if (preg_match('/\n\d TYPE (.+)/', $this->gedcom, $match)) {
+            return strtolower($match[1]);
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Is this object marked as a highlighted image?
+     *
+     * @return string
+     */
+    public function isPrimary() {
+        if (preg_match('/\n\d _PRIM ([YN])/', $this->getGedcom(), $match)) {
+            return $match[1];
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * get image properties
+     *
+     * @param string $which     specify either 'main' or 'thumb'
+     * @param int    $addWidth  amount to add to width
+     * @param int    $addHeight amount to add to height
+     *
+     * @return array
+     */
+    public function getImageAttributes($which = 'main', $addWidth = 0, $addHeight = 0) {
+        $THUMBNAIL_WIDTH = $this->tree->getPreference('THUMBNAIL_WIDTH');
+
+        $var = $which . 'imagesize';
+        if (!empty($this->$var)) {
+            return $this->$var;
+        }
+        $imgsize = array();
+        if ($this->fileExists($which)) {
+
+            try {
+                $imgsize = getimagesize($this->getServerFilename($which));
+                if (is_array($imgsize) && !empty($imgsize['0'])) {
+                    // this is an image
+                    $imgsize[0]      = $imgsize[0] + 0;
+                    $imgsize[1]      = $imgsize[1] + 0;
+                    $imgsize['adjW'] = $imgsize[0] + $addWidth; // adjusted width
+                    $imgsize['adjH'] = $imgsize[1] + $addHeight; // adjusted height
+                    $imageTypes      = array('', 'GIF', 'JPG', 'PNG', 'SWF', 'PSD', 'BMP', 'TIFF', 'TIFF', 'JPC', 'JP2', 'JPX', 'JB2', 'SWC', 'IFF', 'WBMP', 'XBM');
+                    $imgsize['ext']  = $imageTypes[0 + $imgsize[2]];
+                    // this is for display purposes, always show non-adjusted info
+                    $imgsize['WxH']   =
+                        /* I18N: image dimensions, width × height */
+                        I18N::translate('%1$s × %2$s pixels', I18N::number($imgsize['0']), I18N::number($imgsize['1']));
+                    $imgsize['imgWH'] = ' width="' . $imgsize['adjW'] . '" height="' . $imgsize['adjH'] . '" ';
+                    if (($which == 'thumb') && ($imgsize['0'] > $THUMBNAIL_WIDTH)) {
+                        // don’t let large images break the dislay
+                        $imgsize['imgWH'] = ' width="' . $THUMBNAIL_WIDTH . '" ';
+                    }
+                }
+            } catch (\ErrorException $ex) {
+                // Not an image, or not a valid image?
+                $imgsize = false;
+            }
+        }
+
+        if (!is_array($imgsize) || empty($imgsize['0'])) {
+            // this is not an image, OR the file doesn’t exist OR it is a url
+            $imgsize[0]       = 0;
+            $imgsize[1]       = 0;
+            $imgsize['adjW']  = 0;
+            $imgsize['adjH']  = 0;
+            $imgsize['ext']   = '';
+            $imgsize['mime']  = '';
+            $imgsize['WxH']   = '';
+            $imgsize['imgWH'] = '';
+            if ($this->isExternal()) {
+                // don’t let large external images break the dislay
+                $imgsize['imgWH'] = ' width="' . $THUMBNAIL_WIDTH . '" ';
+            }
+        }
+
+        if (empty($imgsize['mime'])) {
+            // this is not an image, OR the file doesn’t exist OR it is a url
+            // set file type equal to the file extension - can’t use parse_url because this may not be a full url
+            $exp            = explode('?', $this->file);
+            $imgsize['ext'] = strtoupper(pathinfo($exp[0], PATHINFO_EXTENSION));
+            // all mimetypes we wish to serve with the media firewall must be added to this array.
+            $mime = array(
+                'DOC' => 'application/msword',
+                'MOV' => 'video/quicktime',
+                'MP3' => 'audio/mpeg',
+                'PDF' => 'application/pdf',
+                'PPT' => 'application/vnd.ms-powerpoint',
+                'RTF' => 'text/rtf',
+                'SID' => 'image/x-mrsid',
+                'TXT' => 'text/plain',
+                'XLS' => 'application/vnd.ms-excel',
+                'WMV' => 'video/x-ms-wmv',
+            );
+            if (empty($mime[$imgsize['ext']])) {
+                // if we don’t know what the mimetype is, use something ambiguous
+                $imgsize['mime'] = 'application/octet-stream';
+                if ($this->fileExists($which)) {
+                    // alert the admin if we cannot determine the mime type of an existing file
+                    // as the media firewall will be unable to serve this file properly
+                    Log::addMediaLog('Media Firewall error: >Unknown Mimetype< for file >' . $this->file . '<');
+                }
+            } else {
+                $imgsize['mime'] = $mime[$imgsize['ext']];
+            }
+        }
+        $this->$var = $imgsize;
+
+        return $this->$var;
+    }
+
+    /**
+     * Generate a URL directly to the media file
+     *
+     * @param string $which
+     * @param bool   $download
+     *
+     * @return string
+     */
+    public function getHtmlUrlDirect($which = 'main', $download = false) {
+        // “cb” is “cache buster”, so clients will make new request if anything significant about the user or the file changes
+        // The extension is there so that image viewers (e.g. colorbox) can do something sensible
+        $thumbstr    = ($which == 'thumb') ? '&amp;thumb=1' : '';
+        $downloadstr = ($download) ? '&dl=1' : '';
+
+        return
+            'mediafirewall.php?mid=' . $this->getXref() . $thumbstr . $downloadstr .
+            '&amp;ged=' . $this->tree->getNameUrl() .
+            '&amp;cb=' . $this->getEtag($which);
+    }
+
+    /**
+     * What file extension is used by this file?
+     *
+     * @return string
+     */
+    public function extension() {
+        if (preg_match('/\.([a-zA-Z0-9]+)$/', $this->file, $match)) {
+            return strtolower($match[1]);
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * What is the mime-type of this object?
+     * For simplicity and efficiency, use the extension, rather than the contents.
+     *
+     * @return string
+     */
+    public function mimeType() {
+        // Themes contain icon definitions for some/all of these mime-types
+        switch ($this->extension()) {
+        case 'bmp':
+            return 'image/bmp';
+        case 'doc':
+            return 'application/msword';
+        case 'docx':
+            return 'application/msword';
+        case 'ged':
+            return 'text/x-gedcom';
+        case 'gif':
+            return 'image/gif';
+        case 'htm':
+            return 'text/html';
+        case 'html':
+            return 'text/html';
+        case 'jpeg':
+            return 'image/jpeg';
+        case 'jpg':
+            return 'image/jpeg';
+        case 'mov':
+            return 'video/quicktime';
+        case 'mp3':
+            return 'audio/mpeg';
+        case 'ogv':
+            return 'video/ogg';
+        case 'pdf':
+            return 'application/pdf';
+        case 'png':
+            return 'image/png';
+        case 'rar':
+            return 'application/x-rar-compressed';
+        case 'swf':
+            return 'application/x-shockwave-flash';
+        case 'svg':
+            return 'image/svg';
+        case 'tif':
+            return 'image/tiff';
+        case 'tiff':
+            return 'image/tiff';
+        case 'xls':
+            return 'application/vnd-ms-excel';
+        case 'xlsx':
+            return 'application/vnd-ms-excel';
+        case 'wmv':
+            return 'video/x-ms-wmv';
+        case 'zip':
+            return 'application/zip';
+        default:
+            return 'application/octet-stream';
+        }
+    }
+
+    /**
+     * Display an image-thumbnail or a media-icon, and add markup for image viewers such as colorbox.
+     *
+     * @return string
+     */
+    public function displayImage() {
+        // Default image for external, missing or corrupt images.
+        $image =
+            '<i' .
+            ' dir="' . 'auto' . '"' . // For the tool-tip
+            ' class="' . 'icon-mime-' . str_replace('/', '-', $this->mimeType()) . '"' .
+            ' title="' . strip_tags($this->getFullName()) . '"' .
+            '></i>';
+
+        // Use a thumbnail image.
+        if (!$this->isExternal()) {
+            try {
+                $imgsize = getimagesize($this->getServerFilename('thumb'));
+                $image   =
+                    '<img' .
+                    ' dir="' . 'auto' . '"' . // For the tool-tip
+                    ' src="' . $this->getHtmlUrlDirect('thumb') . '"' .
+                    ' alt="' . strip_tags($this->getFullName()) . '"' .
+                    ' title="' . strip_tags($this->getFullName()) . '"' .
+                    ' ' . $imgsize[3] . // height="yyy" width="xxx"
+                    '>';
+            } catch (Exception $ex) {
+                // Image file unreadable or Corrupt.
+            }
+        }
+
+        return
+            '<a' .
+            ' class="' . 'gallery' . '"' .
+            ' href="' . $this->getHtmlUrlDirect('main') . '"' .
+            ' type="' . $this->mimeType() . '"' .
+            ' data-obje-url="' . $this->getHtmlUrl() . '"' .
+            ' data-obje-note="' . Filter::escapeHtml($this->getNote()) . '"' .
+            ' data-title="' . Filter::escapeHtml($this->getFullName()) . '"' .
+            '>' . $image . '</a>';
+    }
+
+    /**
+     * If this object has no name, what do we call it?
+     *
+     * @return string
+     */
+    public function getFallBackName() {
+        if ($this->canShow()) {
+            return basename($this->file);
+        } else {
+            return $this->getXref();
+        }
+    }
+
+    /**
+     * Extract names from the GEDCOM record.
+     */
+    public function extractNames() {
+        // Earlier gedcom versions had level 1 titles
+        // Later gedcom versions had level 2 titles
+        $this->extractNamesFromFacts(2, 'TITL', $this->getFacts('FILE'));
+        $this->extractNamesFromFacts(1, 'TITL', $this->getFacts('TITL'));
+    }
+
+    /**
+     * This function should be redefined in derived classes to show any major
+     * identifying characteristics of this record.
+     *
+     * @return string
+     */
+    public function formatListDetails() {
+        ob_start();
+        FunctionsPrintFacts::printMediaLinks('1 OBJE @' . $this->getXref() . '@', 1);
+
+        return ob_get_clean();
+    }
 }

Switch Indentation +68 added lines, -68 removed lines

@@ -190,17 +190,17 @@ 
 					if (FunctionsMedia::hasMemoryForImage($main_file)) {
 						try {
 							switch ($imgsize['mime']) {
-							case 'image/png':
-								$main_image = imagecreatefrompng($main_file);
-								break;
-							case 'image/gif':
-								$main_image = imagecreatefromgif($main_file);
-								break;
-							case 'image/jpeg':
-								$main_image = imagecreatefromjpeg($main_file);
-								break;
-							default:
-								return $file; // Nothing else we can do :-(
+							    case 'image/png':
+								    $main_image = imagecreatefrompng($main_file);
+								    break;
+							    case 'image/gif':
+								    $main_image = imagecreatefromgif($main_file);
+								    break;
+							    case 'image/jpeg':
+								    $main_image = imagecreatefromjpeg($main_file);
+								    break;
+							    default:
+								    return $file; // Nothing else we can do :-(
 							}
 							if ($main_image) {
 								// How big should the thumbnail be?
@@ -213,15 +213,15 @@ 
 								// Shrink the image
 								imagecopyresampled($thumb_image, $main_image, 0, 0, 0, 0, $width, $height, $imgsize[0], $imgsize[1]);
 								switch ($imgsize['mime']) {
-								case 'image/png':
-									imagepng($thumb_image, $file);
-									break;
-								case 'image/gif':
-									imagegif($thumb_image, $file);
-									break;
-								case 'image/jpeg':
-									imagejpeg($thumb_image, $file);
-									break;
+								    case 'image/png':
+									    imagepng($thumb_image, $file);
+									    break;
+								    case 'image/gif':
+									    imagegif($thumb_image, $file);
+									    break;
+								    case 'image/jpeg':
+									    imagejpeg($thumb_image, $file);
+									    break;
 								}
 								imagedestroy($main_image);
 								imagedestroy($thumb_image);
@@ -490,54 +490,54 @@ 
 	public function mimeType() {
 		// Themes contain icon definitions for some/all of these mime-types
 		switch ($this->extension()) {
-		case 'bmp':
-			return 'image/bmp';
-		case 'doc':
-			return 'application/msword';
-		case 'docx':
-			return 'application/msword';
-		case 'ged':
-			return 'text/x-gedcom';
-		case 'gif':
-			return 'image/gif';
-		case 'htm':
-			return 'text/html';
-		case 'html':
-			return 'text/html';
-		case 'jpeg':
-			return 'image/jpeg';
-		case 'jpg':
-			return 'image/jpeg';
-		case 'mov':
-			return 'video/quicktime';
-		case 'mp3':
-			return 'audio/mpeg';
-		case 'ogv':
-			return 'video/ogg';
-		case 'pdf':
-			return 'application/pdf';
-		case 'png':
-			return 'image/png';
-		case 'rar':
-			return 'application/x-rar-compressed';
-		case 'swf':
-			return 'application/x-shockwave-flash';
-		case 'svg':
-			return 'image/svg';
-		case 'tif':
-			return 'image/tiff';
-		case 'tiff':
-			return 'image/tiff';
-		case 'xls':
-			return 'application/vnd-ms-excel';
-		case 'xlsx':
-			return 'application/vnd-ms-excel';
-		case 'wmv':
-			return 'video/x-ms-wmv';
-		case 'zip':
-			return 'application/zip';
-		default:
-			return 'application/octet-stream';
+		    case 'bmp':
+			    return 'image/bmp';
+		    case 'doc':
+			    return 'application/msword';
+		    case 'docx':
+			    return 'application/msword';
+		    case 'ged':
+			    return 'text/x-gedcom';
+		    case 'gif':
+			    return 'image/gif';
+		    case 'htm':
+			    return 'text/html';
+		    case 'html':
+			    return 'text/html';
+		    case 'jpeg':
+			    return 'image/jpeg';
+		    case 'jpg':
+			    return 'image/jpeg';
+		    case 'mov':
+			    return 'video/quicktime';
+		    case 'mp3':
+			    return 'audio/mpeg';
+		    case 'ogv':
+			    return 'video/ogg';
+		    case 'pdf':
+			    return 'application/pdf';
+		    case 'png':
+			    return 'image/png';
+		    case 'rar':
+			    return 'application/x-rar-compressed';
+		    case 'swf':
+			    return 'application/x-shockwave-flash';
+		    case 'svg':
+			    return 'image/svg';
+		    case 'tif':
+			    return 'image/tiff';
+		    case 'tiff':
+			    return 'image/tiff';
+		    case 'xls':
+			    return 'application/vnd-ms-excel';
+		    case 'xlsx':
+			    return 'application/vnd-ms-excel';
+		    case 'wmv':
+			    return 'video/x-ms-wmv';
+		    case 'zip':
+			    return 'application/zip';
+		    default:
+			    return 'application/octet-stream';
 		}
 	}
 

Braces +48 added lines, -24 removed lines

@@ -22,7 +22,8 @@ 
 /**
  * A GEDCOM media (OBJE) object.
  */
-class Media extends GedcomRecord {
+class Media extends GedcomRecord
+{
 	const RECORD_TYPE = 'OBJE';
 	const URL_PREFIX  = 'mediaviewer.php?mid=';
 
@@ -41,7 +42,8 @@ 
 	 *                             empty string for records with pending deletions
 	 * @param Tree        $tree
 	 */
-	public function __construct($xref, $gedcom, $pending, $tree) {
+	public function __construct($xref, $gedcom, $pending, $tree)
+	{
 		parent::__construct($xref, $gedcom, $pending, $tree);
 
 		if (preg_match('/\n1 FILE (.+)/', $gedcom . $pending, $match)) {
@@ -59,7 +61,8 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function canShowByType($access_level) {
+	protected function canShowByType($access_level)
+	{
 		// Hide media objects if they are attached to private records
 		$linked_ids = Database::prepare(
 			"SELECT l_from FROM `##link` WHERE l_to = ? AND l_file = ?"
@@ -85,7 +88,8 @@ 
 	 *
 	 * @return null|string
 	 */
-	protected static function fetchGedcomRecord($xref, $tree_id) {
+	protected static function fetchGedcomRecord($xref, $tree_id)
+	{
 		return Database::prepare(
 			"SELECT m_gedcom FROM `##media` WHERE m_id = :xref AND m_file = :tree_id"
 		)->execute(array(
@@ -99,7 +103,8 @@ 
 	 *
 	 * @return null|string
 	 */
-	public function getNote() {
+	public function getNote()
+	{
 		$note = $this->getFirstFact('NOTE');
 		if ($note) {
 			$text = $note->getValue();
@@ -118,7 +123,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getFilename() {
+	public function getFilename()
+	{
 		return $this->file;
 	}
 
@@ -127,7 +133,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return $this->title;
 	}
 
@@ -139,7 +146,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getServerFilename($which = 'main') {
+	public function getServerFilename($which = 'main')
+	{
 		$MEDIA_DIRECTORY = $this->tree->getPreference('MEDIA_DIRECTORY');
 		$THUMBNAIL_WIDTH = $this->tree->getPreference('THUMBNAIL_WIDTH');
 
@@ -249,7 +257,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function fileExists($which = 'main') {
+	public function fileExists($which = 'main')
+	{
 		return file_exists($this->getServerFilename($which));
 	}
 
@@ -258,7 +267,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isExternal() {
+	public function isExternal()
+	{
 		return strpos($this->file, '://') !== false;
 	}
 
@@ -269,7 +279,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getFilesize($which = 'main') {
+	public function getFilesize($which = 'main')
+	{
 		$size = $this->getFilesizeraw($which);
 		// Round up to the nearest KB.
 		$size = (int) (($size + 1023) / 1024);
@@ -284,7 +295,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function getFilesizeraw($which = 'main') {
+	public function getFilesizeraw($which = 'main')
+	{
 		try {
 			return filesize($this->getServerFilename($which));
 		} catch (\ErrorException $ex) {
@@ -299,7 +311,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function getFiletime($which = 'main') {
+	public function getFiletime($which = 'main')
+	{
 		try {
 			return filemtime($this->getServerFilename($which));
 		} catch (\ErrorException $ex) {
@@ -314,7 +327,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getEtag($which = 'main') {
+	public function getEtag($which = 'main')
+	{
 		if ($this->isExternal()) {
 			// etag not really defined for external media
 
@@ -331,7 +345,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getMediaType() {
+	public function getMediaType()
+	{
 		if (preg_match('/\n\d TYPE (.+)/', $this->gedcom, $match)) {
 			return strtolower($match[1]);
 		} else {
@@ -344,7 +359,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function isPrimary() {
+	public function isPrimary()
+	{
 		if (preg_match('/\n\d _PRIM ([YN])/', $this->getGedcom(), $match)) {
 			return $match[1];
 		} else {
@@ -361,7 +377,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function getImageAttributes($which = 'main', $addWidth = 0, $addHeight = 0) {
+	public function getImageAttributes($which = 'main', $addWidth = 0, $addHeight = 0)
+	{
 		$THUMBNAIL_WIDTH = $this->tree->getPreference('THUMBNAIL_WIDTH');
 
 		$var = $which . 'imagesize';
@@ -456,7 +473,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getHtmlUrlDirect($which = 'main', $download = false) {
+	public function getHtmlUrlDirect($which = 'main', $download = false)
+	{
 		// “cb” is “cache buster”, so clients will make new request if anything significant about the user or the file changes
 		// The extension is there so that image viewers (e.g. colorbox) can do something sensible
 		$thumbstr    = ($which == 'thumb') ? '&thumb=1' : '';
@@ -473,7 +491,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function extension() {
+	public function extension()
+	{
 		if (preg_match('/\.([a-zA-Z0-9]+)$/', $this->file, $match)) {
 			return strtolower($match[1]);
 		} else {
@@ -487,7 +506,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function mimeType() {
+	public function mimeType()
+	{
 		// Themes contain icon definitions for some/all of these mime-types
 		switch ($this->extension()) {
 		case 'bmp':
@@ -546,7 +566,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function displayImage() {
+	public function displayImage()
+	{
 		// Default image for external, missing or corrupt images.
 		$image =
 			'<i' .
@@ -588,7 +609,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getFallBackName() {
+	public function getFallBackName()
+	{
 		if ($this->canShow()) {
 			return basename($this->file);
 		} else {
@@ -599,7 +621,8 @@ 
 	/**
 	 * Extract names from the GEDCOM record.
 	 */
-	public function extractNames() {
+	public function extractNames()
+	{
 		// Earlier gedcom versions had level 1 titles
 		// Later gedcom versions had level 2 titles
 		$this->extractNamesFromFacts(2, 'TITL', $this->getFacts('FILE'));
@@ -612,7 +635,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function formatListDetails() {
+	public function formatListDetails()
+	{
 		ob_start();
 		FunctionsPrintFacts::printMediaLinks('1 OBJE @' . $this->getXref() . '@', 1);
 

app/Config.php

Indentation +191 added lines, -191 removed lines

@@ -20,204 +20,204 @@
  * although most of it can be altered to customise local installations.
  */
 class Config {
-	/** Font used to watermark images */
-	const FONT_DEJAVU_SANS_TTF = 'packages/dejavu-fonts-ttf-2.35/ttf/DejaVuSans.ttf';
+    /** Font used to watermark images */
+    const FONT_DEJAVU_SANS_TTF = 'packages/dejavu-fonts-ttf-2.35/ttf/DejaVuSans.ttf';
 
-	/**
-	 * NPFX tags - name prefixes
-	 *
-	 * @return string[]
-	 */
-	public static function namePrefixes() {
-		return array(
-			'Adm', 'Amb', 'Brig', 'Can', 'Capt', 'Chan', 'Chapln', 'Cmdr', 'Col', 'Cpl',
-			'Cpt', 'Dr', 'Gen', 'Gov', 'Hon', 'Lady', 'Lt', 'Mr', 'Mrs', 'Ms', 'Msgr',
-			'Pfc', 'Pres', 'Prof', 'Pvt', 'Rabbi', 'Rep', 'Rev', 'Sen', 'Sgt', 'Sir',
-			'Sr', 'Sra', 'Srta', 'Ven',
-		);
-	}
+    /**
+     * NPFX tags - name prefixes
+     *
+     * @return string[]
+     */
+    public static function namePrefixes() {
+        return array(
+            'Adm', 'Amb', 'Brig', 'Can', 'Capt', 'Chan', 'Chapln', 'Cmdr', 'Col', 'Cpl',
+            'Cpt', 'Dr', 'Gen', 'Gov', 'Hon', 'Lady', 'Lt', 'Mr', 'Mrs', 'Ms', 'Msgr',
+            'Pfc', 'Pres', 'Prof', 'Pvt', 'Rabbi', 'Rep', 'Rev', 'Sen', 'Sgt', 'Sir',
+            'Sr', 'Sra', 'Srta', 'Ven',
+        );
+    }
 
-	/**
-	 * FILE:FORM tags - file formats
-	 *
-	 * @return string[]
-	 */
-	public static function fileFormats() {
-		return array(
-			'avi', 'bmp', 'gif', 'jpeg', 'mp3', 'ole', 'pcx', 'png', 'tiff', 'wav',
-		);
-	}
+    /**
+     * FILE:FORM tags - file formats
+     *
+     * @return string[]
+     */
+    public static function fileFormats() {
+        return array(
+            'avi', 'bmp', 'gif', 'jpeg', 'mp3', 'ole', 'pcx', 'png', 'tiff', 'wav',
+        );
+    }
 
-	/**
-	 * Fact tags (as opposed to event tags), that don't normally have a value
-	 *
-	 * return string[]
-	 */
-	public static function emptyFacts() {
-		return array(
-			'ADOP', 'ANUL', 'BAPL', 'BAPM', 'BARM', 'BASM', 'BIRT', 'BLES', 'BURI',
-			'CENS', 'CHAN', 'CHR', 'CHRA', 'CONF', 'CONL', 'CREM', 'DATA', 'DEAT',
-			'DIV', 'DIVF', 'EMIG', 'ENDL', 'ENGA', 'FCOM', 'GRAD', 'HUSB', 'IMMI',
-			'MAP', 'MARB', 'MARC', 'MARL', 'MARR', 'MARS', 'NATU', 'ORDN', 'PROB',
-			'RESI', 'RETI', 'SLGC', 'SLGS', 'WIFE', 'WILL', '_HOL', '_NMR', '_NMAR',
-			'_SEPR',
-		);
-	}
+    /**
+     * Fact tags (as opposed to event tags), that don't normally have a value
+     *
+     * return string[]
+     */
+    public static function emptyFacts() {
+        return array(
+            'ADOP', 'ANUL', 'BAPL', 'BAPM', 'BARM', 'BASM', 'BIRT', 'BLES', 'BURI',
+            'CENS', 'CHAN', 'CHR', 'CHRA', 'CONF', 'CONL', 'CREM', 'DATA', 'DEAT',
+            'DIV', 'DIVF', 'EMIG', 'ENDL', 'ENGA', 'FCOM', 'GRAD', 'HUSB', 'IMMI',
+            'MAP', 'MARB', 'MARC', 'MARL', 'MARR', 'MARS', 'NATU', 'ORDN', 'PROB',
+            'RESI', 'RETI', 'SLGC', 'SLGS', 'WIFE', 'WILL', '_HOL', '_NMR', '_NMAR',
+            '_SEPR',
+        );
+    }
 
-	/**
-	 * Tags that don't require a PLAC subtag
-	 *
-	 * @return string[]
-	 */
-	public static function nonPlaceFacts() {
-		return array(
-			'ENDL', 'NCHI', 'REFN', 'SLGC', 'SLGS',
-		);
-	}
+    /**
+     * Tags that don't require a PLAC subtag
+     *
+     * @return string[]
+     */
+    public static function nonPlaceFacts() {
+        return array(
+            'ENDL', 'NCHI', 'REFN', 'SLGC', 'SLGS',
+        );
+    }
 
-	/**
-	 * Tags that don't require a DATE subtag
-	 *
-	 * @return string[]
-	 */
-	public static function nonDateFacts() {
-		return array(
-			'ABBR', 'ADDR', 'AFN', 'ALIA', 'AUTH', 'CHIL', 'EMAIL', 'FAX', 'FILE',
-			'HUSB', 'NAME', 'NCHI', 'NOTE', 'OBJE', 'PHON', 'PUBL', 'REFN', 'REPO',
-			'RESN', 'SEX', 'SOUR', 'SSN', 'TEXT', 'WIFE', 'WWW', '_EMAIL',
-		);
-	}
+    /**
+     * Tags that don't require a DATE subtag
+     *
+     * @return string[]
+     */
+    public static function nonDateFacts() {
+        return array(
+            'ABBR', 'ADDR', 'AFN', 'ALIA', 'AUTH', 'CHIL', 'EMAIL', 'FAX', 'FILE',
+            'HUSB', 'NAME', 'NCHI', 'NOTE', 'OBJE', 'PHON', 'PUBL', 'REFN', 'REPO',
+            'RESN', 'SEX', 'SOUR', 'SSN', 'TEXT', 'WIFE', 'WWW', '_EMAIL',
+        );
+    }
 
-	/**
-	 * Tags that require a DATE:TIME as well as a DATE
-	 *
-	 * @return string[]
-	 */
-	public static function dateAndTime() {
-		return array(
-			'BIRT', 'DEAT',
-		);
-	}
+    /**
+     * Tags that require a DATE:TIME as well as a DATE
+     *
+     * @return string[]
+     */
+    public static function dateAndTime() {
+        return array(
+            'BIRT', 'DEAT',
+        );
+    }
 
-	/**
-	 * Level 2 tags that apply to specific Level 1 tags
-	 * Tags are applied in the order they appear here.
-	 *
-	 * @return string[][]
-	 */
-	public static function levelTwoTags() {
-		return array(
-			'_HEB'     => array(
-				'NAME', 'TITL',
-			),
-			'ROMN'     => array(
-				'NAME', 'TITL',
-			),
-			'TYPE'     => array(
-				'EVEN', 'FACT', 'GRAD', 'IDNO', 'MARR', 'ORDN', 'SSN',
-			),
-			'AGNC'     => array(
-				'EDUC', 'GRAD', 'OCCU', 'ORDN', 'RETI',
-			),
-			'CALN'     => array(
-				'REPO',
-			),
-			'CEME'     => array(// CEME is NOT a valid 5.5.1 tag
-				//'BURI',
-			),
-			'RELA'     => array(
-				'ASSO', '_ASSO',
-			),
-			'DATE'     => array(
-				'ADOP', 'ANUL', 'BAPL', 'BAPM', 'BARM', 'BASM', 'BIRT', 'BLES', 'BURI',
-				'CENS', 'CENS', 'CHR', 'CHRA', 'CONF', 'CONL', 'CREM', 'DEAT', 'DIV', 'DIVF',
-				'DSCR', 'EDUC', 'EMIG', 'ENDL', 'ENGA', 'EVEN', 'FCOM', 'GRAD', 'IMMI',
-				'MARB', 'MARC', 'MARL', 'MARR', 'MARS', 'NATU', 'OCCU', 'ORDN', 'PROB',
-				'PROP', 'RELI', 'RESI', 'RETI', 'SLGC', 'SLGS', 'WILL', '_TODO',
-			),
-			'AGE'      => array(
-				'CENS', 'DEAT',
-			),
-			'TEMP'     => array(
-				'BAPL', 'CONL', 'ENDL', 'SLGC', 'SLGS',
-			),
-			'PLAC'     => array(
-				'ADOP', 'ANUL', 'BAPL', 'BAPM', 'BARM', 'BASM', 'BIRT', 'BLES', 'BURI',
-				'CENS', 'CHR', 'CHRA', 'CONF', 'CONL', 'CREM', 'DEAT', 'DIV', 'DIVF',
-				'EDUC', 'EMIG', 'ENDL', 'ENGA', 'EVEN', 'FCOM', 'GRAD', 'IMMI', 'MARB',
-				'MARC', 'MARL', 'MARR', 'MARS', 'NATU', 'OCCU', 'ORDN', 'PROB', 'PROP',
-				'RELI', 'RESI', 'RETI', 'SLGC', 'SLGS', 'SSN', 'WILL',
-			),
-			'STAT'     => array(
-				'BAPL', 'CONL', 'ENDL', 'SLGC', 'SLGS',
-			),
-			'ADDR'     => array(
-				'BAPM', 'BIRT', 'BURI', 'CENS', 'CHR', 'CHRA', 'CONF', 'CREM', 'DEAT',
-				'EDUC', 'EVEN', 'GRAD', 'MARR', 'OCCU', 'ORDN', 'PROP', 'RESI',
-			),
-			'CAUS'     => array(
-				'DEAT',
-			),
-			'PHON'     => array(
-				'OCCU', 'RESI',
-			),
-			'FAX'      => array(
-				'OCCU', 'RESI',
-			),
-			'WWW'      => array(
-				'OCCU', 'RESI',
-			),
-			'EMAIL'    => array(
-				'OCCU', 'RESI',
-			),
-			'HUSB'     => array(
-				'MARR',
-			),
-			'WIFE'     => array(
-				'MARR',
-			),
-			'FAMC'     => array(
-				'ADOP', 'SLGC',
-			),
-			'FILE'     => array(
-				'OBJE',
-			),
-			'_PRIM'    => array(
-				'OBJE',
-			),
-			'EVEN'     => array(
-				'DATA',
-			),
-			'_WT_USER' => array(
-				'_TODO',
-			),
-			// See https://bugs.launchpad.net/webtrees/+bug/1082666
-			'RELI'     => array(
-				'CHR', 'CHRA', 'BAPM', 'MARR', 'BURI',
-			),
-		);
-	}
+    /**
+     * Level 2 tags that apply to specific Level 1 tags
+     * Tags are applied in the order they appear here.
+     *
+     * @return string[][]
+     */
+    public static function levelTwoTags() {
+        return array(
+            '_HEB'     => array(
+                'NAME', 'TITL',
+            ),
+            'ROMN'     => array(
+                'NAME', 'TITL',
+            ),
+            'TYPE'     => array(
+                'EVEN', 'FACT', 'GRAD', 'IDNO', 'MARR', 'ORDN', 'SSN',
+            ),
+            'AGNC'     => array(
+                'EDUC', 'GRAD', 'OCCU', 'ORDN', 'RETI',
+            ),
+            'CALN'     => array(
+                'REPO',
+            ),
+            'CEME'     => array(// CEME is NOT a valid 5.5.1 tag
+                //'BURI',
+            ),
+            'RELA'     => array(
+                'ASSO', '_ASSO',
+            ),
+            'DATE'     => array(
+                'ADOP', 'ANUL', 'BAPL', 'BAPM', 'BARM', 'BASM', 'BIRT', 'BLES', 'BURI',
+                'CENS', 'CENS', 'CHR', 'CHRA', 'CONF', 'CONL', 'CREM', 'DEAT', 'DIV', 'DIVF',
+                'DSCR', 'EDUC', 'EMIG', 'ENDL', 'ENGA', 'EVEN', 'FCOM', 'GRAD', 'IMMI',
+                'MARB', 'MARC', 'MARL', 'MARR', 'MARS', 'NATU', 'OCCU', 'ORDN', 'PROB',
+                'PROP', 'RELI', 'RESI', 'RETI', 'SLGC', 'SLGS', 'WILL', '_TODO',
+            ),
+            'AGE'      => array(
+                'CENS', 'DEAT',
+            ),
+            'TEMP'     => array(
+                'BAPL', 'CONL', 'ENDL', 'SLGC', 'SLGS',
+            ),
+            'PLAC'     => array(
+                'ADOP', 'ANUL', 'BAPL', 'BAPM', 'BARM', 'BASM', 'BIRT', 'BLES', 'BURI',
+                'CENS', 'CHR', 'CHRA', 'CONF', 'CONL', 'CREM', 'DEAT', 'DIV', 'DIVF',
+                'EDUC', 'EMIG', 'ENDL', 'ENGA', 'EVEN', 'FCOM', 'GRAD', 'IMMI', 'MARB',
+                'MARC', 'MARL', 'MARR', 'MARS', 'NATU', 'OCCU', 'ORDN', 'PROB', 'PROP',
+                'RELI', 'RESI', 'RETI', 'SLGC', 'SLGS', 'SSN', 'WILL',
+            ),
+            'STAT'     => array(
+                'BAPL', 'CONL', 'ENDL', 'SLGC', 'SLGS',
+            ),
+            'ADDR'     => array(
+                'BAPM', 'BIRT', 'BURI', 'CENS', 'CHR', 'CHRA', 'CONF', 'CREM', 'DEAT',
+                'EDUC', 'EVEN', 'GRAD', 'MARR', 'OCCU', 'ORDN', 'PROP', 'RESI',
+            ),
+            'CAUS'     => array(
+                'DEAT',
+            ),
+            'PHON'     => array(
+                'OCCU', 'RESI',
+            ),
+            'FAX'      => array(
+                'OCCU', 'RESI',
+            ),
+            'WWW'      => array(
+                'OCCU', 'RESI',
+            ),
+            'EMAIL'    => array(
+                'OCCU', 'RESI',
+            ),
+            'HUSB'     => array(
+                'MARR',
+            ),
+            'WIFE'     => array(
+                'MARR',
+            ),
+            'FAMC'     => array(
+                'ADOP', 'SLGC',
+            ),
+            'FILE'     => array(
+                'OBJE',
+            ),
+            '_PRIM'    => array(
+                'OBJE',
+            ),
+            'EVEN'     => array(
+                'DATA',
+            ),
+            '_WT_USER' => array(
+                '_TODO',
+            ),
+            // See https://bugs.launchpad.net/webtrees/+bug/1082666
+            'RELI'     => array(
+                'CHR', 'CHRA', 'BAPM', 'MARR', 'BURI',
+            ),
+        );
+    }
 
-	/**
-	 * Name fields
-	 *
-	 * @return string[]
-	 */
-	public static function standardNameFacts() {
-		return array(
-			'NAME', 'NPFX', 'GIVN', 'SPFX', 'SURN', 'NSFX',
-		);
-	}
+    /**
+     * Name fields
+     *
+     * @return string[]
+     */
+    public static function standardNameFacts() {
+        return array(
+            'NAME', 'NPFX', 'GIVN', 'SPFX', 'SURN', 'NSFX',
+        );
+    }
 
-	/**
-	 * A list of facts/events that generally have two associates
-	 * (two witnesses, two godparents, etc.)
-	 *
-	 * @return string[]
-	 */
-	public static function twoAssociates() {
-		return array(
-			'CHR', 'BAPM', 'MARR',
-		);
-	}
+    /**
+     * A list of facts/events that generally have two associates
+     * (two witnesses, two godparents, etc.)
+     *
+     * @return string[]
+     */
+    public static function twoAssociates() {
+        return array(
+            'CHR', 'BAPM', 'MARR',
+        );
+    }
 }

Braces +20 added lines, -10 removed lines

@@ -19,7 +19,8 @@ 
  * Application configuration data. Data here has no GUI to edit it,
  * although most of it can be altered to customise local installations.
  */
-class Config {
+class Config
+{
 	/** Font used to watermark images */
 	const FONT_DEJAVU_SANS_TTF = 'packages/dejavu-fonts-ttf-2.35/ttf/DejaVuSans.ttf';
 
@@ -28,7 +29,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public static function namePrefixes() {
+	public static function namePrefixes()
+	{
 		return array(
 			'Adm', 'Amb', 'Brig', 'Can', 'Capt', 'Chan', 'Chapln', 'Cmdr', 'Col', 'Cpl',
 			'Cpt', 'Dr', 'Gen', 'Gov', 'Hon', 'Lady', 'Lt', 'Mr', 'Mrs', 'Ms', 'Msgr',
@@ -42,7 +44,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public static function fileFormats() {
+	public static function fileFormats()
+	{
 		return array(
 			'avi', 'bmp', 'gif', 'jpeg', 'mp3', 'ole', 'pcx', 'png', 'tiff', 'wav',
 		);
@@ -53,7 +56,8 @@ 
 	 *
 	 * return string[]
 	 */
-	public static function emptyFacts() {
+	public static function emptyFacts()
+	{
 		return array(
 			'ADOP', 'ANUL', 'BAPL', 'BAPM', 'BARM', 'BASM', 'BIRT', 'BLES', 'BURI',
 			'CENS', 'CHAN', 'CHR', 'CHRA', 'CONF', 'CONL', 'CREM', 'DATA', 'DEAT',
@@ -69,7 +73,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public static function nonPlaceFacts() {
+	public static function nonPlaceFacts()
+	{
 		return array(
 			'ENDL', 'NCHI', 'REFN', 'SLGC', 'SLGS',
 		);
@@ -80,7 +85,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public static function nonDateFacts() {
+	public static function nonDateFacts()
+	{
 		return array(
 			'ABBR', 'ADDR', 'AFN', 'ALIA', 'AUTH', 'CHIL', 'EMAIL', 'FAX', 'FILE',
 			'HUSB', 'NAME', 'NCHI', 'NOTE', 'OBJE', 'PHON', 'PUBL', 'REFN', 'REPO',
@@ -93,7 +99,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public static function dateAndTime() {
+	public static function dateAndTime()
+	{
 		return array(
 			'BIRT', 'DEAT',
 		);
@@ -105,7 +112,8 @@ 
 	 *
 	 * @return string[][]
 	 */
-	public static function levelTwoTags() {
+	public static function levelTwoTags()
+	{
 		return array(
 			'_HEB'     => array(
 				'NAME', 'TITL',
@@ -203,7 +211,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public static function standardNameFacts() {
+	public static function standardNameFacts()
+	{
 		return array(
 			'NAME', 'NPFX', 'GIVN', 'SPFX', 'SURN', 'NSFX',
 		);
@@ -215,7 +224,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public static function twoAssociates() {
+	public static function twoAssociates()
+	{
 		return array(
 			'CHR', 'BAPM', 'MARR',
 		);

app/Source.php

Indentation +53 added lines, -53 removed lines

@@ -19,62 +19,62 @@
  * A GEDCOM source (SOUR) object.
  */
 class Source extends GedcomRecord {
-	const RECORD_TYPE = 'SOUR';
-	const URL_PREFIX  = 'source.php?sid=';
+    const RECORD_TYPE = 'SOUR';
+    const URL_PREFIX  = 'source.php?sid=';
 
-	/**
-	 * Each object type may have its own special rules, and re-implement this function.
-	 *
-	 * @param int $access_level
-	 *
-	 * @return bool
-	 */
-	protected function canShowByType($access_level) {
-		// Hide sources if they are attached to private repositories ...
-		preg_match_all('/\n1 REPO @(.+)@/', $this->gedcom, $matches);
-		foreach ($matches[1] as $match) {
-			$repo = Repository::getInstance($match, $this->tree);
-			if ($repo && !$repo->canShow($access_level)) {
-				return false;
-			}
-		}
+    /**
+     * Each object type may have its own special rules, and re-implement this function.
+     *
+     * @param int $access_level
+     *
+     * @return bool
+     */
+    protected function canShowByType($access_level) {
+        // Hide sources if they are attached to private repositories ...
+        preg_match_all('/\n1 REPO @(.+)@/', $this->gedcom, $matches);
+        foreach ($matches[1] as $match) {
+            $repo = Repository::getInstance($match, $this->tree);
+            if ($repo && !$repo->canShow($access_level)) {
+                return false;
+            }
+        }
 
-		// ... otherwise apply default behaviour
-		return parent::canShowByType($access_level);
-	}
+        // ... otherwise apply default behaviour
+        return parent::canShowByType($access_level);
+    }
 
-	/**
-	 * Generate a private version of this record
-	 *
-	 * @param int $access_level
-	 *
-	 * @return string
-	 */
-	protected function createPrivateGedcomRecord($access_level) {
-		return '0 @' . $this->xref . "@ SOUR\n1 TITL " . I18N::translate('Private');
-	}
+    /**
+     * Generate a private version of this record
+     *
+     * @param int $access_level
+     *
+     * @return string
+     */
+    protected function createPrivateGedcomRecord($access_level) {
+        return '0 @' . $this->xref . "@ SOUR\n1 TITL " . I18N::translate('Private');
+    }
 
-	/**
-	 * Fetch data from the database
-	 *
-	 * @param string $xref
-	 * @param int    $tree_id
-	 *
-	 * @return null|string
-	 */
-	protected static function fetchGedcomRecord($xref, $tree_id) {
-		return Database::prepare(
-			"SELECT s_gedcom FROM `##sources` WHERE s_id = :xref AND s_file = :tree_id"
-		)->execute(array(
-			'xref'    => $xref,
-			'tree_id' => $tree_id,
-		))->fetchOne();
-	}
+    /**
+     * Fetch data from the database
+     *
+     * @param string $xref
+     * @param int    $tree_id
+     *
+     * @return null|string
+     */
+    protected static function fetchGedcomRecord($xref, $tree_id) {
+        return Database::prepare(
+            "SELECT s_gedcom FROM `##sources` WHERE s_id = :xref AND s_file = :tree_id"
+        )->execute(array(
+            'xref'    => $xref,
+            'tree_id' => $tree_id,
+        ))->fetchOne();
+    }
 
-	/**
-	 * Extract names from the GEDCOM record.
-	 */
-	public function extractNames() {
-		parent::extractNamesFromFacts(1, 'TITL', $this->getFacts('TITL'));
-	}
+    /**
+     * Extract names from the GEDCOM record.
+     */
+    public function extractNames() {
+        parent::extractNamesFromFacts(1, 'TITL', $this->getFacts('TITL'));
+    }
 }

Braces +10 added lines, -5 removed lines

@@ -18,7 +18,8 @@ 
 /**
  * A GEDCOM source (SOUR) object.
  */
-class Source extends GedcomRecord {
+class Source extends GedcomRecord
+{
 	const RECORD_TYPE = 'SOUR';
 	const URL_PREFIX  = 'source.php?sid=';
 
@@ -29,7 +30,8 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function canShowByType($access_level) {
+	protected function canShowByType($access_level)
+	{
 		// Hide sources if they are attached to private repositories ...
 		preg_match_all('/\n1 REPO @(.+)@/', $this->gedcom, $matches);
 		foreach ($matches[1] as $match) {
@@ -50,7 +52,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function createPrivateGedcomRecord($access_level) {
+	protected function createPrivateGedcomRecord($access_level)
+	{
 		return '0 @' . $this->xref . "@ SOUR\n1 TITL " . I18N::translate('Private');
 	}
 
@@ -62,7 +65,8 @@ 
 	 *
 	 * @return null|string
 	 */
-	protected static function fetchGedcomRecord($xref, $tree_id) {
+	protected static function fetchGedcomRecord($xref, $tree_id)
+	{
 		return Database::prepare(
 			"SELECT s_gedcom FROM `##sources` WHERE s_id = :xref AND s_file = :tree_id"
 		)->execute(array(
@@ -74,7 +78,8 @@ 
 	/**
 	 * Extract names from the GEDCOM record.
 	 */
-	public function extractNames() {
+	public function extractNames()
+	{
 		parent::extractNamesFromFacts(1, 'TITL', $this->getFacts('TITL'));
 	}
 }