Fix Pint formatting
This commit is contained in:
@@ -13,15 +13,15 @@ class ExamDraftDownloadNameService
|
||||
$row = DB::table('exam_drafts as ed')
|
||||
->select('ed.version', 'ed.exam_type', 'ed.class_section_id', 'cs.class_section_name')
|
||||
->leftJoin('classSection as cs', 'cs.class_section_id', '=', 'ed.class_section_id')
|
||||
->where('ed.' . $column, $filename)
|
||||
->where('ed.'.$column, $filename)
|
||||
->limit(1)
|
||||
->first();
|
||||
|
||||
$row = $row ? (array) $row : [];
|
||||
|
||||
$classLabel = trim((string) ($row['class_section_name'] ?? ('Class' . ($row['class_section_id'] ?? '0'))));
|
||||
$classLabel = trim((string) ($row['class_section_name'] ?? ('Class'.($row['class_section_id'] ?? '0'))));
|
||||
$typeLabel = trim((string) ($row['exam_type'] ?? 'Exam'));
|
||||
$version = 'v' . max(1, (int) ($row['version'] ?? 1));
|
||||
$version = 'v'.max(1, (int) ($row['version'] ?? 1));
|
||||
|
||||
$parts = array_filter([
|
||||
$this->slugify($classLabel),
|
||||
@@ -40,6 +40,7 @@ class ExamDraftDownloadNameService
|
||||
if ($value === '') {
|
||||
return 'Exam';
|
||||
}
|
||||
|
||||
return mb_strtolower($value);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ class FileServeService
|
||||
|
||||
$headers = [
|
||||
'Content-Type' => $meta['mime'],
|
||||
'Content-Disposition' => 'inline; filename="' . $meta['download_name'] . '"',
|
||||
'Content-Disposition' => 'inline; filename="'.$meta['download_name'].'"',
|
||||
'Content-Length' => (string) $meta['size'],
|
||||
'ETag' => $meta['etag'],
|
||||
'Last-Modified' => $meta['last_modified'],
|
||||
@@ -53,20 +53,20 @@ class FileServeService
|
||||
}
|
||||
|
||||
$ext = strtolower(pathinfo($name, PATHINFO_EXTENSION));
|
||||
if (!in_array($ext, $allowedExtensions, true)) {
|
||||
if (! in_array($ext, $allowedExtensions, true)) {
|
||||
throw new HttpException(404, 'File not found');
|
||||
}
|
||||
|
||||
$path = rtrim($baseDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $name;
|
||||
if (!is_file($path)) {
|
||||
$path = rtrim($baseDir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$name;
|
||||
if (! is_file($path)) {
|
||||
throw new HttpException(404, 'File not found');
|
||||
}
|
||||
|
||||
$mime = $this->detectMime($path);
|
||||
$mtime = filemtime($path) ?: time();
|
||||
$size = filesize($path) ?: 0;
|
||||
$etag = md5($name . '|' . $mtime . '|' . $size);
|
||||
$downloadName = $downloadName ? $downloadName . '.' . $ext : $name;
|
||||
$etag = md5($name.'|'.$mtime.'|'.$size);
|
||||
$downloadName = $downloadName ? $downloadName.'.'.$ext : $name;
|
||||
|
||||
return [
|
||||
'name' => $name,
|
||||
@@ -76,7 +76,7 @@ class FileServeService
|
||||
'size' => $size,
|
||||
'etag' => $etag,
|
||||
'download_name' => $downloadName,
|
||||
'last_modified' => gmdate('D, d M Y H:i:s', $mtime) . ' GMT',
|
||||
'last_modified' => gmdate('D, d M Y H:i:s', $mtime).' GMT',
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user