From 96a8ff86f712c7511e1496d15543644e90d33884 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 14 Mar 2016 14:29:27 +0800
Subject: [PATCH]  * adjust for check session.

---
 module/install/control.php         | 12 ++++++++++--
 module/install/view/step1.html.php |  2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/module/install/control.php b/module/install/control.php
index b657030f22..de875f76af 100644
--- a/module/install/control.php
+++ b/module/install/control.php
@@ -68,8 +68,6 @@ class install extends control
         $this->view->phpVersion     = $this->install->getPhpVersion();
         $this->view->phpResult      = $this->install->checkPHP();
         $this->view->pdoResult      = $this->install->checkPDO();
-        $this->view->sessionResult  = $this->install->checkSessionSavePath();
-        $this->view->sessionInfo    = $this->install->getSessionSavePath();
         $this->view->pdoMySQLResult = $this->install->checkPDOMySQL();
         $this->view->jsonResult     = $this->install->checkJSON();
         $this->view->tmpRootInfo    = $this->install->getTmpRoot();
@@ -77,6 +75,16 @@ class install extends control
         $this->view->dataRootInfo   = $this->install->getDataRoot();
         $this->view->dataRootResult = $this->install->checkDataRoot();
         $this->view->iniInfo        = $this->install->getIniInfo();
+
+        $checkSession = ini_get('session.save_handler') == 'files';
+        $this->view->sessionResult = 'ok';
+        $this->view->checkSession  = $checkSession;
+        if($checkSession)
+        {
+            $this->view->sessionResult  = $this->install->checkSessionSavePath();
+            $this->view->sessionInfo    = $this->install->getSessionSavePath();
+        }
+
         $this->display();
     }
 
diff --git a/module/install/view/step1.html.php b/module/install/view/step1.html.php
index 757e2ab5d9..edc3a2abe4 100644
--- a/module/install/view/step1.html.php
+++ b/module/install/view/step1.html.php
@@ -79,6 +79,7 @@
             ?>
           </td>
         </tr>
+        <?php if($checkSession):?>
         <tr>
           <th><?php echo $lang->install->session;?></th>
           <td>
@@ -102,6 +103,7 @@
             ?>
           </td>
         </tr>
+        <?php endif;?>
       </table>
     </div>
     <div class='modal-footer'>