Commit 1d89c2cc authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Fixes #4823 Fixed imagick and curl check and message

parent f7db132f
...@@ -87,13 +87,13 @@ class Step_Checks extends setupStep ...@@ -87,13 +87,13 @@ class Step_Checks extends setupStep
$M = TRUE; $M = TRUE;
$basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); $basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M );
/* Check for php5-curl support */ /* Check for curl support */
$N = msgPool::checkingFor("curl"); $N = msgPool::checkingFor('curl');
$D = _("FusionDirectory requires this module to communicate with different types of servers and protocols."); $D = _('FusionDirectory requires this module to communicate with different types of servers and protocols.');
$S = msgPool::installPhpModule("php5-curl"); $S = msgPool::installPhpModule('curl');
$R = is_callable("curl_init"); $R = is_callable('curl_init');
$M = TRUE; $M = TRUE;
$basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); $basic_checks[] = array('NAME' => $N , 'DESC' => $D , 'RESULT' => $R , 'SOLUTION' => $S , 'MUST' => $M );
/* Check for iconv */ /* Check for iconv */
$N = msgPool::checkingFor("iconv"); $N = msgPool::checkingFor("iconv");
...@@ -130,7 +130,7 @@ class Step_Checks extends setupStep ...@@ -130,7 +130,7 @@ class Step_Checks extends setupStep
$N = msgPool::checkingFor(_('imagick')); $N = msgPool::checkingFor(_('imagick'));
$D = _('FusionDirectory requires this extension to handle images.'); $D = _('FusionDirectory requires this extension to handle images.');
$S = msgPool::installPhpModule('imagick'); $S = msgPool::installPhpModule('imagick');
$R = method_exists('imagick', 'getImageBlob'); $R = class_exists('Imagick', FALSE);
$M = TRUE; $M = TRUE;
$basic_checks[] = array('NAME' => $N , 'DESC' => $D , 'RESULT' => $R , 'SOLUTION' => $S , 'MUST' => $M ); $basic_checks[] = array('NAME' => $N , 'DESC' => $D , 'RESULT' => $R , 'SOLUTION' => $S , 'MUST' => $M );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment