@@ -235,7 +235,8 @@ discard block |
||
| 235 | 235 | <?php // Reset - otherwise we might "undo all changes", which refreshes the ?> |
| 236 | 236 | <?php // page, which makes them all again! ?> |
| 237 | 237 | <script>reset_reload();</script> |
| 238 | - <?php else: ?> |
|
| 238 | + <?php else { |
|
| 239 | + : ?> |
|
| 239 | 240 | <hr> |
| 240 | 241 | <div id="batch_update2" class="col-sm-12"> |
| 241 | 242 | <?php if ($this->curr_xref): ?> |
@@ -273,6 +274,7 @@ discard block |
||
| 273 | 274 | foreach (array_keys($this->all_xrefs) as $key) { |
| 274 | 275 | if ($key > $xref) { |
| 275 | 276 | $record = self::getLatestRecord($key, $this->all_xrefs[$key]); |
| 277 | +} |
|
| 276 | 278 | if ($this->PLUGIN->doesRecordNeedUpdate($key, $record)) { |
| 277 | 279 | return $key; |
| 278 | 280 | } |
@@ -168,7 +168,7 @@ |
||
| 168 | 168 | DebugBar::addThrowable($ex); |
| 169 | 169 | |
| 170 | 170 | // The module has been deleted or is broken? Disable it. |
| 171 | - Log::addConfigurationLog("Module {$module_name} is missing or broken - disabling it. " . $ex->getMessage()); |
|
| 171 | + Log::addConfigurationLog("module {$module_name} is missing or broken - disabling it. " . $ex->getMessage()); |
|
| 172 | 172 | Database::prepare( |
| 173 | 173 | "UPDATE `##module` SET status = 'disabled' WHERE module_name = :module_name" |
| 174 | 174 | )->execute([ |
@@ -78,8 +78,7 @@ |
||
| 78 | 78 | // Create the underlying PDO object |
| 79 | 79 | self::$pdo = new PDO( |
| 80 | 80 | (substr($config['dbhost'], 0, 1) === '/' ? |
| 81 | - "mysql:unix_socket={$config['dbhost']};dbname={$config['dbname']}" : |
|
| 82 | - "mysql:host={$config['dbhost']};dbname={$config['dbname']};port={$config['dbport']}" |
|
| 81 | + "mysql:unix_socket={$config['dbhost']};dbname={$config['dbname']}" : "mysql:host={$config['dbhost']};dbname={$config['dbname']};port={$config['dbport']}" |
|
| 83 | 82 | ), |
| 84 | 83 | $config['dbuser'], $config['dbpass'], |
| 85 | 84 | [ |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | <?php use Fisharebest\Webtrees\Theme; ?> |
| 4 | 4 | <?php use Fisharebest\Webtrees\View; ?> |
| 5 | 5 | |
| 6 | -<form method="post" action="<?= e(Html::url('module.php' ,['mod' => 'individuals', 'mod_action' => 'ajax'])) ?>" onsubmit="return false;"> |
|
| 6 | +<form method="post" action="<?= e(Html::url('module.php', ['mod' => 'individuals', 'mod_action' => 'ajax'])) ?>" onsubmit="return false;"> |
|
| 7 | 7 | <input type="search" name="sb_indi_name" id="sb_indi_name" placeholder="<?= I18N::translate('Search') ?>"> |
| 8 | 8 | <p> |
| 9 | 9 | <?php foreach ($initials as $letter => $count): ?> |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | <?php use Fisharebest\Webtrees\Theme; ?> |
| 4 | 4 | <?php use Fisharebest\Webtrees\View; ?> |
| 5 | 5 | |
| 6 | -<form method="post" action="<?= e(Html::url('module.php' ,['mod' => 'families', 'mod_action' => 'ajax'])) ?>" onsubmit="return false;"> |
|
| 6 | +<form method="post" action="<?= e(Html::url('module.php', ['mod' => 'families', 'mod_action' => 'ajax'])) ?>" onsubmit="return false;"> |
|
| 7 | 7 | <input type="search" name="sb_fam_name" id="sb_fam_name" placeholder="<?= I18N::translate('Search') ?>"> |
| 8 | 8 | <p> |
| 9 | 9 | <?php foreach ($initials as $letter => $count): ?> |
@@ -3,9 +3,12 @@ |
||
| 3 | 3 | |
| 4 | 4 | <?php if ($summary !== ''): ?> |
| 5 | 5 | <span class="details_label"><?= $summary ?></span> |
| 6 | -<?php else: ?> |
|
| 6 | +<?php else { |
|
| 7 | + : ?> |
|
| 7 | 8 | <?php foreach ($facts as $fact): ?> |
| 8 | - <?php $record = $fact->getParent(); ?> |
|
| 9 | + <?php $record = $fact->getParent(); |
|
| 10 | +} |
|
| 11 | +?> |
|
| 9 | 12 | <a href="<?= e($record->url()) ?>" class="list_item name2"> |
| 10 | 13 | <?= $record->getFullName() ?> |
| 11 | 14 | </a> |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | ]); |
| 86 | 86 | break; |
| 87 | 87 | case 'descendants': |
| 88 | - $title = I18N::translate('Descendants of %s', $person->getFullName()); |
|
| 88 | + $title = I18N::translate('Descendants of %s', $person->getFullName()); |
|
| 89 | 89 | $chart_url = route('descendants-chart', [ |
| 90 | 90 | 'xref' => $person->getXref(), |
| 91 | 91 | 'ged' => $person->getTree()->getName(), |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | ]); |
| 99 | 99 | break; |
| 100 | 100 | case 'hourglass': |
| 101 | - $title = I18N::translate('Hourglass chart of %s', $person->getFullName()); |
|
| 101 | + $title = I18N::translate('Hourglass chart of %s', $person->getFullName()); |
|
| 102 | 102 | $chart_url = route('hourglass-chart', [ |
| 103 | 103 | 'xref' => $person->getXref(), |
| 104 | 104 | 'ged' => $person->getTree()->getName(), |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | <?= I18N::translate('Theme') ?> |
| 147 | 147 | </label> |
| 148 | 148 | <div class="col-sm-9 wt-page-options-value"> |
| 149 | - <?= Bootstrap4::select($themes, $user->getPreference('theme'), ['id' => 'theme', 'name' => 'theme', 'aria-describedby' => 'theme-description',]) ?> |
|
| 149 | + <?= Bootstrap4::select($themes, $user->getPreference('theme'), ['id' => 'theme', 'name' => 'theme', 'aria-describedby' => 'theme-description', ]) ?> |
|
| 150 | 150 | <p class="small text-muted" id="theme-description"> |
| 151 | 151 | <?= /* I18N: Help text for the "Default theme" site configuration setting */ |
| 152 | 152 | I18N::translate('You can change the appearance of webtrees using “themes”. Each theme has a different style, layout, color scheme, etc.') ?> |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | <?= I18N::translate('Contact method') ?> |
| 161 | 161 | </label> |
| 162 | 162 | <div class="col-sm-9 wt-page-options-value"> |
| 163 | - <?= Bootstrap4::select($contact_methods, $user->getPreference('contactmethod'), ['id' => 'contact-method', 'name' => 'contact_method', 'aria-describedby' => 'contact-method-description',]) ?> |
|
| 163 | + <?= Bootstrap4::select($contact_methods, $user->getPreference('contactmethod'), ['id' => 'contact-method', 'name' => 'contact_method', 'aria-describedby' => 'contact-method-description', ]) ?> |
|
| 164 | 164 | <p class="small text-muted" id="contact-method-description"> |
| 165 | 165 | <?= I18N::translate('Site members can send each other messages. You can choose to how these messages are sent to you, or choose not receive them at all.') ?> |
| 166 | 166 | </p> |
@@ -111,24 +111,24 @@ |
||
| 111 | 111 | * @return Individual[] |
| 112 | 112 | */ |
| 113 | 113 | protected function allAncestors(Individual $individual): array { |
| 114 | - /** @var Individual[] $ancestors */ |
|
| 115 | - $ancestors = [ |
|
| 116 | - 1 => $individual, |
|
| 117 | - ]; |
|
| 114 | + /** @var Individual[] $ancestors */ |
|
| 115 | + $ancestors = [ |
|
| 116 | + 1 => $individual, |
|
| 117 | + ]; |
|
| 118 | 118 | |
| 119 | - do { |
|
| 120 | - $sosa = key($ancestors); |
|
| 119 | + do { |
|
| 120 | + $sosa = key($ancestors); |
|
| 121 | 121 | |
| 122 | 122 | $family = $ancestors[$sosa]->getPrimaryChildFamily(); |
| 123 | 123 | |
| 124 | 124 | if ($family !== null) { |
| 125 | - if ($family->getHusband() !== null) { |
|
| 126 | - $ancestors[$sosa * 2] = $family->getHusband(); |
|
| 127 | - } |
|
| 128 | - if ($family->getWife() !== null) { |
|
| 129 | - $ancestors[$sosa * 2 + 1] = $family->getWife(); |
|
| 130 | - } |
|
| 131 | - } |
|
| 125 | + if ($family->getHusband() !== null) { |
|
| 126 | + $ancestors[$sosa * 2] = $family->getHusband(); |
|
| 127 | + } |
|
| 128 | + if ($family->getWife() !== null) { |
|
| 129 | + $ancestors[$sosa * 2 + 1] = $family->getWife(); |
|
| 130 | + } |
|
| 131 | + } |
|
| 132 | 132 | } while (next($ancestors)); |
| 133 | 133 | |
| 134 | 134 | return $ancestors; |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | $sdx = Soundex::russell($surname); |
| 163 | 163 | if ($sdx !== '') { |
| 164 | 164 | foreach (explode(':', $sdx) as $value) { |
| 165 | - $sql .= " OR n_soundex_surn_std LIKE CONCAT('%', ?, '%')"; |
|
| 165 | + $sql .= " OR n_soundex_surn_std LIKE CONCAT('%', ?, '%')"; |
|
| 166 | 166 | $args[] = $value; |
| 167 | 167 | } |
| 168 | 168 | } |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | $sdx = Soundex::daitchMokotoff($surname); |
| 173 | 173 | if ($sdx !== '') { |
| 174 | 174 | foreach (explode(':', $sdx) as $value) { |
| 175 | - $sql .= " OR n_soundex_surn_dm LIKE CONCAT('%', ?, '%')"; |
|
| 175 | + $sql .= " OR n_soundex_surn_dm LIKE CONCAT('%', ?, '%')"; |
|
| 176 | 176 | $args[] = $value; |
| 177 | 177 | } |
| 178 | 178 | } |