fisharebest / webtrees

app/Module/FamilyTreeFavorites/Schema/Migration1.php

Braces +4 added lines, -2 removed lines

@@ -22,9 +22,11 @@
 /**
  * Upgrade the database schema from version 1 to version 2.
  */
-class Migration1 implements MigrationInterface {
+class Migration1 implements MigrationInterface
+{
 	/** {@inheritDoc} */
-	public function upgrade() {
+	public function upgrade()
+	{
 		// Add the new columns
 		try {
 			Database::exec(

app/Module/FamilyTreeFavorites/Schema/Migration0.php

Braces +4 added lines, -2 removed lines

@@ -21,9 +21,11 @@
 /**
  * Upgrade the database schema from version 0 (empty database) to version 1.
  */
-class Migration0 implements MigrationInterface {
+class Migration0 implements MigrationInterface
+{
 	/** {@inheritDoc} */
-	public function upgrade() {
+	public function upgrade()
+	{
 		// Create the tables, as per PhpGedView 4.2.1
 		Database::exec(
 			"CREATE TABLE IF NOT EXISTS `##favorites` (" .

app/Module/FamilyTreeFavorites/Schema/Migration3.php

Braces +4 added lines, -2 removed lines

@@ -22,9 +22,11 @@
 /**
  * Upgrade the database schema from version 3 to version 4.
  */
-class Migration3 implements MigrationInterface {
+class Migration3 implements MigrationInterface
+{
 	/** {@inheritDoc} */
-	public function upgrade() {
+	public function upgrade()
+	{
 		// An earlier update mistakenly made the fv_note column too short.
 		// Add the new constraints
 		try {

app/Module/SlideShowModule.php

Braces +16 added lines, -8 removed lines

@@ -28,14 +28,17 @@ 
 /**
  * Class SlideShowModule
  */
-class SlideShowModule extends AbstractModule implements ModuleBlockInterface {
+class SlideShowModule extends AbstractModule implements ModuleBlockInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Slide show');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Slide show” module */ I18N::translate('Random images from the current family tree.');
 	}
 
@@ -48,7 +51,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;
 
 		$filter   = $this->getBlockSetting($block_id, 'filter', 'all');
@@ -199,17 +203,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;
 	}
 
@@ -218,7 +225,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, 'filter', Filter::post('filter', 'indi|event|all', 'all'));
 			$this->setBlockSetting($block_id, 'controls', Filter::postBool('controls'));

app/Module/FanChartModule.php

Braces +12 added lines, -6 removed lines

@@ -23,13 +23,15 @@ 
 /**
  * Class FanChartModule
  */
-class FanChartModule extends AbstractModule implements ModuleChartInterface {
+class FanChartModule 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('Fan chart');
 	}
 
@@ -38,7 +40,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Fan Chart” module */ I18N::translate('A fan chart of an individual’s ancestors.');
 	}
 
@@ -49,7 +52,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_PRIVATE;
 	}
 
@@ -60,7 +64,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getChartMenu(Individual $individual) {
+	public function getChartMenu(Individual $individual)
+	{
 		if (function_exists('imagettftext')) {
 			return new Menu(
 				$this->getTitle(),
@@ -78,7 +83,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getBoxChartMenu(Individual $individual) {
+	public function getBoxChartMenu(Individual $individual)
+	{
 		return $this->getChartMenu($individual);
 	}
 }

app/Module/RelationshipsChartModule.php

Braces +22 added lines, -11 removed lines

@@ -43,7 +43,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module/chart */ I18N::translate('Relationships');
 	}
 
@@ -52,7 +53,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “RelationshipsChart” module */ I18N::translate('A chart displaying relationships between two individuals.');
 	}
 
@@ -63,7 +65,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_PRIVATE;
 	}
 
@@ -74,7 +77,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getChartMenu(Individual $individual) {
+	public function getChartMenu(Individual $individual)
+	{
 		$tree     = $individual->getTree();
 		$gedcomid = $tree->getUserPreference(Auth::user(), 'gedcomid');
 
@@ -102,7 +106,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getBoxChartMenu(Individual $individual) {
+	public function getBoxChartMenu(Individual $individual)
+	{
 		return $this->getChartMenu($individual);
 	}
 
@@ -112,7 +117,8 @@ 
 	 *
 	 * @param string $mod_action
 	 */
-	public function modAction($mod_action) {
+	public function modAction($mod_action)
+	{
 		switch ($mod_action) {
 		case 'admin':
 			if ($_SERVER['REQUEST_METHOD'] === 'POST') {
@@ -129,7 +135,8 @@ 
 	/**
 	 * Possible options for the ancestors option
 	 */
-	private function ancestorsOptions() {
+	private function ancestorsOptions()
+	{
 		return array(
 			0 => I18N::translate('Find any relationship'),
 			1 => I18N::translate('Find relationships via ancestors'),
@@ -139,7 +146,8 @@ 
 	/**
 	 * Possible options for the recursion option
 	 */
-	private function recursionOptions() {
+	private function recursionOptions()
+	{
 		return array(
 			0                         => I18N::translate('none'),
 			1                         => I18N::number(1),
@@ -152,7 +160,8 @@ 
 	/**
 	 * Display a form to edit configuration settings.
 	 */
-	private function editConfig() {
+	private function editConfig()
+	{
 		$controller = new PageController;
 		$controller
 			->restrictAccess(Auth::isAdmin())
@@ -208,7 +217,8 @@ 
 	/**
 	 * Save updated configuration settings.
 	 */
-	private function saveConfig() {
+	private function saveConfig()
+	{
 		if (Auth::isAdmin()) {
 			foreach (Tree::getAll() as $tree) {
 				$tree->setPreference('RELATIONSHIP_RECURSION', Filter::post('relationship-recursion-' . $tree->getTreeId()));
@@ -226,7 +236,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getConfigLink() {
+	public function getConfigLink()
+	{
 		return 'module.php?mod=' . $this->getName() . '&mod_action=admin';
 	}
 }

app/Module/LifespansChartModule.php

Braces +12 added lines, -6 removed lines

@@ -23,13 +23,15 @@ 
 /**
  * Class LifespansChartModule
  */
-class LifespansChartModule extends AbstractModule implements ModuleChartInterface {
+class LifespansChartModule 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('Lifespans');
 	}
 
@@ -38,7 +40,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “LifespansChart” module */ I18N::translate('A chart of individuals’ lifespans.');
 	}
 
@@ -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(),
 			'lifespan.php',
@@ -72,7 +77,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getBoxChartMenu(Individual $individual) {
+	public function getBoxChartMenu(Individual $individual)
+	{
 		return null;
 	}
 }

app/Session.php

Braces +18 added lines, -9 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Temporary class to migrate to Symfony-based sessions, which need PHP 5.4.
  */
-class Session {
+class Session
+{
 	/**
 	 * Start a session
 	 *
 	 * @param array $config
 	 */
-	public static function start(array $config = array()) {
+	public static function start(array $config = array())
+	{
 		$default_config = array(
 			'use_cookies'     => 1,
 			'name'            => 'WT_SESSION',
@@ -50,7 +52,8 @@ 
 	 *
 	 * @return mixed
 	 */
-	public static function get($name, $default = null) {
+	public static function get($name, $default = null)
+	{
 		if (isset($_SESSION[$name])) {
 			return $_SESSION[$name];
 		} else {
@@ -64,7 +67,8 @@ 
 	 * @param string $name
 	 * @param mixed  $value
 	 */
-	public static function put($name, $value) {
+	public static function put($name, $value)
+	{
 		$_SESSION[$name] = $value;
 	}
 
@@ -73,7 +77,8 @@ 
 	 *
 	 * @param string $name
 	 */
-	public static function forget($name) {
+	public static function forget($name)
+	{
 		unset($_SESSION[$name]);
 	}
 
@@ -84,14 +89,16 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function has($name) {
+	public static function has($name)
+	{
 		return isset($_SESSION[$name]);
 	}
 
 	/**
 	 * Remove all stored data from the session.
 	 */
-	public static function clear() {
+	public static function clear()
+	{
 		$_SESSION = array();
 	}
 
@@ -100,7 +107,8 @@ 
 	 *
 	 * @param bool $destroy
 	 */
-	public static function regenerate($destroy = false) {
+	public static function regenerate($destroy = false)
+	{
 		if ($destroy) {
 			self::clear();
 		}
@@ -112,7 +120,8 @@ 
 	 *
 	 * @param string $id
 	 */
-	public static function setId($id) {
+	public static function setId($id)
+	{
 		session_id($id);
 	}
 }

app/Query/QueryName.php

Braces +18 added lines, -9 removed lines

@@ -24,7 +24,8 @@ 
 /**
  * Generate lists for indilist.php and famlist.php
  */
-class QueryName {
+class QueryName
+{
 	/**
 	 * Get a list of initial letters, for lists of names.
 	 *
@@ -32,7 +33,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	private static function getAlphabetForLocale($locale) {
+	private static function getAlphabetForLocale($locale)
+	{
 		switch ($locale) {
 		case 'ar':
 			return array(
@@ -123,7 +125,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function initialLetter($name) {
+	public static function initialLetter($name)
+	{
 		$name = I18N::strtoupper($name);
 		switch (WT_LOCALE) {
 		case 'cs':
@@ -189,7 +192,8 @@ 
 	 *
 	 * @return string
 	 */
-	private static function getInitialSql($field, $letter) {
+	private static function getInitialSql($field, $letter)
+	{
 		switch (WT_LOCALE) {
 		case 'cs':
 			switch ($letter) {
@@ -239,7 +243,8 @@ 
 	 *
 	 * @return int[]
 	 */
-	public static function surnameAlpha(Tree $tree, $marnm, $fams, $totals = true) {
+	public static function surnameAlpha(Tree $tree, $marnm, $fams, $totals = true)
+	{
 		$alphas = array();
 
 		$sql =
@@ -315,7 +320,8 @@ 
 	 *
 	 * @return int[]
 	 */
-	public static function givenAlpha(Tree $tree, $surn, $salpha, $marnm, $fams) {
+	public static function givenAlpha(Tree $tree, $surn, $salpha, $marnm, $fams)
+	{
 		$alphas = array();
 
 		$sql =
@@ -397,7 +403,8 @@ 
 	 *
 	 * @return array
 	 */
-	public static function surnames(Tree $tree, $surn, $salpha, $marnm, $fams) {
+	public static function surnames(Tree $tree, $surn, $salpha, $marnm, $fams)
+	{
 		$sql =
 			"SELECT n2.n_surn, n1.n_surname, n1.n_id" .
 			" FROM `##name` n1 " .
@@ -452,7 +459,8 @@ 
 	 *
 	 * @return Individual[]
 	 */
-	public static function individuals(Tree $tree, $surn, $salpha, $galpha, $marnm, $fams) {
+	public static function individuals(Tree $tree, $surn, $salpha, $galpha, $marnm, $fams)
+	{
 		$sql =
 			"SELECT i_id AS xref, i_gedcom AS gedcom, n_full " .
 			"FROM `##individuals` " .
@@ -521,7 +529,8 @@ 
 	 *
 	 * @return Family[]
 	 */
-	public static function families(Tree $tree, $surn, $salpha, $galpha, $marnm) {
+	public static function families(Tree $tree, $surn, $salpha, $galpha, $marnm)
+	{
 		$list = array();
 		foreach (self::individuals($tree, $surn, $salpha, $galpha, $marnm, true) as $indi) {
 			foreach ($indi->getSpouseFamilies() as $family) {