Add checks for archive building libraries
modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilder.php modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilder.php modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderInterface.php modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php modifié: templates/backOffice/default/ajax/export-modal.html modifié: templates/backOffice/default/export-page.html
This commit is contained in:
@@ -47,15 +47,6 @@ class TarArchiveBuilder extends AbstractArchiveBuilder
|
|||||||
/** @var \Thelia\Log\Tlog */
|
/** @var \Thelia\Log\Tlog */
|
||||||
protected $logger;
|
protected $logger;
|
||||||
|
|
||||||
public function __construct()
|
|
||||||
{
|
|
||||||
if (false !== (bool) ini_get("phar.readonly") || !class_exists("\\PharData")) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
parent::__construct();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function __destruct()
|
public function __destruct()
|
||||||
{
|
{
|
||||||
if ($this->tar instanceof \PharData) {
|
if ($this->tar instanceof \PharData) {
|
||||||
@@ -512,4 +503,9 @@ class TarArchiveBuilder extends AbstractArchiveBuilder
|
|||||||
{
|
{
|
||||||
return $this->compression;
|
return $this->compression;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function isAvailable()
|
||||||
|
{
|
||||||
|
return false === (bool) ini_get("phar.readonly") && class_exists("\\PharData");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,15 +19,6 @@ namespace Thelia\Core\FileFormat\Archive\ArchiveBuilder;
|
|||||||
*/
|
*/
|
||||||
class TarBz2ArchiveBuilder extends TarArchiveBuilder
|
class TarBz2ArchiveBuilder extends TarArchiveBuilder
|
||||||
{
|
{
|
||||||
public function __construct()
|
|
||||||
{
|
|
||||||
if (!extension_loaded("bzip2")) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
parent::__construct();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getName()
|
public function getName()
|
||||||
{
|
{
|
||||||
return "tar.bz2";
|
return "tar.bz2";
|
||||||
@@ -53,4 +44,9 @@ class TarBz2ArchiveBuilder extends TarArchiveBuilder
|
|||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function isAvailable()
|
||||||
|
{
|
||||||
|
return parent::isAvailable() && extension_loaded("bzip2");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,15 +19,6 @@ namespace Thelia\Core\FileFormat\Archive\ArchiveBuilder;
|
|||||||
*/
|
*/
|
||||||
class TarGzArchiveBuilder extends TarArchiveBuilder
|
class TarGzArchiveBuilder extends TarArchiveBuilder
|
||||||
{
|
{
|
||||||
public function __construct()
|
|
||||||
{
|
|
||||||
if (!extension_loaded("zlib")) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
parent::__construct();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getName()
|
public function getName()
|
||||||
{
|
{
|
||||||
return "tar.gz";
|
return "tar.gz";
|
||||||
@@ -54,4 +45,8 @@ class TarGzArchiveBuilder extends TarArchiveBuilder
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function isAvailable()
|
||||||
|
{
|
||||||
|
return parent::isAvailable() && extension_loaded("zlib");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -610,4 +610,14 @@ class ZipArchiveBuilder extends AbstractArchiveBuilder
|
|||||||
{
|
{
|
||||||
return $this->zip;
|
return $this->zip;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return bool
|
||||||
|
*
|
||||||
|
* Returns conditions for archive builder to be available ( loaded libraries )
|
||||||
|
*/
|
||||||
|
public function isAvailable()
|
||||||
|
{
|
||||||
|
return class_exists('\\ZipArchive');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -112,4 +112,10 @@ interface ArchiveBuilderInterface
|
|||||||
*/
|
*/
|
||||||
public function hasDirectory($directory);
|
public function hasDirectory($directory);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return bool
|
||||||
|
*
|
||||||
|
* Returns conditions for archive builder to be available ( loaded libraries )
|
||||||
|
*/
|
||||||
|
public function isAvailable();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,9 +33,9 @@ class ArchiveBuilderManager
|
|||||||
* @param AbstractArchiveBuilder $archiveBuilder
|
* @param AbstractArchiveBuilder $archiveBuilder
|
||||||
* @return $this
|
* @return $this
|
||||||
*/
|
*/
|
||||||
public function add(AbstractArchiveBuilder $archiveBuilder = null)
|
public function add(AbstractArchiveBuilder $archiveBuilder)
|
||||||
{
|
{
|
||||||
if (null !== $archiveBuilder) {
|
if ($archiveBuilder->isAvailable()) {
|
||||||
$archiveBuilder->setEnvironment($this->environment);
|
$archiveBuilder->setEnvironment($this->environment);
|
||||||
|
|
||||||
$this->archiveBuilders[$archiveBuilder->getName()] = $archiveBuilder;
|
$this->archiveBuilders[$archiveBuilder->getName()] = $archiveBuilder;
|
||||||
|
|||||||
@@ -48,6 +48,7 @@
|
|||||||
</select>
|
</select>
|
||||||
{/form_field}
|
{/form_field}
|
||||||
</div>
|
</div>
|
||||||
|
{ifloop rel="export-archive-builder"}
|
||||||
<div class="col-md-1"></div>
|
<div class="col-md-1"></div>
|
||||||
<div class="col-md-4">
|
<div class="col-md-4">
|
||||||
{form_field form=$form field="do_compress"}
|
{form_field form=$form field="do_compress"}
|
||||||
@@ -101,6 +102,7 @@
|
|||||||
{/form_field}
|
{/form_field}
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
{/ifloop}
|
||||||
</div>
|
</div>
|
||||||
{/ifloop}
|
{/ifloop}
|
||||||
{elseloop rel="export-formatters"}
|
{elseloop rel="export-formatters"}
|
||||||
|
|||||||
@@ -86,6 +86,7 @@
|
|||||||
</select>
|
</select>
|
||||||
{/form_field}
|
{/form_field}
|
||||||
</div>
|
</div>
|
||||||
|
{ifloop rel="export-archive-builder"}
|
||||||
<div class="col-md-4">
|
<div class="col-md-4">
|
||||||
{form_field form=$form field="do_compress"}
|
{form_field form=$form field="do_compress"}
|
||||||
<label for="{$label_attr.for}">
|
<label for="{$label_attr.for}">
|
||||||
@@ -144,6 +145,7 @@
|
|||||||
{/form_field}
|
{/form_field}
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
{/ifloop}
|
||||||
</div>
|
</div>
|
||||||
{/ifloop}
|
{/ifloop}
|
||||||
{elseloop rel="export-formatters"}
|
{elseloop rel="export-formatters"}
|
||||||
|
|||||||
Reference in New Issue
Block a user