@@ -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\Http\Controllers; |
19 | 19 |
@@ -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\Http\Controllers; |
19 | 19 |
@@ -13,7 +13,7 @@ discard block |
||
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\Http\Controllers; |
19 | 19 | |
@@ -731,7 +731,7 @@ discard block |
||
731 | 731 | * @return Response |
732 | 732 | */ |
733 | 733 | public function changesLogData(Request $request): Response { |
734 | - list($select, , $where, $args1) = $this->changesQuery($request); |
|
734 | + list($select,, $where, $args1) = $this->changesQuery($request); |
|
735 | 735 | list($order_by, $limit, $args2) = $this->dataTablesPagination($request); |
736 | 736 | |
737 | 737 | $rows = Database::prepare( |
@@ -805,7 +805,7 @@ discard block |
||
805 | 805 | * @return Response |
806 | 806 | */ |
807 | 807 | public function changesLogDownload(Request $request): Response { |
808 | - list($select, , $where, $args) = $this->changesQuery($request); |
|
808 | + list($select,, $where, $args) = $this->changesQuery($request); |
|
809 | 809 | |
810 | 810 | $rows = Database::prepare($select . $where)->execute($args)->fetchAll(); |
811 | 811 | |
@@ -1135,7 +1135,7 @@ discard block |
||
1135 | 1135 | $data = array_map(function (string $thumbnail) { |
1136 | 1136 | $original = $this->findOriginalFileFromThumbnail($thumbnail); |
1137 | 1137 | |
1138 | - $original_url = route('unused-media-thumbnail', [ |
|
1138 | + $original_url = route('unused-media-thumbnail', [ |
|
1139 | 1139 | 'folder' => dirname($original), |
1140 | 1140 | 'file' => basename($original), |
1141 | 1141 | 'w' => 100, |
@@ -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\Http\Controllers; |
19 | 19 |
@@ -126,7 +126,8 @@ discard block |
||
126 | 126 | <div class="form-control"><?= e(Auth::user()->getRealName()) ?></div> |
127 | 127 | </div> |
128 | 128 | </div> |
129 | - <?php else: ?> |
|
129 | + <?php else { |
|
130 | + : ?> |
|
130 | 131 | <div class="form-group row"> |
131 | 132 | <label class="col-sm-3 col-form-label" for="from-name"> |
132 | 133 | <?= I18N::translate('Your name') ?> |
@@ -187,6 +188,7 @@ discard block |
||
187 | 188 | function recipients($to) { |
188 | 189 | if ($to === 'all') { |
189 | 190 | $recipients = User::all(); |
191 | +} |
|
190 | 192 | } elseif ($to === 'last_6mo') { |
191 | 193 | $recipients = array_filter(User::all(), function (User $user) { |
192 | 194 | return $user->getPreference('sessiontime') > 0 && WT_TIMESTAMP - $user->getPreference('sessiontime') > 60 * 60 * 24 * 30 * 6; |
@@ -382,7 +382,8 @@ discard block |
||
382 | 382 | <a href="<?= e($individual->url()) ?>#tab-stories"> |
383 | 383 | <?= $individual->getFullName() ?> |
384 | 384 | </a> |
385 | - <?php else: ?> |
|
385 | + <?php else { |
|
386 | + : ?> |
|
386 | 387 | <?= $story->xref ?> |
387 | 388 | <?php endif ?> |
388 | 389 | </td> |
@@ -411,6 +412,7 @@ discard block |
||
411 | 412 | */ |
412 | 413 | private function showList() { |
413 | 414 | global $controller, $WT_TREE; |
415 | +} |
|
414 | 416 | |
415 | 417 | $controller = new PageController; |
416 | 418 | $controller |
@@ -94,7 +94,7 @@ |
||
94 | 94 | |
95 | 95 | /** {@inheritdoc} */ |
96 | 96 | public function hasTabContent(Individual $individual) { |
97 | - return Auth::isManager($individual->getTree() )|| !empty($this->getStoriesForIndividual($individual)); |
|
97 | + return Auth::isManager($individual->getTree()) || !empty($this->getStoriesForIndividual($individual)); |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | /** {@inheritdoc} */ |
@@ -146,7 +146,8 @@ discard block |
||
146 | 146 | value="<?= e($controller->getValue($i)) ?>"> |
147 | 147 | <?php if (preg_match('/^NAME:/', $currentFieldSearch) > 0): ?> |
148 | 148 | <select class="form-control form-control-sm col-3" name="fields[<?= $i ?>]"> |
149 | - <option value="<?= $currentField ?>:EXACT" <?php if (preg_match('/:EXACT$/', $currentFieldSearch) > 0) echo 'selected' ?>> |
|
149 | + <option value="<?= $currentField ?>:EXACT" <?php if (preg_match('/:EXACT$/', $currentFieldSearch) > 0) { |
|
150 | + echo 'selected' ?>> |
|
150 | 151 | <?= I18N::translate('Exact') ?> |
151 | 152 | </option> |
152 | 153 | <option value="<?= $currentField ?>:BEGINS" <?php if (preg_match('/:BEGINS$/', $currentFieldSearch) > 0) echo 'selected' ?>> |
@@ -161,13 +162,15 @@ discard block |
||
161 | 162 | <?php else: ?> |
162 | 163 | <input type="hidden" name="fields[<?= $i ?>]" value="<?= $controller->getField($i) ?>"> |
163 | 164 | <?php endif; |
165 | +} |
|
164 | 166 | if (preg_match('/:DATE$/', $currentFieldSearch) > 0) { |
165 | 167 | ?> |
166 | 168 | <select class="form-control form-control-sm col-3" name="plusminus[<?= $i ?>]"> |
167 | 169 | <option value=""> |
168 | 170 | <?= I18N::translate('Exact date') ?> |
169 | 171 | </option> |
170 | - <option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 2) echo 'selected' ?>> |
|
172 | + <option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 2) { |
|
173 | + echo 'selected' ?>> |
|
171 | 174 | <?= I18N::plural('±%s year', '±%s years', 2, I18N::number(2)) ?> |
172 | 175 | </option> |
173 | 176 | <option value="5" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 5) echo 'selected' ?>> |
@@ -183,6 +186,7 @@ discard block |
||
183 | 186 | //-- relative fields |
184 | 187 | if ($i == 0 && $fct > 4) { |
185 | 188 | $j = $fct; |
189 | +} |
|
186 | 190 | // Get the current options for Father’s and Mother’s name searches |
187 | 191 | $fatherGivnOption = 'SDX'; |
188 | 192 | $fatherSurnOption = 'SDX'; |
@@ -143,7 +143,8 @@ discard block |
||
143 | 143 | <div class="small"> |
144 | 144 | <?= $spouse->getLifeSpan() ?> |
145 | 145 | </div> |
146 | - <?php else: ?> |
|
146 | + <?php else { |
|
147 | + : ?> |
|
147 | 148 | <?= $spouse->getFullName() ?> |
148 | 149 | <?php endif ?> |
149 | 150 | </td> |
@@ -153,6 +154,7 @@ discard block |
||
153 | 154 | |
154 | 155 | foreach ($family->getChildren() as $child) { |
155 | 156 | $icon = $individual === $child ? '<i class="icon-selected"></i>' : ''; |
157 | +} |
|
156 | 158 | $menu = new Menu($icon . Functions::getCloseRelationshipName($individual, $child)); |
157 | 159 | $menu->addSubmenu(new Menu($this->getFamily($child))); |
158 | 160 | ?> |
@@ -170,7 +172,8 @@ discard block |
||
170 | 172 | <div class="small"> |
171 | 173 | <?= $child->getLifeSpan() ?> |
172 | 174 | </div> |
173 | - <?php else: ?> |
|
175 | + <?php else { |
|
176 | + : ?> |
|
174 | 177 | <?= $child->getFullName() ?> |
175 | 178 | <?php endif ?> |
176 | 179 | </td> |
@@ -194,6 +197,7 @@ discard block |
||
194 | 197 | private function getHTML($person, $showUnknown = false) { |
195 | 198 | if ($person instanceof Individual) { |
196 | 199 | return sprintf(self::LNK, e($person->url()), $person->getFullName()); |
200 | +} |
|
197 | 201 | } elseif ($showUnknown) { |
198 | 202 | return sprintf(self::MSG, I18N::translate('unknown')); |
199 | 203 | } else { |
@@ -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\Http\Controllers; |
19 | 19 |