From 45ebd7e0badb593958c3063bb2ebbea5eb3180e9 Mon Sep 17 00:00:00 2001
From: mahdahar <89adham@gmail.com>
Date: Tue, 14 Apr 2026 14:36:58 +0700
Subject: [PATCH] fix: align activity file storage

Set activity uploads and links to the public/file tree and ignore that path.
---
 .gitignore                      | 1 +
 app/Controllers/Activities.php  | 2 +-
 app/Views/activities_detail.php | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7f41000..d174a55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,6 +86,7 @@ phpunit
 #-------------------------
 vendor/
 public/upload
+public/file
 
 #-------------------------
 # IDE / Development Files
diff --git a/app/Controllers/Activities.php b/app/Controllers/Activities.php
index c4a0ff8..7a14662 100644
--- a/app/Controllers/Activities.php
+++ b/app/Controllers/Activities.php
@@ -1027,7 +1027,7 @@ class Activities extends Controller {
 			}
 			else {
 				$subfolder = date('Y/m');
-				$uploadDir = FCPATH . "upload/$subfolder/";
+				$uploadDir = FCPATH . "file/$subfolder/";
 				if (!is_dir($uploadDir)) {
 					mkdir($uploadDir, 0755, true);
 				}
diff --git a/app/Views/activities_detail.php b/app/Views/activities_detail.php
index 5e67e9b..1397abb 100644
--- a/app/Views/activities_detail.php
+++ b/app/Views/activities_detail.php
@@ -7,18 +7,18 @@ $filelist = $attachment;
 $file_array = explode (',', $filelist);
 
 function resolve_attachment_relative_path($filename) {
-	$uploadRoot = FCPATH . 'upload' . DIRECTORY_SEPARATOR;
+	$uploadRoot = FCPATH . 'file' . DIRECTORY_SEPARATOR;
 	$pattern = $uploadRoot . '*' . DIRECTORY_SEPARATOR . '*' . DIRECTORY_SEPARATOR . $filename;
 	$matches = @glob($pattern);
 	if ($matches !== false) {
 		foreach ($matches as $match) {
 			if (is_file($match)) {
 				$relative = str_replace('\\', '/', substr($match, strlen($uploadRoot)));
-				return 'upload/' . $relative;
+				return 'file/' . $relative;
 			}
 		}
 	}
-	return 'upload/' . $filename;
+	return 'file/' . $filename;
 }
 
 $i = 1;