fisharebest / webtrees

app/Database.php

Spacing +2 added lines, -3 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,
 			[
@@ -161,7 +160,7 @@ 
 			}
 		}
 		$milliseconds = sprintf('%.3f', $microseconds * 1000);
-		self::$log[] = '<tr><td>' .$stack . '</td><td>' . $query . '</td><td>' . $rows . '</td><td>' . $milliseconds . '</td></tr>';
+		self::$log[] = '<tr><td>' . $stack . '</td><td>' . $query . '</td><td>' . $rows . '</td><td>' . $milliseconds . '</td></tr>';
 	}
 
 	/**

app/Functions/FunctionsCharts.php

Spacing +3 added lines, -3 removed lines

@@ -297,9 +297,9 @@
 
 		if ($sosa == 0 && Auth::isEditor($family->getTree())) {
 			echo '<br>';
-			echo '<a href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() .'&amp;xref=' . $family->getXref() . '&amp;gender=U">' . I18N::translate('Add a child to this family') . '</a>';
-			echo ' <a class="icon-sex_m_15x15" href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() .'&amp;xref=' . $family->getXref() . '&amp;gender=M" title="', I18N::translate('son'), '"></a>';
-			echo ' <a class="icon-sex_f_15x15" href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() .'&amp;xref=' . $family->getXref() . '&amp;gender=F" title="', I18N::translate('daughter'), '"></a>';
+			echo '<a href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() . '&amp;xref=' . $family->getXref() . '&amp;gender=U">' . I18N::translate('Add a child to this family') . '</a>';
+			echo ' <a class="icon-sex_m_15x15" href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() . '&amp;xref=' . $family->getXref() . '&amp;gender=M" title="', I18N::translate('son'), '"></a>';
+			echo ' <a class="icon-sex_f_15x15" href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() . '&amp;xref=' . $family->getXref() . '&amp;gender=F" title="', I18N::translate('daughter'), '"></a>';
 			echo '<br><br>';
 		}
 		echo '</td>';

app/Controller/FamilyController.php

Spacing +2 added lines, -2 removed lines

@@ -77,11 +77,11 @@
 			$menu->addSubmenu(new Menu(I18N::translate('Change family members'), 'edit_interface.php?action=changefamily&ged=' . $this->record->getTree()->getNameHtml() . '&xref=' . $this->record->getXref(), 'menu-fam-change'));
 
 			// edit_fam / add child
-			$menu->addSubmenu(new Menu(I18N::translate('Add a child to this family'), 'edit_interface.php?action=add_child_to_family&ged=' . $this->record->getTree()->getNameHtml() .'&xref=' . $this->record->getXref() . '&gender=U', 'menu-fam-addchil'));
+			$menu->addSubmenu(new Menu(I18N::translate('Add a child to this family'), 'edit_interface.php?action=add_child_to_family&ged=' . $this->record->getTree()->getNameHtml() . '&xref=' . $this->record->getXref() . '&gender=U', 'menu-fam-addchil'));
 
 			// edit_fam / reorder_children
 			if ($this->record->getNumberOfChildren() > 1) {
-				$menu->addSubmenu(new Menu(I18N::translate('Re-order children'), 'edit_interface.php?action=reorder_children&ged=' . $this->record->getTree()->getNameHtml() .'&xref=' . $this->record->getXref(), 'menu-fam-orderchil'));
+				$menu->addSubmenu(new Menu(I18N::translate('Re-order children'), 'edit_interface.php?action=reorder_children&ged=' . $this->record->getTree()->getNameHtml() . '&xref=' . $this->record->getXref(), 'menu-fam-orderchil'));
 			}
 
 			// delete

app/Functions/FunctionsPrintLists.php

Spacing +3 added lines, -3 removed lines

@@ -1080,7 +1080,7 @@ 
 			"SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##sources` JOIN `##link` ON l_from = s_id AND l_file = s_file AND l_type = 'NOTE' GROUP BY l_to, l_file"
 		)->fetchAssoc();
 
-		$html     = '';
+		$html = '';
 		$html .= '<table ' . Datatables::noteTableAttributes() . '><thead><tr>';
 		$html .= '<th>' . I18N::translate('Title') . '</th>';
 		$html .= '<th>' . I18N::translate('Individuals') . '</th>';
@@ -1146,7 +1146,7 @@ 
 		)->fetchAssoc();
 
 		$html = '';
-		$html .= '<table ' . Datatables::repositoryTableAttributes() . '><thead><tr>';		$html .= '<th>' . I18N::translate('Repository name') . '</th>';
+		$html .= '<table ' . Datatables::repositoryTableAttributes() . '><thead><tr>'; $html .= '<th>' . I18N::translate('Repository name') . '</th>';
 		$html .= '<th>' . I18N::translate('Sources') . '</th>';
 		$html .= '<th>' . I18N::translate('Last change') . '</th>';
 		$html .= '<th>' . I18N::translate('Delete') . '</th>';
@@ -1573,7 +1573,7 @@ 
 					if ($endjd === $startjd) {
 						$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) {

placelist.php

Braces +3 added lines, -1 removed lines

@@ -200,7 +200,8 @@ 
 			<div class="tab-pane fade show active" role="tabpanel" id="individuals">
 				<?php if (empty($myindilist)): ?>
 					<p><?= I18N::translate('No results found.') ?></p>
-				<?php else: ?>
+				<?php else {
+	: ?>
 					<?= FunctionsPrintLists::individualTable($myindilist) ?>
 				<?php endif ?>
 			</div>
@@ -216,6 +217,7 @@ 
 		<?php
 	}
 	echo '<h4><a href="placelist.php?display=list">', I18N::translate('Show all places in a list'), '</a></h4>';
+}
 
 	if ($gm_module && $gm_module->getPreference('GM_PLACE_HIERARCHY')) {
 		$gm_module->mapScripts($numfound, $level, $parent, $linklevels, $place_names);

app/Controller/IndividualController.php

Doc Comments -2 removed lines

@@ -118,7 +118,6 @@ 
 	/**
 	 * Format a name record
 	 *
-	 * @param int  $primary
 	 * @param Fact $fact
 	 *
 	 * @return string
@@ -216,7 +215,6 @@ 
 	/**
 	 * print information for a sex record
 	 *
-	 * @param Fact $event the Event object
 	 *
 	 * @return string
 	 */

Spacing +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
 	public function getTabs() {
 		$active_tabs = Module::getActiveTabs($this->record->getTree());
 
-		return array_filter($active_tabs, function(ModuleTabInterface $tab) { return $tab->hasTabContent(); });
+		return array_filter($active_tabs, function (ModuleTabInterface $tab) { return $tab->hasTabContent(); });
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 
 		if ($n === 0) {
 			$content_class = 'collapse show';
-			$aria  = 'true';
+			$aria = 'true';
 		}
 		if ($fact->isPendingDeletion()) {
 			$container_class .= ' old';
@@ -243,7 +243,7 @@ 
 		}
 
 		if ($individual->canEdit() && !$fact->isPendingDeletion()) {
-			$edit_links = FontAwesome::linkIcon('edit', I18N::translate('Edit the gender'), ['class' => 'btn btn-link', 'href' => 'edit_interface.php?action=edit&xref=' . $individual->getXref() . '&fact_id=' . $fact->getFactId() . '&ged=' . $individual->getTree()->getNameHtml() ]);
+			$edit_links = FontAwesome::linkIcon('edit', I18N::translate('Edit the gender'), ['class' => 'btn btn-link', 'href' => 'edit_interface.php?action=edit&xref=' . $individual->getXref() . '&fact_id=' . $fact->getFactId() . '&ged=' . $individual->getTree()->getNameHtml()]);
 
 		} else {
 			$edit_links = '';
@@ -253,7 +253,7 @@ 
 		<div class="' . $container_class . '">
 			<div class="card-header" role="tab" id="name-header-add">
 				<div class="card-title mb-0">
-					<b>' . I18N::translate('Gender') . '</b> ' .  $sex . $edit_links . '
+					<b>' . I18N::translate('Gender') . '</b> ' . $sex . $edit_links . '
 				</div>
 			</div>
 		</div>';

relationship.php

Braces +3 added lines, -1 removed lines

@@ -82,7 +82,8 @@ 
 				<?php if ($ancestors_only === '1'): ?>
 					<input type="hidden" name="ancestors" value="1">
 					<?= I18N::translate('Find relationships via ancestors') ?>
-				<?php else: ?>
+				<?php else {
+	: ?>
 					<?= Bootstrap4::radioButtons('ancestors', ['0' => I18N::translate('Find any relationship'), '1' => I18N::translate('Find relationships via ancestors')], $ancestors, false) ?>
 			<?php endif ?>
 			</div>
@@ -115,6 +116,7 @@ 
 if ($person1 && $person2) {
 	if (I18N::direction() === 'ltr') {
 		$diagonal1        = Theme::theme()->parameter('image-dline');
+}
 		$diagonal2        = Theme::theme()->parameter('image-dline2');
 	} else {
 		$diagonal1        = Theme::theme()->parameter('image-dline2');

editnews.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 
 switch ($action) {
 case 'delete':
-	Database::prepare("DELETE FROM `##news` WHERE news_id = :news_id")->execute(['news_id'   => $news_id,]);
+	Database::prepare("DELETE FROM `##news` WHERE news_id = :news_id")->execute(['news_id'   => $news_id, ]);
 
 	header('Location: ' . WT_BASE_URL . 'index.php?ctype=' . $ctype . '&ged=' . $controller->tree()->getNameUrl());
 

action.php

Spacing +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
 
 	// Create a media object, and return parameters needed by Select2
 	header('Content-type: application/json');
-	$filename   = 'eek.jpg';
+	$filename = 'eek.jpg';
 	$auto   = Filter::post('auto');
 	$folder = Filter::post('folder');
 	$note   = Filter::post('note');
@@ -145,7 +145,7 @@ 
 	}
 
 
-	$gedcom = "0 @new@ OBJE\n1 FILE " . $folder . $file . "\n2 FORM " .  $format;
+	$gedcom = "0 @new@ OBJE\n1 FILE " . $folder . $file . "\n2 FORM " . $format;
 	if ($type !== '') {
 		$gedcom .= "\n3 TYPE " . $type;
 	}