galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Upgrades from IceHrm Pro v24

Browse Source
This commit is contained in:
gamonoid
2018-07-03 03:10:32 +02:00
parent 8b276d54e6
commit 9cee4e91df
8253 changed files with 659182 additions and 47489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/Classes/FileService.php
View File

@@ -224,7 +224,7 @@ class FileService
return $profile;
}
public function getFileUrl($fileName)
public function getFileUrl($fileName, $isExpiring = true)
{
$file = new File();
$file->Load('name = ?', array($fileName));
@@ -244,10 +244,16 @@ class FileService
$expireUrl = $this->getFromCache($fileUrl);
if (empty($expireUrl)) {
$expireUrl = $s3FileSys->generateExpiringURL($fileUrl, 600);
$this->saveInCache($fileUrl, $expireUrl, 500);
if ($isExpiring) {
$expireUrl = $s3FileSys->generateExpiringURL($fileUrl, 8640000);
$this->saveInCache($fileUrl, $expireUrl, 8640000);
} else {
$expireUrl = $s3FileSys->generateExpiringURL($fileUrl, 600);
$this->saveInCache($fileUrl, $expireUrl, 500);
}
}
return $expireUrl;
} else {
return CLIENT_BASE_URL.'data/'.$file->filename;