Peter M. Groen / knowledgetree

Commit 363a1c1e4df553c3e32998a9d44eec5b515c92e9

Authored by Megan Watson
2 parents a44e8280 085f1ee3

Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge

Inline Side-by-side
Showing 5 changed files with 21 additions and 5 deletions
plugins/thumbnails/thumbnails.php
  View file @363a1c1
... ... @@ -170,6 +170,11 @@ class thumbnailGenerator extends BaseProcessor
170 170 $default->log->debug('Thumbnail Generator Plugin: PDF file does not exist, cannot generate a thumbnail');
171 171 return false;
172 172 }
  173 +
  174 + if (WINDOWS_OS) {
  175 + $thumbnailfile = KT_DIR . $thumbnailfile;
  176 + }
  177 +
173 178 // if a previous version of the thumbnail exists - delete it
174 179 if (file_exists($thumbnailfile)) {
175 180 @unlink($thumbnailfile);
... ... @@ -177,7 +182,10 @@ class thumbnailGenerator extends BaseProcessor
177 182 // do generation
178 183 // if (extension_loaded('imagick')) {
179 184 $pathConvert = (!empty($default->convertPath)) ? $default->convertPath : 'convert';
180   - $result = shell_exec("{$pathConvert} -size 200x200 {$pdfFile}[0] -resize 200x200 $thumbnailfile");
  185 + if (WINDOWS_OS) {
  186 + $pathConvert = '"' . $pathConvert . '"';
  187 + }
  188 + $result = KTUtil::pexec("{$pathConvert} -size 200x200 {$pdfFile}[0] -resize 200x200 $thumbnailfile");
181 189 return true;
182 190 //}else{
183 191 //$default->log->debug('Thumbnail Generator Plugin: Imagemagick not installed, cannot generate a thumbnail');
... ... @@ -212,6 +220,10 @@ class ThumbnailViewlet extends KTDocumentViewlet {
212 220 global $default;
213 221 $varDir = $default->internalVarDirectory;
214 222 $thumbnailfile = $varDir . '/thumbnails/'.$documentId.'.jpg';
  223 +
  224 + if (WINDOWS_OS) {
  225 + $thumbnailfile = KT_DIR . $thumbnailfile;
  226 + }
215 227  
216 228 // if the thumbnail doesn't exist try to create it
217 229 if (!file_exists($thumbnailfile)){
... ...
setup/wizard/lib/services/windowsLucene.php
  View file @363a1c1
... ... @@ -429,7 +429,6 @@ class windowsLucene extends windowsService {
429 429 $luceneExe = $this->getLuceneExe();
430 430 $luceneSource = $this->getLuceneSource();
431 431 $luceneDir = $this->getluceneDir();
432   -// $javaJVM = $this->getJavaJVM();
433 432 if($luceneExe && $luceneSource && $luceneDir) {
434 433 $cmd = "\"{$luceneExe}\""." -install \"".$this->getName()."\" \"".$this->getJavaJVM(). "\" -Djava.class.path=\"".$luceneSource."\"". " -start ".$this->getLuceneServer(). " -out \"".$this->getLuceneOut()."\" -err \"".$this->getLuceneError()."\" -current \"".$luceneDir."\" -auto";
435 434 if(DEBUG) {
... ...
setup/wizard/lib/services/windowsOpenOffice.php
  View file @363a1c1
... ... @@ -201,7 +201,6 @@ class windowsOpenOffice extends windowsService {
201 201 public function install() {
202 202 $status = $this->status();
203 203 if($status == '') {
204   - //$binary = $this->util->openOfficeSpecified();
205 204 $binary = $this->getBin();
206 205 if($binary != '') {
207 206 $cmd = "\"{$this->winservice}\" install $this->name "."-displayname {$this->name} -start auto \"".$binary."\" -headless -invisible -nofirststartwizard -\"accept=socket,host={$this->host},port={$this->port};urp;\"";;
... ...
setup/wizard/steps/database.php
  View file @363a1c1
... ... @@ -781,7 +781,7 @@ class database extends Step
781 781 if($binaries) {
782 782 foreach ($binaries as $k=>$bin) {
783 783 if($k != 1) {
784   - $updateBin = 'UPDATE config_settings c SET c.value = "'.$bin.'" where c.group_name = "externalBinary" and c.display_name = "'.$k.'";';
  784 + $updateBin = 'UPDATE config_settings c SET c.value = "'.str_replace('\\', '\\\\', $bin).'" where c.group_name = "externalBinary" and c.display_name = "'.$k.'";';
785 785 $this->util->dbUtilities->query($updateBin);
786 786 }
787 787 }
... ... @@ -790,6 +790,7 @@ class database extends Step
790 790 // if Windows, hard code (relative to SYSTEM_ROOT) where we expect the Zend MSI installer to have placed them
791 791 if (WINDOWS_OS) {
792 792 $winBinaries = array('php' => 'ZendServer\bin\php.exe', 'python' => 'openoffice\program\python.exe',
  793 + 'java' => 'jre\bin\java.exe',
793 794 // since we don't know where convert is yet, let's just assume somewhere for now (manually test)
794 795 'convert' => 'imagick\convert.exe',
795 796 'zip' => 'bin\zip\zip.exe', 'unzip' => 'bin\unzip\unzip.exe');
... ...
setup/wizard/templates/services.tpl
  View file @363a1c1
... ... @@ -10,6 +10,7 @@
10 10 The wizard will review your system to determine whether you can run KnowledgeTree background services. <br/>Once the scan is completed, you&rsquo;ll see whether your system has met the requirements or whether there are areas you need to address.
11 11 </p>
12 12 <!--Continue Message-->
  13 +<?php if($validation) { ?>
13 14 <?php
14 15 if(!$errors && !$warnings) {
15 16 ?>
... ... @@ -33,10 +34,10 @@
33 34 }?>
34 35 <?php
35 36 if($errors || $warnings) {
36   -// var_dump($errors);
37 37 ?>
38 38 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://wiki.knowledgetree.com/Web_Based_Installer#Service_Dependencies" target="_blank">Click here for help on overcoming service issues</a>
39 39 <?php } ?>
  40 +<?php } ?>
40 41 <!--Content-->
41 42 <div id="step_content_configuration" class="step">
42 43 <?php if(!$alreadyInstalled) { ?>
... ... @@ -170,6 +171,7 @@
170 171 All services are already installed.
171 172 <!-- </p>-->
172 173 <?php } ?>
  174 + <?php if($validation) { ?>
173 175 <h3><?php echo "<span class='{$serviceCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Services Check</h3>
174 176 <?php if($silent) { ?>
175 177 <?php if($serviceCheck != 'tick') {
... ... @@ -216,6 +218,9 @@
216 218 <?php if($silent) { ?>
217 219 </div>
218 220 <?php } ?>
  221 + <?php } else { ?>
  222 + Services have to be manually started after the installation has been run. <a href="http://wiki.knowledgetree.com/KnowledgeTree_Setup_Wizard_Troubleshoot#Services" target="_blank">Click here for help on starting services</a>
  223 + <?php } ?>
219 224 </div>
220 225 <input type="submit" name="Previous" value="Previous" class="button_previous"/>
221 226 <input type="submit" name="Next" value="Next" class="button_next"/>
... ...