fisharebest / webtrees

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

resources/views/modules/faq/config.php

Indentation +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
 
 <p>
 	<?= /* I18N: FAQ = “Frequently Asked Question” */
-	I18N::translate('FAQs are lists of questions and answers, which allow you to explain the site’s rules, policies, and procedures to your visitors. Questions are typically concerned with privacy, copyright, user-accounts, unsuitable content, requirement for source-citations, etc.') ?>
+    I18N::translate('FAQs are lists of questions and answers, which allow you to explain the site’s rules, policies, and procedures to your visitors. Questions are typically concerned with privacy, copyright, user-accounts, unsuitable content, requirement for source-citations, etc.') ?>
 	<?= I18N::translate('You may use HTML to format the answer and to add links to other websites.') ?>
 </p>
 
@@ -28,7 +28,7 @@ 
 	<a href="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminEdit', 'ged' => $tree->getName()])) ?>" class="btn btn-link">
         <?= view('icons/add') ?>
 		<?= /* I18N: FAQ = “Frequently Asked Question” */
-		I18N::translate('Add an FAQ') ?>
+        I18N::translate('Add an FAQ') ?>
 	</a>
 </p>
 

app/Functions/FunctionsRtl.php

Spacing +12 added lines, -12 removed lines

@@ -292,7 +292,7 @@ 
                         if ($openParIndex !== false) {
                             // Opening parentheses always inherit the following directionality
                             self::$waitingText .= $currentLetter;
-                            $workingText       = substr($workingText, $currentLen);
+                            $workingText = substr($workingText, $currentLen);
                             while (true) {
                                 if ($workingText === '') {
                                     break;
@@ -300,13 +300,13 @@ 
                                 if (substr($workingText, 0, 1) === ' ') {
                                     // Spaces following this left parenthesis inherit the following directionality too
                                     self::$waitingText .= ' ';
-                                    $workingText       = substr($workingText, 1);
+                                    $workingText = substr($workingText, 1);
                                     continue;
                                 }
                                 if (substr($workingText, 0, 6) === ' ') {
                                     // Spaces following this left parenthesis inherit the following directionality too
                                     self::$waitingText .= ' ';
-                                    $workingText       = substr($workingText, 6);
+                                    $workingText = substr($workingText, 6);
                                     continue;
                                 }
                                 break;
@@ -323,9 +323,9 @@ 
                         // Exceptions to this rule will be handled later during final clean-up.
                         //
                         self::$waitingText .= $currentLetter;
-                        $workingText       = substr($workingText, $currentLen);
+                        $workingText = substr($workingText, $currentLen);
                         if (self::$currentState != '') {
-                            $result            .= self::$waitingText;
+                            $result .= self::$waitingText;
                             self::$waitingText = '';
                         }
                         break 2; // double break because we're waiting for more information
@@ -456,7 +456,7 @@ 
                 }
                 if (substr($result . "\n", 0, self::LENGTH_START) != self::START_LTR && substr($result . "\n", 0, self::LENGTH_START) != self::START_RTL) {
                     $leadingText .= substr($result, 0, 1);
-                    $result      = substr($result, 1);
+                    $result = substr($result, 1);
                     continue;
                 }
                 $result = substr($result, 0, self::LENGTH_START) . $leadingText . substr($result, self::LENGTH_START);
@@ -591,11 +591,11 @@ 
     public static function breakCurrentSpan(&$result)
     {
         // Interrupt the current span, insert that <br>, and then continue the current span
-        $result            .= self::$waitingText;
+        $result .= self::$waitingText;
         self::$waitingText = '';
 
         $breakString = '<' . self::$currentState . 'br>';
-        $result      .= $breakString;
+        $result .= $breakString;
     }
 
     /**
@@ -648,7 +648,7 @@ 
                 break;
             } // No more numeric strings
 
-            $tempResult    .= substr($textSpan, 0, $posLRE + 3); // Copy everything preceding the numeric string
+            $tempResult .= substr($textSpan, 0, $posLRE + 3); // Copy everything preceding the numeric string
             $numericString = substr($textSpan, $posLRE + 3, $posPDF - $posLRE); // Separate the entire numeric string
             $textSpan      = substr($textSpan, $posPDF + 3);
             $posColon      = strpos($numericString, ':');
@@ -1140,7 +1140,7 @@ 
         while ($string) {
             if (mb_strlen($string) <= $width) {
                 // Do not wrap any text that is less than the output area.
-                $out    .= $string;
+                $out .= $string;
                 $string = '';
             } else {
                 $sub1 = mb_substr($string, 0, $width + 1);
@@ -1154,7 +1154,7 @@ 
                 if ($spacepos === false) {
                     // No space on line?
                     if ($cut) {
-                        $out    .= $sub . $sep;
+                        $out .= $sub . $sep;
                         $string = mb_substr($string, mb_strlen($sub));
                     } else {
                         $spacepos = strpos($string, ' ');
@@ -1168,7 +1168,7 @@ 
                     }
                 } else {
                     // Split at space;
-                    $out    .= substr($string, 0, $spacepos) . $sep;
+                    $out .= substr($string, 0, $spacepos) . $sep;
                     $string = substr($string, $spacepos + 1);
                 }
             }

app/Http/Controllers/AccountController.php

Spacing +11 added lines, -11 removed lines

@@ -47,7 +47,7 @@ 
      */
     public function edit(Tree $tree, User $user): Response
     {
-        $allow_user_themes    = (bool)Site::getPreference('ALLOW_USER_THEMES');
+        $allow_user_themes    = (bool) Site::getPreference('ALLOW_USER_THEMES');
         $my_individual_record = Individual::getInstance($tree->getUserPreference(Auth::user(), 'gedcomid'), $tree);
         $contact_methods      = FunctionsEdit::optionsContactMethods();
         $default_individual   = Individual::getInstance($tree->getUserPreference(Auth::user(), 'rootid'), $tree);
@@ -82,16 +82,16 @@ 
      */
     public function update(Request $request, Tree $tree, User $user): RedirectResponse
     {
-        $contact_method = (string)$request->get('contact_method');
-        $email          = (string)$request->get('email');
-        $language       = (string)$request->get('language');
-        $real_name      = (string)$request->get('real_name');
-        $password       = (string)$request->get('password');
-        $rootid         = (string)$request->get('root_id');
-        $theme          = (string)$request->get('theme');
-        $time_zone      = (string)$request->get('timezone');
-        $user_name      = (string)$request->get('user_name');
-        $visible_online = (string)$request->get('visible_online');
+        $contact_method = (string) $request->get('contact_method');
+        $email          = (string) $request->get('email');
+        $language       = (string) $request->get('language');
+        $real_name      = (string) $request->get('real_name');
+        $password       = (string) $request->get('password');
+        $rootid         = (string) $request->get('root_id');
+        $theme          = (string) $request->get('theme');
+        $time_zone      = (string) $request->get('timezone');
+        $user_name      = (string) $request->get('user_name');
+        $visible_online = (string) $request->get('visible_online');
 
         // Change the password
         if ($password !== '') {

app/Http/Controllers/EditGedcomRecordController.php

Spacing +4 added lines, -4 removed lines

@@ -290,8 +290,8 @@ 
     public function editRawRecordAction(Request $request, Tree $tree): Response
     {
         $xref     = $request->get('xref');
-        $facts    = (array)$request->get('fact');
-        $fact_ids = (array)$request->get('fact_id');
+        $facts    = (array) $request->get('fact');
+        $fact_ids = (array) $request->get('fact_id');
         $record   = GedcomRecord::getInstance($xref, $tree);
 
         $this->checkRecordAccess($record, true);
@@ -395,7 +395,7 @@ 
         $record = GedcomRecord::getInstance($xref, $tree);
         $this->checkRecordAccess($record, true);
 
-        $keep_chan = (bool)$request->get('keep_chan');
+        $keep_chan = (bool) $request->get('keep_chan');
 
         $this->glevels = $request->get('glevels', []);
         $this->tag     = $request->get('tag', []);
@@ -414,7 +414,7 @@ 
 
         $newged = '';
         if (!empty($_POST['NAME'])) {
-            $newged     .= "\n1 NAME " . $_POST['NAME'];
+            $newged .= "\n1 NAME " . $_POST['NAME'];
             $name_facts = [
                 'TYPE',
                 'NPFX',