From 787faa42f3a2bcbf83a7853f23f3667a6febf9da Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 6 Apr 2018 18:21:47 +0200 Subject: Take code review into account Upgrade web-thumbnailer and display thumbs right after download --- application/Thumbnailer.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'application') diff --git a/application/Thumbnailer.php b/application/Thumbnailer.php index 9cf5dacd..d2284e79 100644 --- a/application/Thumbnailer.php +++ b/application/Thumbnailer.php @@ -32,6 +32,14 @@ class Thumbnailer public function __construct($conf) { $this->conf = $conf; + + if (! $this->checkRequirements()) { + $this->conf->set('thumbnails.enabled', false); + $this->conf->write(true); + // TODO: create a proper error handling system able to catch exceptions... + die(t('php-gd extension must be loaded to use thumbnails. Thumbnails are now disabled. Please reload the page.')); + } + $this->wt = new WebThumbnailer(); WTConfigManager::addFile('inc/web-thumbnailer.json'); $this->wt->maxWidth($this->conf->get('thumbnails.width')) @@ -57,4 +65,13 @@ class Thumbnailer return false; } } + + /** + * Make sure that requirements are match to use thumbnails: + * - php-gd is loaded + */ + protected function checkRequirements() + { + return extension_loaded('gd'); + } } -- cgit v1.2.3