Completed
Pull Request — master (#1904)
by Rico
07:48
created
app/Config.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -241,7 +241,7 @@
 block discarded – undo
241 241
             ],
242 242
             'CEME'     => [
243 243
                 // CEME is NOT a valid 5.5.1 tag
244
-               //'BURI',
244
+                //'BURI',
245 245
             ],
246 246
             'RELA'     => [
247 247
                 'ASSO',
Please login to merge, or discard this patch.
app/Functions/FunctionsPrint.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -345,10 +345,10 @@
 block discarded – undo
345 345
         }
346 346
         // print gedcom ages
347 347
         foreach ([
348
-             I18N::translate('Age')     => $fact_age,
349
-             I18N::translate('Husband') => $husb_age,
350
-             I18N::translate('Wife')    => $wife_age,
351
-         ] as $label => $age) {
348
+                I18N::translate('Age')     => $fact_age,
349
+                I18N::translate('Husband') => $husb_age,
350
+                I18N::translate('Wife')    => $wife_age,
351
+            ] as $label => $age) {
352 352
             if ($age != '') {
353 353
                 $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>';
354 354
             }
Please login to merge, or discard this patch.
app/Http/Controllers/HomePageController.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -840,9 +840,9 @@
 block discarded – undo
840 840
         }
841 841
 
842 842
         foreach ([
843
-             'main' => $main_blocks,
844
-             'side' => $side_blocks,
845
-         ] as $location => $updated_blocks) {
843
+                'main' => $main_blocks,
844
+                'side' => $side_blocks,
845
+            ] as $location => $updated_blocks) {
846 846
             foreach ($updated_blocks as $block_order => $block_id) {
847 847
                 if (is_numeric($block_id)) {
848 848
                     // Updated block
Please login to merge, or discard this patch.
resources/views/admin/clean-data.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -13,18 +13,18 @@
 block discarded – undo
13 13
 	<?= csrf_field() ?>
14 14
 	<ul class="fa-ul">
15 15
 		<?php
16
-		foreach ($entries as $entry) {
17
-			if (in_array($entry, $protected)) {
18
-				echo '<li><span class="fa-li">' . view('icons/ban') . '</span>', e($entry), '</li>';
19
-			} else {
20
-				echo '<li><span class="fa-li">' . view('icons/delete') . '</span>';
21
-				echo '<label>';
22
-				echo '<input type="checkbox" name="to_delete[]" value="', e($entry), '"> ';
23
-				echo e($entry);
24
-				echo '</label></li>';
25
-			}
26
-		}
27
-		?>
16
+        foreach ($entries as $entry) {
17
+            if (in_array($entry, $protected)) {
18
+                echo '<li><span class="fa-li">' . view('icons/ban') . '</span>', e($entry), '</li>';
19
+            } else {
20
+                echo '<li><span class="fa-li">' . view('icons/delete') . '</span>';
21
+                echo '<label>';
22
+                echo '<input type="checkbox" name="to_delete[]" value="', e($entry), '"> ';
23
+                echo e($entry);
24
+                echo '</label></li>';
25
+            }
26
+        }
27
+        ?>
28 28
 	</ul>
29 29
 
30 30
 	<button class="btn btn-danger" type="submit">
Please login to merge, or discard this patch.
resources/views/modules/faq/config.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 
8 8
 <p>
9 9
 	<?= /* I18N: FAQ = “Frequently Asked Question” */
10
-	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.') ?>
10
+    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.') ?>
11 11
 	<?= I18N::translate('You may use HTML to format the answer and to add links to other websites.') ?>
12 12
 </p>
13 13
 
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	<a href="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminEdit', 'ged' => $tree->getName()])) ?>" class="btn btn-link">
29 29
         <?= view('icons/add') ?>
30 30
 		<?= /* I18N: FAQ = “Frequently Asked Question” */
31
-		I18N::translate('Add an FAQ') ?>
31
+        I18N::translate('Add an FAQ') ?>
32 32
 	</a>
33 33
 </p>
34 34
 
Please login to merge, or discard this patch.
app/Http/Controllers/AdminUsersController.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -240,7 +240,7 @@
 block discarded – undo
240 240
             // Link to send email to other users.
241 241
             if ($user_id != $user->getUserId()) {
242 242
                 $datum[4] = '<a href="' . e(route('message', ['to'  => $datum[2],
243
-                                                              'url' => route('admin-users'),
243
+                                                                'url' => route('admin-users'),
244 244
                     ])) . '">' . $datum[4] . '</a>';
245 245
             }
246 246
 
Please login to merge, or discard this patch.
resources/views/admin/trees-preferences.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -706,7 +706,7 @@  discard block
 block discarded – undo
706 706
         <?= view('components/radios-no-yes',['name' => 'EXPAND_NOTES', 'value' => $tree->getPreference('EXPAND_NOTES')]) ?>
707 707
 				<p class="small text-muted">
708 708
 					<?= /* I18N: Help text for the “Automatically expand notes” configuration setting */
709
-					I18N::translate('This option controls whether or not to automatically display content of a <i>Note</i> record on the Individual page.') ?>
709
+                    I18N::translate('This option controls whether or not to automatically display content of a <i>Note</i> record on the Individual page.') ?>
710 710
 				</p>
711 711
 			</div>
712 712
 		</div>
@@ -722,7 +722,7 @@  discard block
 block discarded – undo
722 722
         <?= view('components/radios-no-yes',['name' => 'EXPAND_SOURCES', 'value' => $tree->getPreference('EXPAND_SOURCES')]) ?>
723 723
 				<p class="small text-muted">
724 724
 					<?= /* I18N: Help text for the “Automatically expand sources” configuration setting */
725
-					I18N::translate('This option controls whether or not to automatically display content of a <i>Source</i> record on the Individual page.') ?>
725
+                    I18N::translate('This option controls whether or not to automatically display content of a <i>Source</i> record on the Individual page.') ?>
726 726
 				</p>
727 727
 			</div>
728 728
 		</div>
@@ -745,13 +745,13 @@  discard block
 block discarded – undo
745 745
 			</legend>
746 746
 			<div class="col-sm-9">
747 747
 				<?= /* I18N: The placeholders are edit controls. Show the [first/last] [1/2/3/4/5] parts of a place name */ I18N::translate(
748
-					'Show the %1$s %2$s parts of a place name.',
749
-					Bootstrap4::select([
750
-						'0' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'first'),
751
-						'1' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'last'),
752
-					], $tree->getPreference('SHOW_PEDIGREE_PLACES_SUFFIX'), ['name' => 'SHOW_PEDIGREE_PLACES_SUFFIX']),
753
-					Bootstrap4::select(FunctionsEdit::numericOptions(range(1, 9)), $tree->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES'])
754
-				) ?>
748
+                    'Show the %1$s %2$s parts of a place name.',
749
+                    Bootstrap4::select([
750
+                        '0' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'first'),
751
+                        '1' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'last'),
752
+                    ], $tree->getPreference('SHOW_PEDIGREE_PLACES_SUFFIX'), ['name' => 'SHOW_PEDIGREE_PLACES_SUFFIX']),
753
+                    Bootstrap4::select(FunctionsEdit::numericOptions(range(1, 9)), $tree->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES'])
754
+                ) ?>
755 755
 				<p class="small text-muted">
756 756
 					<?= /* I18N: Help text for the “Abbreviate place names” configuration setting */ I18N::translate('Place names are frequently too long to fit on charts, lists, etc. They can be abbreviated by showing just the first few parts of the name, such as <i>village, county</i>, or the last few part of it, such as <i>region, country</i>.') ?>
757 757
 				</p>
Please login to merge, or discard this patch.
app/Services/CalendarService.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -327,9 +327,9 @@
 block discarded – undo
327 327
 
328 328
             // Now fetch these anniversaries
329 329
             foreach ([
330
-                         'INDI' => $ind_sql . $where . $order_by,
331
-                         'FAM'  => $fam_sql . $where . $order_by,
332
-                     ] as $type => $sql) {
330
+                            'INDI' => $ind_sql . $where . $order_by,
331
+                            'FAM'  => $fam_sql . $where . $order_by,
332
+                        ] as $type => $sql) {
333 333
                 $rows = Database::prepare($sql)->execute($args)->fetchAll();
334 334
                 foreach ($rows as $row) {
335 335
                     if ($type === 'INDI') {
Please login to merge, or discard this patch.
app/Stats.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -476,7 +476,7 @@  discard block
 block discarded – undo
476 476
             100 * $tot_sindi_per,
477 477
         ]);
478 478
         $chl           = I18N::translate('Without sources') . ' - ' . I18N::percentage(1 - $tot_sindi_per, 1) . '|' .
479
-                     I18N::translate('With sources') . ' - ' . I18N::percentage($tot_sindi_per, 1);
479
+                        I18N::translate('With sources') . ' - ' . I18N::percentage($tot_sindi_per, 1);
480 480
         $chart_title   = I18N::translate('Individuals with sources');
481 481
 
482 482
         return '<img src="https://chart.googleapis.com/chart?cht=p3&amp;chd=e:' . $chd . '&amp;chs=' . $size . '&amp;chco=' . $color_from . ',' . $color_to . '&amp;chf=bg,s,ffffff00&amp;chl=' . rawurlencode($chl) . '" width="' . $sizes[0] . '" height="' . $sizes[1] . '" alt="' . $chart_title . '" title="' . $chart_title . '">';
@@ -1068,7 +1068,7 @@  discard block
 block discarded – undo
1068 1068
             I18N::translate('Females') . ' - ' . $per_f . '|' .
1069 1069
             I18N::translate('Males') . ' - ' . $per_m;
1070 1070
         $chart_title = I18N::translate('Males') . ' - ' . $per_m . I18N::$list_separator .
1071
-                   I18N::translate('Females') . ' - ' . $per_f;
1071
+                    I18N::translate('Females') . ' - ' . $per_f;
1072 1072
 
1073 1073
         return "<img src=\"https://chart.googleapis.com/chart?cht=p3&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_female},{$color_male}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" width=\"{$sizes[0]}\" height=\"{$sizes[1]}\" alt=\"" . $chart_title . '" title="' . $chart_title . '" />';
1074 1074
     }
@@ -1193,7 +1193,7 @@  discard block
 block discarded – undo
1193 1193
             I18N::translate('Living') . ' - ' . $per_l . '|' .
1194 1194
             I18N::translate('Dead') . ' - ' . $per_d . '|';
1195 1195
         $chart_title = I18N::translate('Living') . ' - ' . $per_l . I18N::$list_separator .
1196
-                   I18N::translate('Dead') . ' - ' . $per_d;
1196
+                    I18N::translate('Dead') . ' - ' . $per_d;
1197 1197
 
1198 1198
         return "<img src=\"https://chart.googleapis.com/chart?cht=p3&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_living},{$color_dead}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" width=\"{$sizes[0]}\" height=\"{$sizes[1]}\" alt=\"" . $chart_title . '" title="' . $chart_title . '" />';
1199 1199
     }
Please login to merge, or discard this patch.