fisharebest / webtrees

app/Database.php

Spacing +1 added lines, -2 removed lines

@@ -85,8 +85,7 @@
 		// Create the underlying PDO object
 		self::$pdo = new PDO(
 			(substr($DBHOST, 0, 1) === '/' ?
-				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" :
-				"mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
+				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
 			),
 			$DBUSER, $DBPASS,
 			array(

Braces +34 added lines, -17 removed lines

@@ -22,7 +22,8 @@ 
 /**
  * Extend PHP's native PDO class.
  */
-class Database {
+class Database
+{
 	/** @var Database Implement the singleton pattern */
 	private static $instance;
 
@@ -38,7 +39,8 @@ 
 	/**
 	 * Prevent instantiation via new Database
 	 */
-	private function __construct() {
+	private function __construct()
+	{
 		self::$log = array();
 	}
 
@@ -47,7 +49,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function beginTransaction() {
+	public static function beginTransaction()
+	{
 		return self::$pdo->beginTransaction();
 	}
 
@@ -56,14 +59,16 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function commit() {
+	public static function commit()
+	{
 		return self::$pdo->commit();
 	}
 
 	/**
 	 * Disconnect from the server, so we can connect to another one
 	 */
-	public static function disconnect() {
+	public static function disconnect()
+	{
 		self::$pdo = null;
 	}
 
@@ -78,7 +83,8 @@ 
 	 *
 	 * @throws \Exception
 	 */
-	public static function createInstance($DBHOST, $DBPORT, $DBNAME, $DBUSER, $DBPASS) {
+	public static function createInstance($DBHOST, $DBPORT, $DBNAME, $DBUSER, $DBPASS)
+	{
 		if (self::$pdo instanceof PDO) {
 			throw new \Exception('Database::createInstance() can only be called once.');
 		}
@@ -109,7 +115,8 @@ 
 	 *
 	 * @return Database
 	 */
-	public static function getInstance() {
+	public static function getInstance()
+	{
 		if (self::$pdo instanceof PDO) {
 			return self::$instance;
 		} else {
@@ -122,7 +129,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function isConnected() {
+	public static function isConnected()
+	{
 		return self::$pdo instanceof PDO;
 	}
 
@@ -134,7 +142,8 @@ 
 	 * @param float    $microtime
 	 * @param string[] $bind_variables
 	 */
-	public static function logQuery($query, $rows, $microtime, $bind_variables) {
+	public static function logQuery($query, $rows, $microtime, $bind_variables)
+	{
 		if (WT_DEBUG_SQL) {
 			// Full logging
 			// Trace
@@ -185,7 +194,8 @@ 
 	 *
 	 * @return int
 	 */
-	public static function getQueryCount() {
+	public static function getQueryCount()
+	{
 		return count(self::$log);
 	}
 
@@ -194,7 +204,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getQueryLog() {
+	public static function getQueryLog()
+	{
 		$html      = '<table border="1" style="table-layout: fixed; width: 960px;word-wrap: break-word;"><col span="3"><col align="char"><thead><tr><th>#</th><th style="width: 800px;">Query</th><th>Rows</th><th>Time (ms)</th></tr></thead><tbody>' . implode('', self::$log) . '</tbody></table>';
 		self::$log = array();
 
@@ -206,7 +217,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function lastInsertId() {
+	public static function lastInsertId()
+	{
 		return self::$pdo->lastInsertId();
 	}
 
@@ -221,7 +233,8 @@ 
 	 *
 	 * @deprecated We should use bind-variables instead.
 	 */
-	public static function quote($string) {
+	public static function quote($string)
+	{
 		if (is_null($string)) {
 			return 'NULL';
 		} else {
@@ -236,7 +249,8 @@ 
 	 *
 	 * @return int The number of rows affected by this SQL query
 	 */
-	public static function exec($sql) {
+	public static function exec($sql)
+	{
 		$sql   = str_replace('##', WT_TBLPREFIX, $sql);
 		$start = microtime(true);
 		$rows  = self::$pdo->exec($sql);
@@ -255,7 +269,8 @@ 
 	 *
 	 * @return Statement
 	 */
-	public static function prepare($sql) {
+	public static function prepare($sql)
+	{
 		if (!self::$pdo instanceof PDO) {
 			throw new \Exception("No Connection Established");
 		}
@@ -274,7 +289,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function rollBack() {
+	public static function rollBack()
+	{
 		return self::$pdo->rollBack();
 	}
 
@@ -289,7 +305,8 @@ 
 	 *
 	 * @return bool  Were any updates applied
 	 */
-	public static function updateSchema($namespace, $schema_name, $target_version) {
+	public static function updateSchema($namespace, $schema_name, $target_version)
+	{
 		try {
 			$current_version = (int) Site::getPreference($schema_name);
 		} catch (PDOException $e) {

app/Report/ReportParserGenerate.php

Spacing +1 added lines, -1 removed lines

@@ -2743,7 +2743,7 @@
 		$tags      = explode(':', $tag);
 		$origlevel = $level;
 		if ($level == 0) {
-			$level = $gedrec{0} + 1;
+			$level = $gedrec{0} +1;
 		}
 
 		$subrec = $gedrec;

Braces +124 added lines, -62 removed lines

@@ -34,7 +34,8 @@ 
 /**
  * Class ReportParserGenerate - parse a report.xml file and generate the report.
  */
-class ReportParserGenerate extends ReportParserBase {
+class ReportParserGenerate extends ReportParserBase
+{
 	/** @var bool Are we collecting data from <Footnote> elements  */
 	private $process_footnote = true;
 
@@ -121,7 +122,8 @@ 
 	 * @param ReportBase $report_root
 	 * @param string[][] $vars
 	 */
-	public function __construct($report, ReportBase $report_root = null, array $vars = array()) {
+	public function __construct($report, ReportBase $report_root = null, array $vars = array())
+	{
 		$this->report_root     = $report_root;
 		$this->wt_report       = $report_root;
 		$this->current_element = new ReportBaseElement;
@@ -139,7 +141,8 @@ 
 	 * @param string   $name   the name of the XML element parsed
 	 * @param array    $attrs  an array of key value pairs for the attributes
 	 */
-	protected function startElement($parser, $name, $attrs) {
+	protected function startElement($parser, $name, $attrs)
+	{
 		$newattrs = array();
 
 		foreach ($attrs as $key => $value) {
@@ -171,7 +174,8 @@ 
 	 * @param resource $parser the resource handler for the XML parser
 	 * @param string   $name   the name of the XML element parsed
 	 */
-	protected function endElement($parser, $name) {
+	protected function endElement($parser, $name)
+	{
 		if (($this->process_footnote || $name === "Footnote") && ($this->process_ifs === 0 || $name === "if") && ($this->process_gedcoms === 0 || $name === "Gedcom") && ($this->process_repeats === 0 || $name === "Facts" || $name === "RepeatTag" || $name === "List" || $name === "Relatives")) {
 			$start_method = $name . 'StartHandler';
 			$end_method   = $name . 'EndHandler';
@@ -189,7 +193,8 @@ 
 	 * @param resource $parser the resource handler for the XML parser
 	 * @param string   $data   the name of the XML element parsed
 	 */
-	protected function characterData($parser, $data) {
+	protected function characterData($parser, $data)
+	{
 		if ($this->print_data && $this->process_gedcoms === 0 && $this->process_ifs === 0 && $this->process_repeats === 0) {
 			$this->current_element->addText($data);
 		}
@@ -200,7 +205,8 @@ 
 	 *
 	 * @param array $attrs an array of key value pairs for the attributes
 	 */
-	private function styleStartHandler($attrs) {
+	private function styleStartHandler($attrs)
+	{
 		if (empty($attrs['name'])) {
 			throw new \DomainException('REPORT ERROR Style: The "name" of the style is missing or not set in the XML file.');
 		}
@@ -239,7 +245,8 @@ 
 	 *
 	 * @param array $attrs an array of key value pairs for the attributes
 	 */
-	private function docStartHandler($attrs) {
+	private function docStartHandler($attrs)
+	{
 		$this->parser = $this->xml_parser;
 
 		// Custom page width
@@ -328,14 +335,16 @@ 
 	/**
 	 * XML </Doc>
 	 */
-	private function docEndHandler() {
+	private function docEndHandler()
+	{
 		$this->wt_report->run();
 	}
 
 	/**
 	 * XML <Header>
 	 */
-	private function headerStartHandler() {
+	private function headerStartHandler()
+	{
 		// Clear the Header before any new elements are added
 		$this->wt_report->clearHeader();
 		$this->wt_report->setProcessing("H");
@@ -344,7 +353,8 @@ 
 	/**
 	 * XML <PageHeader>
 	 */
-	private function pageHeaderStartHandler() {
+	private function pageHeaderStartHandler()
+	{
 		array_push($this->print_data_stack, $this->print_data);
 		$this->print_data = false;
 		array_push($this->wt_report_stack, $this->wt_report);
@@ -354,7 +364,8 @@ 
 	/**
 	 * XML <pageHeaderEndHandler>
 	 */
-	private function pageHeaderEndHandler() {
+	private function pageHeaderEndHandler()
+	{
 		$this->print_data        = array_pop($this->print_data_stack);
 		$this->current_element   = $this->wt_report;
 		$this->wt_report         = array_pop($this->wt_report_stack);
@@ -364,14 +375,16 @@ 
 	/**
 	 * XML <bodyStartHandler>
 	 */
-	private function bodyStartHandler() {
+	private function bodyStartHandler()
+	{
 		$this->wt_report->setProcessing("B");
 	}
 
 	/**
 	 * XML <footerStartHandler>
 	 */
-	private function footerStartHandler() {
+	private function footerStartHandler()
+	{
 		$this->wt_report->setProcessing("F");
 	}
 
@@ -380,7 +393,8 @@ 
 	 *
 	 * @param array $attrs an array of key value pairs for the attributes
 	 */
-	private function cellStartHandler($attrs) {
+	private function cellStartHandler($attrs)
+	{
 		// string The text alignment of the text in this box.
 		$align = "";
 		if (!empty($attrs['align'])) {
@@ -534,7 +548,8 @@ 
 	/**
 	 * XML </Cell>
 	 */
-	private function cellEndHandler() {
+	private function cellEndHandler()
+	{
 		$this->print_data = array_pop($this->print_data_stack);
 		$this->wt_report->addElement($this->current_element);
 	}
@@ -542,7 +557,8 @@ 
 	/**
 	 * XML <Now /> element handler
 	 */
-	private function nowStartHandler() {
+	private function nowStartHandler()
+	{
 		$g = FunctionsDate::timestampToGedcomDate(WT_TIMESTAMP + WT_TIMESTAMP_OFFSET);
 		$this->current_element->addText($g->display());
 	}
@@ -550,14 +566,16 @@ 
 	/**
 	 * XML <PageNum /> element handler
 	 */
-	private function pageNumStartHandler() {
+	private function pageNumStartHandler()
+	{
 		$this->current_element->addText("#PAGENUM#");
 	}
 
 	/**
 	 * XML <TotalPages /> element handler
 	 */
-	private function totalPagesStartHandler() {
+	private function totalPagesStartHandler()
+	{
 		$this->current_element->addText("{{:ptp:}}");
 	}
 
@@ -566,7 +584,8 @@ 
 	 *
 	 * @param array $attrs an array of key value pairs for the attributes
 	 */
-	private function gedcomStartHandler($attrs) {
+	private function gedcomStartHandler($attrs)
+	{
 		global $WT_TREE;
 
 		if ($this->process_gedcoms > 0) {
@@ -629,7 +648,8 @@ 
 	/**
 	 * Called at the end of an element.
 	 */
-	private function gedcomEndHandler() {
+	private function gedcomEndHandler()
+	{
 		if ($this->process_gedcoms > 0) {
 			$this->process_gedcoms--;
 		} else {
@@ -642,7 +662,8 @@ 
 	 *
 	 * @param array $attrs an array of key value pairs for the attributes
 	 */
-	private function textBoxStartHandler($attrs) {
+	private function textBoxStartHandler($attrs)
+	{
 		// string Background color code
 		$bgcolor = "";
 		if (!empty($attrs['bgcolor'])) {
@@ -765,7 +786,8 @@ 
 	/**
 	 * XML <textBoxEndHandler>
 	 */
-	private function textBoxEndHandler() {
+	private function textBoxEndHandler()
+	{
 		$this->print_data      = array_pop($this->print_data_stack);
 		$this->current_element = $this->wt_report;
 		$this->wt_report       = array_pop($this->wt_report_stack);
@@ -777,7 +799,8 @@ 
 	 *
 	 * @param array $attrs an array of key value pairs for the attributes
 	 */
-	private function textStartHandler($attrs) {
+	private function textStartHandler($attrs)
+	{
 		array_push($this->print_data_stack, $this->print_data);
 		$this->print_data = true;
 
@@ -799,7 +822,8 @@ 
 	/**
 	 * XML </Text>
 	 */
-	private function textEndHandler() {
+	private function textEndHandler()
+	{
 		$this->print_data = array_pop($this->print_data_stack);
 		$this->wt_report->addElement($this->current_element);
 	}
@@ -813,7 +837,8 @@ 
 	 *
 	 * @param array $attrs an array of key value pairs for the attributes
 	 */
-	private function getPersonNameStartHandler($attrs) {
+	private function getPersonNameStartHandler($attrs)
+	{
 		global $WT_TREE;
 
 		$id    = "";
@@ -896,7 +921,8 @@ 
 	 *
 	 * @param array $attrs an array of key value pairs for the attributes
 	 */
-	private function gedcomValueStartHandler($attrs) {
+	private function gedcomValueStartHandler($attrs)
+	{
 		global $WT_TREE;
 
 		$id    = "";
@@ -967,7 +993,8 @@ 
 	 *
 	 * @param array $attrs an array of key value pairs for the attributes
 	 */
-	private function repeatTagStartHandler($attrs) {
+	private function repeatTagStartHandler($attrs)
+	{
 		global $WT_TREE;
 
 		$this->process_repeats++;
@@ -1039,7 +1066,8 @@ 
 	/**
 	 * XML </ RepeatTag>
 	 */
-	private function repeatTagEndHandler() {
+	private function repeatTagEndHandler()
+	{
 		global $report;
 
 		$this->process_repeats--;
@@ -1118,7 +1146,8 @@ 
 	 *
 	 * @param array $attrs an array of key value pairs for the attributes
 	 */
-	private function varStartHandler($attrs) {
+	private function varStartHandler($attrs)
+	{
 		if (empty($attrs['var'])) {
 			throw new \DomainException('REPORT ERROR var: The attribute "var=" is missing or not set in the XML file on line: ' . xml_get_current_line_number($this->parser));
 		}
@@ -1159,7 +1188,8 @@ 
 	 *
 	 * @param array $attrs an array of key value pairs for the attributes
 	 */
-	private function factsStartHandler($attrs) {
+	private function factsStartHandler($attrs)
+	{
 		global $WT_TREE;
 
 		$this->process_repeats++;
@@ -1207,7 +1237,8 @@ 
 	/**
 	 * XML </Facts>
 	 */
-	private function factsEndHandler() {
+	private function factsEndHandler()
+	{
 		global $report;
 
 		$this->process_repeats--;
@@ -1290,7 +1321,8 @@ 
 	 *
 	 * @param array $attrs an array of key value pairs for the attributes
 	 */
-	private function setVarStartHandler($attrs) {
+	private function setVarStartHandler($attrs)
+	{
 		if (empty($attrs['name'])) {
 			throw new \DomainException('REPORT ERROR var: The attribute "name" is missing or not set in the XML file');
 		}
@@ -1364,7 +1396,8 @@ 
 	 *
 	 * @param array $attrs an array of key value pairs for the attributes
 	 */
-	private function ifStartHandler($attrs) {
+	private function ifStartHandler($attrs)
+	{
 		if ($this->process_ifs > 0) {
 			$this->process_ifs++;
 
@@ -1419,7 +1452,8 @@ 
 	/**
 	 * XML <if /> end element
 	 */
-	private function ifEndHandler() {
+	private function ifEndHandler()
+	{
 		if ($this->process_ifs > 0) {
 			$this->process_ifs--;
 		}
@@ -1432,7 +1466,8 @@ 
 	 *
 	 * @param array $attrs an array of key value pairs for the attributes
 	 */
-	private function footnoteStartHandler($attrs) {
+	private function footnoteStartHandler($attrs)
+	{
 		global $WT_TREE;
 
 		$id = "";
@@ -1459,7 +1494,8 @@ 
 	 * XML <Footnote /> end element
 	 * Print the collected Footnote data
 	 */
-	private function footnoteEndHandler() {
+	private function footnoteEndHandler()
+	{
 		if ($this->process_footnote) {
 			$this->print_data = array_pop($this->print_data_stack);
 			$temp             = trim($this->current_element->getValue());
@@ -1475,7 +1511,8 @@ 
 	/**
 	 * XML <FootnoteTexts /> element
 	 */
-	private function footnoteTextsStartHandler() {
+	private function footnoteTextsStartHandler()
+	{
 		$temp = "footnotetexts";
 		$this->wt_report->addElement($temp);
 	}
@@ -1483,7 +1520,8 @@ 
 	/**
 	 * XML <AgeAtDeath /> element handler
 	 */
-	private function ageAtDeathStartHandler() {
+	private function ageAtDeathStartHandler()
+	{
 		// This duplicates functionality in FunctionsPrint::format_fact_date()
 		global $factrec, $WT_TREE;
 
@@ -1540,7 +1578,8 @@ 
 	/**
 	 * XML element Forced line break handler - HTML code
 	 */
-	private function brStartHandler() {
+	private function brStartHandler()
+	{
 		if ($this->print_data && $this->process_gedcoms === 0) {
 			$this->current_element->addText('<br>');
 		}
@@ -1549,7 +1588,8 @@ 
 	/**
 	 * XML <sp />element Forced space handler
 	 */
-	private function spStartHandler() {
+	private function spStartHandler()
+	{
 		if ($this->print_data && $this->process_gedcoms === 0) {
 			$this->current_element->addText(' ');
 		}
@@ -1560,7 +1600,8 @@ 
 	 *
 	 * @param array $attrs an array of key value pairs for the attributes
 	 */
-	private function highlightedImageStartHandler($attrs) {
+	private function highlightedImageStartHandler($attrs)
+	{
 		global $WT_TREE;
 
 		$id    = '';
@@ -1661,7 +1702,8 @@ 
 	 *
 	 * @param array $attrs an array of key value pairs for the attributes
 	 */
-	private function imageStartHandler($attrs) {
+	private function imageStartHandler($attrs)
+	{
 		global $WT_TREE;
 
 		// mixed Position the top corner of this box on the page. the default is the current position
@@ -1778,7 +1820,8 @@ 
 	 *
 	 * @param array $attrs an array of key value pairs for the attributes
 	 */
-	private function lineStartHandler($attrs) {
+	private function lineStartHandler($attrs)
+	{
 		// Start horizontal position, current position (default)
 		$x1 = ".";
 		if (isset($attrs['x1'])) {
@@ -1833,7 +1876,8 @@ 
 	 *
 	 * @param array $attrs an array of key value pairs for the attributes
 	 */
-	private function listStartHandler($attrs) {
+	private function listStartHandler($attrs)
+	{
 		global $WT_TREE;
 
 		$this->process_repeats++;
@@ -2212,7 +2256,8 @@ 
 	/**
 	 * XML <List>
 	 */
-	private function listEndHandler() {
+	private function listEndHandler()
+	{
 		global $report;
 
 		$this->process_repeats--;
@@ -2291,7 +2336,8 @@ 
 	 * The total number is collected from
 	 * List and Relatives
 	 */
-	private function listTotalStartHandler() {
+	private function listTotalStartHandler()
+	{
 		if ($this->list_private == 0) {
 			$this->current_element->addText($this->list_total);
 		} else {
@@ -2304,7 +2350,8 @@ 
 	 *
 	 * @param array $attrs an array of key value pairs for the attributes
 	 */
-	private function relativesStartHandler($attrs) {
+	private function relativesStartHandler($attrs)
+	{
 		global $WT_TREE;
 
 		$this->process_repeats++;
@@ -2443,7 +2490,8 @@ 
 	/**
 	 * XML </ Relatives>
 	 */
-	private function relativesEndHandler() {
+	private function relativesEndHandler()
+	{
 		global $report, $WT_TREE;
 
 		$this->process_repeats--;
@@ -2518,7 +2566,8 @@ 
 	 *
 	 * Prints the number of generations
 	 */
-	private function generationStartHandler() {
+	private function generationStartHandler()
+	{
 		$this->current_element->addText($this->generation);
 	}
 
@@ -2527,7 +2576,8 @@ 
 	 *
 	 * Has to be placed in an element (header, pageheader, body or footer)
 	 */
-	private function newPageStartHandler() {
+	private function newPageStartHandler()
+	{
 		$temp = "addpage";
 		$this->wt_report->addElement($temp);
 	}
@@ -2538,7 +2588,8 @@ 
 	 * @param string  $tag   HTML tag name
 	 * @param array[] $attrs an array of key value pairs for the attributes
 	 */
-	private function htmlStartHandler($tag, $attrs) {
+	private function htmlStartHandler($tag, $attrs)
+	{
 		if ($tag === "tempdoc") {
 			return;
 		}
@@ -2555,7 +2606,8 @@ 
 	 *
 	 * @param string $tag
 	 */
-	private function htmlEndHandler($tag) {
+	private function htmlEndHandler($tag)
+	{
 		if ($tag === "tempdoc") {
 			return;
 		}
@@ -2573,42 +2625,48 @@ 
 	/**
 	 * Handle <Input>
 	 */
-	private function inputStartHandler() {
+	private function inputStartHandler()
+	{
 		// Dummy function, to prevent the default HtmlStartHandler() being called
 	}
 
 	/**
 	 * Handle </Input>
 	 */
-	private function inputEndHandler() {
+	private function inputEndHandler()
+	{
 		// Dummy function, to prevent the default HtmlEndHandler() being called
 	}
 
 	/**
 	 * Handle <Report>
 	 */
-	private function reportStartHandler() {
+	private function reportStartHandler()
+	{
 		// Dummy function, to prevent the default HtmlStartHandler() being called
 	}
 
 	/**
 	 * Handle </Report>
 	 */
-	private function reportEndHandler() {
+	private function reportEndHandler()
+	{
 		// Dummy function, to prevent the default HtmlEndHandler() being called
 	}
 
 	/**
 	 * XML </titleEndHandler>
 	 */
-	private function titleEndHandler() {
+	private function titleEndHandler()
+	{
 		$this->report_root->addTitle($this->text);
 	}
 
 	/**
 	 * XML </descriptionEndHandler>
 	 */
-	private function descriptionEndHandler() {
+	private function descriptionEndHandler()
+	{
 		$this->report_root->addDescription($this->text);
 	}
 
@@ -2620,7 +2678,8 @@ 
 	 * @param bool  $parents
 	 * @param int  $generations
 	 */
-	private function addDescendancy(&$list, $pid, $parents = false, $generations = -1) {
+	private function addDescendancy(&$list, $pid, $parents = false, $generations = -1)
+	{
 		global $WT_TREE;
 
 		$person = Individual::getInstance($pid, $WT_TREE);
@@ -2681,7 +2740,8 @@ 
 	 * @param bool  $children
 	 * @param int  $generations
 	 */
-	private function addAncestors(&$list, $pid, $children = false, $generations = -1) {
+	private function addAncestors(&$list, $pid, $children = false, $generations = -1)
+	{
 		global $WT_TREE;
 
 		$genlist                = array($pid);
@@ -2734,7 +2794,8 @@ 
 	 *
 	 * @return string the value of a gedcom tag from the given gedcom record
 	 */
-	private function getGedcomValue($tag, $level, $gedrec) {
+	private function getGedcomValue($tag, $level, $gedrec)
+	{
 		global $WT_TREE;
 
 		if (empty($gedrec)) {
@@ -2810,7 +2871,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function substituteVars($expression, $quote) {
+	private function substituteVars($expression, $quote)
+	{
 		$that = $this; // PHP5.3 cannot access $this inside a closure
 		return preg_replace_callback(
 			'/\$(\w+)/',

app/GedcomCode/GedcomCodeTemp.php

Spacing +6 added lines, -6 removed lines

@@ -57,14 +57,14 @@
 			'MADRI', 'MANAU', 'MANHA', 'MANIL', 'MANTI', 'MEDFO', 'MELBO', 'MEMPH',
 			'MERID', 'MEXIC', 'MNTVD', 'MONTE', 'MONTI', 'MONTR', 'MTIMP', 'NASHV',
 			'NAUV2', 'NAUVO', 'NBEAC', 'NUKUA', 'NYORK', 'NZEAL', 'OAKLA', 'OAXAC',
-			'OGDEN', 'OKLAH',	'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE',
-			'PAYSO', 'PERTH',	'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO',
+			'OGDEN', 'OKLAH', 'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE',
+			'PAYSO', 'PERTH', 'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO',
 			'QUETZ', 'RALEI', 'RECIF', 'REDLA', 'REGIN', 'RENO', 'REXBU', 'SACRA',
-			'SAMOA', 'SANTI',	'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL',
-			'SGEOR', 'SJOSE',	'SLAKE', 'SLOUI', 'SNOWF','SPAUL', 'SPMIN', 'SPOKA',
+			'SAMOA', 'SANTI', 'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL',
+			'SGEOR', 'SJOSE', 'SLAKE', 'SLOUI', 'SNOWF', 'SPAUL', 'SPMIN', 'SPOKA',
 			'STOCK', 'SUVA', 'SWISS', 'SYDNE', 'TAIPE', 'TAMPI', 'TEGUC', 'TGUTI',
-			'TIHUA', 'TOKYO',	'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA',
-			'VILLA', 'WASHI',	'WINTE',
+			'TIHUA', 'TOKYO', 'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA',
+			'VILLA', 'WASHI', 'WINTE',
 		);
 	}
 

Braces +10 added lines, -5 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * Class GedcomCodeTemp - Functions and logic for GEDCOM "TEMP" codes
  */
-class GedcomCodeTemp {
+class GedcomCodeTemp
+{
 	/**
 	 * A list of GEDCOM tags that require a TEMP subtag
 	 *
@@ -28,7 +29,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function isTagLDS($tag) {
+	public static function isTagLDS($tag)
+	{
 		return $tag === 'BAPL' || $tag === 'CONL' || $tag === 'ENDL' || $tag === 'SLGC' || $tag === 'SLGS';
 	}
 
@@ -43,7 +45,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public static function templeCodes() {
+	public static function templeCodes()
+	{
 		return array(
 			'ABA', 'ACCRA', 'ADELA', 'ALBER', 'ALBUQ', 'ANCHO', 'ARIZO', 'ASUNC',
 			'ATLAN', 'BAIRE', 'BILLI', 'BIRMI', 'BISMA', 'BOGOT', 'BOISE', 'BOSTO',
@@ -75,7 +78,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function templeName($temple_code) {
+	public static function templeName($temple_code)
+	{
 		switch ($temple_code) {
 		case 'ABA':
 			return /* I18N: Location of an LDS church temple */ I18N::translate('Aba, Nigeria');
@@ -397,7 +401,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public static function templeNames() {
+	public static function templeNames()
+	{
 		$temple_names = array();
 		foreach (self::templeCodes() as $temple_code) {
 			$temple_names[$temple_code] = self::templeName($temple_code);

edituser.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 $form_pass2          = Filter::post('form_pass2', WT_REGEX_PASSWORD);
 $form_email          = Filter::postEmail('form_email');
 $form_rootid         = Filter::post('form_rootid', WT_REGEX_XREF);
-$form_theme          = Filter::post('form_theme', implode('|', array_keys(Theme::themeNames())), '');;
+$form_theme          = Filter::post('form_theme', implode('|', array_keys(Theme::themeNames())), ''); ;
 $form_language       = Filter::post('form_language');
 $form_timezone       = Filter::post('form_timezone');
 $form_contact_method = Filter::post('form_contact_method');

Braces +5 added lines, -2 removed lines

@@ -183,8 +183,11 @@
 			<div class="value">
 				<?php if ($my_individual_record): ?>
 				<?php echo $my_individual_record->formatList('span'); ?>
-				<?php else: ?>
-					<?php echo I18N::translateContext('unknown people', 'Unknown'); ?>
+				<?php else {
+    : ?>
+					<?php echo I18N::translateContext('unknown people', 'Unknown');
+}
+?>
 				<?php endif; ?>
 				<p class="small text-muted">
 					<?php echo I18N::translate('This is a link to your own record in the family tree. If this is the wrong individual, contact an administrator.'); ?>

app/Functions/FunctionsPrintLists.php

Spacing +6 added lines, -6 removed lines

@@ -1820,24 +1820,24 @@
 			if ($endjd === WT_CLIENT_JD) {
 				// We're dealing with the Today’s Events block
 				if ($filter === 0) {
-					$html .=  I18N::translate('No events exist for today.');
+					$html .= I18N::translate('No events exist for today.');
 				} else {
-					$html .=  I18N::translate('No events for living individuals exist for today.');
+					$html .= I18N::translate('No events for living individuals exist for today.');
 				}
 			} else {
 				// We're dealing with the Upcoming Events block
 				if ($filter === 0) {
 					if ($endjd === $startjd) {
-						$html .=  I18N::translate('No events exist for tomorrow.');
+						$html .= I18N::translate('No events exist for tomorrow.');
 					} else {
-						$html .=  /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
+						$html .= /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
 					}
 				} else {
 					if ($endjd === $startjd) {
-						$html .=  I18N::translate('No events for living individuals exist for tomorrow.');
+						$html .= I18N::translate('No events for living individuals exist for tomorrow.');
 					} else {
 						// I18N: translation for %s==1 is unused; it is translated separately as “tomorrow”
-						$html .=  I18N::plural('No events for living people exist for the next %s day.', 'No events for living people exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
+						$html .= I18N::plural('No events for living people exist for the next %s day.', 'No events for living people exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
 					}
 				}
 			}

Braces +30 added lines, -15 removed lines

@@ -37,7 +37,8 @@ 
 /**
  * Class FunctionsPrintLists - create sortable lists using datatables.net
  */
-class FunctionsPrintLists {
+class FunctionsPrintLists
+{
 	/**
 	 * Generate a SURN,GIVN and GIVN,SURN sortable name for an individual.
 	 * This allows table data to sort by surname or given names.
@@ -50,7 +51,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	private static function sortableNames(Individual $individual) {
+	private static function sortableNames(Individual $individual)
+	{
 		$names   = $individual->getAllNames();
 		$primary = $individual->getPrimaryName();
 
@@ -73,7 +75,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function individualTable($indiviudals, $option = '') {
+	public static function individualTable($indiviudals, $option = '')
+	{
 		global $controller, $WT_TREE;
 
 		$table_id = 'table-indi-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
@@ -516,7 +519,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function familyTable($families) {
+	public static function familyTable($families)
+	{
 		global $WT_TREE, $controller;
 
 		$table_id = 'table-fam-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
@@ -985,7 +989,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function sourceTable($sources) {
+	public static function sourceTable($sources)
+	{
 		global $WT_TREE, $controller;
 
 		// Count the number of linked records. These numbers include private records.
@@ -1112,7 +1117,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function noteTable($notes) {
+	public static function noteTable($notes)
+	{
 		global $WT_TREE, $controller;
 
 		// Count the number of linked records. These numbers include private records.
@@ -1218,7 +1224,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function repositoryTable($repositories) {
+	public static function repositoryTable($repositories)
+	{
 		global $WT_TREE, $controller;
 
 		// Count the number of linked records. These numbers include private records.
@@ -1311,7 +1318,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function mediaTable($media_objects) {
+	public static function mediaTable($media_objects)
+	{
 		global $WT_TREE, $controller;
 
 		$html     = '';
@@ -1404,7 +1412,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function surnameTable($surnames, $script, Tree $tree) {
+	public static function surnameTable($surnames, $script, Tree $tree)
+	{
 		global $controller;
 
 		$html = '';
@@ -1494,7 +1503,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function surnameTagCloud($surnames, $script, $totals, Tree $tree) {
+	public static function surnameTagCloud($surnames, $script, $totals, Tree $tree)
+	{
 		$minimum = PHP_INT_MAX;
 		$maximum = 1;
 		foreach ($surnames as $surn => $surns) {
@@ -1537,7 +1547,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function surnameList($surnames, $style, $totals, $script, Tree $tree) {
+	public static function surnameList($surnames, $style, $totals, $script, Tree $tree)
+	{
 		$html = array();
 		foreach ($surnames as $surn => $surns) {
 			// Each surname links back to the indilist
@@ -1616,7 +1627,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function eventsTable($startjd, $endjd, $events = 'BIRT MARR DEAT', $only_living = false, $sort_by = 'anniv') {
+	public static function eventsTable($startjd, $endjd, $events = 'BIRT MARR DEAT', $only_living = false, $sort_by = 'anniv')
+	{
 		global $controller, $WT_TREE;
 
 		$html     = '';
@@ -1746,7 +1758,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function eventsList($startjd, $endjd, $events = 'BIRT MARR DEAT', $only_living = false, $sort_by = 'anniv') {
+	public static function eventsList($startjd, $endjd, $events = 'BIRT MARR DEAT', $only_living = false, $sort_by = 'anniv')
+	{
 		global $WT_TREE;
 
 		// Did we have any output? Did we skip anything?
@@ -1856,7 +1869,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function chartByAge($data, $title) {
+	public static function chartByAge($data, $title)
+	{
 		$count  = 0;
 		$agemax = 0;
 		$vmax   = 0;
@@ -1927,7 +1941,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function chartByDecade($data, $title) {
+	public static function chartByDecade($data, $title)
+	{
 		$count = 0;
 		$vmax  = 0;
 		foreach ($data as $v) {

app/Family.php

Spacing +2 added lines, -2 removed lines

@@ -343,7 +343,7 @@ 
 			// Check the script used by each name, so we can match cyrillic with cyrillic, greek with greek, etc.
 			$husb_names = array();
 			if ($this->husb) {
-				$husb_names = array_filter($this->husb->getAllNames(), function(array $x) { return $x['type'] !== '_MARNM'; } );
+				$husb_names = array_filter($this->husb->getAllNames(), function (array $x) { return $x['type'] !== '_MARNM'; } );
 			}
 			// If the individual only has married names, create a dummy birth name.
 			if (empty($husb_names)) {
@@ -359,7 +359,7 @@ 
 
 			$wife_names = array();
 			if ($this->wife) {
-				$wife_names = array_filter($this->wife->getAllNames(), function(array $x) { return $x['type'] !== '_MARNM'; } );
+				$wife_names = array_filter($this->wife->getAllNames(), function (array $x) { return $x['type'] !== '_MARNM'; } );
 			}
 			// If the individual only has married names, create a dummy birth name.
 			if (empty($wife_names)) {

Braces +44 added lines, -22 removed lines

@@ -18,7 +18,8 @@ 
 /**
  * A GEDCOM family (FAM) object.
  */
-class Family extends GedcomRecord {
+class Family extends GedcomRecord
+{
 	const RECORD_TYPE = 'FAM';
 	const URL_PREFIX  = 'family.php?famid=';
 
@@ -37,7 +38,8 @@ 
 	 *                             empty string for records with pending deletions
 	 * @param Tree        $tree
 	 */
-	public function __construct($xref, $gedcom, $pending, $tree) {
+	public function __construct($xref, $gedcom, $pending, $tree)
+	{
 		parent::__construct($xref, $gedcom, $pending, $tree);
 
 		// Fetch family members
@@ -65,7 +67,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function createPrivateGedcomRecord($access_level) {
+	protected function createPrivateGedcomRecord($access_level)
+	{
 		$SHOW_PRIVATE_RELATIONSHIPS = $this->tree->getPreference('SHOW_PRIVATE_RELATIONSHIPS');
 
 		$rec = '0 @' . $this->xref . '@ FAM';
@@ -89,7 +92,8 @@ 
 	 *
 	 * @return null|string
 	 */
-	protected static function fetchGedcomRecord($xref, $tree_id) {
+	protected static function fetchGedcomRecord($xref, $tree_id)
+	{
 		return Database::prepare(
 			"SELECT f_gedcom FROM `##families` WHERE f_id = :xref AND f_file = :tree_id"
 		)->execute(array(
@@ -105,7 +109,8 @@ 
 	 *
 	 * @return Individual|null
 	 */
-	public function getHusband($access_level = null) {
+	public function getHusband($access_level = null)
+	{
 		$SHOW_PRIVATE_RELATIONSHIPS = $this->tree->getPreference('SHOW_PRIVATE_RELATIONSHIPS');
 
 		if ($this->husb && ($SHOW_PRIVATE_RELATIONSHIPS || $this->husb->canShowName($access_level))) {
@@ -122,7 +127,8 @@ 
 	 *
 	 * @return Individual|null
 	 */
-	public function getWife($access_level = null) {
+	public function getWife($access_level = null)
+	{
 		$SHOW_PRIVATE_RELATIONSHIPS = $this->tree->getPreference('SHOW_PRIVATE_RELATIONSHIPS');
 
 		if ($this->wife && ($SHOW_PRIVATE_RELATIONSHIPS || $this->wife->canShowName($access_level))) {
@@ -139,7 +145,8 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function canShowByType($access_level) {
+	protected function canShowByType($access_level)
+	{
 		// Hide a family if any member is private
 		preg_match_all('/\n1 (?:CHIL|HUSB|WIFE) @(' . WT_REGEX_XREF . ')@/', $this->gedcom, $matches);
 		foreach ($matches[1] as $match) {
@@ -159,7 +166,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function canShowName($access_level = null) {
+	public function canShowName($access_level = null)
+	{
 		// We can always see the name (Husband-name + Wife-name), however,
 		// the name will often be "private + private"
 		return true;
@@ -173,7 +181,8 @@ 
 	 *
 	 * @return Individual|null
 	 */
-	public function getSpouse(Individual $person, $access_level = null) {
+	public function getSpouse(Individual $person, $access_level = null)
+	{
 		if ($person === $this->wife) {
 			return $this->getHusband($access_level);
 		} else {
@@ -188,7 +197,8 @@ 
 	 *
 	 * @return Individual[]
 	 */
-	public function getSpouses($access_level = null) {
+	public function getSpouses($access_level = null)
+	{
 		return array_filter(array(
 			$this->getHusband($access_level),
 			$this->getWife($access_level),
@@ -202,7 +212,8 @@ 
 	 *
 	 * @return Individual[]
 	 */
-	public function getChildren($access_level = null) {
+	public function getChildren($access_level = null)
+	{
 		if ($access_level === null) {
 			$access_level = Auth::accessLevel($this->tree);
 		}
@@ -228,7 +239,8 @@ 
 	 *
 	 * @return int
 	 */
-	public static function compareMarrDate(Family $x, Family $y) {
+	public static function compareMarrDate(Family $x, Family $y)
+	{
 		return Date::compare($x->getMarriageDate(), $y->getMarriageDate());
 	}
 
@@ -237,7 +249,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function getNumberOfChildren() {
+	public function getNumberOfChildren()
+	{
 		$nchi = count($this->getChildren());
 		foreach ($this->getFacts('NCHI') as $fact) {
 			$nchi = max($nchi, (int) $fact->getValue());
@@ -251,7 +264,8 @@ 
 	 *
 	 * @return Fact
 	 */
-	public function getMarriage() {
+	public function getMarriage()
+	{
 		return $this->getFirstFact('MARR');
 	}
 
@@ -260,7 +274,8 @@ 
 	 *
 	 * @return Date
 	 */
-	public function getMarriageDate() {
+	public function getMarriageDate()
+	{
 		$marriage = $this->getMarriage();
 		if ($marriage) {
 			return $marriage->getDate();
@@ -274,7 +289,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function getMarriageYear() {
+	public function getMarriageYear()
+	{
 		return $this->getMarriageDate()->minimumDate()->y;
 	}
 
@@ -283,7 +299,8 @@ 
 	 *
 	 * @return string|null
 	 */
-	public function getMarriageType() {
+	public function getMarriageType()
+	{
 		$marriage = $this->getMarriage();
 		if ($marriage) {
 			return $marriage->getAttribute('TYPE');
@@ -297,7 +314,8 @@ 
 	 *
 	 * @return Place
 	 */
-	public function getMarriagePlace() {
+	public function getMarriagePlace()
+	{
 		$marriage = $this->getMarriage();
 
 		return $marriage->getPlace();
@@ -308,7 +326,8 @@ 
 	 *
 	 * @return Date[]
 	 */
-	public function getAllMarriageDates() {
+	public function getAllMarriageDates()
+	{
 		foreach (explode('|', WT_EVENTS_MARR) as $event) {
 			if ($array = $this->getAllEventDates($event)) {
 				return $array;
@@ -323,7 +342,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public function getAllMarriagePlaces() {
+	public function getAllMarriagePlaces()
+	{
 		foreach (explode('|', WT_EVENTS_MARR) as $event) {
 			if ($array = $this->getAllEventPlaces($event)) {
 				return $array;
@@ -338,7 +358,8 @@ 
 	 *
 	 * @return string[][]
 	 */
-	public function getAllNames() {
+	public function getAllNames()
+	{
 		if (is_null($this->_getAllNames)) {
 			// Check the script used by each name, so we can match cyrillic with cyrillic, greek with greek, etc.
 			$husb_names = array();
@@ -411,7 +432,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function formatListDetails() {
+	public function formatListDetails()
+	{
 		return
 			$this->formatFirstMajorFact(WT_EVENTS_MARR, 1) .
 			$this->formatFirstMajorFact(WT_EVENTS_DIV, 1);

admin_module_reports.php

Braces +5 added lines, -2 removed lines

@@ -74,8 +74,11 @@
 				<td class="col-xs-2">
 					<?php if ($module instanceof ModuleConfigInterface): ?>
 						<a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a>
-					<?php else: ?>
-						<?php echo $module->getTitle(); ?>
+					<?php else {
+    : ?>
+						<?php echo $module->getTitle();
+}
+?>
 					<?php endif; ?>
 				</td>
 				<td class="col-xs-5"><?php echo $module->getDescription(); ?></td>

themes/_custom/theme.php

Braces +10 added lines, -5 removed lines

@@ -31,14 +31,16 @@ 
  * Only the first two functions are required: themeId() and themeName().
  * The rest are just examples, and should be removed in actual themes.
  */
-class MyTheme extends WebtreesTheme {
+class MyTheme extends WebtreesTheme
+{
 	/**
 	 * Give your theme a unique identifier. Themes beginning with an underscore
 	 * are reserved for internal use.
 	 *
 	 * {@inheritdoc}
 	 */
-	public function themeId() {
+	public function themeId()
+	{
 		return '_custom';
 	}
 
@@ -51,7 +53,8 @@ 
 	 *
 	 * {@inheritdoc}
 	 */
-	public function themeName() {
+	public function themeName()
+	{
 		return 'Custom theme';
 	}
 
@@ -60,7 +63,8 @@ 
 	 *
 	 * {@inheritdoc}
 	 */
-	public function stylesheets() {
+	public function stylesheets()
+	{
 		$css_files   = parent::stylesheets();
 		// Put a version number in the URL, to prevent browsers from caching old versions.
 		$css_files[] = WT_BASE_URL . 'themes/_custom/custom-v1.0.css';
@@ -75,7 +79,8 @@ 
 	 *
 	 * {@inheritdoc}
 	 */
-	public function menuLists($surname) {
+	public function menuLists($surname)
+	{
 		// Start with the default "Lists" menu.
 		$menu = parent::menuLists($surname);
 		// Remove the "notes" sub-menu.

statisticsplot.php

Braces +30 added lines, -15 removed lines

@@ -36,7 +36,8 @@ 
  *
  * @return int
  */
-function month_of_birth($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_birth($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -92,7 +93,8 @@ 
  *
  * @return int
  */
-function month_of_birth_of_first_child($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_birth_of_first_child($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -148,7 +150,8 @@ 
  *
  * @return int
  */
-function month_of_death($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_death($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -204,7 +207,8 @@ 
  *
  * @return int
  */
-function month_of_marriage($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_marriage($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -245,7 +249,8 @@ 
  *
  * @return int
  */
-function month_of_first_marriage($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_first_marriage($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -298,7 +303,8 @@ 
  *
  * @return int
  */
-function lifespan_by_birth_year($z_axis, array $z_boundaries, Stats $stats) {
+function lifespan_by_birth_year($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -350,7 +356,8 @@ 
  *
  * @return int
  */
-function lifespan_by_death_year($z_axis, array $z_boundaries, Stats $stats) {
+function lifespan_by_death_year($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -402,7 +409,8 @@ 
  *
  * @return int
  */
-function age_at_marriage($z_axis, array $z_boundaries, Stats $stats) {
+function age_at_marriage($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -456,7 +464,8 @@ 
  *
  * @return int
  */
-function age_at_first_marriage($z_axis, array $z_boundaries, Stats $stats) {
+function age_at_first_marriage($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -533,7 +542,8 @@ 
  *
  * @return int
  */
-function number_of_children($z_axis, array $z_boundaries, Stats $stats) {
+function number_of_children($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -575,7 +585,8 @@ 
  * @param int $x
  * @param int $val
  */
-function fill_y_data($z, $x, $val) {
+function fill_y_data($z, $x, $val)
+{
 	global $ydata, $xmax, $x_boundaries, $zmax, $z_boundaries, $xgiven, $zgiven;
 	//-- calculate index $i out of given z value
 	//-- calculate index $j out of given x value
@@ -612,7 +623,8 @@ 
  * @param string      $ytitle
  * @param string[]    $legend
  */
-function my_plot($mytitle, $xdata, $xtitle, $ydata, $ytitle, $legend) {
+function my_plot($mytitle, $xdata, $xtitle, $ydata, $ytitle, $legend)
+{
 	global $percentage, $male_female, $ymax, $scalefactor, $datastring, $imgurl;
 
 	// Google Chart API only allows text encoding for numbers less than 100
@@ -752,7 +764,8 @@ 
  *
  * @param string $x_axis_boundaries
  */
-function calculate_axis($x_axis_boundaries) {
+function calculate_axis($x_axis_boundaries)
+{
 	global $x_axis, $xdata, $xmax, $x_boundaries;
 
 	// Calculate xdata and zdata elements out of chart values
@@ -801,7 +814,8 @@ 
  *
  * @return string
  */
-function format_range_of_numbers($x, $y) {
+function format_range_of_numbers($x, $y)
+{
 	return /* I18N: A range of numbers */ I18N::translate(
 		'%1$s–%2$s',
 		I18N::number($x),
@@ -814,7 +828,8 @@ 
  *
  * @param string $boundaries_z_axis
  */
-function calculate_legend($boundaries_z_axis) {
+function calculate_legend($boundaries_z_axis)
+{
 	global $legend, $zmax, $z_boundaries;
 
 	// calculate the legend values