Fixed issue #17351: Also check that GD implement jpeg support (#1918)

Co-authored-by: encuestabizdevgit <devgit@encuesta.biz>
LimeSurvey · Jun 14, 2021 · ace6944 · ace6944
1 parent b895897
commit ace6944
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/application/models/InstallerConfigForm.php b/application/models/InstallerConfigForm.php
@@ -113,6 +113,9 @@ class InstallerConfigForm extends CFormModel
     /** @var bool */
     public $isPhpGdPresent = false;
 
+    /** @var bool */
+    public $phpGdHasJpegSupport = false;
+
     /** @var bool */
     public $isPhpLdapPresent = false;
 
@@ -208,7 +211,9 @@ private function checkStatus()
         $this->isSodiumPresent = function_exists('sodium_crypto_sign_open');
 
         if (function_exists('gd_info')) {
-            $this->isPhpGdPresent = array_key_exists('FreeType Support', gd_info());
+            $gdInfo = gd_info();
+            $this->phpGdHasJpegSupport = !empty($gdInfo['JPEG Support']);
+            $this->isPhpGdPresent = true;
         }
         $this->isPhpVersionOK = version_compare(PHP_VERSION, self::MINIMUM_PHP_VERSION, '>=');
     }

diff --git a/application/views/installer/precheck_view.php b/application/views/installer/precheck_view.php
@@ -112,7 +112,13 @@
         <tr>
                <td><?php eT("PHP GD library"); ?></td>
                <td><span class='fa fa-check text-success'></span></td>
-               <td><?= $model->isPhpGdPresent ? $iconOk : $iconFail ?></td>
+               <td>
+                    <?php if ($model->isPhpGdPresent): ?>
+                        <?= $model->phpGdHasJpegSupport ? $iconOk : $iconFail . '<br/>' . gT("The GD extension found doesn't support JPEG") ?>
+                    <?php else: ?>
+                        <?= $iconFail ?>
+                    <?php endif; ?>
+               </td>
         </tr>
         <tr>
                <td><?php eT("PHP LDAP library"); ?></td>