fisharebest / webtrees

app/Module/IndividualReportModule.php

Braces +10 added lines, -5 removed lines

@@ -22,15 +22,18 @@ 
 /**
  * Class IndividualReportModule
  */
-class IndividualReportModule extends AbstractModule implements ModuleReportInterface {
+class IndividualReportModule 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('Individual');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Description of the “Individual” module */ I18N::translate('A report of an individual’s details.');
 	}
@@ -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 $controller, $WT_TREE;
 
 		return new Menu(

app/Module/DescendancyChartModule.php

Braces +12 added lines, -6 removed lines

@@ -23,13 +23,15 @@ 
 /**
  * Class DescendancyChartModule
  */
-class DescendancyChartModule extends AbstractModule implements ModuleChartInterface {
+class DescendancyChartModule 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('Descendants');
 	}
 
@@ -38,7 +40,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “DescendancyChart” module */ I18N::translate('A chart of an individual’s descendants.');
 	}
 
@@ -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(),
 			'descendancy.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(),
@@ -72,7 +77,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getBoxChartMenu(Individual $individual) {
+	public function getBoxChartMenu(Individual $individual)
+	{
 		return $this->getChartMenu($individual);
 	}
 }

app/Module/FamilyGroupReportModule.php

Braces +10 added lines, -5 removed lines

@@ -22,15 +22,18 @@ 
 /**
  * Class FamilyGroupReportModule
  */
-class FamilyGroupReportModule extends AbstractModule implements ModuleReportInterface {
+class FamilyGroupReportModule 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('Family');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Description of the “Family” module */ I18N::translate('A report of family members and their details.');
 	}
@@ -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 $controller, $WT_TREE;
 
 		return new Menu(

app/Module/ModuleConfigInterface.php

Braces +2 added lines, -1 removed lines

@@ -18,7 +18,8 @@
 /**
  * Interface ModuleConfigInterface - Classes and libraries for module system
  */
-interface ModuleConfigInterface {
+interface ModuleConfigInterface
+{
 	/**
 	 * The URL to a page where the user can modify the configuration of this module.
 	 *

app/Module/UpcomingAnniversariesModule.php

Braces +16 added lines, -8 removed lines

@@ -25,13 +25,15 @@ 
 /**
  * Class UpcomingAnniversariesModule
  */
-class UpcomingAnniversariesModule extends AbstractModule implements ModuleBlockInterface {
+class UpcomingAnniversariesModule 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 */ I18N::translate('Upcoming events');
 	}
 
@@ -40,7 +42,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Upcoming events” module */ I18N::translate('A list of the anniversaries that will occur in the near future.');
 	}
 
@@ -53,7 +56,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
+	public function getBlock($block_id, $template = true, $cfg = array())
+	{
 		global $ctype, $WT_TREE;
 
 		$days      = $this->getBlockSetting($block_id, 'days', '7');
@@ -107,17 +111,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;
 	}
 
@@ -126,7 +133,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, 'days', Filter::postInteger('days', 1, 30, 7));
 			$this->setBlockSetting($block_id, 'filter', Filter::postBool('filter'));

app/Module/ModuleSidebarInterface.php

Braces +2 added lines, -1 removed lines

@@ -18,7 +18,8 @@
 /**
  * Interface ModuleSidebarInterface - Classes and libraries for module system
  */
-interface ModuleSidebarInterface {
+interface ModuleSidebarInterface
+{
 	/**
 	 * The user can change the order of sidebars. Until they do this, they are shown in this order.
 	 *

app/Module/PedigreeChartModule.php

Braces +12 added lines, -6 removed lines

@@ -23,13 +23,15 @@ 
 /**
  * Class PedigreeChartModule
  */
-class PedigreeChartModule extends AbstractModule implements ModuleChartInterface {
+class PedigreeChartModule 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('Pedigree');
 	}
 
@@ -38,7 +40,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “PedigreeChart” module */ I18N::translate('A chart of an individual’s ancestors, formatted as a tree.');
 	}
 
@@ -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(),
 			'pedigree.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(),
@@ -72,7 +77,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getBoxChartMenu(Individual $individual) {
+	public function getBoxChartMenu(Individual $individual)
+	{
 		return $this->getChartMenu($individual);
 	}
 }

app/Module/BatchUpdateModule.php

Braces +36 added lines, -17 removed lines

@@ -34,7 +34,8 @@ 
 /**
  * Class BatchUpdateModule
  */
-class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface {
+class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface
+{
 	/** @var string  Form parameter: chosen plugin*/
 	private $plugin;
 
@@ -73,7 +74,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Batch update');
 	}
 
@@ -82,7 +84,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Batch update” module */ I18N::translate('Apply automatic corrections to your genealogy data.');
 	}
 
@@ -92,7 +95,8 @@ 
 	 *
 	 * @param string $mod_action
 	 */
-	public function modAction($mod_action) {
+	public function modAction($mod_action)
+	{
 		switch ($mod_action) {
 		case 'admin_batch_update':
 			echo $this->main();
@@ -109,7 +113,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function main() {
+	private function main()
+	{
 		global $WT_TREE;
 
 		$this->plugins = $this->getPluginList(); // List of available plugins
@@ -236,12 +241,15 @@ 
 					<?php // Reset - otherwise we might "undo all changes", which refreshes the ?>
 					<?php // page, which makes them all again!  ?>
 					<script>reset_reload();</script>
-			<?php else: ?>
+			<?php else {
+    : ?>
 					<hr>
 					<div id="batch_update2" class="col-sm-12">
 						<?php if ($this->curr_xref): ?>
 							<?php // Create an object, so we can get the latest version of the name. ?>
-								<?php $this->record = GedcomRecord::getInstance($this->curr_xref, $WT_TREE); ?>
+								<?php $this->record = GedcomRecord::getInstance($this->curr_xref, $WT_TREE);
+}
+?>
 							<div class="form-group">
 								<?php echo self::createSubmitButton(I18N::translate('previous'), $this->prev_xref) ?>
 					<?php echo self::createSubmitButton(I18N::translate('next'), $this->next_xref) ?>
@@ -253,8 +261,11 @@ 
 							<div class="form-group">
 							<?php echo implode(' ', $this->PLUGIN->getActionButtons($this->curr_xref, $this->record)); ?>
 							</div>
-						<?php else: ?>
-							<div class="alert alert-info"><?php echo I18N::translate('Nothing found.'); ?></div>
+						<?php else {
+    : ?>
+							<div class="alert alert-info"><?php echo I18N::translate('Nothing found.');
+}
+?></div>
 					<?php endif; ?>
 					</div>
 				<?php endif; ?>
@@ -270,7 +281,8 @@ 
 	 *
 	 * @return string|null
 	 */
-	private function findNextXref($xref) {
+	private function findNextXref($xref)
+	{
 		foreach (array_keys($this->all_xrefs) as $key) {
 			if ($key > $xref) {
 				$record = self::getLatestRecord($key, $this->all_xrefs[$key]);
@@ -290,7 +302,8 @@ 
 	 *
 	 * @return string|null
 	 */
-	private function findPrevXref($xref) {
+	private function findPrevXref($xref)
+	{
 		foreach (array_reverse(array_keys($this->all_xrefs)) as $key) {
 			if ($key < $xref) {
 				$record = self::getLatestRecord($key, $this->all_xrefs[$key]);
@@ -306,7 +319,8 @@ 
 	/**
 	 * Generate a list of all XREFs.
 	 */
-	private function getAllXrefs() {
+	private function getAllXrefs()
+	{
 		global $WT_TREE;
 
 		$sql  = array();
@@ -348,7 +362,8 @@ 
 	 *
 	 * @return BatchUpdateBasePlugin[]
 	 */
-	private function getPluginList() {
+	private function getPluginList()
+	{
 		$plugins    = array();
 		$dir_handle = opendir(__DIR__ . '/BatchUpdate');
 		while (($file = readdir($dir_handle)) !== false) {
@@ -367,7 +382,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function getJavascript() {
+	private function getJavascript()
+	{
 		return
 			'<script>' .
 			'function reset_reload() {' .
@@ -389,7 +405,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function createSubmitButton($text, $xref, $action = '', $data = '') {
+	public static function createSubmitButton($text, $xref, $action = '', $data = '')
+	{
 		return
 			'<input class="btn btn-primary" type="submit" value="' . $text . '" onclick="' .
 			'this.form.xref.value=\'' . Filter::escapeHtml($xref) . '\';' .
@@ -407,7 +424,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getLatestRecord($xref, $type) {
+	public static function getLatestRecord($xref, $type)
+	{
 		global $WT_TREE;
 
 		switch ($type) {
@@ -434,7 +452,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getConfigLink() {
+	public function getConfigLink()
+	{
 		return 'module.php?mod=' . $this->getName() . '&amp;mod_action=admin_batch_update';
 	}
 

app/Module/BatchUpdate/BatchUpdateMarriedNamesPlugin.php

Braces +18 added lines, -9 removed lines

@@ -22,7 +22,8 @@ 
 /**
  * Class BatchUpdateMarriedNamesPlugin Batch Update plugin: add missing 2 _MARNM records
  */
-class BatchUpdateMarriedNamesPlugin extends BatchUpdateBasePlugin {
+class BatchUpdateMarriedNamesPlugin extends BatchUpdateBasePlugin
+{
 	/** @var string User option: add or replace husband’s surname */
 	private $surname;
 
@@ -31,7 +32,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getName() {
+	public function getName()
+	{
 		return I18N::translate('Add missing married names');
 	}
 
@@ -40,7 +42,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return I18N::translate('You can make it easier to search for married women by recording their married name. However not all women take their husband’s surname, so beware of introducing incorrect information into your database.');
 	}
 
@@ -52,7 +55,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function doesRecordNeedUpdate($xref, $gedrec) {
+	public function doesRecordNeedUpdate($xref, $gedrec)
+	{
 		return preg_match('/^1 SEX F/m', $gedrec) && preg_match('/^1 NAME /m', $gedrec) && self::surnamesToAdd($xref, $gedrec);
 	}
 
@@ -64,7 +68,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function updateRecord($xref, $gedrec) {
+	public function updateRecord($xref, $gedrec)
+	{
 		global $WT_TREE;
 
 		$SURNAME_TRADITION = $WT_TREE->getPreference('SURNAME_TRADITION');
@@ -97,7 +102,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	private function surnamesToAdd($xref, $gedrec) {
+	private function surnamesToAdd($xref, $gedrec)
+	{
 		$wife_surnames    = self::surnames($xref, $gedrec);
 		$husb_surnames    = array();
 		$missing_surnames = array();
@@ -126,7 +132,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	private function surnames($xref, $gedrec) {
+	private function surnames($xref, $gedrec)
+	{
 		if (preg_match_all('/^(?:1 NAME|2 _MARNM) .*\/(.+)\//m', $gedrec, $match)) {
 			return $match[1];
 		} else {
@@ -137,7 +144,8 @@ 
 	/**
 	 * Process the user-supplied options.
 	 */
-	public function getOptions() {
+	public function getOptions()
+	{
 		parent::getOptions();
 		$this->surname = Filter::get('surname', 'add|replace', 'replace');
 	}
@@ -147,7 +155,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getOptionsForm() {
+	public function getOptionsForm()
+	{
 		return
 			'<div class="form-group">' .
 			'<label class="control-label col-sm-3">' . I18N::translate('Surname option') . '</label>' .