Inspection of "Fix: #1932 - backport fix for #1229 into 1.7 branc..." - fisharebest/webtrees - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — 1.7 ( ce7091...0d97cf )

by Greg

created 2018-09-28 17:03 UTC

Status

Braces +12 added lines, -6 removed lines patch added patch discarded remove patch

@@ -18,7 +18,8 @@  discard block
 block discarded – undo
 /**
  * A GEDCOM note (NOTE) object.
  */
-class Note extends GedcomRecord {
+class Note extends GedcomRecord
+{
 	const RECORD_TYPE = 'NOTE';
 	const URL_PREFIX  = 'note.php?nid=';
 
@@ -27,7 +28,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string|null
 	 */
-	public function getNote() {
+	public function getNote()
+	{
 		if (preg_match('/^0 @' . WT_REGEX_XREF . '@ NOTE ?(.*(?:\n1 CONT ?.*)*)/', $this->gedcom . $this->pending, $match)) {
 			return preg_replace("/\n1 CONT ?/", "\n", $match[1]);
 		} else {
@@ -42,7 +44,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return bool
 	 */
-	protected function canShowByType($access_level) {
+	protected function canShowByType($access_level)
+	{
 		// Hide notes if they are attached to private records
 		$linked_ids = Database::prepare(
 			"SELECT l_from FROM `##link` WHERE l_to=? AND l_file=?"
@@ -67,7 +70,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function createPrivateGedcomRecord($access_level) {
+	protected function createPrivateGedcomRecord($access_level)
+	{
 		return '0 @' . $this->xref . '@ NOTE ' . I18N::translate('Private');
 	}
 
@@ -79,7 +83,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return null|string
 	 */
-	protected static function fetchGedcomRecord($xref, $tree_id) {
+	protected static function fetchGedcomRecord($xref, $tree_id)
+	{
 		return Database::prepare(
 			"SELECT o_gedcom FROM `##other` WHERE o_id = :xref AND o_file = :tree_id AND o_type = 'NOTE'"
 		)->execute(array(
@@ -92,7 +97,8 @@  discard block
 block discarded – undo
 	 * Create a name for this note - apply (and remove) markup, then take
 	 * a maximum of 100 characters from the first line.
 	 */
-	public function extractNames() {
+	public function extractNames()
+	{
 		$text = $this->getNote();
 
 		if ($text) {

Please login to merge, or discard this patch.

app/HitCounter.php 1 patch

Braces +6 added lines, -3 removed lines patch added patch discarded remove patch

@@ -18,7 +18,8 @@  discard block
 block discarded – undo
 /**
  * Measure page popularity.
  */
-class HitCounter {
+class HitCounter
+{
 	/**
 	 * Count the number of times this page has been viewed.
 	 *
@@ -28,7 +29,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return int
 	 */
-	public static function countHit(Tree $tree, $page, $parameter) {
+	public static function countHit(Tree $tree, $page, $parameter)
+	{
 		// Don't increment the counter while we stay on the same page.
 		if (
 			Session::get('last_tree_id') === $tree->getTreeId() &&
@@ -79,7 +81,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return int
 	 */
-	public static function getCount(Tree $tree, $page, $parameter) {
+	public static function getCount(Tree $tree, $page, $parameter)
+	{
 		return (int) Database::prepare(
 			"SELECT page_count FROM `##hit_counter`" .
 			" WHERE gedcom_id = :tree_id AND page_name = :page AND page_parameter = :parameter"

Please login to merge, or discard this patch.

app/Html.php 1 patch

Braces +4 added lines, -2 removed lines patch added patch discarded remove patch

@@ -18,7 +18,8 @@  discard block
 block discarded – undo
 /**
  * Class Html - Add HTML markup to elements consistently.
  */
-class Html {
+class Html
+{
 	/**
 	 * Filenames are (almost?) always LTR, even on RTL systems.
 	 *
@@ -26,7 +27,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public static function filename($filename) {
+	public static function filename($filename)
+	{
 		return '<samp class="filename" dir="ltr">' . Filter::escapeHtml($filename) . '</samp>';
 	}
 }

Please login to merge, or discard this patch.

app/Theme/CloudsTheme.php 1 patch

Braces +22 added lines, -11 removed lines patch added patch discarded remove patch

@@ -22,13 +22,15 @@  discard block
 block discarded – undo
 /**
  * The clouds theme.
  */
-class CloudsTheme extends AbstractTheme implements ThemeInterface {
+class CloudsTheme 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/clouds/css-1.7.8/';
 	}
 
@@ -39,7 +41,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function flashMessageContainer(\stdClass $message) {
+	protected function flashMessageContainer(\stdClass $message)
+	{
 		// This theme uses jQueryUI markup.
 		switch ($message->status) {
 		case 'danger':
@@ -59,7 +62,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function formatBlock($id, $title, $class, $content) {
+	public function formatBlock($id, $title, $class, $content)
+	{
 		return
 			'<div id="' . $id . '" class="block" >' .
 			'<table class="blockheader"><tr><td class="blockh1"></td><td class="blockh2">' .
@@ -74,7 +78,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function formQuickSearchFields() {
+	protected function formQuickSearchFields()
+	{
 		return
 			'<input type="search" name="query" size="15" placeholder="' . I18N::translate('Search') . '">' .
 			'<input class="search-icon" type="image" src="' . $this->assetUrl() . 'images/go.png" alt="' . I18N::translate('Search') . '" title="' . I18N::translate('Search') . '">';
@@ -85,7 +90,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function hookFooterExtraJavascript() {
+	public function hookFooterExtraJavascript()
+	{
 		return
 			'<script src="' . WT_JQUERY_COLORBOX_URL . '"></script>' .
 			'<script src="' . WT_JQUERY_WHEELZOOM_URL . '"></script>' .
@@ -109,7 +115,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string|int|float
 	 */
-	public function parameter($parameter_name) {
+	public function parameter($parameter_name)
+	{
 		$parameters = array(
 			'chart-background-f'             => 'e9daf1',
 			'chart-background-m'             => 'b1cff0',
@@ -132,7 +139,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function primaryMenuContent(array $menus) {
+	protected function primaryMenuContent(array $menus)
+	{
 		$html = '';
 
 		foreach ($menus as $menu) {
@@ -155,7 +163,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string[]
 	 */
-	protected function stylesheets() {
+	protected function stylesheets()
+	{
 		return array(
 			'themes/clouds/jquery-ui-1.11.2/jquery-ui.css',
 			$this->assetUrl() . 'style.css',
@@ -167,7 +176,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function themeId() {
+	public function themeId()
+	{
 		return 'clouds';
 	}
 
@@ -176,7 +186,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function themeName() {
+	public function themeName()
+	{
 		return /* I18N: Name of a theme. */ I18N::translate('clouds');
 	}
 }

Please login to merge, or discard this patch.

app/Theme/ColorsTheme.php 1 patch

Braces +20 added lines, -10 removed lines patch added patch discarded remove patch

@@ -25,7 +25,8 @@  discard block
 block discarded – undo
 /**
  * The colors theme.
  */
-class ColorsTheme extends CloudsTheme implements ThemeInterface {
+class ColorsTheme extends CloudsTheme implements ThemeInterface
+{
 	/** @var string[] A list of color palettes */
 	protected $palettes;
 
@@ -37,7 +38,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string A relative path, such as "themes/foo/"
 	 */
-	public function assetUrl() {
+	public function assetUrl()
+	{
 		return 'themes/colors/css-1.7.8/';
 	}
 
@@ -46,7 +48,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function formatSecondaryMenu() {
+	protected function formatSecondaryMenu()
+	{
 		return
 			'<ul class="secondary-menu">' .
 			implode('', $this->secondaryMenu()) .
@@ -61,7 +64,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function headerContent() {
+	protected function headerContent()
+	{
 		return
 			//$this->accessibilityLinks() .
 			$this->formatTreeTitle() .
@@ -71,7 +75,8 @@  discard block
 block discarded – undo
 	/**
 	 * Create resources for the colors theme.
 	 */
-	public function hookAfterInit() {
+	public function hookAfterInit()
+	{
 		$this->palettes = array(
 			'aquamarine'       => /* I18N: The name of a colour-scheme */ I18N::translate('Aqua Marine'),
 			'ash'              => /* I18N: The name of a colour-scheme */ I18N::translate('Ash'),
@@ -125,7 +130,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return Menu[]
 	 */
-	protected function secondaryMenu() {
+	protected function secondaryMenu()
+	{
 		return array_filter(array(
 			$this->menuPendingChanges(),
 			$this->menuMyPages(),
@@ -143,7 +149,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return Menu
 	 */
-	protected function menuPalette() {
+	protected function menuPalette()
+	{
 		if ($this->tree && Site::getPreference('ALLOW_USER_THEMES') && $this->tree->getPreference('ALLOW_THEME_DROPDOWN')) {
 			$menu = new Menu(/* I18N: A colour scheme */
 				I18N::translate('Palette'), '#', 'menu-color');
@@ -170,7 +177,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string[]
 	 */
-	protected function stylesheets() {
+	protected function stylesheets()
+	{
 		return array(
 			'themes/colors/jquery-ui-1.11.2/jquery-ui.css',
 			$this->assetUrl() . 'style.css',
@@ -183,7 +191,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function themeId() {
+	public function themeId()
+	{
 		return 'colors';
 	}
 
@@ -192,7 +201,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function themeName() {
+	public function themeName()
+	{
 		return /* I18N: Name of a theme. */ I18N::translate('colors');
 	}
 }

Please login to merge, or discard this patch.

app/Theme/XeneaTheme.php 1 patch

Braces +20 added lines, -10 removed lines patch added patch discarded remove patch

@@ -20,13 +20,15 @@  discard block
 block discarded – undo
 /**
  * The xenea theme.
  */
-class XeneaTheme extends AbstractTheme implements ThemeInterface {
+class XeneaTheme 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/xenea/css-1.7.8/';
 	}
 
@@ -37,7 +39,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function formQuickSearchFields() {
+	protected function formQuickSearchFields()
+	{
 		return
 			'<input type="search" name="query" size="12" placeholder="' . I18N::translate('Search') . '">' .
 			'<input type="submit" name="search" value="&gt;">';
@@ -63,7 +67,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function headerContent() {
+	protected function headerContent()
+	{
 		return
 			//$this->accessibilityLinks() .
 			'<div class="header-upper">' .
@@ -80,7 +85,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function hookFooterExtraJavascript() {
+	public function hookFooterExtraJavascript()
+	{
 		return
 			'<script src="' . WT_JQUERY_COLORBOX_URL . '"></script>' .
 			'<script src="' . WT_JQUERY_WHEELZOOM_URL . '"></script>' .
@@ -104,7 +110,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string|int|float
 	 */
-	public function parameter($parameter_name) {
+	public function parameter($parameter_name)
+	{
 		$parameters = array(
 			'chart-background-f'             => 'e9daf1',
 			'chart-background-m'             => 'b1cff0',
@@ -124,7 +131,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string[]
 	 */
-	protected function stylesheets() {
+	protected function stylesheets()
+	{
 		return array(
 			'themes/xenea/jquery-ui-1.11.2/jquery-ui.css',
 			$this->assetUrl() . 'style.css',
@@ -136,7 +144,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function themeId() {
+	public function themeId()
+	{
 		return 'xenea';
 	}
 
@@ -145,7 +154,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function themeName() {
+	public function themeName()
+	{
 		return /* I18N: Name of a theme. */ I18N::translate('xenea');
 	}
 }

Please login to merge, or discard this patch.

app/Theme/FabTheme.php 1 patch

Braces +24 added lines, -12 removed lines patch added patch discarded remove patch

@@ -21,13 +21,15 @@  discard block
 block discarded – undo
 /**
  * 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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function formatSecondaryMenu() {
+	protected function formatSecondaryMenu()
+	{
 		return
 			'<ul class="secondary-menu">' .
 			implode('', $this->secondaryMenu()) .
@@ -68,7 +72,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function headerContent() {
+	protected function headerContent()
+	{
 		return
 			//$this->accessibilityLinks() .
 			$this->formatTreeTitle() .
@@ -82,7 +87,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function formatSecondaryMenuItem(Menu $menu) {
+	protected function formatSecondaryMenuItem(Menu $menu)
+	{
 		return $menu->getMenuAsList();
 	}
 
@@ -91,7 +97,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function formQuickSearchFields() {
+	protected function formQuickSearchFields()
+	{
 		return
 			'<input type="search" name="query" size="20" placeholder="' . I18N::translate('Search') . '">';
 	}
@@ -101,7 +108,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function themeId() {
+	public function themeId()
+	{
 		return 'fab';
 	}
 
@@ -168,7 +179,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function themeName() {
+	public function themeName()
+	{
 		return /* I18N: Name of a theme. */ I18N::translate('F.A.B.');
 	}
 }

Please login to merge, or discard this patch.

app/Theme/AbstractTheme.php 1 patch

Braces +244 added lines, -122 removed lines patch added patch discarded remove patch

@@ -52,7 +52,8 @@  discard block
 block discarded – undo
 /**
  * Common functions for all themes.
  */
-abstract class AbstractTheme {
+abstract class AbstractTheme
+{
 	/** @var Tree The current tree */
 	protected $tree;
 
@@ -66,7 +67,8 @@  discard block
 block discarded – undo
 	 * 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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function analytics() {
+	protected function analytics()
+	{
 		if ($this->themeId() === '_administration' || !empty($_SERVER['HTTP_DNT'])) {
 			return '';
 		} else {
@@ -123,7 +127,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function bodyHeader() {
+	public function bodyHeader()
+	{
 		return
 			'<body class="container">' .
 			'<header>' .
@@ -247,7 +257,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function bodyHeaderPopupWindow() {
+	public function bodyHeaderPopupWindow()
+	{
 		return
 			'<body class="container container-popup">' .
 			'<main id="content">' .
@@ -261,7 +272,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function contactLink(User $user) {
+	public function contactLink(User $user)
+	{
 		$method = $user->getPreference('contactmethod');
 
 		switch ($method) {
@@ -281,7 +293,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function cookieWarning() {
+	public function cookieWarning()
+	{
 		if (
 			empty($_SERVER['HTTP_DNT']) &&
 			empty($_COOKIE['cookie']) &&
@@ -356,7 +373,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function doctype() {
+	public function doctype()
+	{
 		return '<!DOCTYPE html>';
 	}
 
@@ -365,7 +383,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function flashMessageContainer(\stdClass $message) {
+	protected function flashMessageContainer(\stdClass $message)
+	{
 		return $this->htmlAlert($message->text, $message->status, true);
 	}
 
@@ -392,7 +412,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function footerContainer() {
+	public function footerContainer()
+	{
 		return '</main><footer>' . $this->footerContent() . '</footer>';
 	}
 
@@ -420,7 +442,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function footerContainerPopupWindow() {
+	public function footerContainerPopupWindow()
+	{
 		return '</main>';
 	}
 
@@ -429,7 +452,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function footerContent() {
+	protected function footerContent()
+	{
 		return
 			$this->formatContactLinks() .
 			$this->logoPoweredBy() .
@@ -447,7 +471,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function formatContactLinks() {
+	protected function formatContactLinks()
+	{
 		if ($this->tree) {
 			return '<div class="contact-links">' . $this->contactLinks() . '</div>';
 		} else {
@@ -475,7 +501,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function formatPageViews($count) {
+	protected function formatPageViews($count)
+	{
 		if ($count > 0) {
 			return
 				'<div class="page-views">' .
@@ -492,7 +519,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function formatSecondaryMenu() {
+	protected function formatSecondaryMenu()
+	{
 		return
 			'<ul class="secondary-menu">' .
 			implode('', $this->secondaryMenu()) .
@@ -561,7 +593,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function formatSecondaryMenuItem(Menu $menu) {
+	protected function formatSecondaryMenuItem(Menu $menu)
+	{
 		return $menu->getMenuAsList();
 	}
 
@@ -572,7 +605,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function headerContent() {
+	protected function headerContent()
+	{
 		return
 			//$this->accessibilityLinks() .
 			$this->logoHeader() .
@@ -643,7 +679,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function headerSimple() {
+	protected function headerSimple()
+	{
 		return
 			$this->flashMessagesContainer(FlashMessages::getMessages()) .
 			'<div id="content">';
@@ -653,7 +690,8 @@  discard block
 block discarded – undo
 	 * Allow themes to do things after initialization (since they cannot use
 	 * the constructor).
 	 */
-	public function hookAfterInit() {
+	public function hookAfterInit()
+	{
 	}
 
 	/**
@@ -661,7 +699,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function hookFooterExtraJavascript() {
+	public function hookFooterExtraJavascript()
+	{
 		return '';
 	}
 
@@ -671,7 +710,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function hookHeaderExtraContent() {
+	public function hookHeaderExtraContent()
+	{
 		return '';
 	}
 
@@ -680,7 +720,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function html() {
+	public function html()
+	{
 		return '<html ' . I18N::htmlAttributes() . '>';
 	}
 
@@ -693,7 +734,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return Menu[]
 	 */
-	protected function individualBoxMenuFamilyLinks(Individual $individual) {
+	protected function individualBoxMenuFamilyLinks(Individual $individual)
+	{
 		$menus = array();
 
 		foreach ($individual->getSpouseFamilies() as $family) {
@@ -1013,7 +1066,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function logoHeader() {
+	protected function logoHeader()
+	{
 		return '<div class="header-logo"></div>';
 	}
 
@@ -1048,7 +1104,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return Menu
 	 */
-	protected function menuLists($surname) {
+	protected function menuLists($surname)
+	{
 		// Do not show empty lists
 		$row = Database::prepare(
 			"SELECT" .
@@ -1478,7 +1556,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return Menu|null
 	 */
-	protected function menuLogin() {
+	protected function menuLogin()
+	{
 		if (Auth::check() || WT_SCRIPT_NAME === 'login.php') {
 			return null;
 		} else {
@@ -1567,7 +1654,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return Menu[]
 	 */
-	protected function menuModules() {
+	protected function menuModules()
+	{
 		$menus = array();
 		foreach (Module::getActiveMenus($this->tree) as $module) {
 			$menus[] = $module->getMenu();
@@ -1594,7 +1683,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return Menu|null
 	 */
-	protected function menuMyIndividualRecord() {
+	protected function menuMyIndividualRecord()
+	{
 		$gedcomid = $this->tree->getUserPreference(Auth::user(), 'gedcomid');
 
 		if ($gedcomid) {
@@ -1622,7 +1713,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function metaCharset() {
+	protected function metaCharset()
+	{
 		return '<meta charset="UTF-8">';
 	}
 
@@ -1799,7 +1902,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function metaDescription($description) {
+	protected function metaDescription($description)
+	{
 		if ($description) {
 			return '<meta name="description" content="' . $description . '">';
 		} else {
@@ -1814,7 +1918,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function metaGenerator($generator) {
+	protected function metaGenerator($generator)
+	{
 		if ($generator) {
 			return '<meta name="generator" content="' . $generator . '">';
 		} else {
@@ -1829,7 +1934,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function metaRobots($robots) {
+	protected function metaRobots($robots)
+	{
 		if ($robots) {
 			return '<meta name="robots" content="' . $robots . '">';
 		} else {
@@ -1842,7 +1948,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function metaUaCompatible() {
+	protected function metaUaCompatible()
+	{
 		return '<meta http-equiv="X-UA-Compatible" content="IE=edge">';
 	}
 
@@ -1851,7 +1958,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function metaViewport() {
+	protected function metaViewport()
+	{
 		return '<meta name="viewport" content="width=device-width, initial-scale=1">';
 	}
 
@@ -1862,7 +1970,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return bool
 	 */
-	protected function pendingChangesExist() {
+	protected function pendingChangesExist()
+	{
 		return $this->tree && $this->tree->hasPendingEdit() && Auth::isModerator($this->tree);
 	}
 
@@ -1945,7 +2056,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function pendingChangesLinkText() {
+	protected function pendingChangesLinkText()
+	{
 		return I18N::translate('There are pending changes for you to moderate.');
 	}
 
@@ -1966,7 +2079,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return Menu[]
 	 */
-	protected function primaryMenu() {
+	protected function primaryMenu()
+	{
 		global $controller;
 
 		if ($this->tree) {
@@ -1993,7 +2107,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return Menu[]
 	 */
-	protected function secondaryMenu() {
+	protected function secondaryMenu()
+	{
 		return array_filter(array(
 			$this->menuPendingChanges(),
 			$this->menuMyPages(),
@@ -2034,7 +2151,8 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	/**
 	 * Send any HTTP headers.
 	 */
-	public function sendHeaders() {
+	public function sendHeaders()
+	{
 		header('Content-Type: text/html; charset=UTF-8');
 	}
 
@@ -2063,7 +2183,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string[]
 	 */
-	protected function stylesheets() {
+	protected function stylesheets()
+	{
 		$stylesheets = array(
 			WT_BOOTSTRAP_CSS_URL,
 			WT_FONT_AWESOME_CSS_URL,
@@ -2084,7 +2205,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	protected function title($title) {
+	protected function title($title)
+	{
 		return '<title>' . Filter::escapeHtml($title) . '</title>';
 	}
 }

Please login to merge, or discard this patch.

app/Theme/WebtreesTheme.php 1 patch

Braces +18 added lines, -9 removed lines patch added patch discarded remove patch

@@ -21,13 +21,15 @@  discard block
 block discarded – undo
 /**
  * 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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @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 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function themeId() {
+	public function themeId()
+	{
 		return 'webtrees';
 	}
 
@@ -129,7 +137,8 @@  discard block
 block discarded – undo
 	 *
 	 * @return string
 	 */
-	public function themeName() {
+	public function themeName()
+	{
 		return I18N::translate('webtrees');
 	}
 }

Please login to merge, or discard this patch.

		@@ -18,7 +18,8 @@ discard block
		block discarded – undo
18	18	/**
19	19	* A GEDCOM note (NOTE) object.
20	20	*/
21		-class Note extends GedcomRecord {
	21	+class Note extends GedcomRecord
	22	+{
22	23	const RECORD_TYPE = 'NOTE';
23	24	const URL_PREFIX = 'note.php?nid=';
24	25
		@@ -27,7 +28,8 @@ discard block
		block discarded – undo
27	28	*
28	29	* @return string\|null
29	30	*/
30		- public function getNote() {
	31	+ public function getNote()
	32	+ {
31	33	if (preg_match('/^0 @' . WT_REGEX_XREF . '@ NOTE ?(.(?:\n1 CONT ?.)*)/', $this->gedcom . $this->pending, $match)) {
32	34	return preg_replace("/\n1 CONT ?/", "\n", $match[1]);
33	35	} else {
		@@ -42,7 +44,8 @@ discard block
		block discarded – undo
42	44	*
43	45	* @return bool
44	46	*/
45		- protected function canShowByType($access_level) {
	47	+ protected function canShowByType($access_level)
	48	+ {
46	49	// Hide notes if they are attached to private records
47	50	$linked_ids = Database::prepare(
48	51	"SELECT l_from FROM `##link` WHERE l_to=? AND l_file=?"
		@@ -67,7 +70,8 @@ discard block
		block discarded – undo
67	70	*
68	71	* @return string
69	72	*/
70		- protected function createPrivateGedcomRecord($access_level) {
	73	+ protected function createPrivateGedcomRecord($access_level)
	74	+ {
71	75	return '0 @' . $this->xref . '@ NOTE ' . I18N::translate('Private');
72	76	}
73	77
		@@ -79,7 +83,8 @@ discard block
		block discarded – undo
79	83	*
80	84	* @return null\|string
81	85	*/
82		- protected static function fetchGedcomRecord($xref, $tree_id) {
	86	+ protected static function fetchGedcomRecord($xref, $tree_id)
	87	+ {
83	88	return Database::prepare(
84	89	"SELECT o_gedcom FROM `##other` WHERE o_id = :xref AND o_file = :tree_id AND o_type = 'NOTE'"
85	90	)->execute(array(
		@@ -92,7 +97,8 @@ discard block
		block discarded – undo
92	97	* Create a name for this note - apply (and remove) markup, then take
93	98	* a maximum of 100 characters from the first line.
94	99	*/
95		- public function extractNames() {
	100	+ public function extractNames()
	101	+ {
96	102	$text = $this->getNote();
97	103
98	104	if ($text) {

		@@ -18,7 +18,8 @@ discard block
		block discarded – undo
18	18	/**
19	19	* Measure page popularity.
20	20	*/
21		-class HitCounter {
	21	+class HitCounter
	22	+{
22	23	/**
23	24	* Count the number of times this page has been viewed.
24	25	*
		@@ -28,7 +29,8 @@ discard block
		block discarded – undo
28	29	*
29	30	* @return int
30	31	*/
31		- public static function countHit(Tree $tree, $page, $parameter) {
	32	+ public static function countHit(Tree $tree, $page, $parameter)
	33	+ {
32	34	// Don't increment the counter while we stay on the same page.
33	35	if (
34	36	Session::get('last_tree_id') === $tree->getTreeId() &&
		@@ -79,7 +81,8 @@ discard block
		block discarded – undo
79	81	*
80	82	* @return int
81	83	*/
82		- public static function getCount(Tree $tree, $page, $parameter) {
	84	+ public static function getCount(Tree $tree, $page, $parameter)
	85	+ {
83	86	return (int) Database::prepare(
84	87	"SELECT page_count FROM `##hit_counter`" .
85	88	" WHERE gedcom_id = :tree_id AND page_name = :page AND page_parameter = :parameter"

		@@ -18,7 +18,8 @@ discard block
		block discarded – undo
18	18	/**
19	19	* Class Html - Add HTML markup to elements consistently.
20	20	*/
21		-class Html {
	21	+class Html
	22	+{
22	23	/**
23	24	* Filenames are (almost?) always LTR, even on RTL systems.
24	25	*
		@@ -26,7 +27,8 @@ discard block
		block discarded – undo
26	27	*
27	28	* @return string
28	29	*/
29		- public static function filename($filename) {
	30	+ public static function filename($filename)
	31	+ {
30	32	return '<samp class="filename" dir="ltr">' . Filter::escapeHtml($filename) . '</samp>';
31	33	}
32	34	}

		@@ -22,13 +22,15 @@ discard block
		block discarded – undo
22	22	/**
23	23	* The clouds theme.
24	24	*/
25		-class CloudsTheme extends AbstractTheme implements ThemeInterface {
	25	+class CloudsTheme extends AbstractTheme implements ThemeInterface
	26	+{
26	27	/**
27	28	* Where are our CSS, JS and other assets?
28	29	*
29	30	* @return string A relative path, such as "themes/foo/"
30	31	*/
31		- public function assetUrl() {
	32	+ public function assetUrl()
	33	+ {
32	34	return 'themes/clouds/css-1.7.8/';
33	35	}
34	36
		@@ -39,7 +41,8 @@ discard block
		block discarded – undo
39	41	*
40	42	* @return string
41	43	*/
42		- protected function flashMessageContainer(\stdClass $message) {
	44	+ protected function flashMessageContainer(\stdClass $message)
	45	+ {
43	46	// This theme uses jQueryUI markup.
44	47	switch ($message->status) {
45	48	case 'danger':
		@@ -59,7 +62,8 @@ discard block
		block discarded – undo
59	62	*
60	63	* @return string
61	64	*/
62		- public function formatBlock($id, $title, $class, $content) {
	65	+ public function formatBlock($id, $title, $class, $content)
	66	+ {
63	67	return
64	68	'<div id="' . $id . '" class="block" >' .
65	69	'<table class="blockheader"><tr><td class="blockh1"></td><td class="blockh2">' .
		@@ -74,7 +78,8 @@ discard block
		block discarded – undo
74	78	*
75	79	* @return string
76	80	*/
77		- protected function formQuickSearchFields() {
	81	+ protected function formQuickSearchFields()
	82	+ {
78	83	return
79	84	'<input type="search" name="query" size="15" placeholder="' . I18N::translate('Search') . '">' .
80	85	'<input class="search-icon" type="image" src="' . $this->assetUrl() . 'images/go.png" alt="' . I18N::translate('Search') . '" title="' . I18N::translate('Search') . '">';
		@@ -85,7 +90,8 @@ discard block
		block discarded – undo
85	90	*
86	91	* @return string
87	92	*/
88		- public function hookFooterExtraJavascript() {
	93	+ public function hookFooterExtraJavascript()
	94	+ {
89	95	return
90	96	'<script src="' . WT_JQUERY_COLORBOX_URL . '"></script>' .
91	97	'<script src="' . WT_JQUERY_WHEELZOOM_URL . '"></script>' .
		@@ -109,7 +115,8 @@ discard block
		block discarded – undo
109	115	*
110	116	* @return string\|int\|float
111	117	*/
112		- public function parameter($parameter_name) {
	118	+ public function parameter($parameter_name)
	119	+ {
113	120	$parameters = array(
114	121	'chart-background-f' => 'e9daf1',
115	122	'chart-background-m' => 'b1cff0',
		@@ -132,7 +139,8 @@ discard block
		block discarded – undo
132	139	*
133	140	* @return string
134	141	*/
135		- protected function primaryMenuContent(array $menus) {
	142	+ protected function primaryMenuContent(array $menus)
	143	+ {
136	144	$html = '';
137	145
138	146	foreach ($menus as $menu) {
		@@ -155,7 +163,8 @@ discard block
		block discarded – undo
155	163	*
156	164	* @return string[]
157	165	*/
158		- protected function stylesheets() {
	166	+ protected function stylesheets()
	167	+ {
159	168	return array(
160	169	'themes/clouds/jquery-ui-1.11.2/jquery-ui.css',
161	170	$this->assetUrl() . 'style.css',
		@@ -167,7 +176,8 @@ discard block
		block discarded – undo
167	176	*
168	177	* @return string
169	178	*/
170		- public function themeId() {
	179	+ public function themeId()
	180	+ {
171	181	return 'clouds';
172	182	}
173	183
		@@ -176,7 +186,8 @@ discard block
		block discarded – undo
176	186	*
177	187	* @return string
178	188	*/
179		- public function themeName() {
	189	+ public function themeName()
	190	+ {
180	191	return /* I18N: Name of a theme. */ I18N::translate('clouds');
181	192	}
182	193	}

		@@ -25,7 +25,8 @@ discard block
		block discarded – undo
25	25	/**
26	26	* The colors theme.
27	27	*/
28		-class ColorsTheme extends CloudsTheme implements ThemeInterface {
	28	+class ColorsTheme extends CloudsTheme implements ThemeInterface
	29	+{
29	30	/** @var string[] A list of color palettes */
30	31	protected $palettes;
31	32
		@@ -37,7 +38,8 @@ discard block
		block discarded – undo
37	38	*
38	39	* @return string A relative path, such as "themes/foo/"
39	40	*/
40		- public function assetUrl() {
	41	+ public function assetUrl()
	42	+ {
41	43	return 'themes/colors/css-1.7.8/';
42	44	}
43	45
		@@ -46,7 +48,8 @@ discard block
		block discarded – undo
46	48	*
47	49	* @return string
48	50	*/
49		- protected function formatSecondaryMenu() {
	51	+ protected function formatSecondaryMenu()
	52	+ {
50	53	return
51	54	'<ul class="secondary-menu">' .
52	55	implode('', $this->secondaryMenu()) .
		@@ -61,7 +64,8 @@ discard block
		block discarded – undo
61	64	*
62	65	* @return string
63	66	*/
64		- protected function headerContent() {
	67	+ protected function headerContent()
	68	+ {
65	69	return
66	70	//$this->accessibilityLinks() .
67	71	$this->formatTreeTitle() .
		@@ -71,7 +75,8 @@ discard block
		block discarded – undo
71	75	/**
72	76	* Create resources for the colors theme.
73	77	*/
74		- public function hookAfterInit() {
	78	+ public function hookAfterInit()
	79	+ {
75	80	$this->palettes = array(
76	81	'aquamarine' => /* I18N: The name of a colour-scheme */ I18N::translate('Aqua Marine'),
77	82	'ash' => /* I18N: The name of a colour-scheme */ I18N::translate('Ash'),
		@@ -125,7 +130,8 @@ discard block
		block discarded – undo
125	130	*
126	131	* @return Menu[]
127	132	*/
128		- protected function secondaryMenu() {
	133	+ protected function secondaryMenu()
	134	+ {
129	135	return array_filter(array(
130	136	$this->menuPendingChanges(),
131	137	$this->menuMyPages(),
		@@ -143,7 +149,8 @@ discard block
		block discarded – undo
143	149	*
144	150	* @return Menu
145	151	*/
146		- protected function menuPalette() {
	152	+ protected function menuPalette()
	153	+ {
147	154	if ($this->tree && Site::getPreference('ALLOW_USER_THEMES') && $this->tree->getPreference('ALLOW_THEME_DROPDOWN')) {
148	155	$menu = new Menu(/* I18N: A colour scheme */
149	156	I18N::translate('Palette'), '#', 'menu-color');
		@@ -170,7 +177,8 @@ discard block
		block discarded – undo
170	177	*
171	178	* @return string[]
172	179	*/
173		- protected function stylesheets() {
	180	+ protected function stylesheets()
	181	+ {
174	182	return array(
175	183	'themes/colors/jquery-ui-1.11.2/jquery-ui.css',
176	184	$this->assetUrl() . 'style.css',
		@@ -183,7 +191,8 @@ discard block
		block discarded – undo
183	191	*
184	192	* @return string
185	193	*/
186		- public function themeId() {
	194	+ public function themeId()
	195	+ {
187	196	return 'colors';
188	197	}
189	198
		@@ -192,7 +201,8 @@ discard block
		block discarded – undo
192	201	*
193	202	* @return string
194	203	*/
195		- public function themeName() {
	204	+ public function themeName()
	205	+ {
196	206	return /* I18N: Name of a theme. */ I18N::translate('colors');
197	207	}
198	208	}

		@@ -20,13 +20,15 @@ discard block
		block discarded – undo
20	20	/**
21	21	* The xenea theme.
22	22	*/
23		-class XeneaTheme extends AbstractTheme implements ThemeInterface {
	23	+class XeneaTheme extends AbstractTheme implements ThemeInterface
	24	+{
24	25	/**
25	26	* Where are our CSS, JS and other assets?
26	27	*
27	28	* @return string A relative path, such as "themes/foo/"
28	29	*/
29		- public function assetUrl() {
	30	+ public function assetUrl()
	31	+ {
30	32	return 'themes/xenea/css-1.7.8/';
31	33	}
32	34
		@@ -37,7 +39,8 @@ discard block
		block discarded – undo
37	39	*
38	40	* @return string
39	41	*/
40		- protected function flashMessageContainer(\stdClass $message) {
	42	+ protected function flashMessageContainer(\stdClass $message)
	43	+ {
41	44	// This theme uses jQueryUI markup.
42	45	switch ($message->status) {
43	46	case 'danger':
		@@ -52,7 +55,8 @@ discard block
		block discarded – undo
52	55	*
53	56	* @return string
54	57	*/
55		- protected function formQuickSearchFields() {
	58	+ protected function formQuickSearchFields()
	59	+ {
56	60	return
57	61	'<input type="search" name="query" size="12" placeholder="' . I18N::translate('Search') . '">' .
58	62	'<input type="submit" name="search" value=">">';
		@@ -63,7 +67,8 @@ discard block
		block discarded – undo
63	67	*
64	68	* @return string
65	69	*/
66		- protected function headerContent() {
	70	+ protected function headerContent()
	71	+ {
67	72	return
68	73	//$this->accessibilityLinks() .
69	74	'<div class="header-upper">' .
		@@ -80,7 +85,8 @@ discard block
		block discarded – undo
80	85	*
81	86	* @return string
82	87	*/
83		- public function hookFooterExtraJavascript() {
	88	+ public function hookFooterExtraJavascript()
	89	+ {
84	90	return
85	91	'<script src="' . WT_JQUERY_COLORBOX_URL . '"></script>' .
86	92	'<script src="' . WT_JQUERY_WHEELZOOM_URL . '"></script>' .
		@@ -104,7 +110,8 @@ discard block
		block discarded – undo
104	110	*
105	111	* @return string\|int\|float
106	112	*/
107		- public function parameter($parameter_name) {
	113	+ public function parameter($parameter_name)
	114	+ {
108	115	$parameters = array(
109	116	'chart-background-f' => 'e9daf1',
110	117	'chart-background-m' => 'b1cff0',
		@@ -124,7 +131,8 @@ discard block
		block discarded – undo
124	131	*
125	132	* @return string[]
126	133	*/
127		- protected function stylesheets() {
	134	+ protected function stylesheets()
	135	+ {
128	136	return array(
129	137	'themes/xenea/jquery-ui-1.11.2/jquery-ui.css',
130	138	$this->assetUrl() . 'style.css',
		@@ -136,7 +144,8 @@ discard block
		block discarded – undo
136	144	*
137	145	* @return string
138	146	*/
139		- public function themeId() {
	147	+ public function themeId()
	148	+ {
140	149	return 'xenea';
141	150	}
142	151
		@@ -145,7 +154,8 @@ discard block
		block discarded – undo
145	154	*
146	155	* @return string
147	156	*/
148		- public function themeName() {
	157	+ public function themeName()
	158	+ {
149	159	return /* I18N: Name of a theme. */ I18N::translate('xenea');
150	160	}
151	161	}

		@@ -21,13 +21,15 @@ discard block
		block discarded – undo
21	21	/**
22	22	* The F.A.B. theme.
23	23	*/
24		-class FabTheme extends AbstractTheme implements ThemeInterface {
	24	+class FabTheme extends AbstractTheme implements ThemeInterface
	25	+{
25	26	/**
26	27	* Where are our CSS, JS and other assets?
27	28	*
28	29	* @return string A relative path, such as "themes/foo/"
29	30	*/
30		- public function assetUrl() {
	31	+ public function assetUrl()
	32	+ {
31	33	return 'themes/fab/css-1.7.8/';
32	34	}
33	35
		@@ -38,7 +40,8 @@ discard block
		block discarded – undo
38	40	*
39	41	* @return string
40	42	*/
41		- protected function flashMessageContainer(\stdClass $message) {
	43	+ protected function flashMessageContainer(\stdClass $message)
	44	+ {
42	45	// This theme uses jQueryUI markup.
43	46	switch ($message->status) {
44	47	case 'danger':
		@@ -53,7 +56,8 @@ discard block
		block discarded – undo
53	56	*
54	57	* @return string
55	58	*/
56		- protected function formatSecondaryMenu() {
	59	+ protected function formatSecondaryMenu()
	60	+ {
57	61	return
58	62	'<ul class="secondary-menu">' .
59	63	implode('', $this->secondaryMenu()) .
		@@ -68,7 +72,8 @@ discard block
		block discarded – undo
68	72	*
69	73	* @return string
70	74	*/
71		- protected function headerContent() {
	75	+ protected function headerContent()
	76	+ {
72	77	return
73	78	//$this->accessibilityLinks() .
74	79	$this->formatTreeTitle() .
		@@ -82,7 +87,8 @@ discard block
		block discarded – undo
82	87	*
83	88	* @return string
84	89	*/
85		- protected function formatSecondaryMenuItem(Menu $menu) {
	90	+ protected function formatSecondaryMenuItem(Menu $menu)
	91	+ {
86	92	return $menu->getMenuAsList();
87	93	}
88	94
		@@ -91,7 +97,8 @@ discard block
		block discarded – undo
91	97	*
92	98	* @return string
93	99	*/
94		- protected function formQuickSearchFields() {
	100	+ protected function formQuickSearchFields()
	101	+ {
95	102	return
96	103	'<input type="search" name="query" size="20" placeholder="' . I18N::translate('Search') . '">';
97	104	}
		@@ -101,7 +108,8 @@ discard block
		block discarded – undo
101	108	*
102	109	* @return string
103	110	*/
104		- public function hookFooterExtraJavascript() {
	111	+ public function hookFooterExtraJavascript()
	112	+ {
105	113	return
106	114	'<script src="' . WT_JQUERY_COLORBOX_URL . '"></script>' .
107	115	'<script src="' . WT_JQUERY_WHEELZOOM_URL . '"></script>' .
		@@ -125,7 +133,8 @@ discard block
		block discarded – undo
125	133	*
126	134	* @return string\|int\|float
127	135	*/
128		- public function parameter($parameter_name) {
	136	+ public function parameter($parameter_name)
	137	+ {
129	138	$parameters = array(
130	139	'chart-background-f' => 'e9daf1',
131	140	'chart-background-m' => 'b1cff0',
		@@ -147,7 +156,8 @@ discard block
		block discarded – undo
147	156	*
148	157	* @return string[]
149	158	*/
150		- protected function stylesheets() {
	159	+ protected function stylesheets()
	160	+ {
151	161	return array(
152	162	'themes/fab/jquery-ui-1.11.2/jquery-ui.css',
153	163	$this->assetUrl() . 'style.css',
		@@ -159,7 +169,8 @@ discard block
		block discarded – undo
159	169	*
160	170	* @return string
161	171	*/
162		- public function themeId() {
	172	+ public function themeId()
	173	+ {
163	174	return 'fab';
164	175	}
165	176
		@@ -168,7 +179,8 @@ discard block
		block discarded – undo
168	179	*
169	180	* @return string
170	181	*/
171		- public function themeName() {
	182	+ public function themeName()
	183	+ {
172	184	return /* I18N: Name of a theme. */ I18N::translate('F.A.B.');
173	185	}
174	186	}

		@@ -21,13 +21,15 @@ discard block
		block discarded – undo
21	21	/**
22	22	* The webtrees (default) theme.
23	23	*/
24		-class WebtreesTheme extends AbstractTheme implements ThemeInterface {
	24	+class WebtreesTheme extends AbstractTheme implements ThemeInterface
	25	+{
25	26	/**
26	27	* Where are our CSS, JS and other assets?
27	28	*
28	29	* @return string A relative path, such as "themes/foo/"
29	30	*/
30		- public function assetUrl() {
	31	+ public function assetUrl()
	32	+ {
31	33	return 'themes/webtrees/css-1.7.8/';
32	34	}
33	35
		@@ -38,7 +40,8 @@ discard block
		block discarded – undo
38	40	*
39	41	* @return string
40	42	*/
41		- protected function flashMessageContainer(\stdClass $message) {
	43	+ protected function flashMessageContainer(\stdClass $message)
	44	+ {
42	45	// This theme uses jQueryUI markup.
43	46	switch ($message->status) {
44	47	case 'danger':
		@@ -53,7 +56,8 @@ discard block
		block discarded – undo
53	56	*
54	57	* @return string
55	58	*/
56		- protected function formQuickSearchFields() {
	59	+ protected function formQuickSearchFields()
	60	+ {
57	61	return
58	62	'<input type="search" name="query" size="25" placeholder="' . I18N::translate('Search') . '">' .
59	63	'<input type="image" class="image" src="' . $this->assetUrl() . 'images/search.png" alt="' . I18N::translate('Search') . '" title="' . I18N::translate('Search') . '">';
		@@ -64,7 +68,8 @@ discard block
		block discarded – undo
64	68	*
65	69	* @return string
66	70	*/
67		- public function hookFooterExtraJavascript() {
	71	+ public function hookFooterExtraJavascript()
	72	+ {
68	73	return
69	74	'<script src="' . WT_JQUERY_COLORBOX_URL . '"></script>' .
70	75	'<script src="' . WT_JQUERY_WHEELZOOM_URL . '"></script>' .
		@@ -88,7 +93,8 @@ discard block
		block discarded – undo
88	93	*
89	94	* @return string\|int\|float
90	95	*/
91		- public function parameter($parameter_name) {
	96	+ public function parameter($parameter_name)
	97	+ {
92	98	$parameters = array(
93	99	'chart-background-f' => 'e9daf1',
94	100	'chart-background-m' => 'b1cff0',
		@@ -108,7 +114,8 @@ discard block
		block discarded – undo
108	114	*
109	115	* @return string[]
110	116	*/
111		- protected function stylesheets() {
	117	+ protected function stylesheets()
	118	+ {
112	119	return array(
113	120	'themes/webtrees/jquery-ui-1.11.2/jquery-ui.css',
114	121	$this->assetUrl() . 'style.css',
		@@ -120,7 +127,8 @@ discard block
		block discarded – undo
120	127	*
121	128	* @return string
122	129	*/
123		- public function themeId() {
	130	+ public function themeId()
	131	+ {
124	132	return 'webtrees';
125	133	}
126	134
		@@ -129,7 +137,8 @@ discard block
		block discarded – undo
129	137	*
130	138	* @return string
131	139	*/
132		- public function themeName() {
	140	+ public function themeName()
	141	+ {
133	142	return I18N::translate('webtrees');
134	143	}
135	144	}

fisharebest / webtrees

Push — 1.7 ( ce7091...0d97cf )

Status

Category

Braces +12 added lines, -6 removed lines patch added patch discarded remove patch

Braces +6 added lines, -3 removed lines patch added patch discarded remove patch

Braces +4 added lines, -2 removed lines patch added patch discarded remove patch

Braces +22 added lines, -11 removed lines patch added patch discarded remove patch

Braces +20 added lines, -10 removed lines patch added patch discarded remove patch

Braces +20 added lines, -10 removed lines patch added patch discarded remove patch

Braces +24 added lines, -12 removed lines patch added patch discarded remove patch

Braces +244 added lines, -122 removed lines patch added patch discarded remove patch

Braces +18 added lines, -9 removed lines patch added patch discarded remove patch