@@ -127,7 +127,6 @@ |
||
127 | 127 | /** |
128 | 128 | * Format a name record |
129 | 129 | * |
130 | - * @param int $primary |
|
131 | 130 | * @param Fact $name_fact |
132 | 131 | * |
133 | 132 | * @return string |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | public function getTabs() { |
96 | 96 | $active_tabs = Module::getActiveTabs($this->record->getTree()); |
97 | 97 | |
98 | - return array_filter($active_tabs, function(ModuleTabInterface $tab) { return $tab->hasTabContent(); }); |
|
98 | + return array_filter($active_tabs, function (ModuleTabInterface $tab) { return $tab->hasTabContent(); }); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | /** |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | |
144 | 144 | if ($n === 0) { |
145 | 145 | $content_class = 'collapse show'; |
146 | - $aria = 'true'; |
|
146 | + $aria = 'true'; |
|
147 | 147 | |
148 | 148 | // Display gender icon |
149 | 149 | foreach ($individual->getFacts('SEX') as $sex_fact) { |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | echo '<dd class="field">', $dummy->getFullName(); |
163 | 163 | if ($this->record->canEdit() && !$name_fact->isPendingDeletion()) { |
164 | 164 | echo "<div class=\"deletelink noprint\"><a class=\"deleteicon\" href=\"#\" onclick=\"return delete_fact('" . I18N::translate('Are you sure you want to delete this fact?') . "', '" . $this->record->getXref() . "', '" . $name_fact->getFactId() . "');\" title=\"" . I18N::translate('Delete this name') . '"><span class="link_text">' . I18N::translate('Delete this name') . '</span></a></div>'; |
165 | - echo '<div class="editlink noprint"><a href="edit_interface.php?action=editname&xref=' . $this->record->getXref() . '&fact_id=' . $name_fact->getFactId() . '&ged=' . $this->record->getTree()->getNameHtml() . '" class="editicon" title="' . I18N::translate('Edit the name') . '"><span class="link_text">' . I18N::translate('Edit the name') . '</span></a></div>'; |
|
165 | + echo '<div class="editlink noprint"><a href="edit_interface.php?action=editname&xref=' . $this->record->getXref() . '&fact_id=' . $name_fact->getFactId() . '&ged=' . $this->record->getTree()->getNameHtml() . '" class="editicon" title="' . I18N::translate('Edit the name') . '"><span class="link_text">' . I18N::translate('Edit the name') . '</span></a></div>'; |
|
166 | 166 | } |
167 | 167 | echo '</dd>'; |
168 | 168 | $ct = preg_match_all('/\n2 (\w+) (.*)/', $name_fact->getGedcom(), $nmatch, PREG_SET_ORDER); |
@@ -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 |
@@ -146,7 +146,7 @@ |
||
146 | 146 | } |
147 | 147 | } |
148 | 148 | } |
149 | - if ($user_id < 0 || $gedcom_id < 0 ) { |
|
149 | + if ($user_id < 0 || $gedcom_id < 0) { |
|
150 | 150 | header('Location: ' . WT_BASE_URL . 'admin.php'); |
151 | 151 | } elseif ($user_id > 0) { |
152 | 152 | header('Location: ' . WT_BASE_URL . 'index.php?ctype=user&ged=' . $WT_TREE->getNameUrl()); |
@@ -47,7 +47,7 @@ |
||
47 | 47 | <?= I18N::translate('Individual') ?> |
48 | 48 | </label> |
49 | 49 | <div class="col-sm-9"> |
50 | - <?= FunctionsEdit::formControlIndividual( $controller->root, ['id' => 'rootid', 'name' => 'rootid']) ?> |
|
50 | + <?= FunctionsEdit::formControlIndividual($controller->root, ['id' => 'rootid', 'name' => 'rootid']) ?> |
|
51 | 51 | </div> |
52 | 52 | </div> |
53 | 53 |
@@ -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> |
@@ -17,7 +17,6 @@ |
||
17 | 17 | |
18 | 18 | use Fisharebest\Webtrees\Auth; |
19 | 19 | use Fisharebest\Webtrees\Filter; |
20 | -use Fisharebest\Webtrees\Functions\Functions; |
|
21 | 20 | use Fisharebest\Webtrees\I18N; |
22 | 21 | use Fisharebest\Webtrees\Individual; |
23 | 22 | use Fisharebest\Webtrees\Theme; |
@@ -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 | } |
@@ -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 | } |