@@ -66,7 +66,7 @@ |
||
| 66 | 66 | // The system files are always in this location. |
| 67 | 67 | // It is also the default location of user data, such as media and GEDCOM files. |
| 68 | 68 | // The user files could be anywhere supported by Flysystem. |
| 69 | - public const DATA_DIR = self::ROOT_DIR . 'data/'; |
|
| 69 | + public const DATA_DIR = self::ROOT_DIR . 'data/'; |
|
| 70 | 70 | |
| 71 | 71 | // Location of the file containing the database connection details. |
| 72 | 72 | public const CONFIG_FILE = self::DATA_DIR . 'config.ini.php'; |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | $data_filesystem = $request->getAttribute('filesystem.data'); |
| 150 | 150 | assert($data_filesystem instanceof FilesystemInterface); |
| 151 | 151 | |
| 152 | - $files = $request->getQueryParams()['files']; // local|external|unused |
|
| 152 | + $files = $request->getQueryParams()['files']; // local|external|unused |
|
| 153 | 153 | |
| 154 | 154 | // Files within this folder |
| 155 | 155 | $media_folder = $request->getQueryParams()['media_folder']; |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | $create_form = ''; |
| 265 | 265 | foreach ($media_trees as $media_tree => $media_directory) { |
| 266 | 266 | if (Str::startsWith($row[0], $media_directory)) { |
| 267 | - $tmp = substr($row[0], strlen($media_directory)); |
|
| 267 | + $tmp = substr($row[0], strlen($media_directory)); |
|
| 268 | 268 | $create_form .= |
| 269 | 269 | '<p><a href="#" data-toggle="modal" data-target="#modal-create-media-from-file" data-file="' . e($tmp) . '" data-url="' . e(route('create-media-from-file', ['tree' => $media_tree])) . '" onclick="document.getElementById(\'modal-create-media-from-file-form\').action=this.dataset.url; document.getElementById(\'file\').value=this.dataset.file;">' . I18N::translate('Create') . '</a> — ' . e($media_tree) . '<p>'; |
| 270 | 270 | } |
@@ -355,8 +355,8 @@ discard block |
||
| 355 | 355 | try { |
| 356 | 356 | // This will work for local filesystems. For remote filesystems, we will |
| 357 | 357 | // need to copy the file locally to work out the image size. |
| 358 | - $imgsize = getimagesize(Webtrees::DATA_DIR . $file); |
|
| 359 | - $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>'; |
|
| 358 | + $imgsize = getimagesize(Webtrees::DATA_DIR . $file); |
|
| 359 | + $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>'; |
|
| 360 | 360 | /* I18N: image dimensions, width × height */ |
| 361 | 361 | $html .= '<dd>' . I18N::translate('%1$s × %2$s pixels', I18N::number($imgsize['0']), I18N::number($imgsize['1'])) . '</dd>'; |
| 362 | 362 | } catch (Throwable $ex) { |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | */ |
| 53 | 53 | public function find($user_id): ?User |
| 54 | 54 | { |
| 55 | - return app('cache.array')->remember('user-' . $user_id, static function () use ($user_id): ?User { |
|
| 55 | + return app('cache.array')->remember('user-' . $user_id, static function () use ($user_id) : ?User { |
|
| 56 | 56 | return DB::table('user') |
| 57 | 57 | ->where('user_id', '=', $user_id) |
| 58 | 58 | ->get() |
@@ -283,7 +283,7 @@ |
||
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | // Stay on the same tree page |
| 286 | - $url = route(LoginPage::class, ['tree' => $tree instanceof Tree ? $tree->name() : null, 'url' => $redirect]); |
|
| 286 | + $url = route(LoginPage::class, ['tree' => $tree instanceof Tree ? $tree->name() : null, 'url' => $redirect]); |
|
| 287 | 287 | |
| 288 | 288 | return new Menu(I18N::translate('Sign in'), $url, 'menu-login', ['rel' => 'nofollow']); |
| 289 | 289 | } |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -return array ( |
|
| 3 | +return array( |
|
| 4 | 4 | '%H:%i:%s' => '%g:%i:%s %a', |
| 5 | 5 | '%j %F %Y' => '%F %j, %Y', |
| 6 | 6 | ); |
@@ -88,7 +88,7 @@ |
||
| 88 | 88 | $repository = Auth::checkRepositoryAccess($repository, false); |
| 89 | 89 | |
| 90 | 90 | // Redirect to correct xref/slug |
| 91 | - if ($repository->xref() !== $xref || $request->getAttribute('slug') !== $repository->slug()) { |
|
| 91 | + if ($repository->xref() !== $xref || $request->getAttribute('slug') !== $repository->slug()) { |
|
| 92 | 92 | return redirect($repository->url(), StatusCodeInterface::STATUS_MOVED_PERMANENTLY); |
| 93 | 93 | } |
| 94 | 94 | |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | '_TODO', |
| 68 | 68 | 'CHAN', |
| 69 | 69 | ]; |
| 70 | - protected const BHEIGHT = 30; |
|
| 70 | + protected const BHEIGHT = 30; |
|
| 71 | 71 | |
| 72 | 72 | // Box height |
| 73 | 73 | |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | |
| 153 | 153 | $params = (array) $request->getParsedBody(); |
| 154 | 154 | |
| 155 | - $add = $params['add'] ?? ''; |
|
| 155 | + $add = $params['add'] ?? ''; |
|
| 156 | 156 | |
| 157 | 157 | Auth::checkComponentAccess($this, 'chart', $tree, $user); |
| 158 | 158 | |
@@ -545,7 +545,7 @@ discard block |
||
| 545 | 545 | $tree = $request->getAttribute('tree'); |
| 546 | 546 | assert($tree instanceof Tree); |
| 547 | 547 | |
| 548 | - $xref = $request->getQueryParams()['xref']; |
|
| 548 | + $xref = $request->getQueryParams()['xref']; |
|
| 549 | 549 | |
| 550 | 550 | $individual = Individual::getInstance($xref, $tree); |
| 551 | 551 | $individual = Auth::checkIndividualAccess($individual, true); |
@@ -557,7 +557,7 @@ discard block |
||
| 557 | 557 | $family = Family::getInstance($famid, $tree); |
| 558 | 558 | $family = Auth::checkFamilyAccess($family, true); |
| 559 | 559 | |
| 560 | - $PEDI = $params['PEDI']; |
|
| 560 | + $PEDI = $params['PEDI']; |
|
| 561 | 561 | |
| 562 | 562 | // Replace any existing child->family link (we may be changing the PEDI); |
| 563 | 563 | $fact_id = ''; |
@@ -629,7 +629,7 @@ discard block |
||
| 629 | 629 | $tree = $request->getAttribute('tree'); |
| 630 | 630 | assert($tree instanceof Tree); |
| 631 | 631 | |
| 632 | - $xref = $request->getQueryParams()['xref']; |
|
| 632 | + $xref = $request->getQueryParams()['xref']; |
|
| 633 | 633 | |
| 634 | 634 | $individual = Individual::getInstance($xref, $tree); |
| 635 | 635 | $individual = Auth::checkIndividualAccess($individual, true); |