@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | public function edit(Tree $tree, User $user): Response |
| 49 | 49 | { |
| 50 | - $allow_user_themes = (bool)Site::getPreference('ALLOW_USER_THEMES'); |
|
| 50 | + $allow_user_themes = (bool) Site::getPreference('ALLOW_USER_THEMES'); |
|
| 51 | 51 | $my_individual_record = Individual::getInstance($tree->getUserPreference(Auth::user(), 'gedcomid'), $tree); |
| 52 | 52 | $contact_methods = FunctionsEdit::optionsContactMethods(); |
| 53 | 53 | $default_individual = Individual::getInstance($tree->getUserPreference(Auth::user(), 'rootid'), $tree); |
@@ -82,16 +82,16 @@ discard block |
||
| 82 | 82 | */ |
| 83 | 83 | public function update(Request $request, Tree $tree, User $user): RedirectResponse |
| 84 | 84 | { |
| 85 | - $contact_method = (string)$request->get('contact_method'); |
|
| 86 | - $email = (string)$request->get('email'); |
|
| 87 | - $language = (string)$request->get('language'); |
|
| 88 | - $real_name = (string)$request->get('real_name'); |
|
| 89 | - $password = (string)$request->get('password'); |
|
| 90 | - $rootid = (string)$request->get('root_id'); |
|
| 91 | - $theme = (string)$request->get('theme'); |
|
| 92 | - $time_zone = (string)$request->get('timezone'); |
|
| 93 | - $user_name = (string)$request->get('user_name'); |
|
| 94 | - $visible_online = (string)$request->get('visible_online'); |
|
| 85 | + $contact_method = (string) $request->get('contact_method'); |
|
| 86 | + $email = (string) $request->get('email'); |
|
| 87 | + $language = (string) $request->get('language'); |
|
| 88 | + $real_name = (string) $request->get('real_name'); |
|
| 89 | + $password = (string) $request->get('password'); |
|
| 90 | + $rootid = (string) $request->get('root_id'); |
|
| 91 | + $theme = (string) $request->get('theme'); |
|
| 92 | + $time_zone = (string) $request->get('timezone'); |
|
| 93 | + $user_name = (string) $request->get('user_name'); |
|
| 94 | + $visible_online = (string) $request->get('visible_online'); |
|
| 95 | 95 | |
| 96 | 96 | // Change the password |
| 97 | 97 | if ($password !== '') { |
@@ -290,8 +290,8 @@ discard block |
||
| 290 | 290 | public function editRawRecordAction(Request $request, Tree $tree): Response |
| 291 | 291 | { |
| 292 | 292 | $xref = $request->get('xref'); |
| 293 | - $facts = (array)$request->get('fact'); |
|
| 294 | - $fact_ids = (array)$request->get('fact_id'); |
|
| 293 | + $facts = (array) $request->get('fact'); |
|
| 294 | + $fact_ids = (array) $request->get('fact_id'); |
|
| 295 | 295 | $record = GedcomRecord::getInstance($xref, $tree); |
| 296 | 296 | |
| 297 | 297 | $this->checkRecordAccess($record, true); |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | $record = GedcomRecord::getInstance($xref, $tree); |
| 396 | 396 | $this->checkRecordAccess($record, true); |
| 397 | 397 | |
| 398 | - $keep_chan = (bool)$request->get('keep_chan'); |
|
| 398 | + $keep_chan = (bool) $request->get('keep_chan'); |
|
| 399 | 399 | |
| 400 | 400 | $this->glevels = $request->get('glevels', []); |
| 401 | 401 | $this->tag = $request->get('tag', []); |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | |
| 415 | 415 | $newged = ''; |
| 416 | 416 | if (!empty($_POST['NAME'])) { |
| 417 | - $newged .= "\n1 NAME " . $_POST['NAME']; |
|
| 417 | + $newged .= "\n1 NAME " . $_POST['NAME']; |
|
| 418 | 418 | $name_facts = [ |
| 419 | 419 | 'TYPE', |
| 420 | 420 | 'NPFX', |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | */ |
| 51 | 51 | public function cleanup(Request $request): Response |
| 52 | 52 | { |
| 53 | - $months = (int)$request->get('months', 6); |
|
| 53 | + $months = (int) $request->get('months', 6); |
|
| 54 | 54 | |
| 55 | 55 | $inactive_threshold = time() - $months * 30 * self::SECONDS_PER_DAY; |
| 56 | 56 | $unverified_threshold = time() - 7 * self::SECONDS_PER_DAY; |
@@ -59,9 +59,9 @@ discard block |
||
| 59 | 59 | |
| 60 | 60 | $inactive_users = array_filter($users, function (User $user) use ($inactive_threshold) { |
| 61 | 61 | if ($user->getPreference('sessiontime') === '0') { |
| 62 | - $datelogin = (int)$user->getPreference('reg_timestamp'); |
|
| 62 | + $datelogin = (int) $user->getPreference('reg_timestamp'); |
|
| 63 | 63 | } else { |
| 64 | - $datelogin = (int)$user->getPreference('sessiontime'); |
|
| 64 | + $datelogin = (int) $user->getPreference('sessiontime'); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | return $datelogin < $inactive_threshold && $user->getPreference('verified'); |
@@ -69,9 +69,9 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | $unverified_users = array_filter($users, function (User $user) use ($unverified_threshold) { |
| 71 | 71 | if ($user->getPreference('sessiontime') === '0') { |
| 72 | - $datelogin = (int)$user->getPreference('reg_timestamp'); |
|
| 72 | + $datelogin = (int) $user->getPreference('reg_timestamp'); |
|
| 73 | 73 | } else { |
| 74 | - $datelogin = (int)$user->getPreference('sessiontime'); |
|
| 74 | + $datelogin = (int) $user->getPreference('sessiontime'); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | return $datelogin < $unverified_threshold && !$user->getPreference('verified'); |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | public function cleanupAction(Request $request): RedirectResponse |
| 99 | 99 | { |
| 100 | 100 | foreach (User::all() as $user) { |
| 101 | - if ((bool)$request->get('del_' . $user->getUserId())) { |
|
| 101 | + if ((bool) $request->get('del_' . $user->getUserId())) { |
|
| 102 | 102 | Log::addAuthenticationLog('Deleted user: ' . $user->getUserName()); |
| 103 | 103 | $user->delete(); |
| 104 | 104 | |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | |
| 124 | 124 | $all_users = User::all(); |
| 125 | 125 | |
| 126 | - $page_size = (int)$user->getPreference(' admin_users_page_size', 10); |
|
| 126 | + $page_size = (int) $user->getPreference(' admin_users_page_size', 10); |
|
| 127 | 127 | |
| 128 | 128 | $title = I18N::translate('User administration'); |
| 129 | 129 | |
@@ -145,10 +145,10 @@ discard block |
||
| 145 | 145 | public function data(Request $request, User $user): JsonResponse |
| 146 | 146 | { |
| 147 | 147 | $search = $request->get('search')['value']; |
| 148 | - $start = (int)$request->get('start'); |
|
| 149 | - $length = (int)$request->get('length'); |
|
| 148 | + $start = (int) $request->get('start'); |
|
| 149 | + $length = (int) $request->get('length'); |
|
| 150 | 150 | $order = $request->get('order', []); |
| 151 | - $draw = (int)$request->get('draw'); |
|
| 151 | + $draw = (int) $request->get('draw'); |
|
| 152 | 152 | |
| 153 | 153 | $sql_select = |
| 154 | 154 | "SELECT SQL_CALC_FOUND_ROWS '', u.user_id, user_name, real_name, email, us1.setting_value, us2.setting_value, NULL, us3.setting_value, NULL, us4.setting_value, us5.setting_value" . |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | $args = []; |
| 164 | 164 | |
| 165 | 165 | if ($search) { |
| 166 | - $sql_select .= " AND (user_name LIKE CONCAT('%', :search_1, '%') OR real_name LIKE CONCAT('%', :search_2, '%') OR email LIKE CONCAT('%', :search_3, '%'))"; |
|
| 166 | + $sql_select .= " AND (user_name LIKE CONCAT('%', :search_1, '%') OR real_name LIKE CONCAT('%', :search_2, '%') OR email LIKE CONCAT('%', :search_3, '%'))"; |
|
| 167 | 167 | $args['search_1'] = $search; |
| 168 | 168 | $args['search_2'] = $search; |
| 169 | 169 | $args['search_3'] = $search; |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | |
| 193 | 193 | if ($length) { |
| 194 | 194 | $user->setPreference('admin_users_page_size', $length); |
| 195 | - $sql_select .= " LIMIT :limit OFFSET :offset"; |
|
| 195 | + $sql_select .= " LIMIT :limit OFFSET :offset"; |
|
| 196 | 196 | $args['limit'] = $length; |
| 197 | 197 | $args['offset'] = $start; |
| 198 | 198 | } |
@@ -201,8 +201,8 @@ discard block |
||
| 201 | 201 | $data = Database::prepare($sql_select)->execute($args)->fetchAll(PDO::FETCH_NUM); |
| 202 | 202 | |
| 203 | 203 | // Total filtered/unfiltered rows |
| 204 | - $recordsFiltered = (int)Database::prepare("SELECT FOUND_ROWS()")->fetchOne(); |
|
| 205 | - $recordsTotal = (int)Database::prepare("SELECT COUNT(*) FROM `##user` WHERE user_id > 0")->fetchOne(); |
|
| 204 | + $recordsFiltered = (int) Database::prepare("SELECT FOUND_ROWS()")->fetchOne(); |
|
| 205 | + $recordsTotal = (int) Database::prepare("SELECT COUNT(*) FROM `##user` WHERE user_id > 0")->fetchOne(); |
|
| 206 | 206 | |
| 207 | 207 | $installed_languages = []; |
| 208 | 208 | foreach (I18N::installedLocales() as $installed_locale) { |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | */ |
| 290 | 290 | public function edit(Request $request): Response |
| 291 | 291 | { |
| 292 | - $user_id = (int)$request->get('user_id'); |
|
| 292 | + $user_id = (int) $request->get('user_id'); |
|
| 293 | 293 | $user = User::find($user_id); |
| 294 | 294 | |
| 295 | 295 | if ($user === null) { |
@@ -372,7 +372,7 @@ discard block |
||
| 372 | 372 | */ |
| 373 | 373 | public function update(Request $request, User $user): RedirectResponse |
| 374 | 374 | { |
| 375 | - $user_id = (int)$request->get('user_id'); |
|
| 375 | + $user_id = (int) $request->get('user_id'); |
|
| 376 | 376 | $username = $request->get('username'); |
| 377 | 377 | $real_name = $request->get('real_name'); |
| 378 | 378 | $email = $request->get('email'); |
@@ -382,11 +382,11 @@ discard block |
||
| 382 | 382 | $timezone = $request->get('timezone'); |
| 383 | 383 | $contact_method = $request->get('contact_method'); |
| 384 | 384 | $comment = $request->get('comment'); |
| 385 | - $auto_accept = (bool)$request->get('auto_accept'); |
|
| 386 | - $canadmin = (bool)$request->get('canadmin'); |
|
| 387 | - $visible_online = (bool)$request->get('visible_online'); |
|
| 388 | - $verified = (bool)$request->get('verified'); |
|
| 389 | - $approved = (bool)$request->get('approved'); |
|
| 385 | + $auto_accept = (bool) $request->get('auto_accept'); |
|
| 386 | + $canadmin = (bool) $request->get('canadmin'); |
|
| 387 | + $visible_online = (bool) $request->get('visible_online'); |
|
| 388 | + $verified = (bool) $request->get('verified'); |
|
| 389 | + $approved = (bool) $request->get('approved'); |
|
| 390 | 390 | |
| 391 | 391 | $edit_user = User::find($user_id); |
| 392 | 392 | |
@@ -404,10 +404,10 @@ discard block |
||
| 404 | 404 | ->setPreference('TIMEZONE', $timezone) |
| 405 | 405 | ->setPreference('contactmethod', $contact_method) |
| 406 | 406 | ->setPreference('comment', $comment) |
| 407 | - ->setPreference('auto_accept', (string)$auto_accept) |
|
| 408 | - ->setPreference('visibleonline', (string)$visible_online) |
|
| 409 | - ->setPreference('verified', (string)$verified) |
|
| 410 | - ->setPreference('verified_by_admin', (string)$approved); |
|
| 407 | + ->setPreference('auto_accept', (string) $auto_accept) |
|
| 408 | + ->setPreference('visibleonline', (string) $visible_online) |
|
| 409 | + ->setPreference('verified', (string) $verified) |
|
| 410 | + ->setPreference('verified_by_admin', (string) $approved); |
|
| 411 | 411 | |
| 412 | 412 | // We cannot change our own admin status. Another admin will need to do it. |
| 413 | 413 | if ($edit_user->getUserId() !== $user->getUserId()) { |
@@ -415,7 +415,7 @@ discard block |
||
| 415 | 415 | } |
| 416 | 416 | |
| 417 | 417 | foreach (Tree::getAll() as $tree) { |
| 418 | - $path_length = (int)$request->get('RELATIONSHIP_PATH_LENGTH' . $tree->getTreeId()); |
|
| 418 | + $path_length = (int) $request->get('RELATIONSHIP_PATH_LENGTH' . $tree->getTreeId()); |
|
| 419 | 419 | $gedcom_id = $request->get('gedcomid' . $tree->getTreeId()); |
| 420 | 420 | $can_edit = $request->get('canedit' . $tree->getTreeId()); |
| 421 | 421 | |
@@ -426,7 +426,7 @@ discard block |
||
| 426 | 426 | |
| 427 | 427 | $tree->setUserPreference($edit_user, 'gedcomid', $gedcom_id); |
| 428 | 428 | $tree->setUserPreference($edit_user, 'canedit', $can_edit); |
| 429 | - $tree->setUserPreference($edit_user, 'RELATIONSHIP_PATH_LENGTH', (string)$path_length); |
|
| 429 | + $tree->setUserPreference($edit_user, 'RELATIONSHIP_PATH_LENGTH', (string) $path_length); |
|
| 430 | 430 | } |
| 431 | 431 | |
| 432 | 432 | $url = route('admin-users'); |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | $pages = []; |
| 85 | 85 | |
| 86 | 86 | // Escape the query for MySQL and PHP, converting spaces to wildcards. |
| 87 | - $like_query = strtr($query, [ |
|
| 87 | + $like_query = strtr($query, [ |
|
| 88 | 88 | '_' => '\\_', |
| 89 | 89 | '%' => '\\%', |
| 90 | 90 | ' ' => '%', |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | */ |
| 207 | 207 | public function select2Family(Request $request, Tree $tree): JsonResponse |
| 208 | 208 | { |
| 209 | - $page = (int)$request->get('page'); |
|
| 209 | + $page = (int) $request->get('page'); |
|
| 210 | 210 | $query = $request->get('q'); |
| 211 | 211 | |
| 212 | 212 | return new JsonResponse(Select2::familySearch($tree, $page, $query)); |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | public function select2Flag(Request $request): JsonResponse |
| 221 | 221 | { |
| 222 | 222 | $page = $request->get('page'); |
| 223 | - $query = (int)$request->get('q'); |
|
| 223 | + $query = (int) $request->get('q'); |
|
| 224 | 224 | |
| 225 | 225 | return new JsonResponse(Select2::flagSearch($page, $query)); |
| 226 | 226 | } |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | */ |
| 234 | 234 | public function select2Individual(Request $request, Tree $tree): JsonResponse |
| 235 | 235 | { |
| 236 | - $page = (int)$request->get('page'); |
|
| 236 | + $page = (int) $request->get('page'); |
|
| 237 | 237 | $query = $request->get('q'); |
| 238 | 238 | |
| 239 | 239 | return new JsonResponse(Select2::individualSearch($tree, $page, $query)); |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | */ |
| 248 | 248 | public function select2MediaObject(Request $request, Tree $tree): JsonResponse |
| 249 | 249 | { |
| 250 | - $page = (int)$request->get('page'); |
|
| 250 | + $page = (int) $request->get('page'); |
|
| 251 | 251 | $query = $request->get('q'); |
| 252 | 252 | |
| 253 | 253 | return new JsonResponse(Select2::mediaObjectSearch($tree, $page, $query)); |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | */ |
| 262 | 262 | public function select2Note(Request $request, Tree $tree): JsonResponse |
| 263 | 263 | { |
| 264 | - $page = (int)$request->get('page'); |
|
| 264 | + $page = (int) $request->get('page'); |
|
| 265 | 265 | $query = $request->get('q'); |
| 266 | 266 | |
| 267 | 267 | return new JsonResponse(Select2::noteSearch($tree, $page, $query)); |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | */ |
| 276 | 276 | public function select2Place(Request $request, Tree $tree): JsonResponse |
| 277 | 277 | { |
| 278 | - $page = (int)$request->get('page'); |
|
| 278 | + $page = (int) $request->get('page'); |
|
| 279 | 279 | $query = $request->get('q'); |
| 280 | 280 | |
| 281 | 281 | return new JsonResponse(Select2::placeSearch($tree, $page, $query, true)); |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | */ |
| 290 | 290 | public function select2Repository(Request $request, Tree $tree): JsonResponse |
| 291 | 291 | { |
| 292 | - $page = (int)$request->get('page'); |
|
| 292 | + $page = (int) $request->get('page'); |
|
| 293 | 293 | $query = $request->get('q'); |
| 294 | 294 | |
| 295 | 295 | return new JsonResponse(Select2::repositorySearch($tree, $page, $query)); |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | */ |
| 304 | 304 | public function select2Source(Request $request, Tree $tree): JsonResponse |
| 305 | 305 | { |
| 306 | - $page = (int)$request->get('page'); |
|
| 306 | + $page = (int) $request->get('page'); |
|
| 307 | 307 | $query = $request->get('q'); |
| 308 | 308 | |
| 309 | 309 | return new JsonResponse(Select2::sourceSearch($tree, $page, $query)); |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | */ |
| 318 | 318 | public function select2Submitter(Request $request, Tree $tree): JsonResponse |
| 319 | 319 | { |
| 320 | - $page = (int)$request->get('page'); |
|
| 320 | + $page = (int) $request->get('page'); |
|
| 321 | 321 | $query = $request->get('q'); |
| 322 | 322 | |
| 323 | 323 | return new JsonResponse(Select2::submitterSearch($tree, $page, $query)); |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | */ |
| 47 | 47 | public function treePageBlockEdit(Request $request, Tree $tree): Response |
| 48 | 48 | { |
| 49 | - $block_id = (int)$request->get('block_id'); |
|
| 49 | + $block_id = (int) $request->get('block_id'); |
|
| 50 | 50 | $block = $this->treeBlock($request); |
| 51 | 51 | $title = $block->getTitle() . ' — ' . I18N::translate('Preferences'); |
| 52 | 52 | |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | */ |
| 70 | 70 | public function treePageBlockUpdate(Request $request, Tree $tree): RedirectResponse |
| 71 | 71 | { |
| 72 | - $block_id = (int)$request->get('block_id'); |
|
| 72 | + $block_id = (int) $request->get('block_id'); |
|
| 73 | 73 | $block = $this->treeBlock($request); |
| 74 | 74 | |
| 75 | 75 | $block->configureBlock($tree, $block_id); |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | */ |
| 88 | 88 | private function treeBlock(Request $request, User $user): ModuleBlockInterface |
| 89 | 89 | { |
| 90 | - $block_id = (int)$request->get('block_id'); |
|
| 90 | + $block_id = (int) $request->get('block_id'); |
|
| 91 | 91 | |
| 92 | 92 | $block_info = Database::prepare( |
| 93 | 93 | "SELECT module_Name, user_id FROM `##block` WHERE block_id = :block_id" |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | */ |
| 123 | 123 | public function userPageBlockEdit(Request $request, Tree $tree): Response |
| 124 | 124 | { |
| 125 | - $block_id = (int)$request->get('block_id'); |
|
| 125 | + $block_id = (int) $request->get('block_id'); |
|
| 126 | 126 | $block = $this->userBlock($request); |
| 127 | 127 | $title = $block->getTitle() . ' — ' . I18N::translate('Preferences'); |
| 128 | 128 | |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | */ |
| 146 | 146 | public function userPageBlockUpdate(Request $request, Tree $tree): RedirectResponse |
| 147 | 147 | { |
| 148 | - $block_id = (int)$request->get('block_id'); |
|
| 148 | + $block_id = (int) $request->get('block_id'); |
|
| 149 | 149 | $block = $this->userBlock($request); |
| 150 | 150 | |
| 151 | 151 | $block->configureBlock($tree, $block_id); |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | */ |
| 164 | 164 | private function userBlock(Request $request, User $user): ModuleBlockInterface |
| 165 | 165 | { |
| 166 | - $block_id = (int)$request->get('block_id'); |
|
| 166 | + $block_id = (int) $request->get('block_id'); |
|
| 167 | 167 | |
| 168 | 168 | $block_info = Database::prepare( |
| 169 | 169 | "SELECT module_Name, user_id FROM `##block` WHERE block_id = :block_id" |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | throw new NotFoundHttpException($block_info->module_name . ' is not a block'); |
| 182 | 182 | } |
| 183 | 183 | |
| 184 | - $block_owner_id = (int)$block_info->user_id; |
|
| 184 | + $block_owner_id = (int) $block_info->user_id; |
|
| 185 | 185 | |
| 186 | 186 | if ($block_owner_id !== $user->getUserId() && !Auth::isAdmin()) { |
| 187 | 187 | throw new AccessDeniedHttpException('You are not allowed to edit this block'); |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | */ |
| 228 | 228 | public function treePageBlock(Request $request, Tree $tree): Response |
| 229 | 229 | { |
| 230 | - $block_id = (int)$request->get('block_id'); |
|
| 230 | + $block_id = (int) $request->get('block_id'); |
|
| 231 | 231 | |
| 232 | 232 | $block = Database::prepare( |
| 233 | 233 | "SELECT * FROM `##block` WHERE block_id = :block_id AND gedcom_id = :tree_id AND user_id IS NULL" |
@@ -293,8 +293,8 @@ discard block |
||
| 293 | 293 | */ |
| 294 | 294 | public function treePageDefaultUpdate(Request $request): RedirectResponse |
| 295 | 295 | { |
| 296 | - $main_blocks = (array)$request->get('main'); |
|
| 297 | - $side_blocks = (array)$request->get('side'); |
|
| 296 | + $main_blocks = (array) $request->get('main'); |
|
| 297 | + $side_blocks = (array) $request->get('side'); |
|
| 298 | 298 | |
| 299 | 299 | $this->updateTreeBlocks(-1, $main_blocks, $side_blocks); |
| 300 | 300 | |
@@ -338,14 +338,14 @@ discard block |
||
| 338 | 338 | */ |
| 339 | 339 | public function treePageUpdate(Request $request, Tree $tree): RedirectResponse |
| 340 | 340 | { |
| 341 | - $defaults = (bool)$request->get('defaults'); |
|
| 341 | + $defaults = (bool) $request->get('defaults'); |
|
| 342 | 342 | |
| 343 | 343 | if ($defaults) { |
| 344 | 344 | $main_blocks = $this->getBlocksForTreePage(-1, AUth::PRIV_NONE, 'main'); |
| 345 | 345 | $side_blocks = $this->getBlocksForTreePage(-1, Auth::PRIV_NONE, 'side'); |
| 346 | 346 | } else { |
| 347 | - $main_blocks = (array)$request->get('main'); |
|
| 348 | - $side_blocks = (array)$request->get('side'); |
|
| 347 | + $main_blocks = (array) $request->get('main'); |
|
| 348 | + $side_blocks = (array) $request->get('side'); |
|
| 349 | 349 | } |
| 350 | 350 | |
| 351 | 351 | $this->updateTreeBlocks($tree->getTreeId(), $main_blocks, $side_blocks); |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | */ |
| 393 | 393 | public function userPageBlock(Request $request, Tree $tree, User $user): Response |
| 394 | 394 | { |
| 395 | - $block_id = (int)$request->get('block_id'); |
|
| 395 | + $block_id = (int) $request->get('block_id'); |
|
| 396 | 396 | |
| 397 | 397 | $block = Database::prepare( |
| 398 | 398 | "SELECT * FROM `##block` WHERE block_id = :block_id AND gedcom_id IS NULL AND user_id = :user_id" |
@@ -457,8 +457,8 @@ discard block |
||
| 457 | 457 | */ |
| 458 | 458 | public function userPageDefaultUpdate(Request $request): RedirectResponse |
| 459 | 459 | { |
| 460 | - $main_blocks = (array)$request->get('main'); |
|
| 461 | - $side_blocks = (array)$request->get('side'); |
|
| 460 | + $main_blocks = (array) $request->get('main'); |
|
| 461 | + $side_blocks = (array) $request->get('side'); |
|
| 462 | 462 | |
| 463 | 463 | $this->updateUserBlocks(-1, $main_blocks, $side_blocks); |
| 464 | 464 | |
@@ -504,14 +504,14 @@ discard block |
||
| 504 | 504 | */ |
| 505 | 505 | public function userPageUpdate(Request $request, Tree $tree, User $user): RedirectResponse |
| 506 | 506 | { |
| 507 | - $defaults = (bool)$request->get('defaults'); |
|
| 507 | + $defaults = (bool) $request->get('defaults'); |
|
| 508 | 508 | |
| 509 | 509 | if ($defaults) { |
| 510 | 510 | $main_blocks = $this->getBlocksForUserPage(-1, -1, AUth::PRIV_NONE, 'main'); |
| 511 | 511 | $side_blocks = $this->getBlocksForUserPage(-1, -1, Auth::PRIV_NONE, 'side'); |
| 512 | 512 | } else { |
| 513 | - $main_blocks = (array)$request->get('main'); |
|
| 514 | - $side_blocks = (array)$request->get('side'); |
|
| 513 | + $main_blocks = (array) $request->get('main'); |
|
| 514 | + $side_blocks = (array) $request->get('side'); |
|
| 515 | 515 | } |
| 516 | 516 | |
| 517 | 517 | $this->updateUserBlocks($user->getUserId(), $main_blocks, $side_blocks); |
@@ -528,7 +528,7 @@ discard block |
||
| 528 | 528 | */ |
| 529 | 529 | public function userPageUserEdit(Request $request): Response |
| 530 | 530 | { |
| 531 | - $user_id = (int)$request->get('user_id'); |
|
| 531 | + $user_id = (int) $request->get('user_id'); |
|
| 532 | 532 | $user = User::find($user_id); |
| 533 | 533 | $main_blocks = $this->getBlocksForUserPage(-1, $user_id, Auth::PRIV_NONE, 'main'); |
| 534 | 534 | $side_blocks = $this->getBlocksForUserPage(-1, $user_id, Auth::PRIV_NONE, 'side'); |
@@ -557,9 +557,9 @@ discard block |
||
| 557 | 557 | */ |
| 558 | 558 | public function userPageUserUpdate(Request $request): RedirectResponse |
| 559 | 559 | { |
| 560 | - $user_id = (int)$request->get('user_id'); |
|
| 561 | - $main_blocks = (array)$request->get('main'); |
|
| 562 | - $side_blocks = (array)$request->get('side'); |
|
| 560 | + $user_id = (int) $request->get('user_id'); |
|
| 561 | + $main_blocks = (array) $request->get('main'); |
|
| 562 | + $side_blocks = (array) $request->get('side'); |
|
| 563 | 563 | |
| 564 | 564 | $this->updateUserBlocks($user_id, $main_blocks, $side_blocks); |
| 565 | 565 | |
@@ -60,11 +60,11 @@ discard block |
||
| 60 | 60 | { |
| 61 | 61 | $this->checkModuleIsActive($tree, 'timeline_chart'); |
| 62 | 62 | |
| 63 | - $scale = (int)$request->get('scale', self::SCALE_DEFAULT); |
|
| 63 | + $scale = (int) $request->get('scale', self::SCALE_DEFAULT); |
|
| 64 | 64 | $scale = min($scale, self::SCALE_MAX); |
| 65 | 65 | $scale = max($scale, self::SCALE_MIN); |
| 66 | 66 | |
| 67 | - $xrefs = (array)$request->get('xrefs', []); |
|
| 67 | + $xrefs = (array) $request->get('xrefs', []); |
|
| 68 | 68 | $xrefs = array_unique($xrefs); |
| 69 | 69 | $xrefs = array_filter($xrefs, function (string $xref) use ($tree) { |
| 70 | 70 | $individual = Individual::getInstance($xref, $tree); |
@@ -100,14 +100,14 @@ discard block |
||
| 100 | 100 | |
| 101 | 101 | $zoom_in_url = route('timeline', [ |
| 102 | 102 | 'ged' => $tree->getName(), |
| 103 | - 'scale' => min(self::SCALE_MAX, $scale + (int)($scale * 0.2 + 1)), |
|
| 103 | + 'scale' => min(self::SCALE_MAX, $scale + (int) ($scale * 0.2 + 1)), |
|
| 104 | 104 | 'xrefs' => $xrefs, |
| 105 | 105 | ]); |
| 106 | 106 | |
| 107 | 107 | $zoom_out_url = route('timeline', [ |
| 108 | 108 | 'route' => 'timeline', |
| 109 | 109 | 'ged' => $tree->getName(), |
| 110 | - 'scale' => max(self::SCALE_MIN, $scale - (int)($scale * 0.2 + 1)), |
|
| 110 | + 'scale' => max(self::SCALE_MIN, $scale - (int) ($scale * 0.2 + 1)), |
|
| 111 | 111 | 'xrefs' => $xrefs, |
| 112 | 112 | ]); |
| 113 | 113 | |
@@ -132,11 +132,11 @@ discard block |
||
| 132 | 132 | { |
| 133 | 133 | $this->checkModuleIsActive($tree, 'timeline_chart'); |
| 134 | 134 | |
| 135 | - $scale = (int)$request->get('scale', self::SCALE_DEFAULT); |
|
| 135 | + $scale = (int) $request->get('scale', self::SCALE_DEFAULT); |
|
| 136 | 136 | $scale = min($scale, self::SCALE_MAX); |
| 137 | 137 | $scale = max($scale, self::SCALE_MIN); |
| 138 | 138 | |
| 139 | - $xrefs = (array)$request->get('xrefs', []); |
|
| 139 | + $xrefs = (array) $request->get('xrefs', []); |
|
| 140 | 140 | $xrefs = array_unique($xrefs); |
| 141 | 141 | |
| 142 | 142 | /** @var Individual[] $individuals */ |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | return $individual !== null && $individual->canShow(); |
| 149 | 149 | }); |
| 150 | 150 | |
| 151 | - $baseyear = (int)date('Y'); |
|
| 151 | + $baseyear = (int) date('Y'); |
|
| 152 | 152 | $topyear = 0; |
| 153 | 153 | $indifacts = []; |
| 154 | 154 | $birthyears = []; |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | $topyear = max($topyear, $date->y); |
| 184 | 184 | |
| 185 | 185 | if (!$individual->isDead()) { |
| 186 | - $topyear = max($topyear, (int)date('Y')); |
|
| 186 | + $topyear = max($topyear, (int) date('Y')); |
|
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | // do not add the same fact twice (prevents marriages from being added multiple times) |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | if ($scale === 0) { |
| 199 | - $scale = (int)(($topyear - $baseyear) / 20 * count($indifacts) / 4); |
|
| 199 | + $scale = (int) (($topyear - $baseyear) / 20 * count($indifacts) / 4); |
|
| 200 | 200 | if ($scale < 6) { |
| 201 | 201 | $scale = 6; |
| 202 | 202 | } |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | public function reorderMediaAction(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 | $individual = Individual::getInstance($xref, $tree); |
| 67 | 67 | |
| 68 | 68 | $this->checkIndividualAccess($individual, true); |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | public function reorderNamesAction(Request $request, Tree $tree): Response |
| 124 | 124 | { |
| 125 | 125 | $xref = $request->get('xref'); |
| 126 | - $order = (array)$request->get('order', []); |
|
| 126 | + $order = (array) $request->get('order', []); |
|
| 127 | 127 | $individual = Individual::getInstance($xref, $tree); |
| 128 | 128 | |
| 129 | 129 | $this->checkIndividualAccess($individual, true); |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | public function reorderSpousesAction(Request $request, Tree $tree): Response |
| 185 | 185 | { |
| 186 | 186 | $xref = $request->get('xref'); |
| 187 | - $order = (array)$request->get('order', []); |
|
| 187 | + $order = (array) $request->get('order', []); |
|
| 188 | 188 | $individual = Individual::getInstance($xref, $tree); |
| 189 | 189 | |
| 190 | 190 | $this->checkIndividualAccess($individual, true); |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | $gedcom .= $this->addNewFact($tree, $match); |
| 292 | 292 | } |
| 293 | 293 | } |
| 294 | - if ((bool)$request->get('SOUR_INDI')) { |
|
| 294 | + if ((bool) $request->get('SOUR_INDI')) { |
|
| 295 | 295 | $gedcom = $this->handleUpdates($gedcom); |
| 296 | 296 | } else { |
| 297 | 297 | $gedcom = $this->updateRest($gedcom); |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | $gedcom .= $this->addNewFact($tree, $match); |
| 384 | 384 | } |
| 385 | 385 | } |
| 386 | - if ((bool)$request->get('SOUR_INDI')) { |
|
| 386 | + if ((bool) $request->get('SOUR_INDI')) { |
|
| 387 | 387 | $gedcom = $this->handleUpdates($gedcom); |
| 388 | 388 | } else { |
| 389 | 389 | $gedcom = $this->updateRest($gedcom); |
@@ -416,7 +416,7 @@ discard block |
||
| 416 | 416 | */ |
| 417 | 417 | public function addSpouse(Request $request, Tree $tree): Response |
| 418 | 418 | { |
| 419 | - $xref = $request->get('xref', ''); |
|
| 419 | + $xref = $request->get('xref', ''); |
|
| 420 | 420 | |
| 421 | 421 | $individual = Individual::getInstance($xref, $tree); |
| 422 | 422 | |
@@ -474,7 +474,7 @@ discard block |
||
| 474 | 474 | $indi_gedcom .= $this->addNewFact($tree, $match); |
| 475 | 475 | } |
| 476 | 476 | } |
| 477 | - if ((bool)$request->get('SOUR_INDI')) { |
|
| 477 | + if ((bool) $request->get('SOUR_INDI')) { |
|
| 478 | 478 | $indi_gedcom = $this->handleUpdates($indi_gedcom); |
| 479 | 479 | } else { |
| 480 | 480 | $indi_gedcom = $this->updateRest($indi_gedcom); |
@@ -486,7 +486,7 @@ discard block |
||
| 486 | 486 | $fam_gedcom .= $this->addNewFact($tree, $match); |
| 487 | 487 | } |
| 488 | 488 | } |
| 489 | - if ((bool)$request->get('SOUR_FAM')) { |
|
| 489 | + if ((bool) $request->get('SOUR_FAM')) { |
|
| 490 | 490 | $fam_gedcom = $this->handleUpdates($fam_gedcom); |
| 491 | 491 | } else { |
| 492 | 492 | $fam_gedcom = $this->updateRest($fam_gedcom); |
@@ -560,7 +560,7 @@ discard block |
||
| 560 | 560 | $gedrec .= $this->addNewFact($tree, $match); |
| 561 | 561 | } |
| 562 | 562 | } |
| 563 | - if ((BOOL)$request->get('SOUR_INDI')) { |
|
| 563 | + if ((BOOL) $request->get('SOUR_INDI')) { |
|
| 564 | 564 | $gedrec = $this->handleUpdates($gedrec); |
| 565 | 565 | } else { |
| 566 | 566 | $gedrec = $this->updateRest($gedrec); |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | { |
| 99 | 99 | $url = $request->get('url', ''); |
| 100 | 100 | $xref = $request->get('xref', ''); |
| 101 | - $change_id = (int)$request->get('change_id'); |
|
| 101 | + $change_id = (int) $request->get('change_id'); |
|
| 102 | 102 | |
| 103 | 103 | $changes = Database::prepare( |
| 104 | 104 | "SELECT change_id, xref, old_gedcom, new_gedcom" . |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | { |
| 205 | 205 | $url = $request->get('url', ''); |
| 206 | 206 | $xref = $request->get('xref', ''); |
| 207 | - $change_id = (int)$request->get('change_id'); |
|
| 207 | + $change_id = (int) $request->get('change_id'); |
|
| 208 | 208 | |
| 209 | 209 | // Reject a change, and subsequent changes to the same record |
| 210 | 210 | Database::prepare( |
@@ -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($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); |