@@ -240,7 +240,7 @@ |
||
240 | 240 | // Link to send email to other users. |
241 | 241 | if ($user_id != $user->getUserId()) { |
242 | 242 | $datum[4] = '<a href="' . e(route('message', ['to' => $datum[2], |
243 | - 'url' => route('admin-users'), |
|
243 | + 'url' => route('admin-users'), |
|
244 | 244 | ])) . '">' . $datum[4] . '</a>'; |
245 | 245 | } |
246 | 246 |
@@ -73,7 +73,7 @@ |
||
73 | 73 | { |
74 | 74 | $latest_version = $this->fetchLatestVersion(); |
75 | 75 | |
76 | - list(, , $url) = explode('|', $latest_version . '||'); |
|
76 | + list(,, $url) = explode('|', $latest_version . '||'); |
|
77 | 77 | |
78 | 78 | return $url; |
79 | 79 | } |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | { |
48 | 48 | define('WT_LOCALE', I18N::init('en-US')); |
49 | 49 | |
50 | - $step = (int)$request->get('step', '1'); |
|
50 | + $step = (int) $request->get('step', '1'); |
|
51 | 51 | $errors = $this->serverErrors(); |
52 | 52 | $warnings = $this->serverWarnings(); |
53 | 53 | $data = $this->extractParameters($request); |
@@ -364,7 +364,7 @@ discard block |
||
364 | 364 | */ |
365 | 365 | private function maxExecutionTime(): int |
366 | 366 | { |
367 | - return (int)ini_get('max_execution_time'); |
|
367 | + return (int) ini_get('max_execution_time'); |
|
368 | 368 | } |
369 | 369 | |
370 | 370 | /** |
@@ -397,7 +397,7 @@ discard block |
||
397 | 397 | $memory_limit = $memory_limit / 1024 / 1024; |
398 | 398 | } |
399 | 399 | |
400 | - return (int)$memory_limit; |
|
400 | + return (int) $memory_limit; |
|
401 | 401 | } |
402 | 402 | |
403 | 403 | /** |
@@ -454,11 +454,11 @@ discard block |
||
454 | 454 | /* I18N: a program feature */ |
455 | 455 | 'simplexml' => I18N::translate('reporting'), |
456 | 456 | ]; |
457 | - $settings = [ |
|
457 | + $settings = [ |
|
458 | 458 | /* I18N: a program feature */ |
459 | 459 | 'file_uploads' => I18N::translate('file upload capability'), |
460 | 460 | ]; |
461 | - $warnings = []; |
|
461 | + $warnings = []; |
|
462 | 462 | |
463 | 463 | foreach ($extensions as $extension => $features) { |
464 | 464 | if (!extension_loaded($extension)) { |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | public function reorderChildrenAction(Request $request, Tree $tree): Response |
63 | 63 | { |
64 | 64 | $xref = $request->get('xref'); |
65 | - $order = (array)$request->get('order', []); |
|
65 | + $order = (array) $request->get('order', []); |
|
66 | 66 | $family = Family::getInstance($xref, $tree); |
67 | 67 | |
68 | 68 | $this->checkFamilyAccess($family, true); |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | $this->checkFamilyAccess($family, true); |
139 | 139 | |
140 | 140 | $PEDI = $request->get('PEDI', ''); |
141 | - $keep_chan = (bool)$request->get('keep_chan'); |
|
141 | + $keep_chan = (bool) $request->get('keep_chan'); |
|
142 | 142 | |
143 | 143 | $this->glevels = $request->get('glevels', []); |
144 | 144 | $this->tag = $request->get('tag', []); |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | } |
156 | 156 | } |
157 | 157 | $gedrec .= "\n" . GedcomCodePedi::createNewFamcPedi($PEDI, $xref); |
158 | - if ((bool)$request->get('SOUR_INDI')) { |
|
158 | + if ((bool) $request->get('SOUR_INDI')) { |
|
159 | 159 | $gedrec = $this->handleUpdates($gedrec); |
160 | 160 | } else { |
161 | 161 | $gedrec = $this->updateRest($gedrec); |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | } |
254 | 254 | } |
255 | 255 | |
256 | - if ((bool)$request->get('SOUR_INDI')) { |
|
256 | + if ((bool) $request->get('SOUR_INDI')) { |
|
257 | 257 | $gedrec = $this->handleUpdates($gedrec); |
258 | 258 | } else { |
259 | 259 | $gedrec = $this->updateRest($gedrec); |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | $famrec .= $this->addNewFact($request, $tree, $match); |
274 | 274 | } |
275 | 275 | } |
276 | - if ((bool)$request->get('SOUR_FAM')) { |
|
276 | + if ((bool) $request->get('SOUR_FAM')) { |
|
277 | 277 | $famrec = $this->handleUpdates($famrec); |
278 | 278 | } else { |
279 | 279 | $famrec = $this->updateRest($famrec); |
@@ -327,9 +327,9 @@ |
||
327 | 327 | |
328 | 328 | // Now fetch these anniversaries |
329 | 329 | foreach ([ |
330 | - 'INDI' => $ind_sql . $where . $order_by, |
|
331 | - 'FAM' => $fam_sql . $where . $order_by, |
|
332 | - ] as $type => $sql) { |
|
330 | + 'INDI' => $ind_sql . $where . $order_by, |
|
331 | + 'FAM' => $fam_sql . $where . $order_by, |
|
332 | + ] as $type => $sql) { |
|
333 | 333 | $rows = Database::prepare($sql)->execute($args)->fetchAll(); |
334 | 334 | foreach ($rows as $row) { |
335 | 335 | if ($type === 'INDI') { |
@@ -400,9 +400,9 @@ discard block |
||
400 | 400 | public function exportClient(Request $request, Tree $tree): Response |
401 | 401 | { |
402 | 402 | // Validate user parameters |
403 | - $convert = (bool)$request->get('convert'); |
|
404 | - $zip = (bool)$request->get('zip'); |
|
405 | - $media = (bool)$request->get('media'); |
|
403 | + $convert = (bool) $request->get('convert'); |
|
404 | + $zip = (bool) $request->get('zip'); |
|
405 | + $media = (bool) $request->get('media'); |
|
406 | 406 | $media_path = $request->get('media-path'); |
407 | 407 | $privatize_export = $request->get('privatize_export'); |
408 | 408 | |
@@ -532,8 +532,8 @@ discard block |
||
532 | 532 | public function importAction(Request $request, Tree $tree): RedirectResponse |
533 | 533 | { |
534 | 534 | $source = $request->get('source'); |
535 | - $keep_media = (bool)$request->get('keep_media'); |
|
536 | - $WORD_WRAPPED_NOTES = (bool)$request->get('WORD_WRAPPED_NOTES'); |
|
535 | + $keep_media = (bool) $request->get('keep_media'); |
|
536 | + $WORD_WRAPPED_NOTES = (bool) $request->get('WORD_WRAPPED_NOTES'); |
|
537 | 537 | $GEDCOM_MEDIA_PATH = $request->get('GEDCOM_MEDIA_PATH'); |
538 | 538 | |
539 | 539 | // Save these choices as defaults |
@@ -1022,16 +1022,16 @@ discard block |
||
1022 | 1022 | public function preferencesUpdate(Request $request, Tree $tree): RedirectResponse |
1023 | 1023 | { |
1024 | 1024 | // Coming soon |
1025 | - if ((bool)$request->get('all_trees')) { |
|
1025 | + if ((bool) $request->get('all_trees')) { |
|
1026 | 1026 | FlashMessages::addMessage(I18N::translate('The preferences for all family trees have been updated.'), 'success'); |
1027 | 1027 | } |
1028 | - if ((bool)$request->get('new_trees')) { |
|
1028 | + if ((bool) $request->get('new_trees')) { |
|
1029 | 1029 | FlashMessages::addMessage(I18N::translate('The preferences for new family trees have been updated.'), 'success'); |
1030 | 1030 | } |
1031 | 1031 | |
1032 | 1032 | $tree->setPreference('ADVANCED_NAME_FACTS', implode(',', $request->get('ADVANCED_NAME_FACTS', []))); |
1033 | 1033 | $tree->setPreference('ADVANCED_PLAC_FACTS', implode(',', $request->get('ADVANCED_PLAC_FACTS', []))); |
1034 | - $tree->setPreference('ALLOW_THEME_DROPDOWN', (string)(bool)$request->get('ALLOW_THEME_DROPDOWN')); |
|
1034 | + $tree->setPreference('ALLOW_THEME_DROPDOWN', (string) (bool) $request->get('ALLOW_THEME_DROPDOWN')); |
|
1035 | 1035 | // For backwards compatibility with webtrees 1.x we store the two calendar formats in one variable |
1036 | 1036 | // e.g. "gregorian_and_jewish" |
1037 | 1037 | $tree->setPreference('CALENDAR_FORMAT', implode('_and_', array_unique([ |
@@ -1040,57 +1040,57 @@ discard block |
||
1040 | 1040 | ]))); |
1041 | 1041 | $tree->setPreference('CHART_BOX_TAGS', implode(',', $request->get('CHART_BOX_TAGS', []))); |
1042 | 1042 | $tree->setPreference('CONTACT_USER_ID', $request->get('CONTACT_USER_ID')); |
1043 | - $tree->setPreference('DEFAULT_PEDIGREE_GENERATIONS', (string)(int)$request->get('DEFAULT_PEDIGREE_GENERATIONS')); |
|
1044 | - $tree->setPreference('EXPAND_NOTES', (string)(bool)$request->get('EXPAND_NOTES')); |
|
1045 | - $tree->setPreference('EXPAND_SOURCES', (string)(bool)$request->get('EXPAND_SOURCES')); |
|
1043 | + $tree->setPreference('DEFAULT_PEDIGREE_GENERATIONS', (string) (int) $request->get('DEFAULT_PEDIGREE_GENERATIONS')); |
|
1044 | + $tree->setPreference('EXPAND_NOTES', (string) (bool) $request->get('EXPAND_NOTES')); |
|
1045 | + $tree->setPreference('EXPAND_SOURCES', (string) (bool) $request->get('EXPAND_SOURCES')); |
|
1046 | 1046 | $tree->setPreference('FAM_FACTS_ADD', implode(',', $request->get('FAM_FACTS_ADD', []))); |
1047 | 1047 | $tree->setPreference('FAM_FACTS_QUICK', implode(',', $request->get('FAM_FACTS_QUICK', []))); |
1048 | 1048 | $tree->setPreference('FAM_FACTS_UNIQUE', implode(',', $request->get('FAM_FACTS_UNIQUE', []))); |
1049 | - $tree->setPreference('FULL_SOURCES', (string)(bool)$request->get('FULL_SOURCES')); |
|
1049 | + $tree->setPreference('FULL_SOURCES', (string) (bool) $request->get('FULL_SOURCES')); |
|
1050 | 1050 | $tree->setPreference('FORMAT_TEXT', $request->get('FORMAT_TEXT')); |
1051 | - $tree->setPreference('GENERATE_UIDS', (string)(bool)$request->get('GENERATE_UIDS')); |
|
1051 | + $tree->setPreference('GENERATE_UIDS', (string) (bool) $request->get('GENERATE_UIDS')); |
|
1052 | 1052 | $tree->setPreference('GEONAMES_ACCOUNT', $request->get('GEONAMES_ACCOUNT')); |
1053 | - $tree->setPreference('HIDE_GEDCOM_ERRORS', (string)(bool)$request->get('HIDE_GEDCOM_ERRORS')); |
|
1053 | + $tree->setPreference('HIDE_GEDCOM_ERRORS', (string) (bool) $request->get('HIDE_GEDCOM_ERRORS')); |
|
1054 | 1054 | $tree->setPreference('INDI_FACTS_ADD', implode(',', $request->get('INDI_FACTS_ADD', []))); |
1055 | 1055 | $tree->setPreference('INDI_FACTS_QUICK', implode(',', $request->get('INDI_FACTS_QUICK', []))); |
1056 | 1056 | $tree->setPreference('INDI_FACTS_UNIQUE', implode(',', $request->get('INDI_FACTS_UNIQUE', []))); |
1057 | 1057 | $tree->setPreference('LANGUAGE', $request->get('LANGUAGE')); |
1058 | - $tree->setPreference('MAX_DESCENDANCY_GENERATIONS', (string)(int)$request->get('MAX_DESCENDANCY_GENERATIONS')); |
|
1059 | - $tree->setPreference('MAX_PEDIGREE_GENERATIONS', (string)(int)$request->get('MAX_PEDIGREE_GENERATIONS')); |
|
1058 | + $tree->setPreference('MAX_DESCENDANCY_GENERATIONS', (string) (int) $request->get('MAX_DESCENDANCY_GENERATIONS')); |
|
1059 | + $tree->setPreference('MAX_PEDIGREE_GENERATIONS', (string) (int) $request->get('MAX_PEDIGREE_GENERATIONS')); |
|
1060 | 1060 | $tree->setPreference('MEDIA_UPLOAD', $request->get('MEDIA_UPLOAD')); |
1061 | 1061 | $tree->setPreference('META_DESCRIPTION', $request->get('META_DESCRIPTION')); |
1062 | 1062 | $tree->setPreference('META_TITLE', $request->get('META_TITLE')); |
1063 | - $tree->setPreference('NO_UPDATE_CHAN', (string)(bool)$request->get('NO_UPDATE_CHAN')); |
|
1064 | - $tree->setPreference('PEDIGREE_LAYOUT', (string)(bool)$request->get('PEDIGREE_LAYOUT')); |
|
1063 | + $tree->setPreference('NO_UPDATE_CHAN', (string) (bool) $request->get('NO_UPDATE_CHAN')); |
|
1064 | + $tree->setPreference('PEDIGREE_LAYOUT', (string) (bool) $request->get('PEDIGREE_LAYOUT')); |
|
1065 | 1065 | $tree->setPreference('PEDIGREE_ROOT_ID', $request->get('PEDIGREE_ROOT_ID', WT_REGEX_XREF)); |
1066 | - $tree->setPreference('PEDIGREE_SHOW_GENDER', (string)(bool)$request->get('PEDIGREE_SHOW_GENDER')); |
|
1066 | + $tree->setPreference('PEDIGREE_SHOW_GENDER', (string) (bool) $request->get('PEDIGREE_SHOW_GENDER')); |
|
1067 | 1067 | $tree->setPreference('PREFER_LEVEL2_SOURCES', $request->get('PREFER_LEVEL2_SOURCES')); |
1068 | 1068 | $tree->setPreference('QUICK_REQUIRED_FACTS', implode(',', $request->get('QUICK_REQUIRED_FACTS', []))); |
1069 | 1069 | $tree->setPreference('QUICK_REQUIRED_FAMFACTS', implode(',', $request->get('QUICK_REQUIRED_FAMFACTS', []))); |
1070 | 1070 | $tree->setPreference('REPO_FACTS_ADD', implode(',', $request->get('REPO_FACTS_ADD', []))); |
1071 | 1071 | $tree->setPreference('REPO_FACTS_QUICK', implode(',', $request->get('REPO_FACTS_QUICK', []))); |
1072 | 1072 | $tree->setPreference('REPO_FACTS_UNIQUE', implode(',', $request->get('REPO_FACTS_UNIQUE', []))); |
1073 | - $tree->setPreference('SHOW_COUNTER', (string)(bool)$request->get('SHOW_COUNTER')); |
|
1074 | - $tree->setPreference('SHOW_EST_LIST_DATES', (string)(bool)$request->get('SHOW_EST_LIST_DATES')); |
|
1075 | - $tree->setPreference('SHOW_FACT_ICONS', (string)(bool)$request->get('SHOW_FACT_ICONS')); |
|
1076 | - $tree->setPreference('SHOW_GEDCOM_RECORD', (string)(bool)$request->get('SHOW_GEDCOM_RECORD')); |
|
1077 | - $tree->setPreference('SHOW_HIGHLIGHT_IMAGES', (string)(bool)$request->get('SHOW_HIGHLIGHT_IMAGES')); |
|
1078 | - $tree->setPreference('SHOW_LAST_CHANGE', (string)(bool)$request->get('SHOW_LAST_CHANGE')); |
|
1079 | - $tree->setPreference('SHOW_LDS_AT_GLANCE', (string)(bool)$request->get('SHOW_LDS_AT_GLANCE')); |
|
1073 | + $tree->setPreference('SHOW_COUNTER', (string) (bool) $request->get('SHOW_COUNTER')); |
|
1074 | + $tree->setPreference('SHOW_EST_LIST_DATES', (string) (bool) $request->get('SHOW_EST_LIST_DATES')); |
|
1075 | + $tree->setPreference('SHOW_FACT_ICONS', (string) (bool) $request->get('SHOW_FACT_ICONS')); |
|
1076 | + $tree->setPreference('SHOW_GEDCOM_RECORD', (string) (bool) $request->get('SHOW_GEDCOM_RECORD')); |
|
1077 | + $tree->setPreference('SHOW_HIGHLIGHT_IMAGES', (string) (bool) $request->get('SHOW_HIGHLIGHT_IMAGES')); |
|
1078 | + $tree->setPreference('SHOW_LAST_CHANGE', (string) (bool) $request->get('SHOW_LAST_CHANGE')); |
|
1079 | + $tree->setPreference('SHOW_LDS_AT_GLANCE', (string) (bool) $request->get('SHOW_LDS_AT_GLANCE')); |
|
1080 | 1080 | $tree->setPreference('SHOW_MEDIA_DOWNLOAD', $request->get('SHOW_MEDIA_DOWNLOAD')); |
1081 | 1081 | $tree->setPreference('SHOW_NO_WATERMARK', $request->get('SHOW_NO_WATERMARK')); |
1082 | - $tree->setPreference('SHOW_PARENTS_AGE', (string)(bool)$request->get('SHOW_PARENTS_AGE')); |
|
1082 | + $tree->setPreference('SHOW_PARENTS_AGE', (string) (bool) $request->get('SHOW_PARENTS_AGE')); |
|
1083 | 1083 | $tree->setPreference('SHOW_PEDIGREE_PLACES', $request->get('SHOW_PEDIGREE_PLACES')); |
1084 | - $tree->setPreference('SHOW_PEDIGREE_PLACES_SUFFIX', (string)(bool)$request->get('SHOW_PEDIGREE_PLACES_SUFFIX')); |
|
1084 | + $tree->setPreference('SHOW_PEDIGREE_PLACES_SUFFIX', (string) (bool) $request->get('SHOW_PEDIGREE_PLACES_SUFFIX')); |
|
1085 | 1085 | $tree->setPreference('SHOW_RELATIVES_EVENTS', implode(',', $request->get('SHOW_RELATIVES_EVENTS', []))); |
1086 | 1086 | $tree->setPreference('SOUR_FACTS_ADD', implode(',', $request->get('SOUR_FACTS_ADD', []))); |
1087 | 1087 | $tree->setPreference('SOUR_FACTS_QUICK', implode(',', $request->get('SOUR_FACTS_QUICK', []))); |
1088 | 1088 | $tree->setPreference('SOUR_FACTS_UNIQUE', implode(',', $request->get('SOUR_FACTS_UNIQUE', []))); |
1089 | - $tree->setPreference('SUBLIST_TRIGGER_I', (string)(int)$request->get('SUBLIST_TRIGGER_I', 200)); |
|
1089 | + $tree->setPreference('SUBLIST_TRIGGER_I', (string) (int) $request->get('SUBLIST_TRIGGER_I', 200)); |
|
1090 | 1090 | $tree->setPreference('SURNAME_LIST_STYLE', $request->get('SURNAME_LIST_STYLE')); |
1091 | 1091 | $tree->setPreference('SURNAME_TRADITION', $request->get('SURNAME_TRADITION')); |
1092 | 1092 | $tree->setPreference('THEME_DIR', $request->get('THEME_DIR')); |
1093 | - $tree->setPreference('USE_SILHOUETTE', (string)(bool)$request->get('USE_SILHOUETTE')); |
|
1093 | + $tree->setPreference('USE_SILHOUETTE', (string) (bool) $request->get('USE_SILHOUETTE')); |
|
1094 | 1094 | $tree->setPreference('WEBMASTER_USER_ID', $request->get('WEBMASTER_USER_ID')); |
1095 | 1095 | $tree->setPreference('WEBTREES_EMAIL', $request->get('WEBTREES_EMAIL')); |
1096 | 1096 | $tree->setPreference('title', $request->get('title')); |
@@ -1596,7 +1596,7 @@ discard block |
||
1596 | 1596 | |
1597 | 1597 | foreach ($gedcom_files as $gedcom_file) { |
1598 | 1598 | // Only import files that have changed |
1599 | - $filemtime = (string)filemtime(WT_DATA_DIR . $gedcom_file); |
|
1599 | + $filemtime = (string) filemtime(WT_DATA_DIR . $gedcom_file); |
|
1600 | 1600 | |
1601 | 1601 | $tree = Tree::findByName($gedcom_file) ?? Tree::create($gedcom_file, $gedcom_file); |
1602 | 1602 | |
@@ -1629,7 +1629,7 @@ discard block |
||
1629 | 1629 | */ |
1630 | 1630 | public function unconnected(Request $request, Tree $tree, User $user): Response |
1631 | 1631 | { |
1632 | - $associates = (bool)$request->get('associates'); |
|
1632 | + $associates = (bool) $request->get('associates'); |
|
1633 | 1633 | |
1634 | 1634 | if ($associates) { |
1635 | 1635 | $sql = "SELECT l_from, l_to FROM `##link` WHERE l_file = :tree_id AND l_type IN ('FAMS', 'FAMC', 'ASSO', '_ASSO')"; |
@@ -74,7 +74,7 @@ |
||
74 | 74 | } |
75 | 75 | |
76 | 76 | if (preg_match('/^(\d+) B\.C\.$/', $year, $match)) { |
77 | - return - (int) $match[1]; |
|
77 | + return -(int) $match[1]; |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | return (int) $year; |
@@ -321,7 +321,7 @@ |
||
321 | 321 | throw new IndividualAccessDeniedException(); |
322 | 322 | } |
323 | 323 | |
324 | - return (object)[ |
|
324 | + return (object) [ |
|
325 | 325 | 'name' => 'modules/pedigree-map/pedigree-map-page', |
326 | 326 | 'data' => [ |
327 | 327 | 'module' => $this->getName(), |
@@ -1793,7 +1793,7 @@ |
||
1793 | 1793 | public function menuSearchPhonetic(): Menu |
1794 | 1794 | { |
1795 | 1795 | /* I18N: search using “sounds like”, rather than exact spelling */ |
1796 | - return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged' => $this->tree->getName(), 'action' => 'soundex',]), 'menu-search-soundex', ['rel' => 'nofollow']); |
|
1796 | + return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged' => $this->tree->getName(), 'action' => 'soundex', ]), 'menu-search-soundex', ['rel' => 'nofollow']); |
|
1797 | 1797 | } |
1798 | 1798 | |
1799 | 1799 | /** |