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

Jarrett Jordaan
2 parents d7eec28c a7b58ed1
Showing 3 changed files with 32 additions and 11 deletions
setup/wizard/lib/services/windowsOpenOffice.php
templates/ktcore/document/view.smarty
view.php
@@ -147,11 +147,9 @@ class windowsOpenOffice extends windowsService {
 		$this->setPort("8100");
 		$this->setHost("127.0.0.1");
 		$this->setLog("openoffice.log");
-//		$this->setBin("C:\Program Files (x86)\OpenOffice.org 3\program\soffice.bin");
-//		$this->setBin("C:\Program Files (x86)\ktdms\openoffice\program\soffice.bin");
-//		$this->setBin("C:\Program Files (x86)\ktdms\openoffice.2.4\program\soffice.bin");
+		$this->setBin("C:\Program Files (x86)\OpenOffice.org 3\program\soffice.exe");
 		$this->setWinservice("winserv.exe");
-//		$this->setOption();
+		$this->setOption();
 	}
 	#rem "%INSTALL_PATH%\bin\winserv.exe" install %OpenofficeServiceName% -displayname "%OpenofficeServiceName%" -start auto %SOFFICE_BIN% -headless -invisible -accept=pipe,name=pypipe;urp;
 	private function setPort($port = "8100") {
@@ -178,7 +176,7 @@ class windowsOpenOffice extends windowsService {
 		return $this->log;
 	}
  
-	private function setBin($bin = "soffice") {
+	private function setBin($bin = "soffice.exe") {
 		$this->bin = $bin;
 	}
  
@@ -195,8 +193,8 @@ class windowsOpenOffice extends windowsService {
 	}
  
 	private function setOption() {
-		$this->options = "-displayname {$this->name} -start auto \"{$this->bin}\" -headless -invisible "
-                       . "-accept=socket,host={$this->host},port={$this->port};urp;";
+		$this->options = "-displayname {$this->name} -start auto \"{$this->bin}\" -nologo -headless -invisible -nofirststartwizard "
+                       . "-accept=\"socket,host={$this->host},port={$this->port};urp;StarOffice.ServiceManager\"";
 	}
  
 	public function getOption() {
@@ -35,9 +35,20 @@ these tasks, use the Request Assistance action.{/i18n}
 </div>
 {/if}
  
-{foreach item=oFieldset from=$fieldsets}
-{$oFieldset->render($document_data)}
-{/foreach}
+{if $thumbnail eq ''}
+    <div>
+    {foreach item=oFieldset from=$fieldsets}
+    {$oFieldset->render($document_data)}
+    {/foreach}
+    </div>
+{else}
+    <div style="float:left;width:85%;">
+    {foreach item=oFieldset from=$fieldsets}
+    {$oFieldset->render($document_data)}
+    {/foreach}
+    </div>
+    <div style="padding-top:45px;">{$thumbnail}</div>
+{/if}
  
 {if !empty($viewlet_data)}
  
@@ -210,7 +210,6 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
             array_push($fieldsets, new $displayClass($oFieldset));
         }
  
-
         $checkout_user = 'Unknown user';
         if ($oDocument->getIsCheckedOut() == 1) {
             $oCOU = User::get($oDocument->getCheckedOutUserId());
@@ -249,6 +248,18 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
             $content_class = 'view withviewlets';
         }
         $this->oPage->setContentClass($content_class);
+        
+        // check for a thumbnail
+        $thumbnail = '';
+        if (KTPluginUtil::pluginIsActive('thumbnails.generator.processor.plugin')) {
+            // hook into thumbnail plugin to get display for thumbnail
+            include_once(KT_DIR . '/plugins/thumbnails/thumbnails.php');
+            $thumbnailer = new ThumbnailViewlet();
+            $thumbnailDisplay = $thumbnailer->display_viewlet($document_id);
+            if ($thumbnailDisplay != '') {
+        		$thumbnail = $thumbnailDisplay;
+        	}
+        }
  
         $oTemplating =& KTTemplating::getSingleton();
         $oTemplate = $oTemplating->loadTemplate('ktcore/document/view');
@@ -263,6 +274,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
               'document_data' => $document_data,
               'fieldsets' => $fieldsets,
               'viewlet_data' => $viewlet_data,
+              'thumbnail' => $thumbnail,
         );
         //return '<pre>' . print_r($aTemplateData, true) . '</pre>';
         return $oTemplate->render($aTemplateData);