fisharebest / webtrees

admin_users.php

Braces +5 added lines, -2 removed lines

@@ -770,8 +770,11 @@
 		<p>
 		<?php if ($ucnt): ?>
 			<input type="submit" value="<?php echo I18N::translate('delete'); ?>">
-			<?php else: ?>
-			<?php echo I18N::translate('Nothing found to cleanup'); ?>
+			<?php else {
+    : ?>
+			<?php echo I18N::translate('Nothing found to cleanup');
+}
+?>
 			<?php endif; ?>
 		</p>
 	</form>

mediafirewall.php

Braces +12 added lines, -6 removed lines

@@ -34,7 +34,8 @@ 
 /**
  * Send a “Not found” error as an image
  */
-function send404AsImage() {
+function send404AsImage()
+{
 	$error = I18N::translate('The media file was not found in this family tree.');
 
 	$width  = mb_strlen($error) * 6.5 + 50;
@@ -61,7 +62,8 @@ 
  *
  * @return resource
  */
-function applyWatermark($im, Tree $tree) {
+function applyWatermark($im, Tree $tree)
+{
 	// text to watermark with
 	$word1_text = $tree->getTitle();
 	// maximum font size for “word1” ; will be automaticaly reduced to fit in the image
@@ -100,7 +102,8 @@ 
  * @param string   $vpos
  * @param string   $hpos
  */
-function embedText($im, $text, $maxsize, $color, $font, $vpos, $hpos) {
+function embedText($im, $text, $maxsize, $color, $font, $vpos, $hpos)
+{
 	global $useTTF;
 
 	// there are two ways to embed text with PHP
@@ -203,7 +206,8 @@ 
  *
  * @return int
  */
-function textlength($t, $mxl, $text) {
+function textlength($t, $mxl, $text)
+{
 	$taille_c = $t;
 	$len      = mb_strlen($text);
 	while (($taille_c - 2) * $len > $mxl) {
@@ -225,7 +229,8 @@ 
  *
  * @return bool
  */
-function imagettftextErrorHandler($errno, $errstr) {
+function imagettftextErrorHandler($errno, $errstr)
+{
 	global $useTTF, $serverFilename;
 	// log the error
 	Log::addErrorLog('Media Firewall error: >' . $errno . '/' . $errstr . '< while processing file >' . $serverFilename . '<');
@@ -243,7 +248,8 @@ 
  *
  * @return string|false
  */
-function isImageTypeSupported($reqtype) {
+function isImageTypeSupported($reqtype)
+{
 	$supportByGD = array('jpg' => 'jpeg', 'jpeg' => 'jpeg', 'gif' => 'gif', 'png' => 'png');
 	$reqtype     = strtolower($reqtype);
 

edit_interface.php

Braces +6 added lines, -3 removed lines

@@ -2236,7 +2236,8 @@ 
  *
  * @return string
  */
-function keep_chan(GedcomRecord $record = null) {
+function keep_chan(GedcomRecord $record = null)
+{
 	global $WT_TREE;
 
 	if (Auth::isAdmin()) {
@@ -2271,7 +2272,8 @@ 
  * @param string     $famtag
  * @param string     $gender
  */
-function print_indi_form($nextaction, Individual $person = null, Family $family = null, Fact $name_fact = null, $famtag = 'CHIL', $gender = 'U') {
+function print_indi_form($nextaction, Individual $person = null, Family $family = null, Fact $name_fact = null, $famtag = 'CHIL', $gender = 'U')
+{
 	global $WT_TREE, $bdm, $controller;
 
 	if ($person) {
@@ -2737,7 +2739,8 @@ 
  *
  * @param GedcomRecord $object
  */
-function check_record_access(GedcomRecord $object = null) {
+function check_record_access(GedcomRecord $object = null)
+{
 	global $controller;
 
 	if (!$object || !$object->canShow() || !$object->canEdit()) {

relationship.php

Braces +10 added lines, -4 removed lines

@@ -103,7 +103,8 @@ 
 					<?php if ($ancestors_only === '1'): ?>
 						<input type="hidden" name="ancestors" value="1">
 						<?php echo I18N::translate('Find relationships via ancestors') ?>
-					<?php else: ?>
+					<?php else {
+    : ?>
 						<label>
 							<input type="radio" name="ancestors" value="0" <?php echo $ancestors == 0 ? 'checked' : '' ?>>
 							<?php echo I18N::translate('Find any relationship') ?>
@@ -113,14 +114,17 @@ 
 							<input type="radio" name="ancestors" value="1" <?php echo $ancestors == 1 ? 'checked' : '' ?>>
 							<?php echo I18N::translate('Find relationships via ancestors') ?>
 						</label>
-					<?php endif; ?>
+					<?php endif;
+}
+?>
 
 					<hr>
 
 					<?php if ($max_recursion == 0): ?>
 						<?php echo I18N::translate('Find the closest relationships') ?>
 						<input type="hidden" name="recursion" value="0">
-					<?php else: ?>
+					<?php else {
+    : ?>
 						<label>
 							<input type="radio" name="recursion" value="0" <?php echo $recursion == 0 ? 'checked' : '' ?>>
 							<?php echo I18N::translate('Find the closest relationships') ?>
@@ -132,7 +136,9 @@ 
 								<?php echo I18N::translate('Find all possible relationships') ?>
 							<?php else: ?>
 								<?php echo I18N::translate('Find other relationships') ?>
-							<?php endif; ?>
+							<?php endif;
+}
+?>
 						</label>
 					<?php endif; ?>
 				</td>

autocomplete.php

Braces +12 added lines, -6 removed lines

@@ -506,7 +506,8 @@ 
  *
  * @return \stdClass[]
  */
-function get_FAM_rows(Tree $tree, $term) {
+function get_FAM_rows(Tree $tree, $term)
+{
 	return Database::prepare(
 		"SELECT DISTINCT 'FAM' AS type, f_id AS xref, f_gedcom AS gedcom, husb_name.n_sort, wife_name.n_sort" .
 		" FROM `##families`" .
@@ -530,7 +531,8 @@ 
  *
  * @return \stdClass[]
  */
-function get_INDI_rows(Tree $tree, $term) {
+function get_INDI_rows(Tree $tree, $term)
+{
 	return Database::prepare(
 		"SELECT 'INDI' AS type, i_id AS xref, i_gedcom AS gedcom, n_full" .
 		" FROM `##individuals`" .
@@ -551,7 +553,8 @@ 
  *
  * @return \stdClass[]
  */
-function get_NOTE_rows(Tree $tree, $term) {
+function get_NOTE_rows(Tree $tree, $term)
+{
 	return Database::prepare(
 		"SELECT o_id AS xref, o_gedcom AS gedcom" .
 		" FROM `##other`" .
@@ -573,7 +576,8 @@ 
  *
  * @return \stdClass[]
  */
-function get_OBJE_rows(Tree $tree, $term) {
+function get_OBJE_rows(Tree $tree, $term)
+{
 	return Database::prepare(
 		"SELECT 'OBJE' AS type, m_id AS xref, m_gedcom AS gedcom" .
 		" FROM `##media`" .
@@ -595,7 +599,8 @@ 
  *
  * @return \stdClass[]
  */
-function get_REPO_rows(Tree $tree, $term) {
+function get_REPO_rows(Tree $tree, $term)
+{
 	return Database::prepare(
 		"SELECT o_id AS xref, o_gedcom AS gedcom" .
 		" FROM `##other`" .
@@ -617,7 +622,8 @@ 
  *
  * @return \stdClass[]
  */
-function get_SOUR_rows(Tree $tree, $term) {
+function get_SOUR_rows(Tree $tree, $term)
+{
 	return Database::prepare(
 		"SELECT s_id AS xref, s_gedcom AS gedcom" .
 		" FROM `##sources`" .

admin_trees_duplicates.php

Braces +5 added lines, -2 removed lines

@@ -177,8 +177,11 @@
 	</li>
 <?php endforeach; ?>
 </ul>
-<?php else: ?>
-<p><?php echo I18N::translate('No duplicates have been found.'); ?></p>
+<?php else {
+    : ?>
+<p><?php echo I18N::translate('No duplicates have been found.');
+}
+?></p>
 <?php endif; ?>
 
 <?php endforeach; ?>

edituser.php

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/Family.php

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);

app/Census/CensusColumnBornForeignParts.php

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * Was the individual born in "foreign parts".
  */
-class CensusColumnBornForeignParts extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnBornForeignParts extends AbstractCensusColumn implements CensusColumnInterface
+{
 	/**
 	 * Generate the likely value of this census column, based on available information.
 	 *
@@ -29,7 +30,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function generate(Individual $individual, Individual $head = null) {
+	public function generate(Individual $individual, Individual $head = null)
+	{
 		$birth_place  = explode(', ', $individual->getBirthPlace());
 		$birth_place  = end($birth_place);
 		$census_place = $this->place();