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

Merge branch '3.8'

Browse Source
This commit is contained in:
Romain Neutron
2014-02-28 00:28:06 +01:00
parent aa6045104b 5adc7604bb
commit 2df0f9d659
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Alchemy/Phrasea/Command/Setup/XSendFileConfigurationDumper.php
View File

@@ -33,27 +33,26 @@ class XSendFileConfigurationDumper extends Command
$output->writeln('');
if (!$this->container['phraseanet.xsendfile-factory']->isXSendFileModeEnabled()) {
$output->writeln('XSendFile support is <error>disabled</error>');
return 1;
$output->writeln('XSendFile support is <error>disabled</error>, enable it to use this feature.');
$ret = 1;
} else {
$output->writeln('XSendFile support is <info>enabled</info>');
$ret = 0;
}
$output->writeln('XSendFile support is <info>enabled</info>');
try {
$configuration = $this->container['phraseanet.xsendfile-factory']->getMode(true)->getVirtualHostConfiguration();
$configuration = $this->container['phraseanet.xsendfile-factory']->getMode(true, true)->getVirtualHostConfiguration();
$output->writeln('XSendFile configuration seems <info>OK</info>');
$output->writeln($configuration);
return 0;
} catch (RuntimeException $e) {
$output->writeln('XSendFile configuration seems <error>invalid</error>');
return 1;
$ret = 1;
}
$output->writeln('');
return 0;
return $ret;
}
}

4
lib/Alchemy/Phrasea/Command/Setup/XSendFileMappingGenerator.php
View File

@@ -56,13 +56,15 @@ class XSendFileMappingGenerator extends Command
$this->container['conf']->set('xsendfile', $conf);
$output->writeln(" <info>OK</info>");
$output->writeln("");
$output->write("It is now strongly recommended to use <info>xsendfile:dump-configuration</info> command to upgrade your virtual-host");
$output->writeln("It is now strongly recommended to use <info>xsendfile:dump-configuration</info> command to upgrade your virtual-host");
} else {
$output->writeln("Configuration will <info>not</info> be written, use <info>--write</info> option to write it");
$output->writeln("");
$output->writeln(Yaml::dump(['xsendfile' => $conf], 4));
}
$output->writeln("");
return 0;
}

4
lib/Alchemy/Phrasea/Http/XSendFile/XSendFileFactory.php
View File

@@ -66,9 +66,9 @@ class XSendFileFactory
*
* @throws InvalidArgumentException if mode type is unknown
*/
public function getMode($throwException = false)
public function getMode($throwException = false, $forceMode = false)
{
if (false === $this->enabled) {
if (false === $this->enabled && true !== $forceMode) {
return new NullMode();
}

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

@@ -95,6 +95,9 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
*/
protected $is_physically_present = false;
/** @var integer */
private $size = 0;
/**
* Players types constants
*/
@@ -162,6 +165,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
$this->mime = $datas['mime'];
$this->width = $datas['width'];
$this->height = $datas['height'];
$this->size = $datas['size'];
$this->etag = $datas['etag'];
$this->path = $datas['path'];
$this->url = $datas['url'];
@@ -197,6 +201,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
if ($row) {
$this->width = (int) $row['width'];
$this->size = (int) $row['size'];
$this->height = (int) $row['height'];
$this->mime = $row['mime'];
$this->file = $row['file'];
@@ -222,6 +227,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
$datas = [
'mime' => $this->mime
, 'width' => $this->width
, 'size' => $this->size
, 'height' => $this->height
, 'etag' => $this->etag
, 'path' => $this->path
@@ -441,7 +447,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
*/
public function get_size()
{
return (int) @filesize($this->get_pathfile());
return $this->size;
}
/**