Fixed issue #5903: Not obvious in installation that you need at least…

… one PDO DB driver installer Dev Added a check for at least one DB driver to the pre-check screen
LimeSurvey · Mar 14, 2012 · 51baad7 · 51baad7
1 parent f5bd11a
commit 51baad7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/application/controllers/InstallerController.php b/application/controllers/InstallerController.php
@@ -201,6 +201,7 @@ public function stepViewLicense()
     private function stepPreInstallationCheck()
     {
         $aData['clang'] = $clang = $this->lang;
+        $model = new InstallerConfigForm();
         //usual data required by view
         $aData['title'] = $clang->gT('Pre-installation check');
         $aData['descp'] = $clang->gT('Pre-installation check for LimeSurvey ').Yii::app()->getConfig('versionnumber');
@@ -209,9 +210,15 @@ private function stepPreInstallationCheck()
         $aData['phpVersion'] = phpversion();
         // variable storing next button link.initially null
         $aData['next'] = '';
+        $aData['dbtypes']=$model->supported_db_types;
 
         $bProceed = $this->_check_requirements($aData);
+        $aData['dbtypes']=$model->supported_db_types;
 
+        if(count($aData['dbtypes'])==0)
+        {
+           $bProceed=false;
+        }
         // after all check, if flag value is true, show next button and sabe step2 status.
         if ($bProceed)
         {

diff --git a/application/views/installer/precheck_view.php b/application/views/installer/precheck_view.php
@@ -61,6 +61,12 @@ function dirReport($dir, $write, $clang)
        <td align="center" style="width: 225px;"><?php if (isset($verror) && $verror) { ?><span style='font-weight:bold; color: red'><?php $clang->eT("Outdated"); ?>: <?php echo $phpVersion; ?></span></b>
        <?php } else { ?><?php echo $phpVersion ; ?> <?php } ?></td>
 </tr>
+<tr>
+       <td style="width: 209px;"><?php $clang->eT("PHP DBO driver library"); ?></td>
+       <td align="center" style="width: 225px;"><?php $clang->eT("At least one installed"); ?></td>
+       <td align="center" style="width: 225px;"><?php if (count($dbtypes)==0) { ?><span style='font-weight:bold; color: red'><?php $clang->eT("None found"); ?></span></b>
+       <?php } else { ?><?php echo implode(', ',$dbtypes); ?> <?php } ?></td>
+</tr>
 <tr>
        <td style="width: 209px;"><?php $clang->eT("PHP5 mbstring library"); ?></td>
        <td align="center" style="width: 225px;"><img src="<?php echo Yii::app()->baseUrl; ?>/installer/images/tick-right.png" alt="Yes" /></td>