@@ -299,6 +299,6 @@ |
||
| 299 | 299 | */ |
| 300 | 300 | private function dmyOrder(): string |
| 301 | 301 | { |
| 302 | - return preg_replace('/[^DMY]/', '', str_replace(['J', 'F',], ['D', 'M',], I18N::dateFormat())); |
|
| 302 | + return preg_replace('/[^DMY]/', '', str_replace(['J', 'F', ], ['D', 'M', ], I18N::dateFormat())); |
|
| 303 | 303 | } |
| 304 | 304 | } |
@@ -188,7 +188,7 @@ |
||
| 188 | 188 | $params['tree'] = $media_file->media()->tree()->name(); |
| 189 | 189 | $this->glideSignature()->validateRequest('', $params); |
| 190 | 190 | |
| 191 | - $path = $media_file->media()->tree()->getPreference('MEDIA_DIRECTORY', 'media/') . $media_file->filename(); |
|
| 191 | + $path = $media_file->media()->tree()->getPreference('MEDIA_DIRECTORY', 'media/') . $media_file->filename(); |
|
| 192 | 192 | $folder = dirname($path); |
| 193 | 193 | |
| 194 | 194 | $cache_path = 'thumbnail-cache/' . md5($folder); |
@@ -828,7 +828,7 @@ |
||
| 828 | 828 | // Until this can be re-designed, we need this assertion to help static analysis tools. |
| 829 | 829 | assert($this->current_element instanceof ReportBaseElement, new LogicException()); |
| 830 | 830 | |
| 831 | - $this->wt_report = array_pop($this->wt_report_stack); |
|
| 831 | + $this->wt_report = array_pop($this->wt_report_stack); |
|
| 832 | 832 | $this->wt_report->addElement($this->current_element); |
| 833 | 833 | } |
| 834 | 834 | |
@@ -78,7 +78,7 @@ |
||
| 78 | 78 | public function getIndividuals(Tree $tree, string $request): string |
| 79 | 79 | { |
| 80 | 80 | $json_requests = explode(';', $request); |
| 81 | - $r = []; |
|
| 81 | + $r = []; |
|
| 82 | 82 | foreach ($json_requests as $json_request) { |
| 83 | 83 | $firstLetter = substr($json_request, 0, 1); |
| 84 | 84 | $json_request = substr($json_request, 1); |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | { |
| 33 | 33 | public const RECORD_TYPE = 'SOUR'; |
| 34 | 34 | |
| 35 | - protected const ROUTE_NAME = SourcePage::class; |
|
| 35 | + protected const ROUTE_NAME = SourcePage::class; |
|
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * A closure which will create a record from a database row. |
@@ -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, |
@@ -246,7 +246,8 @@ discard block |
||
| 246 | 246 | <li class="wt-initials-list-item d-flex"> |
| 247 | 247 | <?php if ($count > 0) : ?> |
| 248 | 248 | <a href="<?= e(route('module', ['module' => $module, 'action' => $action, 'alpha' => $letter, 'tree' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a> |
| 249 | - <?php else : ?> |
|
| 249 | + <?php else { |
|
| 250 | + : ?> |
|
| 250 | 251 | <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
| 251 | 252 | |
| 252 | 253 | <?php endif ?> |
@@ -300,6 +301,7 @@ discard block |
||
| 300 | 301 | |
| 301 | 302 | if ($show === 'indi' || $show === 'surn') { |
| 302 | 303 | $surns = $this->individual_list_service->surnames($surname, $alpha, $show_marnm === 'yes', $families, I18N::locale()); |
| 304 | +} |
|
| 303 | 305 | if ($show === 'surn') { |
| 304 | 306 | // Show the surname list |
| 305 | 307 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | $alpha = $request->getQueryParams()['alpha'] ?? ''; |
| 137 | 137 | |
| 138 | 138 | // All individuals with this surname |
| 139 | - $surname = $request->getQueryParams()['surname'] ?? ''; |
|
| 139 | + $surname = $request->getQueryParams()['surname'] ?? ''; |
|
| 140 | 140 | |
| 141 | 141 | // All individuals |
| 142 | 142 | $show_all = $request->getQueryParams()['show_all'] ?? 'no'; |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | 'tree' => $tree->name(), |
| 190 | 190 | 'show_all' => 'yes', |
| 191 | 191 | ]; |
| 192 | - $show = $request->getQueryParams()['show'] ?? 'surn'; |
|
| 192 | + $show = $request->getQueryParams()['show'] ?? 'surn'; |
|
| 193 | 193 | } |
| 194 | 194 | } elseif ($surname !== '') { |
| 195 | 195 | $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)); |