fisharebest / webtrees

app/Report/ReportHtmlFootnote.php

Braces +10 added lines, -5 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * class ReportHtmlFootnote
  */
-class ReportHtmlFootnote extends ReportBaseFootnote {
+class ReportHtmlFootnote extends ReportBaseFootnote
+{
 	/**
 	 * HTML Footnotes number renderer
 	 *
 	 * @param ReportHtml $renderer
 	 */
-	public function render($renderer) {
+	public function render($renderer)
+	{
 		$renderer->setCurrentStyle("footnotenum");
 		echo "<a href=\"#footnote", $this->num, "\"><sup>";
 		$renderer->write($renderer->entityRTL . $this->num);
@@ -37,7 +39,8 @@ 
 	 *
 	 * @param ReportHtml $html
 	 */
-	public function renderFootnote($html) {
+	public function renderFootnote($html)
+	{
 
 		if ($html->getCurrentStyle() != $this->styleName) {
 			$html->setCurrentStyle($this->styleName);
@@ -61,7 +64,8 @@ 
 	 *
 	 * @return int       Footnote height in points
 	 */
-	public function getFootnoteHeight($html, $cellWidth = 0) {
+	public function getFootnoteHeight($html, $cellWidth = 0)
+	{
 		if ($html->getCurrentStyle() != $this->styleName) {
 			$html->setCurrentStyle($this->styleName);
 		}
@@ -84,7 +88,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function getWidth($html) {
+	public function getWidth($html)
+	{
 		// Setup the style name
 		$html->setCurrentStyle("footnotenum");
 

app/Report/ReportBaseTextbox.php

Braces +4 added lines, -2 removed lines

@@ -18,7 +18,8 @@ 
 /**
  * Class ReportBaseTextbox
  */
-class ReportBaseTextbox extends ReportBaseElement {
+class ReportBaseTextbox extends ReportBaseElement
+{
 	/**
 	 * Array of elements in the TextBox
 	 *
@@ -152,7 +153,8 @@ 
 	 *
 	 * @param object|string $element
 	 */
-	public function addElement($element) {
+	public function addElement($element)
+	{
 		$this->elements[] = $element;
 	}
 }

app/Report/ReportTcpdf.php

Braces +54 added lines, -27 removed lines

@@ -22,7 +22,8 @@ 
  *
  * This class inherits from the TCPDF class and is used to generate the PDF document
  */
-class ReportTcpdf extends TCPDF {
+class ReportTcpdf extends TCPDF
+{
 	/** @var ReportBaseElement[] Array of elements in the header */
 	public $headerElements = array();
 
@@ -56,7 +57,8 @@ 
 	/**
 	 * PDF Header -PDF
 	 */
-	public function header() {
+	public function header()
+	{
 		foreach ($this->headerElements as $element) {
 			if (is_object($element)) {
 				$element->render($this);
@@ -80,7 +82,8 @@ 
 	/**
 	 * PDF Body -PDF
 	 */
-	public function body() {
+	public function body()
+	{
 		$this->AddPage();
 		foreach ($this->bodyElements as $key => $element) {
 			if (is_object($element)) {
@@ -98,7 +101,8 @@ 
 	/**
 	 * PDF Footnotes -PDF
 	 */
-	public function footnotes() {
+	public function footnotes()
+	{
 		foreach ($this->printedfootnotes as $element) {
 			if (($this->GetY() + $element->getFootnoteHeight($this)) > $this->getPageHeight()) {
 				$this->AddPage();
@@ -113,7 +117,8 @@ 
 	/**
 	 * PDF Footer -PDF
 	 */
-	public function footer() {
+	public function footer()
+	{
 		foreach ($this->footerElements as $element) {
 			if (is_object($element)) {
 				$element->render($this);
@@ -132,7 +137,8 @@ 
 	 *
 	 * @return int The number of the Header elements
 	 */
-	public function addHeader($element) {
+	public function addHeader($element)
+	{
 		$this->headerElements[] = $element;
 
 		return count($this->headerElements) - 1;
@@ -145,7 +151,8 @@ 
 	 *
 	 * @return int The number of the Page Header elements
 	 */
-	public function addPageHeader($element) {
+	public function addPageHeader($element)
+	{
 		$this->pageHeaderElements[] = $element;
 
 		return count($this->pageHeaderElements) - 1;
@@ -158,7 +165,8 @@ 
 	 *
 	 * @return int The number of the Body elements
 	 */
-	public function addBody($element) {
+	public function addBody($element)
+	{
 		$this->bodyElements[] = $element;
 
 		return count($this->bodyElements) - 1;
@@ -171,7 +179,8 @@ 
 	 *
 	 * @return int The number of the Footer elements
 	 */
-	public function addFooter($element) {
+	public function addFooter($element)
+	{
 		$this->footerElements[] = $element;
 
 		return count($this->footerElements) - 1;
@@ -182,7 +191,8 @@ 
 	 *
 	 * @param $index
 	 */
-	public function removeHeader($index) {
+	public function removeHeader($index)
+	{
 		unset($this->headerElements[$index]);
 	}
 
@@ -191,7 +201,8 @@ 
 	 *
 	 * @param $index
 	 */
-	public function removePageHeader($index) {
+	public function removePageHeader($index)
+	{
 		unset($this->pageHeaderElements[$index]);
 	}
 
@@ -200,7 +211,8 @@ 
 	 *
 	 * @param $index
 	 */
-	public function removeBody($index) {
+	public function removeBody($index)
+	{
 		unset($this->bodyElements[$index]);
 	}
 
@@ -209,14 +221,16 @@ 
 	 *
 	 * @param $index
 	 */
-	public function removeFooter($index) {
+	public function removeFooter($index)
+	{
 		unset($this->footerElements[$index]);
 	}
 
 	/**
 	 * Clear the Header -PDF
 	 */
-	public function clearHeader() {
+	public function clearHeader()
+	{
 		unset($this->headerElements);
 		$this->headerElements = array();
 	}
@@ -224,7 +238,8 @@ 
 	/**
 	 * Clear the Page Header -PDF
 	 */
-	public function clearPageHeader() {
+	public function clearPageHeader()
+	{
 		unset($this->pageHeaderElements);
 		$this->pageHeaderElements = array();
 	}
@@ -234,7 +249,8 @@ 
 	 *
 	 * @param $r
 	 */
-	public function setReport($r) {
+	public function setReport($r)
+	{
 		$this->wt_report = $r;
 	}
 
@@ -243,7 +259,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getCurrentStyle() {
+	public function getCurrentStyle()
+	{
 		return $this->currentStyle;
 	}
 
@@ -252,7 +269,8 @@ 
 	 *
 	 * @param string $s Style name
 	 */
-	public function setCurrentStyle($s) {
+	public function setCurrentStyle($s)
+	{
 		$this->currentStyle = $s;
 		$style              = $this->wt_report->getStyle($s);
 		$this->SetFont($style['font'], $style['style'], $style['size']);
@@ -265,7 +283,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function getStyle($s) {
+	public function getStyle($s)
+	{
 		if (!isset($this->wt_report->Styles[$s])) {
 			$s                           = $this->getCurrentStyle();
 			$this->wt_report->Styles[$s] = $s;
@@ -282,7 +301,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function addMarginX($x) {
+	public function addMarginX($x)
+	{
 		$m = $this->getMargins();
 		if ($this->getRTL()) {
 			$x += $m['right'];
@@ -300,7 +320,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function getMaxLineWidth() {
+	public function getMaxLineWidth()
+	{
 		$m = $this->getMargins();
 		if ($this->getRTL()) {
 			return ($this->getRemainingWidth() + $m['right']);
@@ -314,7 +335,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function getFootnotesHeight() {
+	public function getFootnotesHeight()
+	{
 		$h = 0;
 		foreach ($this->printedfootnotes as $element) {
 			$h += $element->getHeight($this);
@@ -328,7 +350,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function getCurrentStyleHeight() {
+	public function getCurrentStyleHeight()
+	{
 		if (empty($this->currentStyle)) {
 			return $this->wt_report->defaultFontSize;
 		}
@@ -344,7 +367,8 @@ 
 	 *
 	 * @return bool false if not numbered befor | object if already numbered
 	 */
-	public function checkFootnote($footnote) {
+	public function checkFootnote($footnote)
+	{
 		$ct  = count($this->printedfootnotes);
 		$val = $footnote->getValue();
 		$i   = 0;
@@ -370,7 +394,8 @@ 
 	 * Used this function instead of AddPage()
 	 * This function will make sure that images will not be overwritten
 	 */
-	public function newPage() {
+	public function newPage()
+	{
 		if ($this->lastpicpage > $this->getPage()) {
 			$this->setPage($this->lastpicpage);
 		}
@@ -384,7 +409,8 @@ 
 	 *
 	 * @return bool true in case of page break, false otherwise
 	 */
-	public function checkPageBreakPDF($height) {
+	public function checkPageBreakPDF($height)
+	{
 		return $this->checkPageBreak($height);
 	}
 
@@ -393,7 +419,8 @@ 
 	 *
 	 * @return float Remaining width
 	 */
-	public function getRemainingWidthPDF() {
+	public function getRemainingWidthPDF()
+	{
 		return $this->getRemainingWidth();
 	}
 }

app/Date.php

Braces +34 added lines, -17 removed lines

@@ -36,7 +36,8 @@ 
  * this is not the case (e.g. England prior to 1752), we need to use modified
  * years or the OS/NS notation "4 FEB 1750/51".
  */
-class Date {
+class Date
+{
 	/** @var string Optional qualifier, such as BEF, FROM, ABT */
 	public $qual1;
 
@@ -57,7 +58,8 @@ 
 	 *
 	 * @param string $date A date in GEDCOM format
 	 */
-	public function __construct($date) {
+	public function __construct($date)
+	{
 		// Extract any explanatory text
 		if (preg_match('/^(.*) ?[(](.*)[)]/', $date, $match)) {
 			$date       = $match[1];
@@ -80,7 +82,8 @@ 
 	 * When we copy a date object, we need to create copies of
 	 * its child objects.
 	 */
-	public function __clone() {
+	public function __clone()
+	{
 		$this->date1 = clone $this->date1;
 		if (is_object($this->date2)) {
 			$this->date2 = clone $this->date2;
@@ -98,7 +101,8 @@ 
 	 *
 	 * @return CalendarDate
 	 */
-	private function parseDate($date) {
+	private function parseDate($date)
+	{
 		// Valid calendar escape specified? - use it
 		if (preg_match('/^(@#D(?:GREGORIAN|JULIAN|HEBREW|HIJRI|JALALI|FRENCH R|ROMAN)+@) ?(.*)/', $date, $match)) {
 			$cal  = $match[1];
@@ -193,7 +197,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public static function calendarNames() {
+	public static function calendarNames()
+	{
 		return array(
 			'gregorian' => /* I18N: The gregorian calendar */ I18N::translate('Gregorian'),
 			'julian'    => /* I18N: The julian calendar */ I18N::translate('Julian'),
@@ -213,7 +218,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function display($url = false, $date_format = null, $convert_calendars = true) {
+	public function display($url = false, $date_format = null, $convert_calendars = true)
+	{
 		global $WT_TREE;
 
 		$CALENDAR_FORMAT = $WT_TREE->getPreference('CALENDAR_FORMAT');
@@ -346,7 +352,8 @@ 
 	 *
 	 * @return CalendarDate
 	 */
-	public function minimumDate() {
+	public function minimumDate()
+	{
 		return $this->date1;
 	}
 
@@ -357,7 +364,8 @@ 
 	 *
 	 * @return CalendarDate
 	 */
-	public function maximumDate() {
+	public function maximumDate()
+	{
 		if (is_null($this->date2)) {
 			return $this->date1;
 		} else {
@@ -370,7 +378,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function minimumJulianDay() {
+	public function minimumJulianDay()
+	{
 		return $this->minimumDate()->minJD;
 	}
 
@@ -379,7 +388,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function maximumJulianDay() {
+	public function maximumJulianDay()
+	{
 		return $this->maximumDate()->maxJD;
 	}
 
@@ -391,7 +401,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function julianDay() {
+	public function julianDay()
+	{
 		return (int) (($this->minimumJulianDay() + $this->maximumJulianDay()) / 2);
 	}
 
@@ -406,7 +417,8 @@ 
 	 *
 	 * @return Date
 	 */
-	public function addYears($years, $qualifier = '') {
+	public function addYears($years, $qualifier = '')
+	{
 		$tmp = clone $this;
 		$tmp->date1->y += $years;
 		$tmp->date1->m = 0;
@@ -430,7 +442,8 @@ 
 	 *
 	 * @return int|string
 	 */
-	public static function getAge(Date $d1, Date $d2 = null, $format = 0) {
+	public static function getAge(Date $d1, Date $d2 = null, $format = 0)
+	{
 		if ($d2) {
 			if ($d2->maximumJulianDay() >= $d1->minimumJulianDay() && $d2->minimumJulianDay() <= $d1->minimumJulianDay()) {
 				// Overlapping dates
@@ -484,7 +497,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getAgeGedcom(Date $d1, Date $d2 = null) {
+	public static function getAgeGedcom(Date $d1, Date $d2 = null)
+	{
 		if (is_null($d2)) {
 			return $d1->date1->getAge(true, WT_CLIENT_JD, true);
 		} else {
@@ -512,7 +526,8 @@ 
 	 *
 	 * @return int
 	 */
-	public static function compare(Date $a, Date $b) {
+	public static function compare(Date $a, Date $b)
+	{
 		// Get min/max JD for each date.
 		switch ($a->qual1) {
 		case 'BEF':
@@ -563,7 +578,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isOK() {
+	public function isOK()
+	{
 		return $this->minimumJulianDay() && $this->maximumJulianDay();
 	}
 
@@ -575,7 +591,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function gregorianYear() {
+	public function gregorianYear()
+	{
 		if ($this->isOK()) {
 			$gregorian_calendar = new GregorianCalendar;
 			list($year)         = $gregorian_calendar->jdToYmd($this->julianDay());

app/Functions/Functions.php

Braces +32 added lines, -16 removed lines

@@ -26,7 +26,8 @@ 
 /**
  * Class Functions - common functions
  */
-class Functions {
+class Functions
+{
 	/**
 	 * Check with the webtrees.net server for the latest version of webtrees.
 	 * Fetching the remote file can be slow, so check infrequently, and cache the result.
@@ -36,7 +37,8 @@ 
 	 *
 	 * @return null|string
 	 */
-	public static function fetchLatestVersion() {
+	public static function fetchLatestVersion()
+	{
 		$last_update_timestamp = Site::getPreference('LATEST_WT_VERSION_TIMESTAMP');
 		if ($last_update_timestamp < WT_TIMESTAMP - 24 * 60 * 60) {
 			$row                = Database::prepare("SHOW VARIABLES LIKE 'version'")->fetchOneRow();
@@ -63,7 +65,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function fileUploadErrorText($error_code) {
+	public static function fileUploadErrorText($error_code)
+	{
 		switch ($error_code) {
 		case UPLOAD_ERR_OK:
 			return I18N::translate('File successfully uploaded');
@@ -113,7 +116,8 @@ 
 	 *
 	 * @return string the subrecord that was found or an empty string "" if not found.
 	 */
-	public static function getSubRecord($level, $tag, $gedrec, $num = 1) {
+	public static function getSubRecord($level, $tag, $gedrec, $num = 1)
+	{
 		if (empty($gedrec)) {
 			return '';
 		}
@@ -154,7 +158,8 @@ 
 	 *
 	 * @return string a string with all CONT lines merged
 	 */
-	public static function getCont($nlevel, $nrec) {
+	public static function getCont($nlevel, $nrec)
+	{
 		$text = '';
 
 		$subrecords = explode("\n", $nrec);
@@ -180,7 +185,8 @@ 
 	 *
 	 * @param Fact[] $arr
 	 */
-	public static function sortFacts(&$arr) {
+	public static function sortFacts(&$arr)
+	{
 		$dated    = array();
 		$nondated = array();
 		//-- split the array into dated and non-dated arrays
@@ -236,7 +242,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getCloseRelationshipName(Individual $individual1, Individual $individual2) {
+	public static function getCloseRelationshipName(Individual $individual1, Individual $individual2)
+	{
 		if ($individual1 === $individual2) {
 			$label = '<i class="icon-selected"></i> ' . self::reflexivePronoun($individual1);
 		} else {
@@ -254,7 +261,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getAssociateRelationshipName(Individual $individual1, Individual $individual2) {
+	public static function getAssociateRelationshipName(Individual $individual1, Individual $individual2)
+	{
 		if ($individual1 === $individual2) {
 			$label = self::reflexivePronoun($individual1);
 		} else {
@@ -271,7 +279,8 @@ 
 	 *
 	 * @return string
 	 */
-	private static function reflexivePronoun(Individual $individual) {
+	private static function reflexivePronoun(Individual $individual)
+	{
 		switch ($individual->getSex()) {
 		case 'M':
 			return /* I18N: reflexive pronoun */ I18N::translate('himself');
@@ -291,7 +300,8 @@ 
 	 *
 	 * @return array|bool An array of nodes on the relationship path, or false if no path found
 	 */
-	public static function getRelationship(Individual $person1, Individual $person2, $maxlength = 4) {
+	public static function getRelationship(Individual $person1, Individual $person2, $maxlength = 4)
+	{
 		if ($person1 === $person2) {
 			return false;
 		}
@@ -423,7 +433,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getRelationshipName($nodes) {
+	public static function getRelationshipName($nodes)
+	{
 		if (!is_array($nodes)) {
 			return '';
 		}
@@ -461,7 +472,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function cousinName($n, $sex) {
+	public static function cousinName($n, $sex)
+	{
 		switch ($sex) {
 		case 'M':
 			switch ($n) {
@@ -597,7 +609,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function cousinName2($n, $sex, $relation) {
+	public static function cousinName2($n, $sex, $relation)
+	{
 		switch ($sex) {
 		case 'M':
 			switch ($n) {
@@ -659,7 +672,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getRelationshipNameFromPath($path, Individual $person1 = null, Individual $person2 = null) {
+	public static function getRelationshipNameFromPath($path, Individual $person1 = null, Individual $person2 = null)
+	{
 		if (!preg_match('/^(mot|fat|par|hus|wif|spo|son|dau|chi|bro|sis|sib)*$/', $path)) {
 			// TODO: Update all the “3 RELA ” values in class_person
 			return '<span class="error">' . $path . '</span>';
@@ -2176,7 +2190,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getQueryUrl($overwrite = null, $separator = '&') {
+	public static function getQueryUrl($overwrite = null, $separator = '&')
+	{
 		if (empty($_GET)) {
 			$get = array();
 		} else {
@@ -2213,7 +2228,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function isFileExternal($file) {
+	public static function isFileExternal($file)
+	{
 		return strpos($file, '://') !== false;
 	}
 }

app/Functions/FunctionsPrintLists.php

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/Functions/FunctionsDate.php

Braces +8 added lines, -4 removed lines

@@ -21,7 +21,8 @@ 
 /**
  * Class FunctionsDate - common functions
  */
-class FunctionsDate {
+class FunctionsDate
+{
 	/**
 	 * Convert a GEDCOM age string to localized text.
 	 *
@@ -29,7 +30,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getAgeAtEvent($age_string) {
+	public static function getAgeAtEvent($age_string)
+	{
 		switch (strtoupper($age_string)) {
 		case 'CHILD':
 			return I18N::translate('Child');
@@ -68,7 +70,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function formatTimestamp($time) {
+	public static function formatTimestamp($time)
+	{
 		$time_fmt = I18N::timeFormat();
 		// PHP::date() doesn't do I18N. Do it ourselves....
 		preg_match_all('/%[^%]/', $time_fmt, $matches);
@@ -121,7 +124,8 @@ 
 	 *
 	 * @return Date
 	 */
-	public static function timestampToGedcomDate($time) {
+	public static function timestampToGedcomDate($time)
+	{
 		return new Date(strtoupper(gmdate('j M Y', $time)));
 	}
 }

app/Functions/FunctionsDb.php

Braces +46 added lines, -23 removed lines

@@ -38,7 +38,8 @@ 
 /**
  * Class FunctionsDb - common functions
  */
-class FunctionsDb {
+class FunctionsDb
+{
 	/**
 	 * Fetch all records linked to a record - when deleting an object, we must
 	 * also delete all links to it.
@@ -48,7 +49,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public static function fetchAllLinks($xref, $gedcom_id) {
+	public static function fetchAllLinks($xref, $gedcom_id)
+	{
 		return
 			Database::prepare(
 				"SELECT l_from FROM `##link` WHERE l_file = ? AND l_to = ?" .
@@ -71,7 +73,8 @@ 
 	 *
 	 * @return Source[] array
 	 */
-	public static function getSourceList(Tree $tree) {
+	public static function getSourceList(Tree $tree)
+	{
 		$rows = Database::prepare(
 			"SELECT s_id AS xref, s_gedcom AS gedcom FROM `##sources` WHERE s_file = :tree_id"
 		)->execute(array(
@@ -95,7 +98,8 @@ 
 	 *
 	 * @return Repository[] array
 	 */
-	public static function getRepositoryList(Tree $tree) {
+	public static function getRepositoryList(Tree $tree)
+	{
 		$rows = Database::prepare(
 			"SELECT o_id AS xref, o_gedcom AS gedcom FROM `##other` WHERE o_type = 'REPO' AND o_file = ?"
 		)->execute(array(
@@ -119,7 +123,8 @@ 
 	 *
 	 * @return Note[] array
 	 */
-	public static function getNoteList(Tree $tree) {
+	public static function getNoteList(Tree $tree)
+	{
 		$rows = Database::prepare(
 			"SELECT o_id AS xref, o_gedcom AS gedcom FROM `##other` WHERE o_type = 'NOTE' AND o_file = :tree_id"
 		)->execute(array(
@@ -144,7 +149,8 @@ 
 	 *
 	 * @return Individual[]
 	 */
-	public static function searchIndividuals(array $query, array $trees) {
+	public static function searchIndividuals(array $query, array $trees)
+	{
 		// Convert the query into a regular expression
 		$queryregex = array();
 
@@ -197,7 +203,8 @@ 
 	 *
 	 * @return Individual[]
 	 */
-	public static function searchIndividualNames(array $query, array $trees) {
+	public static function searchIndividualNames(array $query, array $trees)
+	{
 		$sql  = "SELECT DISTINCT i_id AS xref, i_file AS gedcom_id, i_gedcom AS gedcom, n_full FROM `##individuals` JOIN `##name` ON i_id=n_id AND i_file=n_file WHERE 1";
 		$args = array();
 
@@ -247,7 +254,8 @@ 
 	 *
 	 * @return Individual[]
 	 */
-	public static function searchIndividualsPhonetic($soundex, $lastname, $firstname, $place, array $trees) {
+	public static function searchIndividualsPhonetic($soundex, $lastname, $firstname, $place, array $trees)
+	{
 		switch ($soundex) {
 		case 'Russell':
 			$givn_sdx = Soundex::russell($firstname);
@@ -358,7 +366,8 @@ 
 	 *
 	 * @return Family[]
 	 */
-	public static function searchFamilies(array $query, array $trees) {
+	public static function searchFamilies(array $query, array $trees)
+	{
 		// Convert the query into a regular expression
 		$queryregex = array();
 
@@ -413,7 +422,8 @@ 
 	 *
 	 * @return Family[]
 	 */
-	public static function searchFamilyNames(array $query, array $trees) {
+	public static function searchFamilyNames(array $query, array $trees)
+	{
 		// No query => no results
 		if (!$query) {
 			return array();
@@ -471,7 +481,8 @@ 
 	 *
 	 * @return Source[]
 	 */
-	public static function searchSources($query, $trees) {
+	public static function searchSources($query, $trees)
+	{
 		// Convert the query into a regular expression
 		$queryregex = array();
 
@@ -526,7 +537,8 @@ 
 	 *
 	 * @return Note[]
 	 */
-	public static function searchNotes(array $query, array $trees) {
+	public static function searchNotes(array $query, array $trees)
+	{
 		// Convert the query into a regular expression
 		$queryregex = array();
 
@@ -581,7 +593,8 @@ 
 	 *
 	 * @return Repository[]
 	 */
-	public static function searchRepositories(array $query, array $trees) {
+	public static function searchRepositories(array $query, array $trees)
+	{
 		// Convert the query into a regular expression
 		$queryregex = array();
 
@@ -635,7 +648,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function findRin($rin) {
+	public static function findRin($rin)
+	{
 		global $WT_TREE;
 
 		$xref =
@@ -659,7 +673,8 @@ 
 	 *
 	 * @return int[]
 	 */
-	public static function getCommonSurnames($min, Tree $tree) {
+	public static function getCommonSurnames($min, Tree $tree)
+	{
 		return self::getTopSurnames($tree->getTreeId(), $min, 0);
 	}
 
@@ -672,7 +687,8 @@ 
 	 *
 	 * @return int[]
 	 */
-	public static function getTopSurnames($ged_id, $min, $max) {
+	public static function getTopSurnames($ged_id, $min, $max)
+	{
 		// Use n_surn, rather than n_surname, as it is used to generate URLs for
 		// the indi-list, etc.
 		$max = (int) $max;
@@ -713,7 +729,8 @@ 
 	 *
 	 * @return Fact[]
 	 */
-	public static function getAnniversaryEvents($jd, $facts, Tree $tree) {
+	public static function getAnniversaryEvents($jd, $facts, Tree $tree)
+	{
 		$found_facts = array();
 		foreach (array(
 			new GregorianDate($jd),
@@ -890,7 +907,8 @@ 
 	 *
 	 * @return Fact[]
 	 */
-	public static function getCalendarEvents($jd1, $jd2, $facts, Tree $tree) {
+	public static function getCalendarEvents($jd1, $jd2, $facts, Tree $tree)
+	{
 		// If no facts specified, get all except these
 		$skipfacts = "CHAN,BAPL,SLGC,SLGS,ENDL,CENS,RESI,NOTE,ADDR,OBJE,SOUR,PAGE,DATA,TEXT";
 
@@ -944,7 +962,8 @@ 
 	 *
 	 * @return Fact[]
 	 */
-	public static function getEventsList($jd1, $jd2, $events, Tree $tree) {
+	public static function getEventsList($jd1, $jd2, $events, Tree $tree)
+	{
 		$found_facts = array();
 		for ($jd = $jd1; $jd <= $jd2; ++$jd) {
 			$found_facts = array_merge($found_facts, self::getAnniversaryEvents($jd, $events, $tree));
@@ -961,7 +980,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function isMediaUsedInOtherTree($file_name, $ged_id) {
+	public static function isMediaUsedInOtherTree($file_name, $ged_id)
+	{
 		return
 			(bool) Database::prepare("SELECT COUNT(*) FROM `##media` WHERE m_filename LIKE ? AND m_file<>?")
 				->execute(array("%{$file_name}", $ged_id))
@@ -975,7 +995,8 @@ 
 	 *
 	 * @return string[][]
 	 */
-	public static function getUserBlocks($user_id) {
+	public static function getUserBlocks($user_id)
+	{
 		global $WT_TREE;
 
 		$blocks = array('main' => array(), 'side' => array());
@@ -1004,7 +1025,8 @@ 
 	 *
 	 * @return string[][]
 	 */
-	public static function getTreeBlocks($gedcom_id) {
+	public static function getTreeBlocks($gedcom_id)
+	{
 		if ($gedcom_id < 0) {
 			$access_level = Auth::PRIV_NONE;
 		} else {
@@ -1041,7 +1063,8 @@ 
 	 *
 	 * @return int
 	 */
-	public static function updateFavorites($xref_from, $xref_to, Tree $tree) {
+	public static function updateFavorites($xref_from, $xref_to, Tree $tree)
+	{
 		return
 			Database::prepare("UPDATE `##favorite` SET xref=? WHERE xref=? AND gedcom_id=?")
 				->execute(array($xref_to, $xref_from, $tree->getTreeId()))

app/Functions/FunctionsExport.php

Braces +10 added lines, -5 removed lines

@@ -30,7 +30,8 @@ 
 /**
  * Class FunctionsExport - common functions
  */
-class FunctionsExport {
+class FunctionsExport
+{
 	/**
 	 * Tidy up a gedcom record on export, for compatibility/portability.
 	 *
@@ -38,7 +39,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function reformatRecord($rec) {
+	public static function reformatRecord($rec)
+	{
 		global $WT_TREE;
 
 		$newrec = '';
@@ -93,7 +95,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function gedcomHeader(Tree $tree) {
+	public static function gedcomHeader(Tree $tree)
+	{
 		// Default values for a new header
 		$HEAD = "0 HEAD";
 		$SOUR = "\n1 SOUR " . WT_WEBTREES . "\n2 NAME " . WT_WEBTREES . "\n2 VERS " . WT_VERSION;
@@ -148,7 +151,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function convertMediaPath($rec, $path) {
+	public static function convertMediaPath($rec, $path)
+	{
 		if ($path && preg_match('/\n1 FILE (.+)/', $rec, $match)) {
 			$old_file_name = $match[1];
 			// Don’t modify external links
@@ -181,7 +185,8 @@ 
 	 *                                'path':         what constant should prefix all media file paths? (eg: media/  or c:\my pictures\my family
 	 *                                'slashes':      what folder separators apply to media file paths? (forward, backward)
 	 */
-	public static function exportGedcom(Tree $tree, $gedout, $exportOptions) {
+	public static function exportGedcom(Tree $tree, $gedout, $exportOptions)
+	{
 		switch ($exportOptions['privatize']) {
 		case 'gedadmin':
 			$access_level = Auth::PRIV_NONE;