Merge branch 'master' of github.com:easysoft/zentaopms

This commit is contained in:
chenfeiCF
2016-03-14 09:11:15 +08:00
2 changed files with 12 additions and 2 deletions
+10 -2
View File
@@ -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();
}
+2
View File
@@ -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'>