hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 02:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1189 from nlegoff/fix-etags

Browse Source 
[3.8] etags calculation
This commit is contained in:
Nicolas Le Goff
2014-11-21 14:56:39 +01:00
parent 5e38583373 4b5a1d79fb
commit d4fdd6e50c
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/classes/media/subdef.php
View File

@@ -211,7 +211,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
$this->height = (int) $row['height'];
$this->mime = $row['mime'];
$this->file = $row['file'];
$this->etag = $row['etag'] !== null ? $row['etag'] : md5(time() . $row['path'] .$row['file']);
$this->etag = $row['etag'] !== null ? $row['etag'] : sha1_file($row['path'].$row['file']);
$this->path = p4string::addEndSlash($row['path']);
$this->is_substituted = ! ! $row['substit'];
$this->subdef_id = (int) $row['subdef_id'];
@@ -251,6 +251,21 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
return $this;
}
public function get_url()
{
$url = parent::get_url();
if (null !== $this->getEtag()) {
return $this->app->path('datafile', array(
'sbas_id' => $this->record->get_sbas_id(),
'record_id' => $this->record->get_record_id(),
'subdef' => $this->get_name(),
'etag' => $this->getEtag()
));
}
return $url;
}
/**
* Removes the file associated to a subdef
*
@@ -351,8 +366,8 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
public function getEtag()
{
if ( ! $this->etag && $this->is_physically_present()) {
$this->setEtag(md5(time() . $this->get_pathfile()));
if (!$this->etag && $this->is_physically_present()) {
$this->setEtag(sha1_file($this->get_pathfile()));
}
return $this->etag;