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 ?>

resources/views/places-page.php

Indentation +4 added lines, -4 removed lines

@@ -21,13 +21,13 @@
         <div class="center">
             <?php if ($showeventslink): ?>
                     <a class="formField" href= <?= e(route('place-hierarchy',
-                            ['ged' => $tree->getName(), 'parent' => $parent, 'action' => 'hierarchy-e']
-                        )
-                    ) ?>><?= I18N::translate('View table of events occurring in %s', $place) ?></a>
+														['ged' => $tree->getName(), 'parent' => $parent, 'action' => 'hierarchy-e']
+												)
+										) ?>><?= I18N::translate('View table of events occurring in %s', $place) ?></a>
                 |
             <?php endif ?>
             <a href="<?= e(route('place-hierarchy', ['ged' => $tree->getName(), 'action' => key($nextaction)]))
-                ?>"><?= current($nextaction) ?></a>
+								?>"><?= current($nextaction) ?></a>
         </div>
 	</div>
 </div>

resources/views/modules/openstreetmap/map.php

Spacing +2 added lines, -2 removed lines

@@ -10,14 +10,14 @@
 
 	<?php if (Auth::isAdmin()): ?>
 		<p class="center">
-			<a href="<?= e(route('admin-module',[
+			<a href="<?= e(route('admin-module', [
 				'module' => $module,
 				'action' => 'AdminConfig',
 			])) ?>">
 				<?= I18N::translate('Map module preferences') ?>
 			</a>
 			|
-			<a href="<?= e(route('admin-module',[
+			<a href="<?= e(route('admin-module', [
 				'module' => $module,
 				'action' => 'AdminPlaces',
 			])) ?>">

resources/views/modules/openstreetmap/admin-import-form.php

Indentation +4 added lines, -4 removed lines

@@ -6,10 +6,10 @@
 
 <h3><?= $title ?></h3>
 <form id="upload_form" method="post" enctype="multipart/form-data" action="<?=
-    e(route('admin-module',[
-        'module' => $module,
-        'action' => 'AdminImport',
-    ])) ?>">
+		e(route('admin-module',[
+				'module' => $module,
+				'action' => 'AdminImport',
+		])) ?>">
 	<?= csrf_field() ?>
 	<input type="hidden" name="parent_id" value="<?= $parent_id ?>">
 	<input type="hidden" name="inactive" value="<?= $inactive ?>">

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
 
 <h3><?= $title ?></h3>
 <form id="upload_form" method="post" enctype="multipart/form-data" action="<?=
-    e(route('admin-module',[
+    e(route('admin-module', [
         'module' => $module,
         'action' => 'AdminImport',
     ])) ?>">
@@ -29,7 +29,7 @@ 
 				</div>
 				<select id="serverfile" name="serverfile" class="form-control">
                     <option class='custom-select' selected disabled value=''><?= I18N::translate('choose a file&hellip;') ?></option>
-                    <?php foreach($files as $file): ?>
+                    <?php foreach ($files as $file): ?>
                         <option value="<?= e($file) ?>"><?= $file ?></option>
                     <?php endforeach ?>
 				</select>

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