@@ -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 | |
@@ -116,7 +116,7 @@ |
||
| 116 | 116 | */ |
| 117 | 117 | public function getURL() { |
| 118 | 118 | return e(route('place-hierarchy', |
| 119 | - ['parent' => array_reverse($this->gedcom_place),'ged' => $this->tree->getNameUrl()])); |
|
| 119 | + ['parent' => array_reverse($this->gedcom_place), 'ged' => $this->tree->getNameUrl()])); |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | /** |
@@ -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> |
@@ -10,14 +10,14 @@ |
||
| 10 | 10 | |
| 11 | 11 | <?php if (Auth::isAdmin()): ?> |
| 12 | 12 | <p class="center"> |
| 13 | - <a href="<?= e(route('admin-module',[ |
|
| 13 | + <a href="<?= e(route('admin-module', [ |
|
| 14 | 14 | 'module' => $module, |
| 15 | 15 | 'action' => 'AdminConfig', |
| 16 | 16 | ])) ?>"> |
| 17 | 17 | <?= I18N::translate('Map module preferences') ?> |
| 18 | 18 | </a> |
| 19 | 19 | | |
| 20 | - <a href="<?= e(route('admin-module',[ |
|
| 20 | + <a href="<?= e(route('admin-module', [ |
|
| 21 | 21 | 'module' => $module, |
| 22 | 22 | 'action' => 'AdminPlaces', |
| 23 | 23 | ])) ?>"> |
@@ -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 ?>"> |
@@ -6,7 +6,7 @@ discard block |
||
| 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',[ |
|
| 9 | + e(route('admin-module', [ |
|
| 10 | 10 | 'module' => $module, |
| 11 | 11 | 'action' => 'AdminImport', |
| 12 | 12 | ])) ?>"> |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | </div> |
| 30 | 30 | <select id="serverfile" name="serverfile" class="form-control"> |
| 31 | 31 | <option class='custom-select' selected disabled value=''><?= I18N::translate('choose a file…') ?></option> |
| 32 | - <?php foreach($files as $file): ?> |
|
| 32 | + <?php foreach ($files as $file): ?> |
|
| 33 | 33 | <option value="<?= e($file) ?>"><?= $file ?></option> |
| 34 | 34 | <?php endforeach ?> |
| 35 | 35 | </select> |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | * You should have received a copy of the GNU General Public License |
| 14 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | 15 | */ |
| 16 | -declare(strict_types = 1); |
|
| 16 | +declare(strict_types=1); |
|
| 17 | 17 | |
| 18 | 18 | namespace Fisharebest\Webtrees; |
| 19 | 19 | |
@@ -9,14 +9,14 @@ |
||
| 9 | 9 | </a> |
| 10 | 10 | <?php endif ?> |
| 11 | 11 | |
| 12 | -<?php if($value): ?> |
|
| 12 | +<?php if ($value): ?> |
|
| 13 | 13 | <span> |
| 14 | 14 | <?= $value ?> |
| 15 | 15 | </span> |
| 16 | 16 | <?php endif ?> |
| 17 | 17 | |
| 18 | 18 | <div> |
| 19 | - <?php if($addtag): ?> |
|
| 19 | + <?php if ($addtag): ?> |
|
| 20 | 20 | <?= GedcomTag::getLabel('BIRT') ?>: |
| 21 | 21 | <?php endif ?> |
| 22 | 22 | <?= $date ?> |
@@ -47,14 +47,14 @@ discard block |
||
| 47 | 47 | $osm_module = Module::getModuleByName(self::MAP_MODULE); |
| 48 | 48 | $method = 'assets'; |
| 49 | 49 | $showmap = $osm_module && |
| 50 | - (bool)$osm_module->getPreference('place_hierarchy') && |
|
| 50 | + (bool) $osm_module->getPreference('place_hierarchy') && |
|
| 51 | 51 | method_exists($osm_module, $method) && |
| 52 | 52 | strpos($action, 'hierarchy') === 0; |
| 53 | 53 | $data = null; |
| 54 | 54 | $note = false; |
| 55 | 55 | |
| 56 | 56 | if ($showmap) { |
| 57 | - $note = true; |
|
| 57 | + $note = true; |
|
| 58 | 58 | $content .= view('modules/openstreetmap/map', |
| 59 | 59 | [ |
| 60 | 60 | 'assets' => $osm_module->$method(), |
@@ -67,14 +67,14 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | switch ($action) { |
| 69 | 69 | case 'list': |
| 70 | - $nextaction = ['hierarchy' => I18N::translate('Show place hierarchy')]; |
|
| 71 | - $content .= view('place-list', $this->getList($tree)); |
|
| 70 | + $nextaction = ['hierarchy' => I18N::translate('Show place hierarchy')]; |
|
| 71 | + $content .= view('place-list', $this->getList($tree)); |
|
| 72 | 72 | break; |
| 73 | 73 | case 'hierarchy': |
| 74 | 74 | case 'hierarchy-e': |
| 75 | 75 | $nextaction = ['list' => I18N::translate('List all places')]; |
| 76 | 76 | $data = $this->getHierarchy($tree, $place, $parent); |
| 77 | - $content .= (null === $data || $showmap) ? '' : view('place-hierarchy', $data); |
|
| 77 | + $content .= (null === $data || $showmap) ? '' : view('place-hierarchy', $data); |
|
| 78 | 78 | if (null === $data || $action === 'hierarchy-e') { |
| 79 | 79 | $content .= view('place-events', $this->getEvents($tree, $place)); |
| 80 | 80 | } |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | |
| 115 | 115 | return |
| 116 | 116 | [ |
| 117 | - 'columns' => array_chunk($list_places, (int)ceil($numfound / $divisor)), |
|
| 117 | + 'columns' => array_chunk($list_places, (int) ceil($numfound / $divisor)), |
|
| 118 | 118 | ]; |
| 119 | 119 | } |
| 120 | 120 | |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | [ |
| 137 | 137 | 'tree' => $tree, |
| 138 | 138 | 'col_class' => "w-" . ($divisor === 2 ? "25" : "50"), |
| 139 | - 'columns' => array_chunk($child_places, (int)ceil($numfound / $divisor)), |
|
| 139 | + 'columns' => array_chunk($child_places, (int) ceil($numfound / $divisor)), |
|
| 140 | 140 | 'place' => $place, |
| 141 | 141 | 'parent' => $parent, |
| 142 | 142 | ]; |
@@ -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 ?> |
@@ -67,12 +67,10 @@ discard block |
||
| 67 | 67 | </a> |
| 68 | 68 | </td> |
| 69 | 69 | <td> |
| 70 | - <?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') : |
|
| 71 | - strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?> |
|
| 70 | + <?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') : strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?> |
|
| 72 | 71 | </td> |
| 73 | 72 | <td> |
| 74 | - <?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') : |
|
| 75 | - strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?> |
|
| 73 | + <?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') : strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?> |
|
| 76 | 74 | </td> |
| 77 | 75 | <td> |
| 78 | 76 | <?= $place->pl_long === null ? FontAwesome::decorativeIcon('warning') : $place->pl_zoom ?> |
@@ -194,7 +192,7 @@ discard block |
||
| 194 | 192 | </tfoot> |
| 195 | 193 | </table> |
| 196 | 194 | |
| 197 | -<form method="POST" action="<?= e(route('admin-module',[ |
|
| 195 | +<form method="POST" action="<?= e(route('admin-module', [ |
|
| 198 | 196 | 'module' => $module, |
| 199 | 197 | 'action' => 'AdminImportPlaces' |
| 200 | 198 | ])) ?>"> |