@@ -176,7 +176,7 @@ |
||
176 | 176 | /** |
177 | 177 | * Format an individual. |
178 | 178 | * |
179 | - * @param $person |
|
179 | + * @param Individual|null $person |
|
180 | 180 | * @param bool $showUnknown |
181 | 181 | * |
182 | 182 | * @return string |
@@ -141,7 +141,8 @@ discard block |
||
141 | 141 | <div class="small"> |
142 | 142 | <?= $spouse->getLifeSpan() ?> |
143 | 143 | </div> |
144 | - <?php else: ?> |
|
144 | + <?php else { |
|
145 | + : ?> |
|
145 | 146 | <?= $spouse->getFullName() ?> |
146 | 147 | <?php endif ?> |
147 | 148 | </td> |
@@ -151,6 +152,7 @@ discard block |
||
151 | 152 | |
152 | 153 | foreach ($family->getChildren() as $child) { |
153 | 154 | $icon = $controller->record === $child ? '<i class="icon-selected"></i>' : ''; |
155 | +} |
|
154 | 156 | $menu = new Menu($icon . Functions::getCloseRelationshipName($controller->record, $child)); |
155 | 157 | $menu->addSubmenu(new Menu($this->getFamily($child))); |
156 | 158 | ?> |
@@ -168,7 +170,8 @@ discard block |
||
168 | 170 | <div class="small"> |
169 | 171 | <?= $child->getLifeSpan() ?> |
170 | 172 | </div> |
171 | - <?php else: ?> |
|
173 | + <?php else { |
|
174 | + : ?> |
|
172 | 175 | <?= $child->getFullName() ?> |
173 | 176 | <?php endif ?> |
174 | 177 | </td> |
@@ -192,6 +195,7 @@ discard block |
||
192 | 195 | private function getHTML($person, $showUnknown = false) { |
193 | 196 | if ($person instanceof Individual) { |
194 | 197 | return sprintf(self::LNK, $person->getHtmlUrl(), $person->getFullName()); |
198 | +} |
|
195 | 199 | } elseif ($showUnknown) { |
196 | 200 | return sprintf(self::MSG, I18N::translate('unknown')); |
197 | 201 | } else { |
@@ -200,7 +200,8 @@ discard block |
||
200 | 200 | <div class="tab-pane fade show active" role="tabpanel" id="individuals"> |
201 | 201 | <?php if (empty($myindilist)): ?> |
202 | 202 | <p><?= I18N::translate('No results found.') ?></p> |
203 | - <?php else: ?> |
|
203 | + <?php else { |
|
204 | + : ?> |
|
204 | 205 | <?= FunctionsPrintLists::individualTable($myindilist) ?> |
205 | 206 | <?php endif ?> |
206 | 207 | </div> |
@@ -216,6 +217,7 @@ discard block |
||
216 | 217 | <?php |
217 | 218 | } |
218 | 219 | echo '<h4><a href="placelist.php?display=list">', I18N::translate('Show all places in a list'), '</a></h4>'; |
220 | +} |
|
219 | 221 | |
220 | 222 | if ($gm_module && $gm_module->getPreference('GM_PLACE_HIERARCHY')) { |
221 | 223 | $gm_module->mapScripts($numfound, $level, $parent, $linklevels, $place_names); |
@@ -126,7 +126,8 @@ discard block |
||
126 | 126 | <div class="form-control"><?= Html::escape(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; |