MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Check for ImageMagick and for GIF support

Browse source
This commit is contained in:
fabrixxm 2015-11-07 00:22:26 +01:00
parent a1da54834b
commit 16123f5ad5
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
mod/install.php
View file

@ -1,4 +1,5 @@
<?php <?php
require_once "include/Photo.php";
$install_wizard_pass=1; $install_wizard_pass=1;
@ -84,15 +85,15 @@ function install_post(&$a) {
'$phpath' => $phpath, '$phpath' => $phpath,
'$adminmail' => $adminmail '$adminmail' => $adminmail
)); ));
$result = file_put_contents('.htconfig.php', $txt); $result = file_put_contents('.htconfig.php', $txt);
if(! $result) { if(! $result) {
$a->data['txt'] = $txt; $a->data['txt'] = $txt;
} }
$errors = load_database($db); $errors = load_database($db);
if($errors) if($errors)
$a->data['db_failed'] = $errors; $a->data['db_failed'] = $errors;
@ -177,6 +178,8 @@ function install_content(&$a) {
check_funcs($checks); check_funcs($checks);
check_imagik($checks);
check_htconfig($checks); check_htconfig($checks);
check_smarty3($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.'); $ck_funcs[5]['help']= t('Error: mcrypt PHP module required but not installed.');
} }
$checks = array_merge($checks, $ck_funcs); $checks = array_merge($checks, $ck_funcs);
/*if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg'])) /*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) { function manual_config(&$a) {
$data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8'); $data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8');