fisharebest / webtrees

app/Module/AlbumModule.php

Braces +20 added lines, -10 removed lines

@@ -27,7 +27,8 @@ 
 /**
  * Class AlbumModule
  */
-class AlbumModule extends AbstractModule implements ModuleTabInterface {
+class AlbumModule extends AbstractModule implements ModuleTabInterface
+{
 	/** @var Media[] List of media objects. */
 	private $media_list;
 
@@ -36,7 +37,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Album');
 	}
 
@@ -45,7 +47,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Album” module */ I18N::translate('An alternative to the “media” tab, and an enhanced image viewer.');
 	}
 
@@ -55,7 +58,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultTabOrder() {
+	public function defaultTabOrder()
+	{
 		return 60;
 	}
 
@@ -64,7 +68,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function hasTabContent() {
+	public function hasTabContent()
+	{
 		global $WT_TREE;
 
 		return Auth::isEditor($WT_TREE) || $this->getMedia();
@@ -76,7 +81,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isGrayedOut() {
+	public function isGrayedOut()
+	{
 		return !$this->getMedia();
 	}
 
@@ -85,7 +91,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getTabContent() {
+	public function getTabContent()
+	{
 		global $WT_TREE, $controller;
 
 		$html = '<div id="' . $this->getName() . '_content">';
@@ -210,7 +217,8 @@ 
 	 *
 	 * @return Media[]
 	 */
-	private function getMedia() {
+	private function getMedia()
+	{
 		global $controller;
 
 		if ($this->media_list === null) {
@@ -255,7 +263,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function canLoadAjax() {
+	public function canLoadAjax()
+	{
 		return !Auth::isSearchEngine(); // Search engines cannot use AJAX
 	}
 
@@ -266,7 +275,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getPreLoadContent() {
+	public function getPreLoadContent()
+	{
 		return '';
 	}
 }

app/Module/FactSourcesReportModule.php

Braces +10 added lines, -5 removed lines

@@ -22,15 +22,18 @@ 
 /**
  * Class FactSourcesReportModule
  */
-class FactSourcesReportModule extends AbstractModule implements ModuleReportInterface {
+class FactSourcesReportModule extends AbstractModule implements ModuleReportInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Name of a module/report */ I18N::translate('Source');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Description of the “Source” module */ I18N::translate('A report of the information provided by a source.');
 	}
@@ -42,7 +45,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_USER;
 	}
 
@@ -51,7 +55,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	public function getReportMenu() {
+	public function getReportMenu()
+	{
 		global $WT_TREE;
 
 		return new Menu(

app/Module/TimelineChartModule.php

Braces +12 added lines, -6 removed lines

@@ -23,13 +23,15 @@ 
 /**
  * Class TimelineChartModule
  */
-class TimelineChartModule extends AbstractModule implements ModuleChartInterface {
+class TimelineChartModule extends AbstractModule implements ModuleChartInterface
+{
 	/**
 	 * How should this module be labelled on tabs, menus, etc.?
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module/chart */ I18N::translate('Timeline');
 	}
 
@@ -38,7 +40,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “TimelineChart” module */ I18N::translate('A timeline displaying individual events.');
 	}
 
@@ -49,7 +52,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_PRIVATE;
 	}
 
@@ -58,7 +62,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getChartMenu(Individual $individual) {
+	public function getChartMenu(Individual $individual)
+	{
 		return new Menu(
 			$this->getTitle(),
 			'timeline.php?pids%5B%5D=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(),
@@ -72,7 +77,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getBoxChartMenu(Individual $individual) {
+	public function getBoxChartMenu(Individual $individual)
+	{
 		return null;
 	}
 }

app/Module/FamilyTreeFavoritesModule.php

Braces +24 added lines, -12 removed lines

@@ -34,7 +34,8 @@ 
  * Note that the user favorites module simply extends this module, so ensure that the
  * logic works for both.
  */
-class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInterface {
+class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInterface
+{
 	// How to update the database schema for this module
 	const SCHEMA_TARGET_VERSION   = 4;
 	const SCHEMA_SETTING_NAME     = 'FV_SCHEMA_VERSION';
@@ -45,7 +46,8 @@ 
 	 *
 	 * @param string $directory Where is this module installed
 	 */
-	public function __construct($directory) {
+	public function __construct($directory)
+	{
 		parent::__construct($directory);
 
 		// Create/update the database tables.
@@ -58,7 +60,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Favorites');
 	}
 
@@ -67,7 +70,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Favorites” module */ I18N::translate('Display and manage a family tree’s favorite pages.');
 	}
 
@@ -80,7 +84,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
+	public function getBlock($block_id, $template = true, $cfg = array())
+	{
 		global $ctype, $controller, $WT_TREE;
 
 		$action = Filter::get('action');
@@ -248,7 +253,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function loadAjax() {
+	public function loadAjax()
+	{
 		return false;
 	}
 
@@ -257,7 +263,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isUserBlock() {
+	public function isUserBlock()
+	{
 		return false;
 	}
 
@@ -266,7 +273,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isGedcomBlock() {
+	public function isGedcomBlock()
+	{
 		return true;
 	}
 
@@ -275,7 +283,8 @@ 
 	 *
 	 * @param int $block_id
 	 */
-	public function configureBlock($block_id) {
+	public function configureBlock($block_id)
+	{
 		if (Filter::postBool('save') && Filter::checkCsrf()) {
 			$this->setBlockSetting($block_id, 'block', Filter::postBool('block'));
 		}
@@ -296,7 +305,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function deleteFavorite($favorite_id) {
+	public static function deleteFavorite($favorite_id)
+	{
 		return (bool)
 			Database::prepare("DELETE FROM `##favorite` WHERE favorite_id=?")
 			->execute(array($favorite_id));
@@ -309,7 +319,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function addFavorite($favorite) {
+	public static function addFavorite($favorite)
+	{
 		// -- make sure a favorite is added
 		if (empty($favorite['gid']) && empty($favorite['url'])) {
 			return false;
@@ -350,7 +361,8 @@ 
 	 *
 	 * @return string[][]
 	 */
-	public static function getFavorites($gedcom_id) {
+	public static function getFavorites($gedcom_id)
+	{
 		return
 			Database::prepare(
 				"SELECT favorite_id AS id, user_id, gedcom_id, xref AS gid, favorite_type AS type, title, note, url" .

app/Module/ClippingsCartModule.php

Braces +24 added lines, -12 removed lines

@@ -33,13 +33,15 @@ 
  */
 class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface, ModuleSidebarInterface {
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */
 			I18N::translate('Clippings cart');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Clippings cart” module */
 			I18N::translate('Select records from your family tree and save them as a GEDCOM file.');
 	}
@@ -51,7 +53,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_USER;
 	}
 
@@ -61,7 +64,8 @@ 
 	 *
 	 * @param string $mod_action
 	 */
-	public function modAction($mod_action) {
+	public function modAction($mod_action)
+	{
 		global $WT_TREE;
 
 		// Only allow access if either the menu or sidebar is enabled.
@@ -555,7 +559,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultMenuOrder() {
+	public function defaultMenuOrder()
+	{
 		return 20;
 	}
 
@@ -564,7 +569,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getMenu() {
+	public function getMenu()
+	{
 		global $controller, $WT_TREE;
 
 		$submenus = array();
@@ -583,12 +589,14 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function defaultSidebarOrder() {
+	public function defaultSidebarOrder()
+	{
 		return 60;
 	}
 
 	/** {@inheritdoc} */
-	public function hasSidebarContent() {
+	public function hasSidebarContent()
+	{
 		// Creating a controller has the side effect of initialising the cart
 		new ClippingsCartController;
 
@@ -600,7 +608,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getSidebarContent() {
+	public function getSidebarContent()
+	{
 		global $controller;
 
 		$controller->addInlineJavascript('
@@ -614,7 +623,8 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function getSidebarAjaxContent() {
+	public function getSidebarAjaxContent()
+	{
 		global $WT_TREE;
 
 		$cart = Session::get('cart');
@@ -678,7 +688,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getCartList() {
+	public function getCartList()
+	{
 		global $WT_TREE;
 
 		$cart = Session::get('cart', array());
@@ -747,7 +758,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function downloadForm(ClippingsCartController $clip_ctrl) {
+	public function downloadForm(ClippingsCartController $clip_ctrl)
+	{
 		global $WT_TREE;
 
 		$pid = Filter::get('pid', WT_REGEX_XREF);

app/Module/TopSurnamesModule.php

Braces +18 added lines, -9 removed lines

@@ -27,13 +27,15 @@ 
 /**
  * Class TopSurnamesModule
  */
-class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface {
+class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface
+{
 	/**
 	 * How should this module be labelled on tabs, menus, etc.?
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module. Top=Most common */ I18N::translate('Top surnames');
 	}
 
@@ -42,7 +44,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Top surnames” module */ I18N::translate('A list of the most popular surnames.');
 	}
 
@@ -55,7 +58,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
+	public function getBlock($block_id, $template = true, $cfg = array())
+	{
 		global $WT_TREE, $ctype;
 
 		$num       = $this->getBlockSetting($block_id, 'num', '10');
@@ -125,17 +129,20 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function loadAjax() {
+	public function loadAjax()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function isUserBlock() {
+	public function isUserBlock()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function isGedcomBlock() {
+	public function isGedcomBlock()
+	{
 		return true;
 	}
 
@@ -144,7 +151,8 @@ 
 	 *
 	 * @param int $block_id
 	 */
-	public function configureBlock($block_id) {
+	public function configureBlock($block_id)
+	{
 		if (Filter::postBool('save') && Filter::checkCsrf()) {
 			$this->setBlockSetting($block_id, 'num', Filter::postInteger('num', 1, 10000, 10));
 			$this->setBlockSetting($block_id, 'infoStyle', Filter::post('infoStyle', 'list|array|table|tagcloud', 'table'));
@@ -174,7 +182,8 @@ 
 	 *
 	 * @return int
 	 */
-	private static function surnameCountSort($a, $b) {
+	private static function surnameCountSort($a, $b)
+	{
 		$counta = 0;
 		foreach ($a as $x) {
 			$counta += count($x);

app/Module/MarriageReportModule.php

Braces +10 added lines, -5 removed lines

@@ -22,15 +22,18 @@ 
 /**
  * Class MarriageReportModule
  */
-class MarriageReportModule extends AbstractModule implements ModuleReportInterface {
+class MarriageReportModule extends AbstractModule implements ModuleReportInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Name of a module/report */ I18N::translate('Marriages');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Description of the “Marriages” module */ I18N::translate('A report of individuals who were married in a given time or place.');
 	}
@@ -42,7 +45,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_PRIVATE;
 	}
 
@@ -51,7 +55,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	public function getReportMenu() {
+	public function getReportMenu()
+	{
 		global $WT_TREE;
 
 		return new Menu(

app/Module/FamilyNavigatorModule.php

Braces +32 added lines, -15 removed lines

@@ -24,33 +24,39 @@ 
 /**
  * Class FamilyNavigatorModule
  */
-class FamilyNavigatorModule extends AbstractModule implements ModuleSidebarInterface {
+class FamilyNavigatorModule extends AbstractModule implements ModuleSidebarInterface
+{
 	const TTL = "<div class='flyout2'>%s</div>";
 	const LNK = "<div class='flyout3' data-href='%s'>%s</div>";
 	const MSG = "<div class='flyout4'>(%s)</div>"; // class flyout4 not used in standard themes
 
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module/sidebar */ I18N::translate('Family navigator');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Family navigator” module */ I18N::translate('A sidebar showing an individual’s close families and relatives.');
 	}
 
 	/** {@inheritdoc} */
-	public function defaultSidebarOrder() {
+	public function defaultSidebarOrder()
+	{
 		return 20;
 	}
 
 	/** {@inheritdoc} */
-	public function hasSidebarContent() {
+	public function hasSidebarContent()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function getSidebarAjaxContent() {
+	public function getSidebarAjaxContent()
+	{
 		return '';
 	}
 
@@ -59,7 +65,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getSidebarContent() {
+	public function getSidebarContent()
+	{
 		global $controller;
 
 		$controller->addInlineJavascript('
@@ -110,7 +117,8 @@ 
 	 * @param Family $family
 	 * @param string $title
 	 */
-	private function drawFamily(Family $family, $title) {
+	private function drawFamily(Family $family, $title)
+	{
 		global $controller;
 
 		?>
@@ -139,8 +147,11 @@ 
 					<div class="font9">
 						<?php echo $spouse->getLifeSpan(); ?>
 					</div>
-					<?php else: ?>
-						<?php echo $spouse->getFullName(); ?>
+					<?php else {
+    : ?>
+						<?php echo $spouse->getFullName();
+}
+?>
 					<?php endif; ?>
 				</td>
 			</tr>
@@ -164,8 +175,11 @@ 
 					<div class="font9">
 						<?php echo $child->getLifeSpan(); ?>
 					</div>
-					<?php else: ?>
-						<?php echo $child->getFullName(); ?>
+					<?php else {
+    : ?>
+						<?php echo $child->getFullName();
+}
+?>
 					<?php endif; ?>
 				</td>
 			</tr>
@@ -181,7 +195,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function getHTML($person, $showUnknown = false) {
+	private function getHTML($person, $showUnknown = false)
+	{
 		if ($person instanceof Individual) {
 			return sprintf(self::LNK, $person->getHtmlUrl(), $person->getFullName());
 		} elseif ($showUnknown) {
@@ -198,7 +213,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function getParents(Individual $person) {
+	private function getParents(Individual $person)
+	{
 		$father = null;
 		$mother = null;
 		$html   = sprintf(self::TTL, I18N::translate('Parents'));
@@ -240,7 +256,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function getFamily(Individual $person) {
+	private function getFamily(Individual $person)
+	{
 		$html = '';
 		if ($person->canShowName()) {
 			foreach ($person->getSpouseFamilies() as $family) {

app/Module/BirthReportModule.php

Braces +10 added lines, -5 removed lines

@@ -22,15 +22,18 @@ 
 /**
  * Class BirthReportModule
  */
-class BirthReportModule extends AbstractModule implements ModuleReportInterface {
+class BirthReportModule extends AbstractModule implements ModuleReportInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Name of a module/report */ I18N::translate('Births');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Description of the “Births” module */ I18N::translate('A report of individuals who were born in a given time or place.');
 	}
@@ -42,7 +45,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_PRIVATE;
 	}
 
@@ -51,7 +55,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	public function getReportMenu() {
+	public function getReportMenu()
+	{
 		global $WT_TREE;
 
 		return new Menu(