Commit 308dbdec0ed94ba883a0b003f48baf3a3aba1081
1 parent
fc5e0591
KTS-3594
"xls2csv is not resolving in the stack. there is a typo refering to xls2cvs" Fixed. xls2csv should now be resolved correctly. Committed By: Conrad Vermeulen Reviewed By: Megan Watson git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@9074 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
8 additions
and
8 deletions
lib/util/ktutil.inc
| @@ -91,11 +91,11 @@ class KTUtil { | @@ -91,11 +91,11 @@ class KTUtil { | ||
| 91 | $cacheDir = $default->cacheDirectory; | 91 | $cacheDir = $default->cacheDirectory; |
| 92 | 92 | ||
| 93 | $base_url = @file_get_contents($cacheDir . '/' . KTUtil::SERVER_NAME_FILE); | 93 | $base_url = @file_get_contents($cacheDir . '/' . KTUtil::SERVER_NAME_FILE); |
| 94 | - | 94 | + |
| 95 | /* We are checking if the object exists because we could have an error pre oor during initialization */ | 95 | /* We are checking if the object exists because we could have an error pre oor during initialization */ |
| 96 | - if(is_object($default->log)) | 96 | + if(is_object($default->log)) |
| 97 | { | 97 | { |
| 98 | - $default->log->debug("kt_url: base url - $base_url"); | 98 | + $default->log->debug("kt_url: base url - $base_url"); |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | if (false !== $base_url) | 101 | if (false !== $base_url) |
| @@ -108,12 +108,12 @@ class KTUtil { | @@ -108,12 +108,12 @@ class KTUtil { | ||
| 108 | $rootUrl = $default->rootUrl; | 108 | $rootUrl = $default->rootUrl; |
| 109 | 109 | ||
| 110 | $base_url = ($default->sslEnabled ? 'https' : 'http') .'://'.$serverName . $rootUrl; | 110 | $base_url = ($default->sslEnabled ? 'https' : 'http') .'://'.$serverName . $rootUrl; |
| 111 | - | ||
| 112 | - if(is_object($default->log)) | 111 | + |
| 112 | + if(is_object($default->log)) | ||
| 113 | { | 113 | { |
| 114 | - $default->log->debug("kt_url: base url - $base_url"); | 114 | + $default->log->debug("kt_url: base url - $base_url"); |
| 115 | } | 115 | } |
| 116 | - | 116 | + |
| 117 | 117 | ||
| 118 | return $base_url; | 118 | return $base_url; |
| 119 | 119 | ||
| @@ -790,7 +790,7 @@ class KTUtil { | @@ -790,7 +790,7 @@ class KTUtil { | ||
| 790 | 790 | ||
| 791 | switch ($configCommand) | 791 | switch ($configCommand) |
| 792 | { | 792 | { |
| 793 | - case 'externalBinary/xls2cvs': | 793 | + case 'externalBinary/xls2csv': |
| 794 | if (OS_WINDOWS) | 794 | if (OS_WINDOWS) |
| 795 | { | 795 | { |
| 796 | $script = $stackPath . '/bin/catdoc/xls2csv.exe'; | 796 | $script = $stackPath . '/bin/catdoc/xls2csv.exe'; |