@@ -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() |