fisharebest / webtrees

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

resources/views/admin/site-preferences.php

Indentation +15 added lines, -15 removed lines

@@ -14,17 +14,17 @@ 
 	<div class="row form-group">
 		<label for="INDEX_DIRECTORY" class="col-sm-3 col-form-label">
 			<?= /* I18N: A configuration setting */
-			I18N::translate('Data folder') ?>
+            I18N::translate('Data folder') ?>
 		</label>
 		<div class="col-sm-9">
 			<input type="text" class="form-control" dir="ltr" id="INDEX_DIRECTORY" name="INDEX_DIRECTORY" value="<?= e(Site::getPreference('INDEX_DIRECTORY')) ?>" maxlength="255" placeholder="data/" required>
 			<p class="small text-muted">
 				<?= /* I18N: Help text for the "Data folder" site configuration setting */
-				I18N::translate('This folder will be used by webtrees to store media files, GEDCOM files, temporary files, etc. These files may contain private data, and should not be made available over the internet.') ?>
+                I18N::translate('This folder will be used by webtrees to store media files, GEDCOM files, temporary files, etc. These files may contain private data, and should not be made available over the internet.') ?>
 			</p>
 			<p class="small text-muted">
 				<?= /* I18N: “Apache” is a software program. */
-				I18N::translate('To protect this private data, webtrees uses an Apache configuration file (.htaccess) which blocks all access to this folder. If your web-server does not support .htaccess files, and you cannot restrict access to this folder, then you can select another folder, away from your web documents.') ?>
+                I18N::translate('To protect this private data, webtrees uses an Apache configuration file (.htaccess) which blocks all access to this folder. If your web-server does not support .htaccess files, and you cannot restrict access to this folder, then you can select another folder, away from your web documents.') ?>
 			</p>
 			<p class="small text-muted">
 				<?= I18N::translate('If you select a different folder, you must also move all files (except config.ini.php, index.php, and .htaccess) from the existing folder to the new folder.') ?>
@@ -39,13 +39,13 @@ 
 	<div class="row form-group">
 		<label for="MEMORY_LIMIT" class="col-sm-3 col-form-label">
 			<?= /* I18N: A configuration setting */
-			I18N::translate('Memory limit') ?>
+            I18N::translate('Memory limit') ?>
 		</label>
 		<div class="col-sm-9">
 			<input type="text" class="form-control" id="MEMORY_LIMIT" name="MEMORY_LIMIT" value="<?= e(Site::getPreference('MEMORY_LIMIT')) ?>" pattern="[0-9]+[KMG]" placeholder="<?= get_cfg_var('memory_limit') ?>" maxlength="255">
 			<p class="small text-muted">
 				<?= /* I18N: %s is an amount of memory, such as 32MB */
-				I18N::translate('By default, your server allows scripts to use %s of memory.', get_cfg_var('memory_limit')) ?>
+                I18N::translate('By default, your server allows scripts to use %s of memory.', get_cfg_var('memory_limit')) ?>
 				<?= I18N::translate('You can request a higher or lower limit, although the server may ignore this request.') ?>
 				<?= I18N::translate('Leave this blank to use the default value.') ?>
 			</p>
@@ -56,16 +56,16 @@ 
 	<div class="row form-group">
 		<label for="MAX_EXECUTION_TIME" class="col-sm-3 col-form-label">
 			<?= /* I18N: A configuration setting */
-			I18N::translate('PHP time limit') ?>
+            I18N::translate('PHP time limit') ?>
 		</label>
 		<div class="col-sm-9">
 			<input type="text" class="form-control" id="MAX_EXECUTION_TIME" name="MAX_EXECUTION_TIME" value="<?= e(Site::getPreference('MAX_EXECUTION_TIME')) ?>" pattern="[0-9]*" placeholder="<?= get_cfg_var('max_execution_time') ?>" maxlength="255">
 			<p class="small text-muted">
 				<?= I18N::plural(
-					'By default, your server allows scripts to run for %s second.',
-					'By default, your server allows scripts to run for %s seconds.',
-					get_cfg_var('max_execution_time'), I18N::number((float) get_cfg_var('max_execution_time')));
-				?>
+                    'By default, your server allows scripts to run for %s second.',
+                    'By default, your server allows scripts to run for %s seconds.',
+                    get_cfg_var('max_execution_time'), I18N::number((float) get_cfg_var('max_execution_time')));
+                ?>
 				<?= I18N::translate('You can request a higher or lower limit, although the server may ignore this request.') ?>
 				<?= I18N::translate('Leave this blank to use the default value.') ?>
 			</p>
@@ -89,13 +89,13 @@ 
 	<div class="row form-group">
 		<label for="THEME_DIR" class="col-sm-3 col-form-label">
 			<?= /* I18N: A configuration setting */
-			I18N::translate('Default theme') ?>
+            I18N::translate('Default theme') ?>
 		</label>
 		<div class="col-sm-9">
 			<?= Bootstrap4::select($all_themes, Site::getPreference('THEME_DIR'), ['id' => 'THEME_DIR', 'name' => 'THEME_DIR']) ?>
 			<p class="small text-muted">
 				<?= /* 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>
 			<p class="small text-muted">
 				<?= I18N::translate('Themes can be selected at three levels: user, family tree, and website. User preferences take priority over family tree preferences, which in turn take priority over the website preferences. Selecting “default theme” at one level will use the theme at the next level.') ?>
@@ -108,7 +108,7 @@ 
 		<div class="row">
 			<legend class="col-form-label col-sm-3">
 				<?= /* I18N: A configuration setting */
-				I18N::translate('Allow users to select their own theme') ?>
+                I18N::translate('Allow users to select their own theme') ?>
 			</legend>
 			<div class="col-sm-9">
 				<?= Bootstrap4::radioButtons('ALLOW_USER_THEMES', FunctionsEdit::optionsNoYes(), (string) (int) Site::getPreference('ALLOW_USER_THEMES'), true) ?>
@@ -121,13 +121,13 @@ 
 		<div class="row">
 			<legend class="col-form-label col-sm-3">
 				<?= /* I18N: A configuration setting */
-				I18N::translate('Show list of family trees') ?>
+                I18N::translate('Show list of family trees') ?>
 			</legend>
 			<div class="col-sm-9">
 				<?= Bootstrap4::radioButtons('ALLOW_CHANGE_GEDCOM', FunctionsEdit::optionsNoYes(), (string) (int) Site::getPreference('ALLOW_CHANGE_GEDCOM'), true) ?>
 				<p class="small text-muted">
 					<?= /* I18N: Help text for the “Show list of family trees” site configuration setting */
-					I18N::translate('For websites with more than one family tree, this option will show the list of family trees in the main menu, the search pages, etc.') ?>
+                    I18N::translate('For websites with more than one family tree, this option will show the list of family trees in the main menu, the search pages, etc.') ?>
 				</p>
 			</div>
 		</div>

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',

app/Http/Controllers/AutocompleteController.php

Spacing +10 added lines, -10 removed lines

@@ -84,7 +84,7 @@ 
         $pages = [];
 
         // Escape the query for MySQL and PHP, converting spaces to wildcards.
-        $like_query  = strtr($query, [
+        $like_query = strtr($query, [
             '_' => '\\_',
             '%' => '\\%',
             ' ' => '%',
@@ -206,7 +206,7 @@ 
      */
     public function select2Family(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::familySearch($tree, $page, $query));
@@ -220,7 +220,7 @@ 
     public function select2Flag(Request $request): JsonResponse
     {
         $page  = $request->get('page');
-        $query = (int)$request->get('q');
+        $query = (int) $request->get('q');
 
         return new JsonResponse(Select2::flagSearch($page, $query));
     }
@@ -233,7 +233,7 @@ 
      */
     public function select2Individual(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::individualSearch($tree, $page, $query));
@@ -247,7 +247,7 @@ 
      */
     public function select2MediaObject(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::mediaObjectSearch($tree, $page, $query));
@@ -261,7 +261,7 @@ 
      */
     public function select2Note(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::noteSearch($tree, $page, $query));
@@ -275,7 +275,7 @@ 
      */
     public function select2Place(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::placeSearch($tree, $page, $query, true));
@@ -289,7 +289,7 @@ 
      */
     public function select2Repository(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::repositorySearch($tree, $page, $query));
@@ -303,7 +303,7 @@ 
      */
     public function select2Source(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::sourceSearch($tree, $page, $query));
@@ -317,7 +317,7 @@ 
      */
     public function select2Submitter(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::submitterSearch($tree, $page, $query));

app/Http/Controllers/PendingChangesController.php

Spacing +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
     {
         $url       = $request->get('url', '');
         $xref      = $request->get('xref', '');
-        $change_id = (int)$request->get('change_id');
+        $change_id = (int) $request->get('change_id');
 
         $changes = Database::prepare(
             "SELECT change_id, xref, old_gedcom, new_gedcom" .
@@ -204,7 +204,7 @@ 
     {
         $url       = $request->get('url', '');
         $xref      = $request->get('xref', '');
-        $change_id = (int)$request->get('change_id');
+        $change_id = (int) $request->get('change_id');
 
         // Reject a change, and subsequent changes to the same record
         Database::prepare(

app/Module/UserMessagesModule.php

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
      */
     public function postDeleteMessageAction(Request $request, Tree $tree): Response
     {
-        $message_ids = (array)$request->get('message_id', []);
+        $message_ids = (array) $request->get('message_id', []);
 
         $stmt = Database::prepare("DELETE FROM `##message` WHERE user_id = :user_id AND message_id = :message_id");
 
@@ -100,7 +100,7 @@ 
 
         $content = '';
         if (!empty($users)) {
-            $url     = route('user-page', ['ged' => $tree->getName()]);
+            $url = route('user-page', ['ged' => $tree->getName()]);
             $content .= '<form onsubmit="return $(&quot;#to&quot;).val() !== &quot;&quot;">';
             $content .= '<input type="hidden" name="route" value="message">';
             $content .= '<input type="hidden" name="ged" value="' . e($tree->getName()) . '">';
@@ -136,7 +136,7 @@ 
                 $content .= '<td class="list_value_wrap"><a href="#" onclick="return expand_layer(\'message' . $message->message_id . '\');"><i id="message' . $message->message_id . '_img" class="icon-plus"></i> <b dir="auto">' . e($message->subject) . '</b></a></td>';
                 $content .= '<td class="list_value_wrap">' . FunctionsDate::formatTimestamp($message->created + WT_TIMESTAMP_OFFSET) . '</td>';
                 $content .= '<td class="list_value_wrap">';
-                $user    = User::findByIdentifier($message->sender);
+                $user = User::findByIdentifier($message->sender);
                 if ($user) {
                     $content .= '<span dir="auto">' . e($user->getRealName()) . '</span> - <span dir="auto">' . $user->getEmail() . '</span>';
                 } else {
@@ -158,7 +158,7 @@ 
                         'subject' => $message->subject,
                         'ged'     => $tree->getName(),
                     ]);
-                    $content   .= '<a class="btn btn-primary" href="' . e($reply_url) . '" title="' . I18N::translate('Reply') . '">' . I18N::translate('Reply') . '</a> ';
+                    $content .= '<a class="btn btn-primary" href="' . e($reply_url) . '" title="' . I18N::translate('Reply') . '">' . I18N::translate('Reply') . '</a> ';
                 }
                 $content .= '<button type="button" class="btn btn-danger" data-confirm="' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '" onclick="if (confirm(this.dataset.confirm)) {$(\'#messageform :checkbox\').prop(\'checked\', false); $(\'#cb_message' . $message->message_id . '\').prop(\'checked\', true); document.messageform.submit();}">' . I18N::translate('Delete') . '</button></div></td></tr>';
             }

app/Module/UserFavoritesModule.php

Spacing +1 added lines, -1 removed lines

@@ -191,7 +191,7 @@
      */
     public function postDeleteFavoriteAction(Request $request, Tree $tree, User $user): RedirectResponse
     {
-        $favorite_id = (int)$request->get('favorite_id');
+        $favorite_id = (int) $request->get('favorite_id');
 
         if (Auth::check()) {
             Database::prepare(

app/Module/FrequentlyAskedQuestionsModule.php

Spacing +6 added lines, -6 removed lines

@@ -156,7 +156,7 @@ 
      */
     public function postAdminDeleteAction(Request $request, Tree $tree): RedirectResponse
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         Database::prepare(
             "DELETE FROM `##block_setting` WHERE block_id = :block_id"
@@ -184,7 +184,7 @@ 
      */
     public function postAdminMoveDownAction(Request $request, Tree $tree): RedirectResponse
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         $block_order = Database::prepare(
             "SELECT block_order FROM `##block` WHERE block_id = :block_id"
@@ -237,7 +237,7 @@ 
      */
     public function postAdminMoveUpAction(Request $request, Tree $tree): RedirectResponse
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         $block_order = Database::prepare(
             "SELECT block_order FROM `##block` WHERE block_id = :block_id"
@@ -292,7 +292,7 @@ 
     {
         $this->layout = 'layouts/administration';
 
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         if ($block_id === 0) {
             // Creating a new faq
@@ -303,7 +303,7 @@ 
             )->execute([
                 'module_name' => $this->getName(),
             ])->fetchOne();
-            $languages   = [];
+            $languages = [];
 
             $title = I18N::translate('Add an FAQ');
         } else {
@@ -340,7 +340,7 @@ 
      */
     public function postAdminEditAction(Request $request, Tree $tree): RedirectResponse
     {
-        $block_id  = (int)$request->get('block_id');
+        $block_id  = (int) $request->get('block_id');
         $faqbody   = $request->get('faqbody', '');
         $header    = $request->get('header', '');
         $languages = $request->get('languages', []);