Fixed issue: Check for required JSON library not existent in installer

LimeSurvey · Nov 28, 2012 · fc287eb · fc287eb
1 parent 656d7d4
commit fc287eb
Show file tree

Hide file tree

Showing 3 changed files with 345 additions and 9 deletions.
diff --git a/application/controllers/InstallerController.php b/application/controllers/InstallerController.php
@@ -818,6 +818,10 @@ function check_DirectoryWriteable($sDirectory, &$aData, $sBase, $sKeyError, $bRe
         if (!check_PHPFunction('mb_convert_encoding', $aData['mbstringPresent']))
             $bProceed = false;
 
+        // JSON library check
+        if (!check_PHPFunction('json_encode', $data['bJSONPresent']))
+            $bProceed = false;
+
         // ** file and directory permissions checking **
 
         // config directory

diff --git a/application/views/installer/precheck_view.php b/application/views/installer/precheck_view.php
@@ -68,10 +68,15 @@ function dirReport($dir, $write, $clang)
        <?php } else { ?><?php echo implode(', ',$dbtypes); ?> <?php } ?></td>
 </tr>
 <tr>
-       <td style="width: 209px;"><?php $clang->eT("PHP5 mbstring library"); ?></td>
+       <td style="width: 209px;"><?php $clang->eT("PHP mbstring library"); ?></td>
        <td align="center" style="width: 225px;"><img src="<?php echo Yii::app()->baseUrl; ?>/installer/images/tick-right.png" alt="Yes" /></td>
        <td align="center" style="width: 225px;"><?php echo $mbstringPresent; ?></td>
 </tr>
+<tr>
+       <td style="width: 209px;"><?php $clang->eT("PHP/PECL JSON library"); ?></td>
+       <td align="center" style="width: 225px;"><img src="<?php echo Yii::app()->baseUrl; ?>/installer/images/tick-right.png" alt="Yes" /></td>
+       <td align="center" style="width: 225px;"><?php echo $bJSONPresent; ?></td>
+</tr>
 <tr>
        <td style="width: 209px;">/application/config <?php $clang->eT("directory"); ?></td>
        <td align="center" style="width: 225px;"><?php $clang->eT("Found & writable"); ?></td>
@@ -99,27 +104,27 @@ function dirReport($dir, $write, $clang)
        <td align="center" style="width: 225px;"><b><?php $clang->eT('Current'); ?></b></td>
 </tr>
 <tr>
-       <td style="width: 209px;">PHP5 GD library</td>
+       <td style="width: 209px;">PHP GD library</td>
        <td align="center" style="width: 225px;"><img src="<?php echo Yii::app()->baseUrl; ?>/installer/images/tick-right.png" alt="Check" /></td>
        <td align="center" style="width: 225px;"><?php echo $gdPresent ; ?></td>
 </tr>
 <tr>
-       <td style="width: 209px;">PHP5 LDAP library</td>
+       <td style="width: 209px;">PHP LDAP library</td>
        <td align="center" style="width: 225px;"><img src="<?php echo Yii::app()->baseUrl; ?>/installer/images/tick-right.png" alt="Check" /></td>
        <td align="center" style="width: 225px;"><?php echo $ldapPresent ; ?></td>
 </tr>
 <tr>
-       <td style="width: 209px;">PHP5 zip library</td>
+       <td style="width: 209px;">PHP zip library</td>
        <td align="center" style="width: 225px;"><img src="<?php echo Yii::app()->baseUrl; ?>/installer/images/tick-right.png" alt="Check" /></td>
        <td align="center" style="width: 225px;"><?php echo $zipPresent ; ?></td>
 </tr>
 <tr>
-       <td style="width: 209px;">PHP5 zlib library</td>
+       <td style="width: 209px;">PHP zlib library</td>
        <td align="center" style="width: 225px;"><img src="<?php echo Yii::app()->baseUrl; ?>/installer/images/tick-right.png" alt="Check" /></td>
        <td align="center" style="width: 225px;"><?php echo $zlibPresent ; ?></td>
 </tr>
 <tr>
-       <td style="width: 209px;">PHP5 imap library</td>
+       <td style="width: 209px;">PHP imap library</td>
        <td align="center" style="width: 225px;"><img src="<?php echo Yii::app()->baseUrl; ?>/installer/images/tick-right.png" alt="Check" /></td>
        <td align="center" style="width: 225px;"><?php echo $bIMAPPresent ; ?></td>
 </tr>