@@ -32,6 +32,6 @@ |
||
| 32 | 32 | * @return string |
| 33 | 33 | */ |
| 34 | 34 | public function generate(Individual $individual, Individual $head = null) { |
| 35 | - return (string)Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0); |
|
| 35 | + return (string) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0); |
|
| 36 | 36 | } |
| 37 | 37 | } |
@@ -94,7 +94,7 @@ |
||
| 94 | 94 | * @return bool |
| 95 | 95 | */ |
| 96 | 96 | private function isChild(Individual $individual) { |
| 97 | - $age = (int)Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0); |
|
| 97 | + $age = (int) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0); |
|
| 98 | 98 | |
| 99 | 99 | return $age < $this->age_adult; |
| 100 | 100 | } |
@@ -49,6 +49,6 @@ |
||
| 49 | 49 | } |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | - return (string)$count; |
|
| 52 | + return (string) $count; |
|
| 53 | 53 | } |
| 54 | 54 | } |
@@ -49,6 +49,6 @@ |
||
| 49 | 49 | } |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | - return (string)$count; |
|
| 52 | + return (string) $count; |
|
| 53 | 53 | } |
| 54 | 54 | } |
@@ -40,7 +40,7 @@ |
||
| 40 | 40 | $years -= $years % 5; |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - return (string)$years; |
|
| 43 | + return (string) $years; |
|
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | } |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | |
| 48 | 48 | switch ($action) { |
| 49 | 49 | case 'delete': |
| 50 | - Database::prepare("DELETE FROM `##news` WHERE news_id = :news_id")->execute(['news_id' => $news_id,]); |
|
| 50 | + Database::prepare("DELETE FROM `##news` WHERE news_id = :news_id")->execute(['news_id' => $news_id, ]); |
|
| 51 | 51 | |
| 52 | 52 | header('Location: index.php?ctype=' . $ctype . '&ged=' . $controller->tree()->getNameUrl()); |
| 53 | 53 | |
@@ -2235,7 +2235,7 @@ discard block |
||
| 2235 | 2235 | 'place_id' => $place_id, |
| 2236 | 2236 | ]); |
| 2237 | 2237 | } catch (\Exception $ex) { |
| 2238 | - FlashMessages::addMessage(I18N::translate('Location not removed: this location contains sub-locations'),'danger'); |
|
| 2238 | + FlashMessages::addMessage(I18N::translate('Location not removed: this location contains sub-locations'), 'danger'); |
|
| 2239 | 2239 | } |
| 2240 | 2240 | |
| 2241 | 2241 | header('Location: module.php?mod=googlemap&mod_action=admin_places&parent_id=' . $parent_id . '&inactive=' . $inactive); |
@@ -2582,7 +2582,7 @@ discard block |
||
| 2582 | 2582 | [0 => I18N::translate('Geographic data')] + |
| 2583 | 2583 | $this->placeIdToHierarchy($place_id === 0 ? $parent_id : $place_id); |
| 2584 | 2584 | foreach ($hierarchy as $id => $name) { |
| 2585 | - $breadcrumbs += ['module.php?mod=googlemap&mod_action=admin_places&parent_id=' . $id .'&inactive=' . $inactive => Filter::escapeHtml($name)]; |
|
| 2585 | + $breadcrumbs += ['module.php?mod=googlemap&mod_action=admin_places&parent_id=' . $id . '&inactive=' . $inactive => Filter::escapeHtml($name)]; |
|
| 2586 | 2586 | } |
| 2587 | 2587 | echo Bootstrap4::breadcrumbs($breadcrumbs, $place_id === 0 ? I18N::translate('Add') : I18N::translate('Edit')); |
| 2588 | 2588 | |
@@ -3088,7 +3088,7 @@ discard block |
||
| 3088 | 3088 | [0 => I18N::translate('Geographic data')] + |
| 3089 | 3089 | $this->placeIdToHierarchy($parent_id); |
| 3090 | 3090 | foreach (array_slice($hierarchy, 0, -1, true) as $id => $name) { |
| 3091 | - $breadcrumbs += ['module.php?mod=googlemap&mod_action=admin_places&parent_id=' . $id .'&inactive=' . $inactive => Filter::escapeHtml($name)]; |
|
| 3091 | + $breadcrumbs += ['module.php?mod=googlemap&mod_action=admin_places&parent_id=' . $id . '&inactive=' . $inactive => Filter::escapeHtml($name)]; |
|
| 3092 | 3092 | } |
| 3093 | 3093 | echo Bootstrap4::breadcrumbs($breadcrumbs, end($hierarchy)); |
| 3094 | 3094 | |
@@ -3280,7 +3280,7 @@ discard block |
||
| 3280 | 3280 | <?php endif ?> |
| 3281 | 3281 | </td> |
| 3282 | 3282 | <td> |
| 3283 | - <?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['href' => 'module.php?mod=googlemap&mod_action=admin_place_edit&action=update&place_id=' . $place['place_id'] . '&parent_id=' . $place['parent_id'], 'class' => 'btn btn-primary']) ?> |
|
| 3283 | + <?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['href' => 'module.php?mod=googlemap&mod_action=admin_place_edit&action=update&place_id=' . $place['place_id'] . '&parent_id=' . $place['parent_id'], 'class' => 'btn btn-primary']) ?> |
|
| 3284 | 3284 | </td> |
| 3285 | 3285 | <td> |
| 3286 | 3286 | <?php if ($noRows == 0): ?> |
@@ -3289,7 +3289,7 @@ discard block |
||
| 3289 | 3289 | <input type="hidden" name="place_id" value="<?= $place['place_id'] ?>"> |
| 3290 | 3290 | <input type="hidden" name="inactive" value="<?= $inactive ?>"> |
| 3291 | 3291 | <button type="submit" class="btn btn-danger"> |
| 3292 | - <?= FontAwesome::semanticIcon('delete', I18N::translate('Delete')) ?> |
|
| 3292 | + <?= FontAwesome::semanticIcon('delete', I18N::translate('Delete')) ?> |
|
| 3293 | 3293 | </button> |
| 3294 | 3294 | </form> |
| 3295 | 3295 | <?php else: ?> |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | } |
| 128 | 128 | } |
| 129 | 129 | } |
| 130 | - if ($user_id < 0 || $gedcom_id < 0 ) { |
|
| 130 | + if ($user_id < 0 || $gedcom_id < 0) { |
|
| 131 | 131 | header('Location: admin.php'); |
| 132 | 132 | } elseif ($user_id > 0) { |
| 133 | 133 | header('Location: index.php?ctype=user&ged=' . $WT_TREE->getNameUrl()); |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | <?= FontAwesome::decorativeIcon('save') ?> |
| 372 | 372 | <?= I18N::translate('save') ?> |
| 373 | 373 | </button> |
| 374 | - <?php if ($user_id < 0 || $gedcom_id < 0 ): ?> |
|
| 374 | + <?php if ($user_id < 0 || $gedcom_id < 0): ?> |
|
| 375 | 375 | <a class="btn btn-secondary" href="admin.php"> |
| 376 | 376 | <?php elseif ($user_id > 0): ?> |
| 377 | 377 | <a class="btn btn-secondary" href="index.php?ctype=user&ged=<?= $WT_TREE->getNameHtml() ?>"> |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | $action = Filter::post('action', null, Filter::get('action')); |
| 28 | 28 | |
| 29 | -$controller = new PageController; |
|
| 29 | +$controller = new PageController; |
|
| 30 | 30 | $controller |
| 31 | 31 | ->restrictAccess(Auth::isEditor($controller->tree())) |
| 32 | 32 | ->addInlineJavascript('var locale_date_format="' . preg_replace('/[^DMY]/', '', str_replace(['j', 'F'], ['D', 'M'], I18N::dateFormat())) . '";'); |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | //////////////////////////////////////////////////////////////////////////////// |
| 340 | 340 | case 'add': |
| 341 | 341 | $xref = Filter::get('xref', WT_REGEX_XREF); |
| 342 | - $fact = Filter::get('fact', WT_REGEX_TAG); |
|
| 342 | + $fact = Filter::get('fact', WT_REGEX_TAG); |
|
| 343 | 343 | |
| 344 | 344 | $record = GedcomRecord::getInstance($xref, $controller->tree()); |
| 345 | 345 | check_record_access($record); |
@@ -438,7 +438,7 @@ discard block |
||
| 438 | 438 | |
| 439 | 439 | $newged = ''; |
| 440 | 440 | if (!empty($_POST['NAME'])) { |
| 441 | - $newged .= "\n1 NAME " . $_POST['NAME']; |
|
| 441 | + $newged .= "\n1 NAME " . $_POST['NAME']; |
|
| 442 | 442 | $name_facts = ['TYPE', 'NPFX', 'GIVN', 'NICK', 'SPFX', 'SURN', 'NSFX']; |
| 443 | 443 | foreach ($name_facts as $name_fact) { |
| 444 | 444 | if (!empty($_POST[$name_fact])) { |
@@ -1192,7 +1192,7 @@ discard block |
||
| 1192 | 1192 | //////////////////////////////////////////////////////////////////////////////// |
| 1193 | 1193 | case 'linkspouse': |
| 1194 | 1194 | $famtag = Filter::get('famtag', 'HUSB|WIFE'); |
| 1195 | - $xref = Filter::get('xref', WT_REGEX_XREF); |
|
| 1195 | + $xref = Filter::get('xref', WT_REGEX_XREF); |
|
| 1196 | 1196 | |
| 1197 | 1197 | $person = Individual::getInstance($xref, $controller->tree()); |
| 1198 | 1198 | check_record_access($person); |
@@ -1440,7 +1440,7 @@ discard block |
||
| 1440 | 1440 | $TITL = Filter::post('TITL'); |
| 1441 | 1441 | if ($TITL) { |
| 1442 | 1442 | $newgedrec .= "\n1 TITL " . $TITL; |
| 1443 | - $_HEB = Filter::post('_HEB'); |
|
| 1443 | + $_HEB = Filter::post('_HEB'); |
|
| 1444 | 1444 | if ($_HEB) { |
| 1445 | 1445 | $newgedrec .= "\n2 _HEB " . $_HEB; |
| 1446 | 1446 | } |
@@ -1460,7 +1460,7 @@ discard block |
||
| 1460 | 1460 | $REPO = Filter::post('REPO', WT_REGEX_XREF); |
| 1461 | 1461 | if ($REPO) { |
| 1462 | 1462 | $newgedrec .= "\n1 REPO @" . $REPO . '@'; |
| 1463 | - $CALN = Filter::post('CALN'); |
|
| 1463 | + $CALN = Filter::post('CALN'); |
|
| 1464 | 1464 | if ($CALN) { |
| 1465 | 1465 | $newgedrec .= "\n2 CALN " . $CALN; |
| 1466 | 1466 | } |
@@ -1734,7 +1734,7 @@ discard block |
||
| 1734 | 1734 | $REPO_NAME = Filter::post('REPO_NAME'); |
| 1735 | 1735 | if ($REPO_NAME) { |
| 1736 | 1736 | $gedrec .= "\n1 NAME " . $REPO_NAME; |
| 1737 | - $_HEB = Filter::post('_HEB'); |
|
| 1737 | + $_HEB = Filter::post('_HEB'); |
|
| 1738 | 1738 | if ($_HEB) { |
| 1739 | 1739 | $gedrec .= "\n2 _HEB " . $_HEB; |
| 1740 | 1740 | } |
@@ -1944,7 +1944,7 @@ discard block |
||
| 1944 | 1944 | //////////////////////////////////////////////////////////////////////////////// |
| 1945 | 1945 | case 'reorder_children': |
| 1946 | 1946 | $xref = Filter::post('xref', WT_REGEX_XREF, Filter::get('xref', WT_REGEX_XREF)); |
| 1947 | - $option = Filter::post('option'); |
|
| 1947 | + $option = Filter::post('option'); |
|
| 1948 | 1948 | |
| 1949 | 1949 | $family = Family::getInstance($xref, $controller->tree()); |
| 1950 | 1950 | check_record_access($family); |
@@ -2342,7 +2342,7 @@ discard block |
||
| 2342 | 2342 | //////////////////////////////////////////////////////////////////////////////// |
| 2343 | 2343 | case 'reorder_fams': |
| 2344 | 2344 | $xref = Filter::post('xref', WT_REGEX_XREF, Filter::get('xref', WT_REGEX_XREF)); |
| 2345 | - $option = Filter::post('option'); |
|
| 2345 | + $option = Filter::post('option'); |
|
| 2346 | 2346 | |
| 2347 | 2347 | $person = Individual::getInstance($xref, $controller->tree()); |
| 2348 | 2348 | check_record_access($person); |
@@ -2460,7 +2460,7 @@ discard block |
||
| 2460 | 2460 | '<div class="form-group row"><label class="col-sm-3 col-form-label" for="keep_chan">' . |
| 2461 | 2461 | I18N::translate('Last change') . |
| 2462 | 2462 | '</label><div class="col-sm-9">' . |
| 2463 | - Bootstrap4::checkbox(I18N::translate('Keep the existing “last change” information'), true, ['name' => 'keep_chan', 'checked' => (bool)$controller->tree()->getPreference('NO_UPDATE_CHAN')]) . |
|
| 2463 | + Bootstrap4::checkbox(I18N::translate('Keep the existing “last change” information'), true, ['name' => 'keep_chan', 'checked' => (bool) $controller->tree()->getPreference('NO_UPDATE_CHAN')]) . |
|
| 2464 | 2464 | $details . |
| 2465 | 2465 | '</div></div>'; |
| 2466 | 2466 | } else { |