@@ -174,7 +174,7 @@ |
||
| 174 | 174 | // Turn each filename into a row for the table |
| 175 | 175 | $original = $this->findOriginalFileFromThumbnail($thumbnail); |
| 176 | 176 | |
| 177 | - $original_url = route('unused-media-thumbnail', [ |
|
| 177 | + $original_url = route('unused-media-thumbnail', [ |
|
| 178 | 178 | 'path' => $original, |
| 179 | 179 | 'w' => 100, |
| 180 | 180 | 'h' => 100, |
@@ -312,7 +312,7 @@ |
||
| 312 | 312 | $title = I18N::translate('Edit the story') . ' — ' . e($tree->title()); |
| 313 | 313 | } |
| 314 | 314 | |
| 315 | - $individual = Individual::getInstance($xref, $tree); |
|
| 315 | + $individual = Individual::getInstance($xref, $tree); |
|
| 316 | 316 | |
| 317 | 317 | return $this->viewResponse('modules/stories/edit', [ |
| 318 | 318 | 'block_id' => $block_id, |
@@ -172,7 +172,7 @@ |
||
| 172 | 172 | 'tree' => $tree->name(), |
| 173 | 173 | 'show_all' => 'yes', |
| 174 | 174 | ]; |
| 175 | - $show = $request->getQueryParams()['show'] ?? 'surn'; |
|
| 175 | + $show = $request->getQueryParams()['show'] ?? 'surn'; |
|
| 176 | 176 | } |
| 177 | 177 | } elseif ($surname !== '') { |
| 178 | 178 | $alpha = $this->localization_service->initialLetter($surname, I18N::locale()); // so we can highlight the initial letter |
@@ -75,7 +75,7 @@ |
||
| 75 | 75 | |
| 76 | 76 | $query = DB::table('hit_counter') |
| 77 | 77 | ->where('gedcom_id', '=', $tree->id()) |
| 78 | - ->whereIn('page_name', ['individual.php','family.php','source.php','repo.php','note.php','mediaviewer.php']) |
|
| 78 | + ->whereIn('page_name', ['individual.php', 'family.php', 'source.php', 'repo.php', 'note.php', 'mediaviewer.php']) |
|
| 79 | 79 | ->orderByDesc('page_count'); |
| 80 | 80 | |
| 81 | 81 | $results = []; |
@@ -80,7 +80,7 @@ |
||
| 80 | 80 | $sizePostMax = $this->parseIniFileSize(ini_get('post_max_size')); |
| 81 | 81 | $sizeUploadMax = $this->parseIniFileSize(ini_get('upload_max_filesize')); |
| 82 | 82 | |
| 83 | - $bytes = min($sizePostMax, $sizeUploadMax); |
|
| 83 | + $bytes = min($sizePostMax, $sizeUploadMax); |
|
| 84 | 84 | $kb = intdiv($bytes + 1023, 1024); |
| 85 | 85 | |
| 86 | 86 | return I18N::translate('%s KB', I18N::number($kb)); |
@@ -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 | } |