fisharebest / webtrees

app/Http/Controllers/BranchesController.php

Indentation +13 added lines, -13 removed lines

@@ -111,24 +111,24 @@
 	 * @return Individual[]
 	 */
 	protected function allAncestors(Individual $individual): array {
-	    /** @var Individual[] $ancestors */
-        $ancestors = [
-            1 => $individual,
-        ];
+			/** @var Individual[] $ancestors */
+				$ancestors = [
+						1 => $individual,
+				];
 
-        do {
-            $sosa = key($ancestors);
+				do {
+						$sosa = key($ancestors);
 
 			$family = $ancestors[$sosa]->getPrimaryChildFamily();
 
 			if ($family !== null) {
-                if ($family->getHusband() !== null) {
-                    $ancestors[$sosa * 2] = $family->getHusband();
-                }
-                if ($family->getWife() !== null) {
-                    $ancestors[$sosa * 2 + 1] = $family->getWife();
-                }
-            }
+								if ($family->getHusband() !== null) {
+										$ancestors[$sosa * 2] = $family->getHusband();
+								}
+								if ($family->getWife() !== null) {
+										$ancestors[$sosa * 2 + 1] = $family->getWife();
+								}
+						}
 		} while (next($ancestors));
 
 		return $ancestors;

resources/views/modules/openstreetmap/admin-config.php

Indentation +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
 <?= view('admin/breadcrumbs', [
 		'links' => [route('admin-control-panel') => I18N::translate('Control panel'),
-		            route('admin-modules') => I18N::translate('Module administration'),
+								route('admin-modules') => I18N::translate('Module administration'),
 					$title
 		]]) ?>
 

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

resources/views/modules/openstreetmap/admin-places.php

Indentation +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
 </div>
 <form method="POST"
 	  action="<?=e(route('admin-module',
-		  ['module' => $module, 'action' => 'AdminPlaces', 'parent_id' => $parent_id])) ?>">
+			['module' => $module, 'action' => 'AdminPlaces', 'parent_id' => $parent_id])) ?>">
 
 	<?= csrf_field() ?>
 	<?= Bootstrap4::checkbox(
@@ -54,12 +54,12 @@ 
 		<tr>
             <td>
                 <a href="<?= e(route('admin-module',
-					   ['module' => $module,
-					    'action' => 'AdminPlaces',
-					    'parent_id' => $place->pl_id,
-					    'inactive' => $inactive]
-				   )
-				   ) ?>">
+						 ['module' => $module,
+							'action' => 'AdminPlaces',
+							'parent_id' => $place->pl_id,
+							'inactive' => $inactive]
+					 )
+					 ) ?>">
 					<?= e($place->pl_place) ?>
                     <span class="badge badge-pill badge-<?= $place->badge ?>">
 				        <?= I18N::number($place->child_count) ?>
@@ -68,11 +68,11 @@ 
             </td>
 			<td>
 				<?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') :
-                    strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
+										strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
 			</td>
 			<td>
 				<?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') :
-                    strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
+										strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
 			</td>
 			<td>
 				<?= $place->pl_long === null ? FontAwesome::decorativeIcon('warning') : $place->pl_zoom ?>

app/Module/OpenStreetMapModule.php

Braces +6 added lines, -3 removed lines

@@ -1067,9 +1067,11 @@ 
 		$delimiter   = '';
 		$field_names = ['pl_level', 'pl_long', 'pl_lati', 'pl_zoom', 'pl_icon', 'fqpn'];
 
-		if ($serverfile !== '') {  // first choice is file on server
+		if ($serverfile !== '') {
+// first choice is file on server
 			$filename = WT_MODULES_DIR . $this->getName() . '/extra/' . $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'];
 		}
 
@@ -1090,7 +1092,8 @@ 
 					$delimiter = ',';
 				}
 				if ($delimiter !== '') {
-					if (!is_numeric($record[0])) { // lose the header
+					if (!is_numeric($record[0])) {
+// lose the header
 						array_shift($input_array);
 					}
 

Indentation +7 added lines, -7 removed lines

@@ -529,8 +529,8 @@ 
 			case 'BaseData':
 				$varName = (self::$map_selections['style'] === '') ? '' : self::$map_providers[self::$map_selections['provider']]['styles'][self::$map_selections['style']];
 				$payload = ['selectedProvIndex' => self::$map_selections['provider'],
-				            'selectedProvName'  => self::$map_providers[self::$map_selections['provider']]['name'],
-				            'selectedStyleName' => $varName,
+										'selectedProvName'  => self::$map_providers[self::$map_selections['provider']]['name'],
+										'selectedStyleName' => $varName,
 				];
 				break;
 			case 'ProviderStyles':
@@ -543,9 +543,9 @@ 
 					$providers[$key] = $provider['name'];
 				}
 				$payload = ['providers'     => $providers,
-				            'selectedProv'  => self::$map_selections['provider'],
-				            'styles'        => self::$map_providers[self::$map_selections['provider']]['styles'],
-				            'selectedStyle' => self::$map_selections['style'],
+										'selectedProv'  => self::$map_selections['provider'],
+										'styles'        => self::$map_providers[self::$map_selections['provider']]['styles'],
+										'selectedStyle' => self::$map_selections['style'],
 				];
 				break;
 			default:
@@ -1105,8 +1105,8 @@ 
 					$row    = explode($delimiter, $input_array[0]);
 					$fields = count($row);
 					if ($fields >= 6 &&
-					    (bool)preg_match("/[SN][0-9]*\.?[0-9]*/", $row[$fields - 3]) &&
-					    (bool)preg_match("/[EW][0-9]*\.?[0-9]*/", $row[$fields - 4])) {
+							(bool)preg_match("/[SN][0-9]*\.?[0-9]*/", $row[$fields - 3]) &&
+							(bool)preg_match("/[EW][0-9]*\.?[0-9]*/", $row[$fields - 4])) {
 						$filetype = 'csv';
 					}
 				}

app/Module/SiteMapModule.php

Braces +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
 	public function getFileAction(Request $request): Response {
 		$file = $request->get('file', '');
 
-		if (!preg_match('/^(\d+)-([imnrs])-(\d+)$/', $file, $match))		 {
+		if (!preg_match('/^(\d+)-([imnrs])-(\d+)$/', $file, $match)) {
 			throw new NotFoundHttpException('Bad sitemap file');
 		}
 

resources/views/lists/surnames-table.php

Braces +5 added lines, -2 removed lines

@@ -12,7 +12,8 @@ 
 			<th>
 				<?php if ($route == 'family-list'):?>
 					<?= I18N::translate('Spouses') ?>
-				<?php else: ?>
+				<?php else {
+	: ?>
 					<?= I18N::translate('Individuals') ?>
 				<?php endif ?>
 			</th>
@@ -43,7 +44,9 @@ 
 					<?php endforeach ?>
 				</td>
 
-				<td class="text-center" data-sort="<?= array_sum(array_map(function(array $x) { return count($x); }, $surns)) ?>">
+				<td class="text-center" data-sort="<?= array_sum(array_map(function(array $x) { return count($x);
+}
+}, $surns)) ?>">
 					<?php foreach ($surns as $indis): ?>
 						<?= I18N::number(count($indis)) ?>
 						<br>

resources/views/lists/individuals-table.php

Braces +5 added lines, -2 removed lines

@@ -319,8 +319,11 @@
 					<?php if (!isset($unique_indis[$individual->getXref()]) && $age_at_death >= 0 && $age_at_death <= $max_age): ?>
 						<?php $deat_by_age[$age_at_death] .= $individual->getSex(); ?>
 					<?php endif ?>
-				<?php else: ?>
-					<?php $age_at_death = ''; ?>
+				<?php else {
+	: ?>
+					<?php $age_at_death = '';
+}
+?>
 					<?php $age_at_death_sort = PHP_INT_MAX; ?>
 				<?php endif ?>
 				<td class="center" data-sort="<?= e($age_at_death_sort) ?>">