Fixed issue: session write check is unreliable

dev: now write something to session and check if present in the next request
LimeSurvey · Dec 21, 2012 · 4369f6f · 4369f6f
1 parent 22ad48a
commit 4369f6f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/application/controllers/InstallerController.php b/application/controllers/InstallerController.php
@@ -173,6 +173,7 @@ private function stepLicense()
         {
             $this->redirect($this->createUrl('installer/precheck'));
         }
+        Yii::app()->session['saveCheck'] = 'save';  // Checked in next step
 
         $this->render('/installer/license_view',$aData);
     }
@@ -832,8 +833,16 @@ function check_DirectoryWriteable($directory, &$data, $base, $keyError, $bRecurs
         if (!check_DirectoryWriteable(Yii::app()->getConfig('uploaddir').'/', $data, 'uploaddir', 'uerror',true) )
             $bProceed = false;
 
-        if (!check_DirectoryWriteable(Yii::app()->session->getSavePath().'/', $data, 'sessiondir', 'serror',true) )
+        // Session writable check
+        $session = Yii::app()->session; /* @var $session CHttpSession */
+        $sessionWritable = ($session->get('saveCheck', null)==='save');
+        $data['sessionWritable'] = $sessionWritable;
+        $data['sessionWritableImg'] = check_HTML_image($sessionWritable);
+        if (!$sessionWritable){  
+            // For recheck, try to set the value again
+            $session['saveCheck'] = 'save';
             $bProceed = false;
+        }
 
         // ** optional settings check **
 

diff --git a/application/views/installer/precheck_view.php b/application/views/installer/precheck_view.php
@@ -92,10 +92,10 @@ function dirReport($dir, $write, $clang)
        <td align="center" style="width: 225px;"><?php $clang->eT("Found & writable"); ?></td>
        <td align="center" style="width: 225px;"><?php  echo dirReport($tmpdirPresent,$tmpdirWritable,$clang); ?></td>
 
-       <tr>
-           <td style="width: 209px;">session.save_path <?php echo session_save_path(); ?></td>
-       <td align="center" style="width: 225px;"><?php $clang->eT("Found & writable"); ?></td>
-       <td align="center" style="width: 225px;"><?php  echo dirReport($sessiondirPresent,$sessiondirWritable,$clang); ?></td>
+<tr>
+       <td style="width: 209px;"><?php $clang->eT("Session writable"); ?></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 $sessionWritableImg; if (!$sessionWritable) echo '<br/>session.save_path: ' . session_save_path(); ?></td>
 </tr>
 </tr>