@@ -29,10 +29,10 @@ |
||
29 | 29 | // Check for updates |
30 | 30 | $latest_version_txt = Functions::fetchLatestVersion(); |
31 | 31 | if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) { |
32 | - list($latest_version, , $download_url) = explode('|', $latest_version_txt); |
|
32 | + list($latest_version,, $download_url) = explode('|', $latest_version_txt); |
|
33 | 33 | } else { |
34 | 34 | // Cannot determine the latest version |
35 | - list($latest_version, , $download_url) = explode('|', '||'); |
|
35 | + list($latest_version,, $download_url) = explode('|', '||'); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | $latest_version_html = '<span dir="ltr">' . $latest_version . '</span>'; |
@@ -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): ?> |
@@ -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> |
@@ -74,7 +74,7 @@ |
||
74 | 74 | <?php endforeach ?> |
75 | 75 | </td> |
76 | 76 | <td> |
77 | - <a href="<?= e(route('message', ['to' => $record_change->user_name, 'subject' => I18N::translate('Pending changes') . ' - ' . strip_tags($record_change->record->getFullName()), 'body' => WT_BASE_URL . $record_change->record->url(), 'ged' => $record_change->gedcom_name,])) ?>" title="<?= I18N::translate('Send a message') ?>"> |
|
77 | + <a href="<?= e(route('message', ['to' => $record_change->user_name, 'subject' => I18N::translate('Pending changes') . ' - ' . strip_tags($record_change->record->getFullName()), 'body' => WT_BASE_URL . $record_change->record->url(), 'ged' => $record_change->gedcom_name, ])) ?>" title="<?= I18N::translate('Send a message') ?>"> |
|
78 | 78 | <?= e($record_change->real_name) ?> - <?= e($record_change->user_name) ?> |
79 | 79 | </a> |
80 | 80 | </td> |
@@ -2787,7 +2787,7 @@ |
||
2787 | 2787 | <?php |
2788 | 2788 | if ($level < 3 && $record->pl_icon != '') { |
2789 | 2789 | echo 'var image = { |
2790 | - "url" : "' . WT_MODULES_DIR . 'googlemap/" + "' . $record->pl_icon . '", |
|
2790 | + "url" : "' . WT_MODULES_DIR . 'googlemap/" + "' . $record->pl_icon . '", |
|
2791 | 2791 | "size" : new google.maps.Size(25, 15), |
2792 | 2792 | "origin" : new google.maps.Point(0, 0), |
2793 | 2793 | "anchor" : new google.maps.Point(12, 15) |
@@ -184,6 +184,6 @@ |
||
184 | 184 | </table> |
185 | 185 | </form> |
186 | 186 | |
187 | -<div class="wt-ajax-load wt-page-content" data-ajax-url="<?= e(route('calendar-events', ['ged' => $tree->getName(), 'cal' => $cal, 'day' => $day, 'month' => $month, 'year' => $year, 'view' => $view, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx,])) ?>"></div> |
|
187 | +<div class="wt-ajax-load wt-page-content" data-ajax-url="<?= e(route('calendar-events', ['ged' => $tree->getName(), 'cal' => $cal, 'day' => $day, 'month' => $month, 'year' => $year, 'view' => $view, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, ])) ?>"></div> |
|
188 | 188 | |
189 | 189 | <?= view('modals/ajax') ?> |