From 16123f5ad5ec08257ba97e1def23db90ce9062f7 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sat, 7 Nov 2015 00:22:26 +0100 Subject: [PATCH] Check for ImageMagick and for GIF support --- mod/install.php | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/mod/install.php b/mod/install.php index 182495d258..db8f730714 100755 --- a/mod/install.php +++ b/mod/install.php @@ -1,4 +1,5 @@ $phpath, '$adminmail' => $adminmail )); - + $result = file_put_contents('.htconfig.php', $txt); if(! $result) { $a->data['txt'] = $txt; } - + $errors = load_database($db); - + if($errors) $a->data['db_failed'] = $errors; @@ -177,6 +178,8 @@ function install_content(&$a) { check_funcs($checks); + check_imagik($checks); + check_htconfig($checks); check_smarty3($checks); @@ -428,8 +431,8 @@ function check_funcs(&$checks) { $ck_funcs[5]['help']= t('Error: mcrypt PHP module required but not installed.'); } - - + + $checks = array_merge($checks, $ck_funcs); /*if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg'])) @@ -490,6 +493,23 @@ function check_htaccess(&$checks) { } } +function check_imagik(&$checks) { + $imagick = false; + $gif = false; + + if (class_exists('Imagick')) { + $imagick = true; + $supported = Photo::supportedTypes(); + if (array_key_exists('image/gif', $supported)) { + $gif = true; + } + } + check_add($checks, t('ImageMagick PHP extension is installed'), $imagick, false, ""); + if ($imagick) { + check_add($checks, t('ImageMagick supports GIF'), $gif, false, ""); + } +} + function manual_config(&$a) { $data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8');