Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix SAAS-922 for files on S3 too

This commit is contained in:
Albert Santoni 2015-07-15 17:33:33 -04:00
parent 7ecabffbe8
commit 064e1bd4e0
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airtime_mvc/application/cloud_storage/Amazon_S3StorageBackend.php
View File

@ -42,12 +42,12 @@ class Amazon_S3StorageBackend extends StorageBackend
}
/** Returns a signed download URL from Amazon S3, expiring in 60 minutes */
public function getDownloadURLs($resourceId)
public function getDownloadURLs($resourceId, $contentDispositionFilename)
{
$urls = array();
$signedS3Url = $this->s3Client->getObjectUrl($this->getBucket(), $resourceId, '+60 minutes');
$s3args = array('response-content-disposition', "attachment; filename=" . urlencode($contentDispositionFilename));
$signedS3Url = $this->s3Client->getObjectUrl($this->getBucket(), $resourceId, '+60 minutes', $s3args);
//If we're using the proxy cache, we need to modify the request URL after it has
//been generated by the above. (The request signature must be for the amazonaws.com,

2
airtime_mvc/application/cloud_storage/FileStorageBackend.php
View File

@ -13,7 +13,7 @@ class FileStorageBackend extends StorageBackend
return $resourceId;
}
public function getDownloadURLs($resourceId)
public function getDownloadURLs($resourceId, $contentDispositionFilename)
{
return "";
}

4
airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
View File

@ -38,9 +38,9 @@ class ProxyStorageBackend extends StorageBackend
return $this->storageBackend->getAbsoluteFilePath($resourceId);
}
public function getDownloadURLs($resourceId)
public function getDownloadURLs($resourceId, $contentDispositionFilename)
{
return $this->storageBackend->getDownloadURLs($resourceId);
return $this->storageBackend->getDownloadURLs($resourceId, $contentDispositionFilename);
}
public function deletePhysicalFile($resourceId)

2
airtime_mvc/application/cloud_storage/StorageBackend.php
View File

@ -15,7 +15,7 @@ abstract class StorageBackend
/** Returns the file object's signed URL. The URL must be signed since they
* privately stored on the storage backend. */
abstract public function getDownloadURLs($resourceId);
abstract public function getDownloadURLs($resourceId, $contentDispositionFilename);
/** Deletes the file from the storage backend. */
abstract public function deletePhysicalFile($resourceId);

2
airtime_mvc/application/models/airtime/CloudFile.php
View File

@ -32,7 +32,7 @@ class CloudFile extends BaseCloudFile
if ($this->proxyStorageBackend == null) {
$this->proxyStorageBackend = new ProxyStorageBackend($this->getStorageBackend());
}
return $this->proxyStorageBackend->getDownloadURLs($this->getResourceId());
return $this->proxyStorageBackend->getDownloadURLs($this->getResourceId(), $this->getFilename());
}
/**