forked from mahdahar/crm-summit
fix: align activity file storage
Set activity uploads and links to the public/file tree and ignore that path.
This commit is contained in:
parent
e2d29cd12a
commit
45ebd7e0ba
1
.gitignore
vendored
1
.gitignore
vendored
@ -86,6 +86,7 @@ phpunit
|
||||
#-------------------------
|
||||
vendor/
|
||||
public/upload
|
||||
public/file
|
||||
|
||||
#-------------------------
|
||||
# IDE / Development Files
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
@ -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;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user