fisharebest / webtrees

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,11 +401,11 @@ 
             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']);
                     }
 
-                    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)" .

resources/views/admin/map-import-form.php

Indentation +13 added lines, -13 removed lines

@@ -55,11 +55,11 @@ 
 			</legend>
 			<div class="col-sm-8">
 				<?= Bootstrap4::radioButtons(
-					'cleardatabase',
-					[I18N::translate('no'), I18N::translate('yes')],
-					'0',
-					true
-				) ?>
+                    'cleardatabase',
+                    [I18N::translate('no'), I18N::translate('yes')],
+                    '0',
+                    true
+                ) ?>
 			</div>
 		</div>
 	</fieldset>
@@ -72,14 +72,14 @@ 
 			</legend>
 			<div class="col-sm-8">
 				<?= Bootstrap4::select(
-					[
-						'addupdate' => I18N::translate('Add new, and update existing records'),
-						'add'	   => I18N::translate('Only add new records'),
-						'update'	=> I18N::translate('Only update existing records'),
-					],
-					'0',
-					['id' => 'import-options', 'name' => 'import-options']
-				) ?>
+                    [
+                        'addupdate' => I18N::translate('Add new, and update existing records'),
+                        'add'	   => I18N::translate('Only add new records'),
+                        'update'	=> I18N::translate('Only update existing records'),
+                    ],
+                    '0',
+                    ['id' => 'import-options', 'name' => 'import-options']
+                ) ?>
 			</div>
 		</div>
 	</fieldset>

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 				</div>
 				<select id="serverfile" name="serverfile" class="form-control">
                     <option selected value=""></option>
-                    <?php foreach($files as $file): ?>
+                    <?php foreach ($files as $file): ?>
                         <option value="<?= e($file) ?>">
                             <?= e($file) ?>
                         </option>

resources/views/admin/locations.php

Indentation +9 added lines, -9 removed lines

@@ -75,27 +75,27 @@ 
 			<a class="btn btn-primary" href="<?= e(route('map-data', ['parent_id' => $parent_id])) ?>">
 				<?= FontAwesome::decorativeIcon('add') ?>
 				<?= /* I18N: A button label. */
-				I18N::translate('add place') ?>
+                I18N::translate('add place') ?>
 			</a>
 			<button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenuButton"
 					data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 				<?= FontAwesome::decorativeIcon('download') ?>
 				<?= /* I18N: A button label. */
-				I18N::translate('export file') ?>
+                I18N::translate('export file') ?>
 			</button>
 			<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
 				<a class="dropdown-item" href="<?= e(route('locations-export', ['parent_id' => $parent_id, 'format' => 'csv'])) ?>">
                     csv
 				</a>
 				<a class="dropdown-item" href="<?= e(route('locations-export', ['parent_id' => $parent_id, 'format' => 'geojson']
-				)) ?>">
+                )) ?>">
                     geoJSON
 				</a>
 			</div>
 			<a class="btn btn-primary" href="<?= e(route('locations-import', ['parent_id' => $parent_id])) ?>">
                 <?= FontAwesome::decorativeIcon('upload') ?>
 				<?= /* I18N: A button label. */
-				I18N::translate('import file') ?>
+                I18N::translate('import file') ?>
 			</a>
 		</td>
 	</tr>
@@ -111,16 +111,16 @@ 
 		</label>
 		<div class="col-sm-6">
 			<?= Bootstrap4::select(
-				Tree::getNameList(),
-				'',
-				['id' => 'ged', 'name' => 'ged']
-			) ?>
+                Tree::getNameList(),
+                '',
+                ['id' => 'ged', 'name' => 'ged']
+            ) ?>
 		</div>
 		<div class="col-sm-2">
 			<button type="submit" class="btn btn-primary">
                 <?= view('icons/upload') ?>
 				<?= /* I18N: A button label. */
-				I18N::translate('import') ?>
+                I18N::translate('import') ?>
 			</button>
 		</div>
 	</div>

Spacing +2 added lines, -4 removed lines

@@ -32,12 +32,10 @@
                 </a>
             </th>
 			<td>
-				<?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') :
-                    strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
+				<?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') : strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
 			</td>
 			<td>
-				<?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') :
-                    strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
+				<?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') : strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
 			</td>
 			<td>
 				<?= $place->pl_long === null ? FontAwesome::decorativeIcon('warning') : $place->pl_zoom ?>

app/Bootstrap4.php

Spacing +3 added lines, -3 removed lines

@@ -100,7 +100,7 @@ 
                     'type'    => 'radio',
                     'name'    => $name,
                     'value'   => $value,
-                    'checked' => (string)$value === (string)$selected,
+                    'checked' => (string) $value === (string) $selected,
                 ] + $attributes);
 
             $html .=
@@ -129,7 +129,7 @@ 
         foreach ($options as $value => $option) {
             $option_attributes = self::attributes([
                 'value'    => $value,
-                'selected' => (string)$value === (string)$selected,
+                'selected' => (string) $value === (string) $selected,
             ]);
 
             $html .= '<option ' . $option_attributes . '>' . e($option) . '</option>';
@@ -161,7 +161,7 @@ 
         foreach ($options as $value => $option) {
             $option_attributes = self::attributes([
                 'value'    => $value,
-                'selected' => in_array((string)$value, $selected),
+                'selected' => in_array((string) $value, $selected),
             ]);
 
             $html .= '<option ' . $option_attributes . '>' . e($option) . '</option>';

resources/views/admin/trees.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 				</div>
 				<div id="card-tree-content-<?= $managed_tree->getTreeId() ?>" class="collapse<?= $managed_tree == $tree || $managed_tree->getPreference('imported') === '0' ? ' show' : '' ?>" role="tabpanel" aria-labelledby="panel-tree-header-<?= $managed_tree->getTreeId() ?>">
 					<div class="card-body">
-						<?php $importing = Database::prepare("SELECT 1 FROM `##gedcom_chunk` WHERE gedcom_id = ? AND imported = '0' LIMIT 1" )->execute([$managed_tree->getTreeId()])->fetchOne() ?>
+						<?php $importing = Database::prepare("SELECT 1 FROM `##gedcom_chunk` WHERE gedcom_id = ? AND imported = '0' LIMIT 1")->execute([$managed_tree->getTreeId()])->fetchOne() ?>
 						<?php if ($importing): ?>
 							<div id="import<?= $managed_tree->getTreeId() ?>" class="col-xs-12">
 								<div class="progress">

resources/views/edit-account-page.php

Indentation +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
 		</label>
 		<div class="col-sm-9 wt-page-options-value">
 			<?= FunctionsEdit::formControlIndividual($tree, $default_individual, ['id' => 'root-id',
- 'name' => 'root_id', 'aria-describedby' => 'root-id-description']) ?>
+    'name' => 'root_id', 'aria-describedby' => 'root-id-description']) ?>
 			<p class="small text-muted" id="root-id-description">
 				<?= I18N::translate('This individual will be selected by default when viewing charts and reports.') ?>
 			</p>
@@ -149,7 +149,7 @@ 
 				<?= Bootstrap4::select($themes, $user->getPreference('theme'), ['id' => 'theme', 'name' => 'theme', 'aria-describedby' => 'theme-description']) ?>
 				<p class="small text-muted" id="theme-description">
 					<?= /* I18N: Help text for the "Default theme" site configuration setting */
-					I18N::translate('You can change the appearance of webtrees using “themes”. Each theme has a different style, layout, color scheme, etc.') ?>
+                    I18N::translate('You can change the appearance of webtrees using “themes”. Each theme has a different style, layout, color scheme, etc.') ?>
 				</p>
 			</div>
 		</div>

app/Config.php

Indentation +1 added lines, -1 removed lines

@@ -241,7 +241,7 @@
             ],
             'CEME'     => [
                 // CEME is NOT a valid 5.5.1 tag
-               //'BURI',
+                //'BURI',
             ],
             'RELA'     => [
                 'ASSO',

app/Http/Controllers/HomePageController.php

Indentation +3 added lines, -3 removed lines

@@ -840,9 +840,9 @@
         }
 
         foreach ([
-             'main' => $main_blocks,
-             'side' => $side_blocks,
-         ] as $location => $updated_blocks) {
+                'main' => $main_blocks,
+                'side' => $side_blocks,
+            ] as $location => $updated_blocks) {
             foreach ($updated_blocks as $block_order => $block_id) {
                 if (is_numeric($block_id)) {
                     // Updated block

Spacing +21 added lines, -21 removed lines

@@ -47,7 +47,7 @@ 
      */
     public function treePageBlockEdit(Request $request, Tree $tree, User $user): Response
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
         $block    = $this->treeBlock($request, $user);
         $title    = $block->getTitle() . ' — ' . I18N::translate('Preferences');
 
@@ -89,7 +89,7 @@ 
      */
     private function treeBlock(Request $request, User $user): ModuleBlockInterface
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         $block_info = Database::prepare(
             "SELECT module_Name, user_id FROM `##block` WHERE block_id = :block_id"
@@ -125,7 +125,7 @@ 
      */
     public function userPageBlockEdit(Request $request, Tree $tree, User $user): Response
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
         $block    = $this->userBlock($request, $user);
         $title    = $block->getTitle() . ' — ' . I18N::translate('Preferences');
 
@@ -167,7 +167,7 @@ 
      */
     private function userBlock(Request $request, User $user): ModuleBlockInterface
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         $block_info = Database::prepare(
             "SELECT module_Name, user_id FROM `##block` WHERE block_id = :block_id"
@@ -185,7 +185,7 @@ 
             throw new NotFoundHttpException($block_info->module_name . ' is not a block');
         }
 
-        $block_owner_id = (int)$block_info->user_id;
+        $block_owner_id = (int) $block_info->user_id;
 
         if ($block_owner_id !== $user->getUserId() && !Auth::isAdmin()) {
             throw new AccessDeniedHttpException('You are not allowed to edit this block');
@@ -231,7 +231,7 @@ 
      */
     public function treePageBlock(Request $request, Tree $tree): Response
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         $block = Database::prepare(
             "SELECT * FROM `##block` WHERE block_id = :block_id AND gedcom_id = :tree_id AND user_id IS NULL"
@@ -297,8 +297,8 @@ 
      */
     public function treePageDefaultUpdate(Request $request): RedirectResponse
     {
-        $main_blocks = (array)$request->get('main');
-        $side_blocks = (array)$request->get('side');
+        $main_blocks = (array) $request->get('main');
+        $side_blocks = (array) $request->get('side');
 
         $this->updateTreeBlocks(-1, $main_blocks, $side_blocks);
 
@@ -342,14 +342,14 @@ 
      */
     public function treePageUpdate(Request $request, Tree $tree): RedirectResponse
     {
-        $defaults = (bool)$request->get('defaults');
+        $defaults = (bool) $request->get('defaults');
 
         if ($defaults) {
             $main_blocks = $this->getBlocksForTreePage(-1, AUth::PRIV_NONE, 'main');
             $side_blocks = $this->getBlocksForTreePage(-1, Auth::PRIV_NONE, 'side');
         } else {
-            $main_blocks = (array)$request->get('main');
-            $side_blocks = (array)$request->get('side');
+            $main_blocks = (array) $request->get('main');
+            $side_blocks = (array) $request->get('side');
         }
 
         $this->updateTreeBlocks($tree->getTreeId(), $main_blocks, $side_blocks);
@@ -396,7 +396,7 @@ 
      */
     public function userPageBlock(Request $request, Tree $tree, User $user): Response
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         $block = Database::prepare(
             "SELECT * FROM `##block` WHERE block_id = :block_id AND gedcom_id IS NULL AND user_id = :user_id"
@@ -461,8 +461,8 @@ 
      */
     public function userPageDefaultUpdate(Request $request): RedirectResponse
     {
-        $main_blocks = (array)$request->get('main');
-        $side_blocks = (array)$request->get('side');
+        $main_blocks = (array) $request->get('main');
+        $side_blocks = (array) $request->get('side');
 
         $this->updateUserBlocks(-1, $main_blocks, $side_blocks);
 
@@ -508,14 +508,14 @@ 
      */
     public function userPageUpdate(Request $request, Tree $tree, User $user): RedirectResponse
     {
-        $defaults = (bool)$request->get('defaults');
+        $defaults = (bool) $request->get('defaults');
 
         if ($defaults) {
             $main_blocks = $this->getBlocksForUserPage(-1, -1, AUth::PRIV_NONE, 'main');
             $side_blocks = $this->getBlocksForUserPage(-1, -1, Auth::PRIV_NONE, 'side');
         } else {
-            $main_blocks = (array)$request->get('main');
-            $side_blocks = (array)$request->get('side');
+            $main_blocks = (array) $request->get('main');
+            $side_blocks = (array) $request->get('side');
         }
 
         $this->updateUserBlocks($user->getUserId(), $main_blocks, $side_blocks);
@@ -532,7 +532,7 @@ 
      */
     public function userPageUserEdit(Request $request): Response
     {
-        $user_id     = (int)$request->get('user_id');
+        $user_id     = (int) $request->get('user_id');
         $user        = User::find($user_id);
         $main_blocks = $this->getBlocksForUserPage(-1, $user_id, Auth::PRIV_NONE, 'main');
         $side_blocks = $this->getBlocksForUserPage(-1, $user_id, Auth::PRIV_NONE, 'side');
@@ -561,9 +561,9 @@ 
      */
     public function userPageUserUpdate(Request $request): RedirectResponse
     {
-        $user_id     = (int)$request->get('user_id');
-        $main_blocks = (array)$request->get('main');
-        $side_blocks = (array)$request->get('side');
+        $user_id     = (int) $request->get('user_id');
+        $main_blocks = (array) $request->get('main');
+        $side_blocks = (array) $request->get('side');
 
         $this->updateUserBlocks($user_id, $main_blocks, $side_blocks);
 

resources/views/admin/clean-data.php

Indentation +12 added lines, -12 removed lines

@@ -13,18 +13,18 @@
 	<?= csrf_field() ?>
 	<ul class="fa-ul">
 		<?php
-		foreach ($entries as $entry) {
-			if (in_array($entry, $protected)) {
-				echo '<li><span class="fa-li">' . view('icons/ban') . '</span>', e($entry), '</li>';
-			} else {
-				echo '<li><span class="fa-li">' . view('icons/delete') . '</span>';
-				echo '<label>';
-				echo '<input type="checkbox" name="to_delete[]" value="', e($entry), '"> ';
-				echo e($entry);
-				echo '</label></li>';
-			}
-		}
-		?>
+        foreach ($entries as $entry) {
+            if (in_array($entry, $protected)) {
+                echo '<li><span class="fa-li">' . view('icons/ban') . '</span>', e($entry), '</li>';
+            } else {
+                echo '<li><span class="fa-li">' . view('icons/delete') . '</span>';
+                echo '<label>';
+                echo '<input type="checkbox" name="to_delete[]" value="', e($entry), '"> ';
+                echo e($entry);
+                echo '</label></li>';
+            }
+        }
+        ?>
 	</ul>
 
 	<button class="btn btn-danger" type="submit">