Completed
Branch develop (b6db7c)
by Greg
09:30
created
app/Functions/FunctionsPrintFacts.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -192,23 +192,23 @@
 block discarded – undo
192 192
             <?= $label ?>
193 193
 					<div class="editfacts">
194 194
               <?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), [
195
-                  'class' => 'btn btn-link',
196
-                  'href'  => route('edit-fact', [
197
-                      'xref'    => $parent->getXref(),
198
-                      'fact_id' => $fact->getFactId(),
199
-                      'ged' . $tree->getName(),
200
-                  ]),
201
-              ]) ?>
195
+                    'class' => 'btn btn-link',
196
+                    'href'  => route('edit-fact', [
197
+                        'xref'    => $parent->getXref(),
198
+                        'fact_id' => $fact->getFactId(),
199
+                        'ged' . $tree->getName(),
200
+                    ]),
201
+                ]) ?>
202 202
               <?= FontAwesome::linkIcon('copy', I18N::translate('Copy'), [
203
-                  'class'   => 'btn btn-link',
204
-                  'href'    => '#',
205
-                  'onclick' => 'return copy_fact("' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->getFactId() . '");',
206
-              ]) ?>
203
+                    'class'   => 'btn btn-link',
204
+                    'href'    => '#',
205
+                    'onclick' => 'return copy_fact("' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->getFactId() . '");',
206
+                ]) ?>
207 207
               <?= FontAwesome::linkIcon('delete', I18N::translate('Delete'), [
208
-                  'class'   => 'btn btn-link',
209
-                  'href'    => '#',
210
-                  'onclick' => 'return delete_fact("' . I18N::translate('Are you sure you want to delete this fact?') . '", "' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->getFactId() . '");',
211
-              ]) ?>
208
+                    'class'   => 'btn btn-link',
209
+                    'href'    => '#',
210
+                    'onclick' => 'return delete_fact("' . I18N::translate('Are you sure you want to delete this fact?') . '", "' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->getFactId() . '");',
211
+                ]) ?>
212 212
 					</div>
213 213
             <?php
214 214
         } else {
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
@@ -231,7 +231,7 @@
 block discarded – undo
231 231
             // $datum[4] is the email address
232 232
             if ($user_id != $user->getUserId()) {
233 233
                 $datum[4] = '<a href="' . e(route('message', ['to'  => $datum[2],
234
-                                                              'url' => route('admin-users'),
234
+                                                                'url' => route('admin-users'),
235 235
                     ])) . '">' . e($datum[4]) . '</a>';
236 236
             }
237 237
             // The username
Please login to merge, or discard this patch.
app/Http/Controllers/DescendantsChartController.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -187,8 +187,8 @@  discard block
 block discarded – undo
187 187
         foreach ($person->getChildFamilies() as $cfamily) {
188 188
             foreach ($cfamily->getSpouses() as $parent) {
189 189
                 echo FontAwesome::linkIcon('arrow-up', I18N::translate('Start at parents'), ['href' => route('descendants', ['ged'         => $parent->getTree()->getName(),
190
-                                                                                                                             'xref'        => $parent->getXref(),
191
-                                                                                                                             'generations' => $generations,
190
+                                                                                                                                'xref'        => $parent->getXref(),
191
+                                                                                                                                'generations' => $generations,
192 192
                 ]),
193 193
                 ]);
194 194
                 // only show the arrow for one of the parents
@@ -268,8 +268,8 @@  discard block
 block discarded – undo
268 268
             foreach ($spouse->getChildFamilies() as $cfamily) {
269 269
                 foreach ($cfamily->getSpouses() as $parent) {
270 270
                     echo FontAwesome::linkIcon('arrow-up', I18N::translate('Start at parents'), ['href' => route('descendants', ['ged'         => $parent->getTree()->getName(),
271
-                                                                                                                                 'xref'        => $parent->getXref(),
272
-                                                                                                                                 'generations' => $generations,
271
+                                                                                                                                    'xref'        => $parent->getXref(),
272
+                                                                                                                                    'generations' => $generations,
273 273
                     ]),
274 274
                     ]);
275 275
                     // only show the arrow for one of the parents
Please login to merge, or discard this patch.
app/Http/Controllers/ListController.php 1 patch
Indentation   +81 added lines, -81 removed lines patch added patch discarded remove patch
@@ -260,91 +260,91 @@
 block discarded – undo
260 260
 			<div class="wt-page-content">
261 261
           <?php
262 262
 
263
-          if ($show === 'indi' || $show === 'surn') {
264
-              $surns = $this->surnames($tree, $surname, $alpha, $show_marnm === 'yes', $families);
265
-              if ($show === 'surn') {
266
-                  // Show the surname list
267
-                  switch ($tree->getPreference('SURNAME_LIST_STYLE')) {
268
-                      case 'style1':
263
+            if ($show === 'indi' || $show === 'surn') {
264
+                $surns = $this->surnames($tree, $surname, $alpha, $show_marnm === 'yes', $families);
265
+                if ($show === 'surn') {
266
+                    // Show the surname list
267
+                    switch ($tree->getPreference('SURNAME_LIST_STYLE')) {
268
+                        case 'style1':
269 269
                           echo FunctionsPrintLists::surnameList($surns, 3, true, $route, $tree);
270
-                          break;
271
-                      case 'style3':
270
+                            break;
271
+                        case 'style3':
272 272
                           echo FunctionsPrintLists::surnameTagCloud($surns, $route, true, $tree);
273
-                          break;
274
-                      case 'style2':
273
+                            break;
274
+                        case 'style2':
275 275
                       default:
276 276
                           echo view('lists/surnames-table', [
277
-                              'surnames' => $surns,
278
-                              'route'    => $route,
279
-                          ]);
280
-                          break;
281
-                  }
282
-              } else {
283
-                  // Show the list
284
-                  $count = 0;
285
-                  foreach ($surns as $surnames) {
286
-                      foreach ($surnames as $list) {
287
-                          $count += count($list);
288
-                      }
289
-                  }
290
-                  // Don't sublists short lists.
291
-                  if ($count < $tree->getPreference('SUBLIST_TRIGGER_I')) {
292
-                      $falpha = '';
293
-                  } else {
294
-                      $givn_initials = $this->givenAlpha($tree, $surname, $alpha, $show_marnm === 'yes', $families);
295
-                      // Break long lists by initial letter of given name
296
-                      if ($surname || $show_all === 'yes') {
297
-                          if ($show_all === 'no') {
298
-                              echo '<h2 class="wt-page-title">', I18N::translate('Individuals with surname %s', $legend), '</h2>';
299
-                          }
300
-                          // Don't show the list until we have some filter criteria
301
-                          $show = ($falpha || $show_all_firstnames === 'yes') ? 'indi' : 'none';
302
-                          $list = [];
303
-                          echo '<ul class="d-flex flex-wrap justify-content-center wt-initials-list">';
304
-                          foreach ($givn_initials as $givn_initial => $count) {
305
-                              echo '<li class="wt-initials-list-item">';
306
-                              if ($count > 0) {
307
-                                  if ($show === 'indi' && $givn_initial === $falpha && $show_all_firstnames === 'no') {
308
-                                      echo '<a class="wt-initial active" href="' . e(route($route, ['falpha' => $givn_initial] + $params)) . '" title="' . I18N::number($count) . '">' . $this->givenNameInitial((string)$givn_initial) . '</a>';
309
-                                  } else {
310
-                                      echo '<a class="wt-initial" href="' . e(route($route, ['falpha' => $givn_initial] + $params)) . '" title="' . I18N::number($count) . '">' . $this->givenNameInitial((string)$givn_initial) . '</a>';
311
-                                  }
312
-                              } else {
313
-                                  echo '<span class="wt-initial text-muted">' . $this->givenNameInitial((string)$givn_initial) . '</span>';
314
-                              }
315
-                              echo '</li>';
316
-                          }
317
-                          // Search spiders don't get the "show all" option as the other links give them everything.
318
-                          if (Session::has('initiated')) {
319
-                              echo '<li class="wt-initials-list-item">';
320
-                              if ($show_all_firstnames === 'yes') {
321
-                                  echo '<span class="wt-initial warning">' . I18N::translate('All') . '</span>';
322
-                              } else {
323
-                                  echo '<a class="wt-initial" href="' . e(route($route, ['show_all_firstnames' => 'yes'] + $params)) . '" title="' . I18N::number($count) . '">' . I18N::translate('All') . '</a>';
324
-                              }
325
-                              echo '</li>';
326
-                          }
327
-                          echo '</ul>';
328
-                          echo '<p class="center alpha_index">', implode(' | ', $list), '</p>';
329
-                      }
330
-                  }
331
-                  if ($show === 'indi') {
332
-                      if ($route === 'individual-list') {
333
-                          echo view('lists/individuals-table', [
334
-                              'individuals' => $this->individuals($tree, $surname, $alpha, $falpha, $show_marnm === 'yes', false),
335
-                              'sosa'        => false,
336
-                              'tree'        => $tree,
337
-                          ]);
338
-                      } else {
339
-                          echo view('lists/families-table', [
340
-                              'families' => $this->families($tree, $surname, $alpha, $falpha, $show_marnm === 'yes'),
341
-                              'tree'     => $tree,
342
-                          ]);
343
-                      }
344
-                  }
345
-              }
346
-          }
347
-          ?>
277
+                                'surnames' => $surns,
278
+                                'route'    => $route,
279
+                            ]);
280
+                            break;
281
+                    }
282
+                } else {
283
+                    // Show the list
284
+                    $count = 0;
285
+                    foreach ($surns as $surnames) {
286
+                        foreach ($surnames as $list) {
287
+                            $count += count($list);
288
+                        }
289
+                    }
290
+                    // Don't sublists short lists.
291
+                    if ($count < $tree->getPreference('SUBLIST_TRIGGER_I')) {
292
+                        $falpha = '';
293
+                    } else {
294
+                        $givn_initials = $this->givenAlpha($tree, $surname, $alpha, $show_marnm === 'yes', $families);
295
+                        // Break long lists by initial letter of given name
296
+                        if ($surname || $show_all === 'yes') {
297
+                            if ($show_all === 'no') {
298
+                                echo '<h2 class="wt-page-title">', I18N::translate('Individuals with surname %s', $legend), '</h2>';
299
+                            }
300
+                            // Don't show the list until we have some filter criteria
301
+                            $show = ($falpha || $show_all_firstnames === 'yes') ? 'indi' : 'none';
302
+                            $list = [];
303
+                            echo '<ul class="d-flex flex-wrap justify-content-center wt-initials-list">';
304
+                            foreach ($givn_initials as $givn_initial => $count) {
305
+                                echo '<li class="wt-initials-list-item">';
306
+                                if ($count > 0) {
307
+                                    if ($show === 'indi' && $givn_initial === $falpha && $show_all_firstnames === 'no') {
308
+                                        echo '<a class="wt-initial active" href="' . e(route($route, ['falpha' => $givn_initial] + $params)) . '" title="' . I18N::number($count) . '">' . $this->givenNameInitial((string)$givn_initial) . '</a>';
309
+                                    } else {
310
+                                        echo '<a class="wt-initial" href="' . e(route($route, ['falpha' => $givn_initial] + $params)) . '" title="' . I18N::number($count) . '">' . $this->givenNameInitial((string)$givn_initial) . '</a>';
311
+                                    }
312
+                                } else {
313
+                                    echo '<span class="wt-initial text-muted">' . $this->givenNameInitial((string)$givn_initial) . '</span>';
314
+                                }
315
+                                echo '</li>';
316
+                            }
317
+                            // Search spiders don't get the "show all" option as the other links give them everything.
318
+                            if (Session::has('initiated')) {
319
+                                echo '<li class="wt-initials-list-item">';
320
+                                if ($show_all_firstnames === 'yes') {
321
+                                    echo '<span class="wt-initial warning">' . I18N::translate('All') . '</span>';
322
+                                } else {
323
+                                    echo '<a class="wt-initial" href="' . e(route($route, ['show_all_firstnames' => 'yes'] + $params)) . '" title="' . I18N::number($count) . '">' . I18N::translate('All') . '</a>';
324
+                                }
325
+                                echo '</li>';
326
+                            }
327
+                            echo '</ul>';
328
+                            echo '<p class="center alpha_index">', implode(' | ', $list), '</p>';
329
+                        }
330
+                    }
331
+                    if ($show === 'indi') {
332
+                        if ($route === 'individual-list') {
333
+                            echo view('lists/individuals-table', [
334
+                                'individuals' => $this->individuals($tree, $surname, $alpha, $falpha, $show_marnm === 'yes', false),
335
+                                'sosa'        => false,
336
+                                'tree'        => $tree,
337
+                            ]);
338
+                        } else {
339
+                            echo view('lists/families-table', [
340
+                                'families' => $this->families($tree, $surname, $alpha, $falpha, $show_marnm === 'yes'),
341
+                                'tree'     => $tree,
342
+                            ]);
343
+                        }
344
+                    }
345
+                }
346
+            }
347
+            ?>
348 348
 			</div>
349 349
         <?php
350 350
 
Please login to merge, or discard this patch.
app/Http/Controllers/IndividualController.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -327,8 +327,8 @@  discard block
 block discarded – undo
327 327
                 FontAwesome::linkIcon('edit', I18N::translate('Edit the name'), [
328 328
                     'class' => 'btn btn-link',
329 329
                     'href'  => route('edit-name', ['xref'    => $individual->getXref(),
330
-                                                   'fact_id' => $fact->getFactId(),
331
-                                                   'ged'     => $individual->getTree()->getName(),
330
+                                                    'fact_id' => $fact->getFactId(),
331
+                                                    'ged'     => $individual->getTree()->getName(),
332 332
                     ]),
333 333
                 ]);
334 334
         } else {
@@ -381,8 +381,8 @@  discard block
 block discarded – undo
381 381
             $edit_links = FontAwesome::linkIcon('edit', I18N::translate('Edit the gender'), [
382 382
                 'class' => 'btn btn-link',
383 383
                 'href'  => route('edit-fact', ['xref'    => $individual->getXref(),
384
-                                               'fact_id' => $fact->getFactId(),
385
-                                               'ged'     => $individual->getTree()->getName(),
384
+                                                'fact_id' => $fact->getFactId(),
385
+                                                'ged'     => $individual->getTree()->getName(),
386 386
                 ]),
387 387
             ]);
388 388
         } else {
Please login to merge, or discard this patch.
app/Module/MissingFactsReportModule.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
         return new Menu(
66 66
             $this->getTitle(),
67 67
             route('report-setup', ['ged'    => $tree->getName(),
68
-                                   'report' => $this->getName(),
68
+                                    'report' => $this->getName(),
69 69
             ]),
70 70
             'menu-report-' . $this->getName(),
71 71
             ['rel' => 'nofollow']
Please login to merge, or discard this patch.
app/Module/FamilyBookChartModule.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
         return new Menu(
72 72
             $this->getTitle(),
73 73
             route('family-book', ['ged'  => $individual->getTree()->getName(),
74
-                                  'xref' => $individual->getXref(),
74
+                                    'xref' => $individual->getXref(),
75 75
             ]),
76 76
             'menu-chart-familybook',
77 77
             ['rel' => 'nofollow']
Please login to merge, or discard this patch.
app/Module/DescendancyChartModule.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
         return new Menu(
72 72
             $this->getTitle(),
73 73
             route('descendants', ['ged'  => $individual->getTree()->getName(),
74
-                                  'xref' => $individual->getXref(),
74
+                                    'xref' => $individual->getXref(),
75 75
             ]),
76 76
             'menu-chart-descendants',
77 77
             ['rel' => 'nofollow']
Please login to merge, or discard this patch.
app/MediaFile.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -224,10 +224,10 @@
 block discarded – undo
224 224
             $src    = $this->imageUrl($width, $height, $fit);
225 225
             $srcset = [];
226 226
             foreach ([
227
-                         2,
228
-                         3,
229
-                         4,
230
-                     ] as $x) {
227
+                            2,
228
+                            3,
229
+                            4,
230
+                        ] as $x) {
231 231
                 $srcset[] = $this->imageUrl($width * $x, $height * $x, $fit) . ' ' . $x . 'x';
232 232
             }
233 233
         }
Please login to merge, or discard this patch.