@@ -85,8 +85,7 @@ |
||
| 85 | 85 | // Create the underlying PDO object |
| 86 | 86 | self::$pdo = new PDO( |
| 87 | 87 | (substr($DBHOST, 0, 1) === '/' ? |
| 88 | - "mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : |
|
| 89 | - "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}" |
|
| 88 | + "mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}" |
|
| 90 | 89 | ), |
| 91 | 90 | $DBUSER, $DBPASS, |
| 92 | 91 | array( |
@@ -16,8 +16,8 @@ |
||
| 16 | 16 | namespace Fisharebest\Webtrees; |
| 17 | 17 | |
| 18 | 18 | use Exception; |
| 19 | -use Swift_Mailer; |
|
| 20 | 19 | use Swift_MailTransport; |
| 20 | +use Swift_Mailer; |
|
| 21 | 21 | use Swift_Message; |
| 22 | 22 | use Swift_NullTransport; |
| 23 | 23 | use Swift_SmtpTransport; |
@@ -19,7 +19,6 @@ |
||
| 19 | 19 | use Fisharebest\Webtrees\Database; |
| 20 | 20 | use Fisharebest\Webtrees\Filter; |
| 21 | 21 | use Fisharebest\Webtrees\Functions\FunctionsDate; |
| 22 | -use Fisharebest\Webtrees\Functions\FunctionsPrint; |
|
| 23 | 22 | use Fisharebest\Webtrees\I18N; |
| 24 | 23 | use Fisharebest\Webtrees\Theme; |
| 25 | 24 | |
@@ -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 ?> |
@@ -1486,7 +1486,7 @@ |
||
| 1486 | 1486 | '1' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'last'), |
| 1487 | 1487 | ], $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES_SUFFIX') |
| 1488 | 1488 | ), |
| 1489 | - Bootstrap4::select('SHOW_PEDIGREE_PLACES', FunctionsEdit::numericOptions(range(1,9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES')) |
|
| 1489 | + Bootstrap4::select('SHOW_PEDIGREE_PLACES', FunctionsEdit::numericOptions(range(1, 9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES')) |
|
| 1490 | 1490 | ) ?> |
| 1491 | 1491 | <p class="small text-muted"> |
| 1492 | 1492 | <?= /* I18N: Help text for the “Abbreviate place names” configuration setting */ I18N::translate('Place names are frequently too long to fit on charts, lists, etc. They can be abbreviated by showing just the first few parts of the name, such as <i>village, county</i>, or the last few part of it, such as <i>region, country</i>.') ?> |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | protected function formatSecondaryMenu() { |
| 50 | 50 | return |
| 51 | 51 | '<ul class="secondary-menu">' . |
| 52 | - implode('', array_map(function(Menu $menu) { return $this->formatSecondaryMenuItem($menu); }, $this->secondaryMenu())) . |
|
| 52 | + implode('', array_map(function (Menu $menu) { return $this->formatSecondaryMenuItem($menu); }, $this->secondaryMenu())) . |
|
| 53 | 53 | '<li>' . |
| 54 | 54 | $this->formQuickSearch() . |
| 55 | 55 | '</li>' . |
@@ -165,7 +165,7 @@ |
||
| 165 | 165 | } |
| 166 | 166 | if ($this->record->canEdit() && !$event->isPendingDeletion()) { |
| 167 | 167 | 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() . "', '" . $event->getFactId() . "');\" title=\"" . I18N::translate('Delete this name') . '"><span class="link_text">' . I18N::translate('Delete this name') . '</span></a></div>'; |
| 168 | - echo '<div class="editlink noprint"><a href="edit_interface.php?action=editname&xref=' . $this->record->getXref() . '&fact_id=' . $event->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>'; |
|
| 168 | + echo '<div class="editlink noprint"><a href="edit_interface.php?action=editname&xref=' . $this->record->getXref() . '&fact_id=' . $event->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>'; |
|
| 169 | 169 | } |
| 170 | 170 | echo '</dd>'; |
| 171 | 171 | echo '</dl>'; |
@@ -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 | } |
@@ -1089,7 +1089,7 @@ discard block |
||
| 1089 | 1089 | "SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##sources` JOIN `##link` ON l_from = s_id AND l_file = s_file AND l_type = 'NOTE' GROUP BY l_to, l_file" |
| 1090 | 1090 | )->fetchAssoc(); |
| 1091 | 1091 | |
| 1092 | - $html = ''; |
|
| 1092 | + $html = ''; |
|
| 1093 | 1093 | $html .= '<table ' . Datatables::noteTableAttributes() . '><thead><tr>'; |
| 1094 | 1094 | $html .= '<th>' . I18N::translate('Title') . '</th>'; |
| 1095 | 1095 | $html .= '<th>' . I18N::translate('Individuals') . '</th>'; |
@@ -1155,7 +1155,7 @@ discard block |
||
| 1155 | 1155 | )->fetchAssoc(); |
| 1156 | 1156 | |
| 1157 | 1157 | $html = ''; |
| 1158 | - $html .= '<table ' . Datatables::repositoryTableAttributes() . '"><thead><tr>'; $html .= '<th>' . I18N::translate('Repository name') . '</th>'; |
|
| 1158 | + $html .= '<table ' . Datatables::repositoryTableAttributes() . '"><thead><tr>'; $html .= '<th>' . I18N::translate('Repository name') . '</th>'; |
|
| 1159 | 1159 | $html .= '<th>' . I18N::translate('Sources') . '</th>'; |
| 1160 | 1160 | $html .= '<th>' . I18N::translate('Last change') . '</th>'; |
| 1161 | 1161 | $html .= '<th>' . I18N::translate('Delete') . '</th>'; |
@@ -1585,7 +1585,7 @@ discard block |
||
| 1585 | 1585 | if ($endjd === $startjd) { |
| 1586 | 1586 | $html .= I18N::translate('No events exist for tomorrow.'); |
| 1587 | 1587 | } else { |
| 1588 | - $html .= /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1)); |
|
| 1588 | + $html .= /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1)); |
|
| 1589 | 1589 | } |
| 1590 | 1590 | } else { |
| 1591 | 1591 | if ($endjd === $startjd) { |