fisharebest / webtrees

resources/views/individual-page.php

Spacing +2 added lines, -2 removed lines

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

resources/views/family-page.php

Spacing +2 added lines, -2 removed lines

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

resources/views/repository-page.php

Spacing +2 added lines, -2 removed lines

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

app/Http/Controllers/StatisticsChartController.php

Spacing +1 added lines, -1 removed lines

@@ -1147,7 +1147,7 @@
 				}
 			}
 		}
-		$colors      = [
+		$colors = [
 			'0000FF',
 			'FFA0CB',
 			'9F00FF',

app/Http/Controllers/AdminController.php

Spacing +12 added lines, -12 removed lines

@@ -745,7 +745,7 @@ 
 	 * @return Response
 	 */
 	public function changesLogData(Request $request): Response {
-		list($select, , $where, $args1) = $this->changesQuery($request);
+		list($select,, $where, $args1) = $this->changesQuery($request);
 		list($order_by, $limit, $args2) = $this->dataTablesPagination($request);
 
 		$rows = Database::prepare(
@@ -819,7 +819,7 @@ 
 	 * @return Response
 	 */
 	public function changesLogDownload(Request $request): Response {
-		list($select, , $where, $args) = $this->changesQuery($request);
+		list($select,, $where, $args) = $this->changesQuery($request);
 
 		$rows = Database::prepare($select . $where)->execute($args)->fetchAll();
 
@@ -970,7 +970,7 @@ 
 		$args  = [];
 
 		if ($search !== '') {
-			$where           .= " AND (multimedia_file_refn LIKE CONCAT('%', :search1, '%') OR multimedia_file_refn LIKE CONCAT('%', :search2, '%'))";
+			$where .= " AND (multimedia_file_refn LIKE CONCAT('%', :search1, '%') OR multimedia_file_refn LIKE CONCAT('%', :search2, '%'))";
 			$args['search1'] = $search;
 			$args['search2'] = $search;
 		}
@@ -1151,7 +1151,7 @@ 
 		$data = array_map(function (string $thumbnail) {
 			$original = $this->findOriginalFileFromThumbnail($thumbnail);
 
-			$original_url  = route('unused-media-thumbnail', [
+			$original_url = route('unused-media-thumbnail', [
 				'folder' => dirname($original),
 				'file'   => basename($original),
 				'w'      => 100,
@@ -1691,36 +1691,36 @@ 
 		$where = ' WHERE 1';
 		$args  = [];
 		if ($search !== '') {
-			$where            .= " AND (old_gedcom LIKE CONCAT('%', :search_1, '%') OR new_gedcom LIKE CONCAT('%', :search_2, '%'))";
+			$where .= " AND (old_gedcom LIKE CONCAT('%', :search_1, '%') OR new_gedcom LIKE CONCAT('%', :search_2, '%'))";
 			$args['search_1'] = $search;
 			$args['search_2'] = $search;
 		}
 		if ($from !== '') {
-			$where        .= " AND change_time >= :from";
+			$where .= " AND change_time >= :from";
 			$args['from'] = $from;
 		}
 		if ($to !== '') {
-			$where      .= ' AND change_time < TIMESTAMPADD(DAY, 1 , :to)'; // before end of the day
+			$where .= ' AND change_time < TIMESTAMPADD(DAY, 1 , :to)'; // before end of the day
 			$args['to'] = $to;
 		}
 		if ($type !== '') {
-			$where          .= ' AND status = :status';
+			$where .= ' AND status = :status';
 			$args['status'] = $type;
 		}
 		if ($oldged !== '') {
-			$where           .= " AND old_gedcom LIKE CONCAT('%', :old_ged, '%')";
+			$where .= " AND old_gedcom LIKE CONCAT('%', :old_ged, '%')";
 			$args['old_ged'] = $oldged;
 		}
 		if ($newged !== '') {
-			$where           .= " AND new_gedcom LIKE CONCAT('%', :new_ged, '%')";
+			$where .= " AND new_gedcom LIKE CONCAT('%', :new_ged, '%')";
 			$args['new_ged'] = $newged;
 		}
 		if ($xref !== '') {
-			$where        .= " AND xref = :xref";
+			$where .= " AND xref = :xref";
 			$args['xref'] = $xref;
 		}
 		if ($username !== '') {
-			$where        .= " AND user_name LIKE CONCAT('%', :user, '%')";
+			$where .= " AND user_name LIKE CONCAT('%', :user, '%')";
 			$args['user'] = $username;
 		}
 		if ($ged !== '') {

app/Http/Controllers/LifespansChartController.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 		if ($individual !== null) {
 			$xrefs[] = $addxref;
 			if ($addfam) {
-				$xrefs = array_merge($xrefs,  $this->closeFamily($individual));
+				$xrefs = array_merge($xrefs, $this->closeFamily($individual));
 			}
 		}
 

app/Http/Controllers/PedigreeChartController.php

Spacing +2 added lines, -2 removed lines

@@ -366,7 +366,7 @@ 
 			$html = sprintf('<div id="childarrow"><a href="#" class="menuselect %s"></a><div id="childbox-pedigree">', $this->arrows->menu);
 
 			foreach ($families as $family) {
-				$html   .= '<span class="name1">' . I18N::translate('Family') . '</span>';
+				$html .= '<span class="name1">' . I18N::translate('Family') . '</span>';
 				$spouse = $family->getSpouse($this->root);
 				if ($spouse) {
 					$html .= '<a class="name1" href="' . e(route('pedigree', [
@@ -426,7 +426,7 @@ 
 		$html = '';
 		if ($this->chartHasAncestors) {
 			if ($this->nodes[$index]['indi'] && $this->nodes[$index]['indi']->getChildFamilies()) {
-				$html         .= '<div class="ancestorarrow">';
+				$html .= '<div class="ancestorarrow">';
 				$rootParentId = 1;
 				if ($index > (int) ($this->treesize / 2) + (int) ($this->treesize / 4)) {
 					$rootParentId++;

app/Http/Controllers/AccountController.php

Spacing +1 added lines, -1 removed lines

@@ -130,7 +130,7 @@
 			->setPreference('TIMEZONE', $time_zone)
 			->setPreference('visibleonline', $visible_online);
 
-		$tree->setUserPreference($user,'rootid', $rootid);
+		$tree->setUserPreference($user, 'rootid', $rootid);
 
 		// Switch to the new theme now
 		Session::put('theme_id', $theme);

app/Http/Controllers/HourglassChartController.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
 		$maximum_generations = (int) $tree->getPreference('MAX_DESCENDANCY_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
 		$default_generations = (int) $tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
 
-		$generations  = (int) $request->get('generations', $default_generations);
+		$generations = (int) $request->get('generations', $default_generations);
 
 		$generations = min($generations, $maximum_generations);
 		$generations = max($generations, self::MINIMUM_GENERATIONS);
@@ -220,7 +220,7 @@ 
 				echo '<table cellspacing="0" cellpadding="0" border="0" style="position: relative; top: auto; float: ' . $tablealign . ';">';
 				for ($i = 0; $i < $ct; $i++) {
 					$individual2 = $children[$i];
-					$chil    = $individual2->getXref();
+					$chil = $individual2->getXref();
 					echo '<tr>';
 					echo '<td id="td_', e($chil), '" class="', I18N::direction(), '" style="text-align:', $otablealign, '">';
 					$this->printDescendency($individual2, $generation + 1, $generations, $show_spouse, false);