@@ -22,7 +22,6 @@ |
||
| 22 | 22 | use Fisharebest\Webtrees\Filter; |
| 23 | 23 | use Fisharebest\Webtrees\Functions\FunctionsDate; |
| 24 | 24 | use Fisharebest\Webtrees\Functions\FunctionsPrint; |
| 25 | -use Fisharebest\Webtrees\Html; |
|
| 26 | 25 | use Fisharebest\Webtrees\I18N; |
| 27 | 26 | use Fisharebest\Webtrees\Individual; |
| 28 | 27 | use Fisharebest\Webtrees\Theme; |
@@ -25,11 +25,8 @@ |
||
| 25 | 25 | use Fisharebest\Webtrees\GedcomCode\GedcomCodeTemp; |
| 26 | 26 | use Fisharebest\Webtrees\GedcomRecord; |
| 27 | 27 | use Fisharebest\Webtrees\GedcomTag; |
| 28 | -use Fisharebest\Webtrees\Html; |
|
| 29 | 28 | use Fisharebest\Webtrees\I18N; |
| 30 | 29 | use Fisharebest\Webtrees\Individual; |
| 31 | -use Fisharebest\Webtrees\Module; |
|
| 32 | -use Fisharebest\Webtrees\Module\CensusAssistantModule; |
|
| 33 | 30 | use Fisharebest\Webtrees\Note; |
| 34 | 31 | use Fisharebest\Webtrees\Place; |
| 35 | 32 | use Fisharebest\Webtrees\Session; |
@@ -26,12 +26,9 @@ |
||
| 26 | 26 | use Fisharebest\Webtrees\GedcomCode\GedcomCodeRela; |
| 27 | 27 | use Fisharebest\Webtrees\GedcomRecord; |
| 28 | 28 | use Fisharebest\Webtrees\GedcomTag; |
| 29 | -use Fisharebest\Webtrees\Html; |
|
| 30 | 29 | use Fisharebest\Webtrees\I18N; |
| 31 | 30 | use Fisharebest\Webtrees\Individual; |
| 32 | 31 | use Fisharebest\Webtrees\Media; |
| 33 | -use Fisharebest\Webtrees\Module; |
|
| 34 | -use Fisharebest\Webtrees\Module\CensusAssistantModule; |
|
| 35 | 32 | use Fisharebest\Webtrees\Note; |
| 36 | 33 | use Fisharebest\Webtrees\Repository; |
| 37 | 34 | use Fisharebest\Webtrees\Source; |
@@ -15,17 +15,14 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | namespace Fisharebest\Webtrees\Functions; |
| 17 | 17 | |
| 18 | -use Fisharebest\Webtrees\Auth; |
|
| 19 | 18 | use Fisharebest\Webtrees\Database; |
| 20 | 19 | use Fisharebest\Webtrees\Datatables; |
| 21 | 20 | use Fisharebest\Webtrees\Date; |
| 22 | 21 | use Fisharebest\Webtrees\Fact; |
| 23 | 22 | use Fisharebest\Webtrees\Family; |
| 24 | 23 | use Fisharebest\Webtrees\Filter; |
| 25 | -use Fisharebest\Webtrees\FontAwesome; |
|
| 26 | 24 | use Fisharebest\Webtrees\GedcomRecord; |
| 27 | 25 | use Fisharebest\Webtrees\GedcomTag; |
| 28 | -use Fisharebest\Webtrees\Html; |
|
| 29 | 26 | use Fisharebest\Webtrees\I18N; |
| 30 | 27 | use Fisharebest\Webtrees\Individual; |
| 31 | 28 | use Fisharebest\Webtrees\Media; |
@@ -17,7 +17,6 @@ |
||
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Database; |
| 19 | 19 | use Fisharebest\Webtrees\Filter; |
| 20 | -use Fisharebest\Webtrees\Html; |
|
| 21 | 20 | use Fisharebest\Webtrees\I18N; |
| 22 | 21 | use Fisharebest\Webtrees\Individual; |
| 23 | 22 | use Fisharebest\Webtrees\Query\QueryName; |
@@ -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'; |
@@ -19,7 +19,6 @@ |
||
| 19 | 19 | |
| 20 | 20 | use Fisharebest\Webtrees\Auth; |
| 21 | 21 | use Fisharebest\Webtrees\Family; |
| 22 | -use Fisharebest\Webtrees\Filter; |
|
| 23 | 22 | use Fisharebest\Webtrees\GedcomRecord; |
| 24 | 23 | use Fisharebest\Webtrees\I18N; |
| 25 | 24 | use Fisharebest\Webtrees\Individual; |
@@ -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 | |