fisharebest / webtrees

resources/views/media-page.php

Spacing +2 added lines, -2 removed lines

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

@@ -7,13 +7,13 @@
 
 <?php if ($record->isPendingDeletion()): ?>
 	<?php if (Auth::isModerator($record->getTree())): ?>
-		<?= view('components/alert-warning-dismissible', ['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('components/alert-warning-dismissible', ['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('components/alert-warning-dismissible', ['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('components/alert-warning-dismissible', ['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('components/alert-warning-dismissible', ['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('components/alert-warning-dismissible', ['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/admin/trees-renumber.php

Indentation +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 		<button type="submit" class="btn btn-primary">
 			<?= view('icons/save') ?>
 			<?= /* I18N: A button label. */
-			I18N::translate('continue') ?>
+            I18N::translate('continue') ?>
 		</button>
 
 		<?= I18N::translate('Caution! This may take a long time. Be patient.') ?>

resources/views/modules/pedigree-map/pedigree-map-page.php

Indentation +8 added lines, -8 removed lines

@@ -25,12 +25,12 @@ 
 		</label>
 		<div class="col-sm-9 wt-page-options-value">
 			<?=
-			Bootstrap4::select(
-				FunctionsEdit::numericOptions(range(2, $maxgenerations)),
-				$generations,
-				['id' => 'generations', 'name' => 'generations']
-			)
-			?>
+            Bootstrap4::select(
+                FunctionsEdit::numericOptions(range(2, $maxgenerations)),
+                $generations,
+                ['id' => 'generations', 'name' => 'generations']
+            )
+            ?>
 		</div>
 	</div>
 
@@ -38,8 +38,8 @@ 
 		<div class="col-sm-3 wt-page-options-label"></div>
 		<div class="col-sm-9 wt-page-options-value">
 			<input class="btn btn-primary" type="submit" value="<?= /* I18N: A button label. */
-			I18N::translate('view')
-			?>">
+            I18N::translate('view')
+            ?>">
 		</div>
 	</div>
 </form>

app/Http/Controllers/PlaceHierarchyController.php

Spacing +3 added lines, -3 removed lines

@@ -60,7 +60,7 @@ 
         $note       = false;
 
         if ($showmap) {
-            $note    = true;
+            $note = true;
             $content .= view('place-map', [
                 'module' => self::MAP_MODULE,
                 'ref'    => $fqpn,
@@ -72,13 +72,13 @@ 
         switch ($action) {
             case 'list':
                 $nextaction = ['hierarchy' => I18N::translate('Show place hierarchy')];
-                $content    .= view('place-list', $this->getList($tree));
+                $content .= view('place-list', $this->getList($tree));
                 break;
             case 'hierarchy':
             case 'hierarchy-e':
                 $nextaction = ['list' => I18N::translate('Show all places in a list')];
                 $data       = $this->getHierarchy($tree, $place, $parent);
-                $content    .= (null === $data || $showmap) ? '' : view('place-hierarchy', $data);
+                $content .= (null === $data || $showmap) ? '' : view('place-hierarchy', $data);
                 if (null === $data || $action === 'hierarchy-e') {
                     $content .= view('place-events', $this->getEvents($tree, $place));
                 }

app/Http/Middleware/PageHitCounter.php

Spacing +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
      */
     public function getCount(Tree $tree, $page, $parameter): int
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT page_count FROM `##hit_counter` WHERE gedcom_id = :tree_id AND page_name = :page AND page_parameter = :parameter"
         )->execute([
             'tree_id'   => $tree->getTreeId(),

resources/views/modules/pedigree-map/event-sidebar.php

Spacing +2 added lines, -2 removed lines

@@ -9,14 +9,14 @@
     </a>
 <?php endif ?>
 
-<?php if($value): ?>
+<?php if ($value): ?>
     <span>
         <?= $value ?>
     </span>
 <?php endif ?>
 
 <div>
-    <?php if($addtag): ?>
+    <?php if ($addtag): ?>
         <?= GedcomTag::getLabel('BIRT') ?>:
     <?php endif ?>
     <?= $date ?>

resources/views/modules/places/event-sidebar.php

Spacing +2 added lines, -2 removed lines

@@ -9,14 +9,14 @@
     </a>
 <?php endif ?>
 
-<?php if($value): ?>
+<?php if ($value): ?>
     <span>
         <?= $value ?>
     </span>
 <?php endif ?>
 
 <div>
-    <?php if($addtag): ?>
+    <?php if ($addtag): ?>
         <?= GedcomTag::getLabel('BIRT') ?>:
     <?php endif ?>
     <?= $date ?>

app/Http/Controllers/AdminLocationController.php

Braces +4 added lines, -2 removed lines

@@ -342,9 +342,11 @@
             'fqpn',
         ];
 
-        if ($serverfile !== '') {  // first choice is file on server
+        if ($serverfile !== '') {
+// first choice is file on server
             $filename = WT_DATA_DIR . 'places/' . $serverfile;
-        } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { // 2nd choice is local file
+        } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) {
+// 2nd choice is local file
             $filename = $_FILES['localfile']['tmp_name'];
         }
 

Spacing +7 added lines, -7 removed lines

@@ -106,7 +106,7 @@ 
             $breadcrumbs[] = I18N::translate('Add');
         } else {
             $breadcrumbs[] = I18N::translate('Edit');
-            $title         .= ' — ' . I18N::translate('Edit');
+            $title .= ' — ' . I18N::translate('Edit');
         }
 
         return $this->viewResponse('admin/location-edit', [
@@ -240,7 +240,7 @@ 
      */
     public function exportLocations(Request $request): Response
     {
-        $parent_id = (int)$request->get('parent_id');
+        $parent_id = (int) $request->get('parent_id');
         $format    = $request->get('format');
         $maxlevel  = (int) Database::prepare("SELECT max(pl_level) FROM `##placelocation`")->execute()->fetchOne();
         $startfqpn = [];
@@ -298,7 +298,7 @@ 
      */
     public function importLocations(Request $request): Response
     {
-        $parent_id   = (int) $request->get('parent_id');
+        $parent_id = (int) $request->get('parent_id');
 
         $files = array_merge(
             glob(WT_DATA_DIR . 'places/*.csv'),
@@ -351,7 +351,7 @@ 
         }
 
         if (is_file($filename)) {
-            $string   = file_get_contents($filename);
+            $string = file_get_contents($filename);
 
             // Check the filetype
             if (stripos($string, 'FeatureCollection') !== false) {
@@ -401,10 +401,10 @@ 
             usort(
                 $places,
                 function (array $a, array $b) {
-                    if ((int)$a['pl_level'] === (int)$b['pl_level']) {
+                    if ((int) $a['pl_level'] === (int) $b['pl_level']) {
                         return I18N::strcasecmp($a['fqpn'], $b['fqpn']);
                     } else {
-                        return (int)$a['pl_level'] - (int)$b['pl_level'];
+                        return (int) $a['pl_level'] - (int) $b['pl_level'];
                     }
                 }
             );
@@ -521,7 +521,7 @@ 
                 "INSERT INTO `##placelocation` (pl_id, pl_parent_id, pl_level, pl_place)" .
                 " VALUES (:id, :parent, :level, :place)"
             );
-            $checkRecordQry  = Database::prepare(
+            $checkRecordQry = Database::prepare(
                 "SELECT pl1.pl_id" .
                 " FROM	  `##placelocation` AS pl1" .
                 " LEFT JOIN `##placelocation` AS pl2 ON (pl1.pl_parent_id = pl2.pl_id)" .