@@ -109,7 +109,7 @@ |
||
| 109 | 109 | </option> |
| 110 | 110 | </select> |
| 111 | 111 | </td> |
| 112 | - <?php else: ?> |
|
| 112 | + <?php else : ?> |
|
| 113 | 113 | <td class="descriptionbox wrap"></td> |
| 114 | 114 | <td class="optionbox wrap"></td> |
| 115 | 115 | <?php endif ?> |
@@ -109,7 +109,8 @@ discard block |
||
| 109 | 109 | </option> |
| 110 | 110 | </select> |
| 111 | 111 | </td> |
| 112 | - <?php else: ?> |
|
| 112 | + <?php else { |
|
| 113 | + : ?> |
|
| 113 | 114 | <td class="descriptionbox wrap"></td> |
| 114 | 115 | <td class="optionbox wrap"></td> |
| 115 | 116 | <?php endif ?> |
@@ -133,6 +134,7 @@ discard block |
||
| 133 | 134 | <?php |
| 134 | 135 | foreach (['10', '20', '30', '40', '50', '75', '100', '125', '150', '200'] as $selectEntry) { |
| 135 | 136 | echo '<option value="', $selectEntry, '" '; |
| 137 | +} |
|
| 136 | 138 | if ($selectEntry == $max) { |
| 137 | 139 | echo 'selected'; |
| 138 | 140 | } |
@@ -770,13 +770,15 @@ |
||
| 770 | 770 | <p> |
| 771 | 771 | <?php if ($ucnt): ?> |
| 772 | 772 | <input type="submit" value="<?= I18N::translate('delete') ?>"> |
| 773 | - <?php else: ?> |
|
| 773 | + <?php else { |
|
| 774 | + : ?> |
|
| 774 | 775 | <?= I18N::translate('Nothing found to cleanup') ?> |
| 775 | 776 | <?php endif ?> |
| 776 | 777 | </p> |
| 777 | 778 | </form> |
| 778 | 779 | <?php |
| 779 | 780 | break; |
| 781 | +} |
|
| 780 | 782 | |
| 781 | 783 | case 'cleanup2': |
| 782 | 784 | foreach (User::all() as $user) { |
@@ -154,7 +154,8 @@ discard block |
||
| 154 | 154 | <input type="text" id="value<?= $i ?>" name="values[<?= $i ?>]" value="<?= Filter::escapeHtml($controller->getValue($i)) ?>"<?= substr($controller->getField($i), -4) == 'PLAC' ? 'data-autocomplete-type="PLAC"' : '' ?>> |
| 155 | 155 | <?php if (preg_match('/^NAME:/', $currentFieldSearch) > 0) { ?> |
| 156 | 156 | <select name="fields[<?= $i ?>]"> |
| 157 | - <option value="<?= $currentField ?>:EXACT" <?php if (preg_match('/:EXACT$/', $currentFieldSearch) > 0) echo 'selected' ?>><?= I18N::translate('Exact') ?></option> |
|
| 157 | + <option value="<?= $currentField ?>:EXACT" <?php if (preg_match('/:EXACT$/', $currentFieldSearch) > 0) { |
|
| 158 | + echo 'selected' ?>><?= I18N::translate('Exact') ?></option> |
|
| 158 | 159 | <option value="<?= $currentField ?>:BEGINS" <?php if (preg_match('/:BEGINS$/', $currentFieldSearch) > 0) echo 'selected' ?>><?= I18N::translate('Begins with') ?></option> |
| 159 | 160 | <option value="<?= $currentField ?>:CONTAINS" <?php if (preg_match('/:CONTAINS$/', $currentFieldSearch) > 0) echo 'selected' ?>><?= I18N::translate('Contains') ?></option> |
| 160 | 161 | <option value="<?= $currentField ?>:SDX" <?php if (preg_match('/:SDX$/', $currentFieldSearch) > 0) echo 'selected' ?>><?= I18N::translate('Sounds like') ?></option> |
@@ -176,6 +177,7 @@ discard block |
||
| 176 | 177 | //-- relative fields |
| 177 | 178 | if ($i == 0 && $fct > 4) { |
| 178 | 179 | $j = $fct; |
| 180 | +} |
|
| 179 | 181 | // Get the current options for Father’s and Mother’s name searches |
| 180 | 182 | $fatherGivnOption = 'SDX'; |
| 181 | 183 | $fatherSurnOption = 'SDX'; |
@@ -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 | } |
@@ -148,7 +148,7 @@ |
||
| 148 | 148 | public static function createEditLinks($gedrec, GedcomRecord $record) { |
| 149 | 149 | return preg_replace( |
| 150 | 150 | "/@([^#@\n]+)@/m", |
| 151 | - '<a href="edit_interface.php?action=editraw&ged=' . $record->getTree()->getNameHtml() . '&xref=' . $record->getXref() .'">@\\1@</a>', |
|
| 151 | + '<a href="edit_interface.php?action=editraw&ged=' . $record->getTree()->getNameHtml() . '&xref=' . $record->getXref() . '">@\\1@</a>', |
|
| 152 | 152 | $gedrec |
| 153 | 153 | ); |
| 154 | 154 | } |
@@ -89,7 +89,7 @@ |
||
| 89 | 89 | if (Auth::isAdmin()) { |
| 90 | 90 | $user = User::findByGenealogyRecord($controller->record); |
| 91 | 91 | if ($user) { |
| 92 | - $user_link = ' — <a href="admin_users.php?filter=' . Filter::escapeHtml($user->getUserName()) . '">' . Filter::escapeHtml($user->getUserName()) . '</a>'; |
|
| 92 | + $user_link = ' — <a href="admin_users.php?filter=' . Filter::escapeHtml($user->getUserName()) . '">' . Filter::escapeHtml($user->getUserName()) . '</a>'; |
|
| 93 | 93 | }; |
| 94 | 94 | } |
| 95 | 95 | |
@@ -189,7 +189,7 @@ |
||
| 189 | 189 | <div class="modal-content"> |
| 190 | 190 | <div class="modal-header"> |
| 191 | 191 | <h3 class="modal-title" id="wt-modal-title">' . $title . '</h3> |
| 192 | - <button type="button" class="close" data-dismiss="modal" aria-label="'. I18N::translate('close') .'"> |
|
| 192 | + <button type="button" class="close" data-dismiss="modal" aria-label="'. I18N::translate('close') . '"> |
|
| 193 | 193 | <span aria-hidden="true">×</span> |
| 194 | 194 | </button> |
| 195 | 195 | </div> |
@@ -127,7 +127,7 @@ |
||
| 127 | 127 | $message->subject = I18N::translate('RE: ') . $message->subject; |
| 128 | 128 | } |
| 129 | 129 | if ($user) { |
| 130 | - $content .= '<a class="btn btn-secondary" href="message.php?to=' . Filter::escapeUrl($message->sender) . '&subject=' . Filter::escapeUrl($message->subject) . '&ged=' . $WT_TREE->getNameUrl() .'" title="' . I18N::translate('Reply') .'">' . I18N::translate('Reply') . '</a> '; |
|
| 130 | + $content .= '<a class="btn btn-secondary" href="message.php?to=' . Filter::escapeUrl($message->sender) . '&subject=' . Filter::escapeUrl($message->subject) . '&ged=' . $WT_TREE->getNameUrl() . '" title="' . I18N::translate('Reply') . '">' . I18N::translate('Reply') . '</a> '; |
|
| 131 | 131 | } |
| 132 | 132 | $content .= '<button type="button" onclick="if (confirm(\'' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '\')) {$(\'#messageform :checkbox\').prop(\'checked\', false); $(\'#cb_message' . $message->message_id . '\').prop(\'checked\', true); document.messageform.submit();}">' . I18N::translate('Delete') . '</button></div></td></tr>'; |
| 133 | 133 | } |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | $controller->restrictAccess(!in_array($to, ['all', 'never_logged', 'last_6mo']) || Auth::isAdmin()); |
| 101 | 101 | $controller->pageHeader(); |
| 102 | 102 | |
| 103 | -$to_names = implode(I18N::$list_separator, array_map(function(User $user) { return $user->getRealName(); }, recipients($to))); |
|
| 103 | +$to_names = implode(I18N::$list_separator, array_map(function (User $user) { return $user->getRealName(); }, recipients($to))); |
|
| 104 | 104 | |
| 105 | 105 | ?> |
| 106 | 106 | <h2><?= I18N::translate('Send a message') ?></h2> |
@@ -185,13 +185,13 @@ discard block |
||
| 185 | 185 | */ |
| 186 | 186 | function recipients($to) { |
| 187 | 187 | if ($to === 'all') { |
| 188 | - $recipients = User::all(); |
|
| 188 | + $recipients = User::all(); |
|
| 189 | 189 | } elseif ($to === 'last_6mo') { |
| 190 | - $recipients = array_filter(User::all(), function(User $user) { |
|
| 190 | + $recipients = array_filter(User::all(), function (User $user) { |
|
| 191 | 191 | return $user->getPreference('sessiontime') > 0 && WT_TIMESTAMP - $user->getPreference('sessiontime') > 60 * 60 * 24 * 30 * 6; |
| 192 | 192 | }); |
| 193 | 193 | } elseif ($to === 'never_logged') { |
| 194 | - $recipients = array_filter(User::all(), function(User $user) { |
|
| 194 | + $recipients = array_filter(User::all(), function (User $user) { |
|
| 195 | 195 | return $user->getPreference('verified_by_admin') && $user->getPreference('reg_timestamp') > $user->getPreference('sessiontime'); |
| 196 | 196 | }); |
| 197 | 197 | } else { |
@@ -128,7 +128,8 @@ discard block |
||
| 128 | 128 | <div class="form-control"><?= Filter::escapeHtml(Auth::user()->getRealName()) ?></div> |
| 129 | 129 | </div> |
| 130 | 130 | </div> |
| 131 | - <?php else: ?> |
|
| 131 | + <?php else { |
|
| 132 | + : ?> |
|
| 132 | 133 | <div class="form-group row"> |
| 133 | 134 | <label class="col-sm-3 col-form-label" for="from-name"> |
| 134 | 135 | <?= I18N::translate('Your name') ?> |
@@ -186,6 +187,7 @@ discard block |
||
| 186 | 187 | function recipients($to) { |
| 187 | 188 | if ($to === 'all') { |
| 188 | 189 | $recipients = User::all(); |
| 190 | +} |
|
| 189 | 191 | } elseif ($to === 'last_6mo') { |
| 190 | 192 | $recipients = array_filter(User::all(), function(User $user) { |
| 191 | 193 | return $user->getPreference('sessiontime') > 0 && WT_TIMESTAMP - $user->getPreference('sessiontime') > 60 * 60 * 24 * 30 * 6; |