diff --git a/dmsctl.bat b/dmsctl.bat index 2b1660e..f024be8 100644 --- a/dmsctl.bat +++ b/dmsctl.bat @@ -9,8 +9,11 @@ cd .. cd .. set ZEND_PATH=%CD% cd %INSTALL_PATH% -set JAVA_BIN=%ZEND_PATH%\jre\bin\java.exe -set SOFFICE_PATH=%ZEND_PATH%\openoffice +cd .. +set KTDMS_PATH=%CD% +cd %INSTALL_PATH% +set JAVA_BIN=%KTDMS_PATH%\jre\bin\java.exe +set SOFFICE_PATH=%KTDMS_PATH%\openoffice set SOFFICE_BIN=%SOFFICE_PATH%\program\soffice.exe set SOFFICE_PORT=8100 @@ -84,6 +87,7 @@ goto end :path echo ZEND_PATH == %ZEND_PATH% +echo KTDMS_PATH == %KTDMS_PATH% echo INSTALL_PATH == %INSTALL_PATH% echo JAVA_BIN == %JAVA_BIN% echo SOFFICE_PATH == %SOFFICE_PATH% diff --git a/setup/wizard/installUtil.php b/setup/wizard/installUtil.php index 0e79992..6967908 100644 --- a/setup/wizard/installUtil.php +++ b/setup/wizard/installUtil.php @@ -244,10 +244,14 @@ class InstallUtil { * @param boolean $create Whether to create the directory if it doesn't exist * @return array The message and css class to use */ - public function _checkPermission($dir) + public function _checkPermission($dir, $writable = false) { - //return true; // TODO: remove - if(is_readable($dir) && is_writable($dir)) { + if(is_readable($dir)) { + if($writable) { + if(!is_writable($dir)) { + return false; + } + } return true; } else { return false;