@@ -111,24 +111,24 @@ |
||
111 | 111 | * @return Individual[] |
112 | 112 | */ |
113 | 113 | protected function allAncestors(Individual $individual): array { |
114 | - /** @var Individual[] $ancestors */ |
|
115 | - $ancestors = [ |
|
116 | - 1 => $individual, |
|
117 | - ]; |
|
114 | + /** @var Individual[] $ancestors */ |
|
115 | + $ancestors = [ |
|
116 | + 1 => $individual, |
|
117 | + ]; |
|
118 | 118 | |
119 | - do { |
|
120 | - $sosa = key($ancestors); |
|
119 | + do { |
|
120 | + $sosa = key($ancestors); |
|
121 | 121 | |
122 | 122 | $family = $ancestors[$sosa]->getPrimaryChildFamily(); |
123 | 123 | |
124 | 124 | if ($family !== null) { |
125 | - if ($family->getHusband() !== null) { |
|
126 | - $ancestors[$sosa * 2] = $family->getHusband(); |
|
127 | - } |
|
128 | - if ($family->getWife() !== null) { |
|
129 | - $ancestors[$sosa * 2 + 1] = $family->getWife(); |
|
130 | - } |
|
131 | - } |
|
125 | + if ($family->getHusband() !== null) { |
|
126 | + $ancestors[$sosa * 2] = $family->getHusband(); |
|
127 | + } |
|
128 | + if ($family->getWife() !== null) { |
|
129 | + $ancestors[$sosa * 2 + 1] = $family->getWife(); |
|
130 | + } |
|
131 | + } |
|
132 | 132 | } while (next($ancestors)); |
133 | 133 | |
134 | 134 | return $ancestors; |
@@ -5,7 +5,7 @@ |
||
5 | 5 | |
6 | 6 | <?= view('admin/breadcrumbs', [ |
7 | 7 | 'links' => [route('admin-control-panel') => I18N::translate('Control panel'), |
8 | - route('admin-modules') => I18N::translate('Module administration'), |
|
8 | + route('admin-modules') => I18N::translate('Module administration'), |
|
9 | 9 | $title |
10 | 10 | ]]) ?> |
11 | 11 |
@@ -21,13 +21,13 @@ |
||
21 | 21 | <div class="center"> |
22 | 22 | <?php if ($showeventslink): ?> |
23 | 23 | <a class="formField" href= <?= e(route('place-hierarchy', |
24 | - ['ged' => $tree->getName(), 'parent' => $parent, 'action' => 'hierarchy-e'] |
|
25 | - ) |
|
26 | - ) ?>><?= I18N::translate('View table of events occurring in %s', $place) ?></a> |
|
24 | + ['ged' => $tree->getName(), 'parent' => $parent, 'action' => 'hierarchy-e'] |
|
25 | + ) |
|
26 | + ) ?>><?= I18N::translate('View table of events occurring in %s', $place) ?></a> |
|
27 | 27 | | |
28 | 28 | <?php endif ?> |
29 | 29 | <a href="<?= e(route('place-hierarchy', ['ged' => $tree->getName(), 'action' => key($nextaction)])) |
30 | - ?>"><?= current($nextaction) ?></a> |
|
30 | + ?>"><?= current($nextaction) ?></a> |
|
31 | 31 | </div> |
32 | 32 | </div> |
33 | 33 | </div> |
@@ -6,10 +6,10 @@ |
||
6 | 6 | |
7 | 7 | <h3><?= $title ?></h3> |
8 | 8 | <form id="upload_form" method="post" enctype="multipart/form-data" action="<?= |
9 | - e(route('admin-module',[ |
|
10 | - 'module' => $module, |
|
11 | - 'action' => 'AdminImport', |
|
12 | - ])) ?>"> |
|
9 | + e(route('admin-module',[ |
|
10 | + 'module' => $module, |
|
11 | + 'action' => 'AdminImport', |
|
12 | + ])) ?>"> |
|
13 | 13 | <?= csrf_field() ?> |
14 | 14 | <input type="hidden" name="parent_id" value="<?= $parent_id ?>"> |
15 | 15 | <input type="hidden" name="inactive" value="<?= $inactive ?>"> |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | </div> |
20 | 20 | <form method="POST" |
21 | 21 | action="<?=e(route('admin-module', |
22 | - ['module' => $module, 'action' => 'AdminPlaces', 'parent_id' => $parent_id])) ?>"> |
|
22 | + ['module' => $module, 'action' => 'AdminPlaces', 'parent_id' => $parent_id])) ?>"> |
|
23 | 23 | |
24 | 24 | <?= csrf_field() ?> |
25 | 25 | <?= Bootstrap4::checkbox( |
@@ -54,12 +54,12 @@ discard block |
||
54 | 54 | <tr> |
55 | 55 | <td> |
56 | 56 | <a href="<?= e(route('admin-module', |
57 | - ['module' => $module, |
|
58 | - 'action' => 'AdminPlaces', |
|
59 | - 'parent_id' => $place->pl_id, |
|
60 | - 'inactive' => $inactive] |
|
61 | - ) |
|
62 | - ) ?>"> |
|
57 | + ['module' => $module, |
|
58 | + 'action' => 'AdminPlaces', |
|
59 | + 'parent_id' => $place->pl_id, |
|
60 | + 'inactive' => $inactive] |
|
61 | + ) |
|
62 | + ) ?>"> |
|
63 | 63 | <?= e($place->pl_place) ?> |
64 | 64 | <span class="badge badge-pill badge-<?= $place->badge ?>"> |
65 | 65 | <?= I18N::number($place->child_count) ?> |
@@ -68,11 +68,11 @@ discard block |
||
68 | 68 | </td> |
69 | 69 | <td> |
70 | 70 | <?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') : |
71 | - strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?> |
|
71 | + strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?> |
|
72 | 72 | </td> |
73 | 73 | <td> |
74 | 74 | <?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') : |
75 | - strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?> |
|
75 | + strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?> |
|
76 | 76 | </td> |
77 | 77 | <td> |
78 | 78 | <?= $place->pl_long === null ? FontAwesome::decorativeIcon('warning') : $place->pl_zoom ?> |
@@ -529,8 +529,8 @@ discard block |
||
529 | 529 | case 'BaseData': |
530 | 530 | $varName = (self::$map_selections['style'] === '') ? '' : self::$map_providers[self::$map_selections['provider']]['styles'][self::$map_selections['style']]; |
531 | 531 | $payload = ['selectedProvIndex' => self::$map_selections['provider'], |
532 | - 'selectedProvName' => self::$map_providers[self::$map_selections['provider']]['name'], |
|
533 | - 'selectedStyleName' => $varName, |
|
532 | + 'selectedProvName' => self::$map_providers[self::$map_selections['provider']]['name'], |
|
533 | + 'selectedStyleName' => $varName, |
|
534 | 534 | ]; |
535 | 535 | break; |
536 | 536 | case 'ProviderStyles': |
@@ -543,9 +543,9 @@ discard block |
||
543 | 543 | $providers[$key] = $provider['name']; |
544 | 544 | } |
545 | 545 | $payload = ['providers' => $providers, |
546 | - 'selectedProv' => self::$map_selections['provider'], |
|
547 | - 'styles' => self::$map_providers[self::$map_selections['provider']]['styles'], |
|
548 | - 'selectedStyle' => self::$map_selections['style'], |
|
546 | + 'selectedProv' => self::$map_selections['provider'], |
|
547 | + 'styles' => self::$map_providers[self::$map_selections['provider']]['styles'], |
|
548 | + 'selectedStyle' => self::$map_selections['style'], |
|
549 | 549 | ]; |
550 | 550 | break; |
551 | 551 | default: |
@@ -1105,8 +1105,8 @@ discard block |
||
1105 | 1105 | $row = explode($delimiter, $input_array[0]); |
1106 | 1106 | $fields = count($row); |
1107 | 1107 | if ($fields >= 6 && |
1108 | - (bool)preg_match("/[SN][0-9]*\.?[0-9]*/", $row[$fields - 3]) && |
|
1109 | - (bool)preg_match("/[EW][0-9]*\.?[0-9]*/", $row[$fields - 4])) { |
|
1108 | + (bool)preg_match("/[SN][0-9]*\.?[0-9]*/", $row[$fields - 3]) && |
|
1109 | + (bool)preg_match("/[EW][0-9]*\.?[0-9]*/", $row[$fields - 4])) { |
|
1110 | 1110 | $filetype = 'csv'; |
1111 | 1111 | } |
1112 | 1112 | } |
@@ -322,8 +322,8 @@ |
||
322 | 322 | $default_locale = new LocaleEnUs; |
323 | 323 | try { |
324 | 324 | // @TODO, when no language is requested by the user (e.g. search engines), we should use |
325 | - // the tree's default language. However, we currently initialise languages before trees, |
|
326 | - // so there is no tree available for us to use. |
|
325 | + // the tree's default language. However, we currently initialise languages before trees, |
|
326 | + // so there is no tree available for us to use. |
|
327 | 327 | } catch (\Exception $ex) { |
328 | 328 | DebugBar::addThrowable($ex); |
329 | 329 | } |