Peter M. Groen / knowledgetree

Commit d6001493b1b681bb41dd9bdfff502f3ef4454ef7

Authored by Jarrett Jordaan
1 parent 0ceae340

Build push 

Committed by: Jarrett Jordaan

Reviewed by: Paul Barrett
Inline Side-by-side
Showing 2 changed files with 13 additions and 5 deletions
dmsctl.bat
  View file @d600149
... ... @@ -9,8 +9,11 @@ cd ..
9 9 cd ..
10 10 set ZEND_PATH=%CD%
11 11 cd %INSTALL_PATH%
12   -set JAVA_BIN=%ZEND_PATH%\jre\bin\java.exe
13   -set SOFFICE_PATH=%ZEND_PATH%\openoffice
  12 +cd ..
  13 +set KTDMS_PATH=%CD%
  14 +cd %INSTALL_PATH%
  15 +set JAVA_BIN=%KTDMS_PATH%\jre\bin\java.exe
  16 +set SOFFICE_PATH=%KTDMS_PATH%\openoffice
14 17 set SOFFICE_BIN=%SOFFICE_PATH%\program\soffice.exe
15 18 set SOFFICE_PORT=8100
16 19  
... ... @@ -84,6 +87,7 @@ goto end
84 87  
85 88 :path
86 89 echo ZEND_PATH == %ZEND_PATH%
  90 +echo KTDMS_PATH == %KTDMS_PATH%
87 91 echo INSTALL_PATH == %INSTALL_PATH%
88 92 echo JAVA_BIN == %JAVA_BIN%
89 93 echo SOFFICE_PATH == %SOFFICE_PATH%
... ...
setup/wizard/installUtil.php
  View file @d600149
... ... @@ -244,10 +244,14 @@ class InstallUtil {
244 244 * @param boolean $create Whether to create the directory if it doesn't exist
245 245 * @return array The message and css class to use
246 246 */
247   - public function _checkPermission($dir)
  247 + public function _checkPermission($dir, $writable = false)
248 248 {
249   - //return true; // TODO: remove
250   - if(is_readable($dir) && is_writable($dir)) {
  249 + if(is_readable($dir)) {
  250 + if($writable) {
  251 + if(!is_writable($dir)) {
  252 + return false;
  253 + }
  254 + }
251 255 return true;
252 256 } else {
253 257 return false;
... ...