@@ -21,6 +21,7 @@ |
||
| 21 | 21 | interface MigrationInterface { |
| 22 | 22 | /** |
| 23 | 23 | * Upgrade to to the next version |
| 24 | + * @return void |
|
| 24 | 25 | */ |
| 25 | 26 | public function upgrade(); |
| 26 | 27 | } |
@@ -5362,7 +5362,7 @@ |
||
| 5362 | 5362 | /** |
| 5363 | 5363 | * Find common surnames. |
| 5364 | 5364 | * |
| 5365 | - * @return string |
|
| 5365 | + * @return integer|null |
|
| 5366 | 5366 | */ |
| 5367 | 5367 | public function getCommonSurname() { |
| 5368 | 5368 | $surnames = array_keys(FunctionsDb::getTopSurnames($this->tree->getTreeId(), 1, 1)); |
@@ -102,6 +102,7 @@ discard block |
||
| 102 | 102 | /** |
| 103 | 103 | * Allow themes to do things after initialization (since they cannot use |
| 104 | 104 | * the constructor). |
| 105 | + * @return void |
|
| 105 | 106 | */ |
| 106 | 107 | public function hookAfterInit(); |
| 107 | 108 | |
@@ -193,6 +194,7 @@ discard block |
||
| 193 | 194 | * happens in a theme file, and we need to be able to change it. |
| 194 | 195 | * |
| 195 | 196 | * @param Tree|null $tree The current tree (if there is one). |
| 197 | + * @return void |
|
| 196 | 198 | */ |
| 197 | 199 | public function init(Tree $tree = null); |
| 198 | 200 | |
@@ -214,6 +216,7 @@ discard block |
||
| 214 | 216 | |
| 215 | 217 | /** |
| 216 | 218 | * Send any HTTP headers. |
| 219 | + * @return void |
|
| 217 | 220 | */ |
| 218 | 221 | public function sendHeaders(); |
| 219 | 222 | |
@@ -648,16 +648,22 @@ |
||
| 648 | 648 | <div dir="ltr"> |
| 649 | 649 | <?php if (count($media_folders) > 1): ?> |
| 650 | 650 | <?php echo WT_DATA_DIR, FunctionsEdit::selectEditControl('media_folder', $media_folders, null, $media_folder, 'onchange="this.form.submit();"'); ?> |
| 651 | - <?php else: ?> |
|
| 652 | - <?php echo WT_DATA_DIR, Filter::escapeHtml($media_folder); ?> |
|
| 651 | + <?php else { |
|
| 652 | + : ?> |
|
| 653 | + <?php echo WT_DATA_DIR, Filter::escapeHtml($media_folder); |
|
| 654 | +} |
|
| 655 | +?> |
|
| 653 | 656 | <input type="hidden" name="media_folder" value="<?php echo Filter::escapeHtml($media_folder); ?>"> |
| 654 | 657 | <?php endif; ?> |
| 655 | 658 | </div> |
| 656 | 659 | |
| 657 | 660 | <?php if (count($media_paths) > 1): ?> |
| 658 | 661 | <?php echo FunctionsEdit::selectEditControl('media_path', $media_paths, null, $media_path, 'onchange="this.form.submit();"'); ?> |
| 659 | - <?php else: ?> |
|
| 660 | - <?php echo Filter::escapeHtml($media_path); ?> |
|
| 662 | + <?php else { |
|
| 663 | + : ?> |
|
| 664 | + <?php echo Filter::escapeHtml($media_path); |
|
| 665 | +} |
|
| 666 | +?> |
|
| 661 | 667 | <input type="hidden" name="media_path" value="<?php echo Filter::escapeHtml($media_path); ?>"> |
| 662 | 668 | <?php endif; ?> |
| 663 | 669 | |
@@ -74,8 +74,11 @@ |
||
| 74 | 74 | <td class="col-xs-2"> |
| 75 | 75 | <?php if ($module instanceof ModuleConfigInterface): ?> |
| 76 | 76 | <a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a> |
| 77 | - <?php else: ?> |
|
| 78 | - <?php echo $module->getTitle(); ?> |
|
| 77 | + <?php else { |
|
| 78 | + : ?> |
|
| 79 | + <?php echo $module->getTitle(); |
|
| 80 | +} |
|
| 81 | +?> |
|
| 79 | 82 | <?php endif; ?> |
| 80 | 83 | </td> |
| 81 | 84 | <td class="col-xs-5"><?php echo $module->getDescription(); ?></td> |
@@ -98,8 +98,11 @@ |
||
| 98 | 98 | <td class="col-xs-1"> |
| 99 | 99 | <?php if ($module instanceof ModuleConfigInterface): ?> |
| 100 | 100 | <a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a> |
| 101 | - <?php else: ?> |
|
| 102 | - <?php echo $module->getTitle(); ?> |
|
| 101 | + <?php else { |
|
| 102 | + : ?> |
|
| 103 | + <?php echo $module->getTitle(); |
|
| 104 | +} |
|
| 105 | +?> |
|
| 103 | 106 | <?php endif; ?> |
| 104 | 107 | </td> |
| 105 | 108 | <td class="col-xs-5"><?php echo $module->getDescription(); ?></td> |
@@ -232,9 +232,12 @@ discard block |
||
| 232 | 232 | <?php endforeach; ?> |
| 233 | 233 | </tbody> |
| 234 | 234 | </table> |
| 235 | - <?php else: ?> |
|
| 235 | + <?php else { |
|
| 236 | + : ?> |
|
| 236 | 237 | <p> |
| 237 | - <?php echo I18N::translate('No matching facts found'); ?> |
|
| 238 | + <?php echo I18N::translate('No matching facts found'); |
|
| 239 | +} |
|
| 240 | +?> |
|
| 238 | 241 | </p> |
| 239 | 242 | <?php endif; ?> |
| 240 | 243 | </div> |
@@ -279,9 +282,12 @@ discard block |
||
| 279 | 282 | <?php endforeach; ?> |
| 280 | 283 | </tbody> |
| 281 | 284 | </table> |
| 282 | - <?php else: ?> |
|
| 285 | + <?php else { |
|
| 286 | + : ?> |
|
| 283 | 287 | <p> |
| 284 | - <?php echo I18N::translate('No matching facts found'); ?> |
|
| 288 | + <?php echo I18N::translate('No matching facts found'); |
|
| 289 | +} |
|
| 290 | +?> |
|
| 285 | 291 | </p> |
| 286 | 292 | <?php endif; ?> |
| 287 | 293 | </div> |
@@ -325,9 +331,12 @@ discard block |
||
| 325 | 331 | <?php endforeach; ?> |
| 326 | 332 | </tbody> |
| 327 | 333 | </table> |
| 328 | - <?php else: ?> |
|
| 334 | + <?php else { |
|
| 335 | + : ?> |
|
| 329 | 336 | <p> |
| 330 | - <?php echo I18N::translate('No matching facts found'); ?> |
|
| 337 | + <?php echo I18N::translate('No matching facts found'); |
|
| 338 | +} |
|
| 339 | +?> |
|
| 331 | 340 | </p> |
| 332 | 341 | <?php endif; ?> |
| 333 | 342 | </div> |
@@ -341,10 +350,13 @@ discard block |
||
| 341 | 350 | </button> |
| 342 | 351 | </form> |
| 343 | 352 | |
| 344 | -<?php else: ?> |
|
| 353 | +<?php else { |
|
| 354 | + : ?> |
|
| 345 | 355 | |
| 346 | 356 | <form class="form form-horizontal"> |
| 347 | - <input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>"> |
|
| 357 | + <input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); |
|
| 358 | +} |
|
| 359 | +?>"> |
|
| 348 | 360 | <p><?php echo /* I18N: Records are indviduals, sources, etc. */ I18N::translate('Select two records to merge.'); ?></p> |
| 349 | 361 | |
| 350 | 362 | <div class="form-group"> |
@@ -554,18 +554,24 @@ |
||
| 554 | 554 | <div class="bg-danger text-danger"> |
| 555 | 555 | <?php echo $resn->xref, ' — ', I18N::translate('this record does not exist'); ?> |
| 556 | 556 | </div> |
| 557 | - <?php else: ?> |
|
| 557 | + <?php else { |
|
| 558 | + : ?> |
|
| 558 | 559 | <div class="text-muted"> |
| 559 | - <?php echo I18N::translate('All records'); ?> |
|
| 560 | + <?php echo I18N::translate('All records'); |
|
| 561 | +} |
|
| 562 | +?> |
|
| 560 | 563 | </div> |
| 561 | 564 | <?php endif; ?> |
| 562 | 565 | </td> |
| 563 | 566 | <td> |
| 564 | 567 | <?php if ($resn->tag_label): ?> |
| 565 | 568 | <?php echo $resn->tag_label; ?> |
| 566 | - <?php else: ?> |
|
| 569 | + <?php else { |
|
| 570 | + : ?> |
|
| 567 | 571 | <div class="text-muted"> |
| 568 | - <?php echo I18N::translate('All facts and events'); ?> |
|
| 572 | + <?php echo I18N::translate('All facts and events'); |
|
| 573 | +} |
|
| 574 | +?> |
|
| 569 | 575 | </div> |
| 570 | 576 | <?php endif; ?> |
| 571 | 577 | </td> |
@@ -177,8 +177,11 @@ |
||
| 177 | 177 | </li> |
| 178 | 178 | <?php endforeach; ?> |
| 179 | 179 | </ul> |
| 180 | -<?php else: ?> |
|
| 181 | -<p><?php echo I18N::translate('No duplicates have been found.'); ?></p> |
|
| 180 | +<?php else { |
|
| 181 | + : ?> |
|
| 182 | +<p><?php echo I18N::translate('No duplicates have been found.'); |
|
| 183 | +} |
|
| 184 | +?></p> |
|
| 182 | 185 | <?php endif; ?> |
| 183 | 186 | |
| 184 | 187 | <?php endforeach; ?> |