fix: align activity file storage

Set activity uploads and links to the public/file tree and ignore that path.
This commit is contained in:
mahdahar 2026-04-14 14:36:58 +07:00
parent e2d29cd12a
commit 45ebd7e0ba
3 changed files with 5 additions and 4 deletions

1
.gitignore vendored
View File

@ -86,6 +86,7 @@ phpunit
#------------------------- #-------------------------
vendor/ vendor/
public/upload public/upload
public/file
#------------------------- #-------------------------
# IDE / Development Files # IDE / Development Files

View File

@ -1027,7 +1027,7 @@ class Activities extends Controller {
} }
else { else {
$subfolder = date('Y/m'); $subfolder = date('Y/m');
$uploadDir = FCPATH . "upload/$subfolder/"; $uploadDir = FCPATH . "file/$subfolder/";
if (!is_dir($uploadDir)) { if (!is_dir($uploadDir)) {
mkdir($uploadDir, 0755, true); mkdir($uploadDir, 0755, true);
} }

View File

@ -7,18 +7,18 @@ $filelist = $attachment;
$file_array = explode (',', $filelist); $file_array = explode (',', $filelist);
function resolve_attachment_relative_path($filename) { function resolve_attachment_relative_path($filename) {
$uploadRoot = FCPATH . 'upload' . DIRECTORY_SEPARATOR; $uploadRoot = FCPATH . 'file' . DIRECTORY_SEPARATOR;
$pattern = $uploadRoot . '*' . DIRECTORY_SEPARATOR . '*' . DIRECTORY_SEPARATOR . $filename; $pattern = $uploadRoot . '*' . DIRECTORY_SEPARATOR . '*' . DIRECTORY_SEPARATOR . $filename;
$matches = @glob($pattern); $matches = @glob($pattern);
if ($matches !== false) { if ($matches !== false) {
foreach ($matches as $match) { foreach ($matches as $match) {
if (is_file($match)) { if (is_file($match)) {
$relative = str_replace('\\', '/', substr($match, strlen($uploadRoot))); $relative = str_replace('\\', '/', substr($match, strlen($uploadRoot)));
return 'upload/' . $relative; return 'file/' . $relative;
} }
} }
} }
return 'upload/' . $filename; return 'file/' . $filename;
} }
$i = 1; $i = 1;