fisharebest / webtrees

app/Controller/CompactController.php

Braces +8 added lines, -4 removed lines

@@ -21,7 +21,8 @@ 
 /**
  * Controller for the compact chart
  */
-class CompactController extends ChartController {
+class CompactController extends ChartController
+{
 	/** @var bool Data for the view .*/
 	public $show_thumbs = false;
 
@@ -31,7 +32,8 @@ 
 	/**
 	 * Startup activity
 	 */
-	public function __construct() {
+	public function __construct()
+	{
 		parent::__construct();
 
 		// Extract the request parameters
@@ -55,7 +57,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function sosaIndividual($n) {
+	public function sosaIndividual($n)
+	{
 		$indi = $this->treeid[$n];
 
 		if ($indi && $indi->canShowName()) {
@@ -109,7 +112,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function sosaArrow($n, $arrow_dir) {
+	public function sosaArrow($n, $arrow_dir)
+	{
 		$indi = $this->treeid[$n];
 
 		$arrow_dir = substr($arrow_dir, 0, 1);

app/Controller/DescendancyController.php

Braces +14 added lines, -7 removed lines

@@ -28,7 +28,8 @@ 
 /**
  * Controller for the descendancy chart
  */
-class DescendancyController extends ChartController {
+class DescendancyController extends ChartController
+{
 	/** @var int Show boxes for cousins */
 	public $show_cousins;
 
@@ -47,7 +48,8 @@ 
 	/**
 	 * Create the descendancy controller
 	 */
-	public function __construct() {
+	public function __construct()
+	{
 		global $WT_TREE;
 
 		parent::__construct();
@@ -74,7 +76,8 @@ 
 	 * @param string     $label
 	 * @param string     $gpid
 	 */
-	public function printChildFamily(Individual $person, $depth, $label = '1.', $gpid = '') {
+	public function printChildFamily(Individual $person, $depth, $label = '1.', $gpid = '')
+	{
 
 		if ($depth < 2) {
 			return;
@@ -94,7 +97,8 @@ 
 	 * @param Individual $person
 	 * @param int        $depth the descendancy depth to show
 	 */
-	public function printChildDescendancy(Individual $person, $depth) {
+	public function printChildDescendancy(Individual $person, $depth)
+	{
 		echo "<li>";
 		echo "<table><tr><td>";
 		if ($depth == $this->generations) {
@@ -160,7 +164,8 @@ 
 	 * @param Family     $family
 	 * @param int        $depth the descendancy depth to show
 	 */
-	private function printFamilyDescendancy(Individual $person, Family $family, $depth) {
+	private function printFamilyDescendancy(Individual $person, Family $family, $depth)
+	{
 		$uid = Uuid::uuid4(); // create a unique ID
 		// print marriage info
 		echo '<li>';
@@ -233,7 +238,8 @@ 
 	 *
 	 * @return Individual[]
 	 */
-	public function individualDescendancy(Individual $person, $n, $array) {
+	public function individualDescendancy(Individual $person, $n, $array)
+	{
 		if ($n < 1) {
 			return $array;
 		}
@@ -260,7 +266,8 @@ 
 	 *
 	 * @return Family[]
 	 */
-	public function familyDescendancy($person, $n, $array) {
+	public function familyDescendancy($person, $n, $array)
+	{
 		if ($n < 1) {
 			return $array;
 		}

app/Controller/ChartController.php

Braces +12 added lines, -6 removed lines

@@ -23,7 +23,8 @@ 
 /**
  * Base controller for all chart pages
  */
-class ChartController extends PageController {
+class ChartController extends PageController
+{
 	/** @var Individual Who is chart about? */
 	public $root;
 
@@ -40,7 +41,8 @@ 
 	 *
 	 * @param int $show_full needed for use by charts module
 	 */
-	public function __construct($show_full = 1) {
+	public function __construct($show_full = 1)
+	{
 		global $WT_TREE;
 
 		parent::__construct();
@@ -80,7 +82,8 @@ 
 	 *
 	 * @return Individual
 	 */
-	public function getSignificantIndividual() {
+	public function getSignificantIndividual()
+	{
 		if ($this->root) {
 			return $this->root;
 		} else {
@@ -95,7 +98,8 @@ 
 	 *
 	 * @return Individual[]
 	 */
-	public function sosaAncestors($generations) {
+	public function sosaAncestors($generations)
+	{
 		$ancestors = array(
 			1 => $this->root,
 		);
@@ -128,7 +132,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function showFull() {
+	public function showFull()
+	{
 		return $this->show_full;
 	}
 
@@ -137,7 +142,8 @@ 
 	 *
 	 * @return \stdClass
 	 */
-	public function getBoxDimensions() {
+	public function getBoxDimensions()
+	{
 		return $this->box;
 	}
 }

app/Controller/RelationshipController.php

Braces +10 added lines, -5 removed lines

@@ -24,7 +24,8 @@ 
 /**
  * Controller for the relationships calculations
  */
-class RelationshipController extends PageController {
+class RelationshipController extends PageController
+{
 	/**
 	 * Calculate the shortest paths - or all paths - between two individuals.
 	 *
@@ -35,7 +36,8 @@ 
 	 *
 	 * @return string[][]
 	 */
-	public function calculateRelationships(Individual $individual1, Individual $individual2, $recursion, $ancestor = false) {
+	public function calculateRelationships(Individual $individual1, Individual $individual2, $recursion, $ancestor = false)
+	{
 
 		$rows = Database::prepare(
 			"SELECT l_from, l_to FROM `##link` WHERE l_file = :tree_id AND l_type IN ('FAMS', 'FAMC')"
@@ -114,7 +116,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public function oldStyleRelationshipPath(array $path) {
+	public function oldStyleRelationshipPath(array $path)
+	{
 		global $WT_TREE;
 
 		$spouse_codes  = array('M' => 'hus', 'F' => 'wif', 'U' => 'spo');
@@ -160,7 +163,8 @@ 
 	 *
 	 * @return array
 	 */
-	private function allAncestors($xref1, $xref2, $tree_id) {
+	private function allAncestors($xref1, $xref2, $tree_id)
+	{
 		$ancestors = array($xref1, $xref2);
 
 		$queue = array($xref1, $xref2);
@@ -199,7 +203,8 @@ 
 	 *
 	 * @return array
 	 */
-	private function excludeFamilies($xref1, $xref2, $tree_id) {
+	private function excludeFamilies($xref1, $xref2, $tree_id)
+	{
 		return Database::prepare(
 			"SELECT l_to" .
 			" FROM `##link` AS l1" .

app/Controller/PageController.php

Braces +24 added lines, -12 removed lines

@@ -27,7 +27,8 @@ 
 /**
  * Controller for full-page, themed HTML responses
  */
-class PageController extends BaseController {
+class PageController extends BaseController
+{
 	/** @var string Most pages are not intended for robots */
 	private $meta_robots = 'noindex,nofollow';
 
@@ -44,7 +45,8 @@ 
 	 *
 	 * @return $this
 	 */
-	public function setPageTitle($page_title) {
+	public function setPageTitle($page_title)
+	{
 		$this->page_title = $page_title;
 
 		return $this;
@@ -55,7 +57,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getPageTitle() {
+	public function getPageTitle()
+	{
 		return $this->page_title;
 	}
 
@@ -66,7 +69,8 @@ 
 	 *
 	 * @return $this
 	 */
-	public function setMetaRobots($meta_robots) {
+	public function setMetaRobots($meta_robots)
+	{
 		$this->meta_robots = $meta_robots;
 
 		return $this;
@@ -77,7 +81,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getMetaRobots() {
+	public function getMetaRobots()
+	{
 		return $this->meta_robots;
 	}
 
@@ -88,7 +93,8 @@ 
 	 *
 	 * @return $this
 	 */
-	public function restrictAccess($condition) {
+	public function restrictAccess($condition)
+	{
 		if ($condition !== true) {
 			header('Location: ' . WT_LOGIN_URL . '?url=' . rawurlencode(Functions::getQueryUrl()));
 			exit;
@@ -100,7 +106,8 @@ 
 	/**
 	 * Print the page footer, using the theme
 	 */
-	public function pageFooter() {
+	public function pageFooter()
+	{
 		echo
 			Theme::theme()->footerContainer() .
 			'<!--[if lt IE 9]><script src="' . WT_JQUERY_JS_URL . '"></script><![endif]-->' .
@@ -122,7 +129,8 @@ 
 	 * Print the page footer, using the theme
 	 * Note that popup windows are deprecated
 	 */
-	public function pageFooterPopupWindow() {
+	public function pageFooterPopupWindow()
+	{
 		echo
 			Theme::theme()->footerContainerPopupWindow() .
 			'<!--[if lt IE 9]><script src="' . WT_JQUERY_JS_URL . '"></script><![endif]-->' .
@@ -147,7 +155,8 @@ 
 	 *
 	 * @return $this
 	 */
-	public function pageHeader($popup = false) {
+	public function pageHeader($popup = false)
+	{
 		global $WT_TREE;
 
 		$this->popup = $popup;
@@ -188,7 +197,8 @@ 
 	 *
 	 * @return Individual
 	 */
-	public function getSignificantIndividual() {
+	public function getSignificantIndividual()
+	{
 		global $WT_TREE;
 
 		static $individual; // Only query the DB once.
@@ -224,7 +234,8 @@ 
 	 *
 	 * @return Family
 	 */
-	public function getSignificantFamily() {
+	public function getSignificantFamily()
+	{
 		$individual = $this->getSignificantIndividual();
 		if ($individual) {
 			foreach ($individual->getChildFamilies() as $family) {
@@ -245,7 +256,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getSignificantSurname() {
+	public function getSignificantSurname()
+	{
 		return '';
 	}
 }

app/Controller/MediaController.php

Braces +8 added lines, -4 removed lines

@@ -27,11 +27,13 @@ 
 /**
  * Controller for the media page
  */
-class MediaController extends GedcomRecordController {
+class MediaController extends GedcomRecordController
+{
 	/**
 	 * get edit menu
 	 */
-	public function getEditMenu() {
+	public function getEditMenu()
+	{
 		if (!$this->record || $this->record->isPendingDeletion()) {
 			return null;
 		}
@@ -84,7 +86,8 @@ 
 	 *
 	 * @return Fact[]
 	 */
-	public function getFacts() {
+	public function getFacts()
+	{
 		$facts = $this->record->getFacts();
 
 		// Add some dummy facts to show additional information
@@ -110,7 +113,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getMediaListMenu(Media $mediaobject) {
+	public static function getMediaListMenu(Media $mediaobject)
+	{
 		$html = '';
 
 		$menu = new Menu(I18N::translate('Edit the details'), '#', 'lb-image_edit', array(

app/Controller/LifespanController.php

Braces +16 added lines, -8 removed lines

@@ -37,7 +37,8 @@ 
 /**
  * Controller for the timeline chart
  */
-class LifespanController extends PageController {
+class LifespanController extends PageController
+{
 	// Base color parameters
 	const RANGE           = 120; // degrees
 	const SATURATION      = 100; // percent
@@ -113,7 +114,8 @@ 
 	/**
 	 * Startup activity
 	 */
-	public function __construct() {
+	public function __construct()
+	{
 		global $WT_TREE;
 
 		parent::__construct();
@@ -302,7 +304,8 @@ 
 	 *
 	 * @return array
 	 */
-	private function addFamily(Individual $person, $add_family) {
+	private function addFamily(Individual $person, $add_family)
+	{
 		$xrefs   = array();
 		$xrefs[] = $person->getXref();
 		if ($add_family) {
@@ -333,7 +336,8 @@ 
 	/**
 	 * Prints the time line scale
 	 */
-	public function printTimeline() {
+	public function printTimeline()
+	{
 		$startYear = $this->timelineMinYear;
 		while ($startYear < $this->timelineMaxYear) {
 			$date = new Date($this->calendarEscape . $startYear);
@@ -347,7 +351,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function fillTimeline() {
+	public function fillTimeline()
+	{
 		$rows = array();
 		$maxY = self::CHART_TOP;
 		//base case
@@ -480,7 +485,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function checkFact(Fact $fact) {
+	public function checkFact(Fact $fact)
+	{
 		$valid = !in_array($fact->getTag(), $this->nonfacts);
 		if ($valid && $this->place_obj) {
 			$valid = stripos($fact->getPlace()->getGedcomName(), $this->place_obj->getGedcomName()) !== false;
@@ -507,7 +513,8 @@ 
 	 *
 	 * @return object
 	 */
-	public function getCalendarDate($date) {
+	public function getCalendarDate($date)
+	{
 		switch ($this->calendar) {
 		case 'julian':
 			$caldate = new JulianDate($date);
@@ -536,7 +543,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getCalendarOptionList() {
+	public function getCalendarOptionList()
+	{
 		$html = '';
 		foreach (Date::calendarNames() as $calendar => $name) {
 			$selected = $this->calendar === $calendar ? 'selected' : '';

app/Controller/HourglassController.php

Braces +14 added lines, -7 removed lines

@@ -24,7 +24,8 @@ 
 /**
  * Controller for the hourglass chart
  */
-class HourglassController extends ChartController {
+class HourglassController extends ChartController
+{
 	/** @var int Whether to show spouse details. */
 	public $show_spouse;
 
@@ -56,7 +57,8 @@ 
 	 * @param int    $show_full
 	 * @param bool   $loadJS
 	 */
-	public function __construct($rootid = '', $show_full = 1, $loadJS = true) {
+	public function __construct($rootid = '', $show_full = 1, $loadJS = true)
+	{
 		global $WT_TREE;
 
 		parent::__construct($show_full);
@@ -93,7 +95,8 @@ 
 	 * @param Individual $person ID of person to print the pedigree for
 	 * @param int        $count  generation count, so it recursively calls itself
 	 */
-	public function printPersonPedigree(Individual $person, $count) {
+	public function printPersonPedigree(Individual $person, $count)
+	{
 
 		if ($count >= $this->generations) {
 			return;
@@ -181,7 +184,8 @@ 
 	 * @return string
 	 */
 
-	private function printEmptyBox() {
+	private function printEmptyBox()
+	{
 		return $this->showFull() ? Theme::theme()->individualBoxEmpty() : Theme::theme()->individualBoxSmallEmpty();
 	}
 
@@ -194,7 +198,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function printDescendency($person, $count, $showNav = true) {
+	public function printDescendency($person, $count, $showNav = true)
+	{
 		global $lastGenSecondFam;
 
 		if ($count > $this->dgenerations) {
@@ -381,7 +386,8 @@ 
 	 *
 	 * @return int Number of generations the descendency actually goes
 	 */
-	private function maxDescendencyGenerations(Individual $individual, $depth) {
+	private function maxDescendencyGenerations(Individual $individual, $depth)
+	{
 		if ($depth > $this->generations) {
 			return $depth;
 		}
@@ -409,7 +415,8 @@ 
 	/**
 	 * setup all of the javascript that is needed for the hourglass chart
 	 */
-	public function setupJavascript() {
+	public function setupJavascript()
+	{
 		$js = "
 			var WT_HOURGLASS_CHART = (function() {
 				function sizeLines() {

app/Controller/BaseController.php

Braces +14 added lines, -7 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * Base controller for all other controllers
  */
-class BaseController {
+class BaseController
+{
 	// The controller accumulates Javascript (inline and external), and renders it in the footer
 	const JS_PRIORITY_HIGH   = 0;
 	const JS_PRIORITY_NORMAL = 1;
@@ -39,7 +40,8 @@ 
 	/**
 	 * Startup activity
 	 */
-	public function __construct() {
+	public function __construct()
+	{
 	}
 
 	/**
@@ -49,7 +51,8 @@ 
 	 *
 	 * @return $this
 	 */
-	public function addExternalJavascript($script_name) {
+	public function addExternalJavascript($script_name)
+	{
 		$this->external_javascript[$script_name] = true;
 
 		return $this;
@@ -65,7 +68,8 @@ 
 	 *
 	 * @return $this
 	 */
-	public function addInlineJavascript($script, $priority = self::JS_PRIORITY_NORMAL) {
+	public function addInlineJavascript($script, $priority = self::JS_PRIORITY_NORMAL)
+	{
 		$tmp   = &$this->inline_javascript[$priority];
 		$tmp[] = $script;
 
@@ -78,7 +82,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getJavascript() {
+	public function getJavascript()
+	{
 		$javascript1 = '';
 		$javascript2 = '';
 		$javascript3 = '';
@@ -120,7 +125,8 @@ 
 	 *
 	 * @return $this
 	 */
-	public function pageHeader() {
+	public function pageHeader()
+	{
 		// We've displayed the header - display the footer automatically
 		register_shutdown_function(array($this, 'pageFooter'));
 
@@ -130,7 +136,8 @@ 
 	/**
 	 * Print the page footer, using the theme
 	 */
-	public function pageFooter() {
+	public function pageFooter()
+	{
 		if (WT_DEBUG_SQL) {
 			echo Database::getQueryLog();
 		}