fisharebest / webtrees

app/Module/ClippingsCartModule.php

Spacing +9 added lines, -9 removed lines

@@ -231,7 +231,7 @@ 
 
 		// Create a source, to indicate the source of the data.
 		$filetext .= "0 @WEBTREES@ SOUR\n1 TITL " . WT_BASE_URL . "\n";
-		$author   = User::find($tree->getPreference('CONTACT_EMAIL'));
+		$author = User::find($tree->getPreference('CONTACT_EMAIL'));
 		if ($author !== null) {
 			$filetext .= '1 AUTH ' . $author->getRealName() . "\n";
 		}
@@ -608,7 +608,7 @@ 
 
 		$xref = $request->get('xref');
 
-		$media  = Media::getInstance($xref, $tree);
+		$media = Media::getInstance($xref, $tree);
 
 		if ($media === null) {
 			throw new NotFoundHttpException;
@@ -649,7 +649,7 @@ 
 		/** @var Tree $tree */
 		$tree = $request->attributes->get('tree');
 
-		$xref   = $request->get('xref');
+		$xref = $request->get('xref');
 
 		$media = Media::getInstance($xref, $tree);
 
@@ -673,7 +673,7 @@ 
 
 		$xref = $request->get('xref');
 
-		$note  = Note::getInstance($xref, $tree);
+		$note = Note::getInstance($xref, $tree);
 
 		if ($note === null) {
 			throw new NotFoundHttpException;
@@ -714,7 +714,7 @@ 
 		/** @var Tree $tree */
 		$tree = $request->attributes->get('tree');
 
-		$xref   = $request->get('xref');
+		$xref = $request->get('xref');
 
 		$note = Note::getInstance($xref, $tree);
 
@@ -738,7 +738,7 @@ 
 
 		$xref = $request->get('xref');
 
-		$repository  = Repository::getInstance($xref, $tree);
+		$repository = Repository::getInstance($xref, $tree);
 
 		if ($repository === null) {
 			throw new NotFoundHttpException;
@@ -779,7 +779,7 @@ 
 		/** @var Tree $tree */
 		$tree = $request->attributes->get('tree');
 
-		$xref   = $request->get('xref');
+		$xref = $request->get('xref');
 
 		$repository = Repository::getInstance($xref, $tree);
 
@@ -803,7 +803,7 @@ 
 
 		$xref = $request->get('xref');
 
-		$source  = Source::getInstance($xref, $tree);
+		$source = Source::getInstance($xref, $tree);
 
 		if ($source === null) {
 			throw new NotFoundHttpException;
@@ -889,7 +889,7 @@ 
 		$records = array_filter($records);
 
 		// Group and sort.
-		uasort($records, function(GedcomRecord $x, GedcomRecord $y) {
+		uasort($records, function (GedcomRecord $x, GedcomRecord $y) {
 			return $x::RECORD_TYPE <=> $y::RECORD_TYPE ?: GedcomRecord::compare($x, $y);
 		});
 

edit_interface.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 					echo view('cards/add-source-citation', [
 						'level'          => 2,
 						'full_citations' => $controller->tree()->getPreference('FULL_SOURCES'),
-					]);				}
+					]); }
 				if ($level1type !== 'OBJE') {
 					if ($controller->tree()->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($controller->tree())) {
 						echo view('cards/add-media-object', [

app/Http/Controllers/EditIndividualController.php

Spacing +1 added lines, -1 removed lines

@@ -223,7 +223,7 @@
 		/** @var Tree $tree */
 		$tree = $request->attributes->get('tree');
 
-		$xref   = $request->get('xref', '');
+		$xref = $request->get('xref', '');
 
 		$individual = Individual::getInstance($xref, $tree);
 

app/Http/Controllers/DescendantsChartController.php

Spacing +3 added lines, -3 removed lines

@@ -101,7 +101,7 @@ 
 
 		$this->checkModuleIsActive($tree, 'descendancy_chart');
 
-		$xref         = $request->get('xref');
+		$xref = $request->get('xref');
 		$individual = Individual::getInstance($xref, $tree);
 
 		$this->checkIndividualAccess($individual);
@@ -118,7 +118,7 @@ 
 
 		$descendants = $this->descendants($individual, $generations, []);
 
-		switch($chart_style) {
+		switch ($chart_style) {
 			case self::CHART_STYLE_LIST:
 			default:
 				return $this->descendantsList($individual, $generations);
@@ -315,7 +315,7 @@ 
 	 * @return Response
 	 */
 	private function descendantsFamilies(Tree $tree, array $descendants): Response {
-		$families  = [];
+		$families = [];
 		foreach ($descendants as $individual) {
 			foreach ($individual->getChildFamilies() as $family) {
 				$families[$family->getXref()] = $family;

resources/views/lists/notes-table.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 $count_media       = Database::prepare(
 	"SELECT l_to, COUNT(*) FROM `##media` JOIN `##link` ON l_from = m_id AND l_file = m_file AND l_type = 'NOTE' AND l_file = :tree_id GROUP BY l_to"
 )->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc();
-$count_sources       = Database::prepare(
+$count_sources = Database::prepare(
 	"SELECT l_to, COUNT(*) FROM `##sources` JOIN `##link` ON l_from = s_id AND l_file = s_file AND l_type = 'NOTE' AND l_file = :tree_id GROUP BY l_to"
 )->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc();
 ?>

resources/views/lists/chart-by-decade.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 }
 $chart_url .= '|1:||' . rawurlencode(I18N::percentage($vmax / $count)); // y axis
 $chart_url .= '|2:||';
-$step      = $vmax;
+$step = $vmax;
 for ($d = $vmax; $d > 0; $d--) {
 	if ($vmax < ($d * 10 + 1) && ($vmax % $d) == 0) {
 		$step = $d;

resources/views/source-page.php

Spacing +2 added lines, -2 removed lines

@@ -8,13 +8,13 @@
 
 <?php if ($source->isPendingDeletion()): ?>
 	<?php if (Auth::isModerator($source->getTree())): ?>
-		<?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate( 'This source has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
+		<?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This source has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
 	<?php elseif (Auth::isEditor($source->getTree())): ?>
 		<?= view('alerts/warning-dissmissible', ['alert' => I18N::translate('This source has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
 	<?php endif ?>
 <?php elseif ($source->isPendingAddition()): ?>
 	<?php if (Auth::isModerator($source->getTree())): ?>
-		<?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate( 'This source has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . $source->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>' ) . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
+		<?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This source has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . $source->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
 	<?php elseif (Auth::isEditor($source->getTree())): ?>
 		<?= view('alerts/warning-dissmissible', ['alert' => I18N::translate('This source has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
 	<?php endif ?>

app/Module/BatchUpdate/BatchUpdateMarriedNamesPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 	 */
 	public function updateRecord(GedcomRecord $record): string {
 		$old_gedcom = $record->getGedcom();
-		$tree   = $record->getTree();
+		$tree = $record->getTree();
 
 		$SURNAME_TRADITION = $tree->getPreference('SURNAME_TRADITION');