Merged in from DEV trunk...

KTS-3077 "Error dialogs are not displayed correctly" Fixed. Fixed text overlapping the bottom of the block. Fixed holes in the side of the block. Committed By: Jonathan Byrne Reviewed By: Megan Watson KTS-3056 "Create a script to check if Open Office is running (SUP-614)" Fixed. Added the script to the scheduled tasks. Committed by: Megan Watson Reviewed by: Conrad Vermeulen KTS-3083 "Import from Server Location, you get a Fatal Error" Fixed. Added document object error checking. Committed By: Kevin Fourie Reviewed By: Jonnathan Byrne git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8139 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from DEV trunk...
KTS-3077 "Error dialogs are not displayed correctly" Fixed. Fixed text overlapping the bottom of the block. Fixed holes in the side of the block. Committed By: Jonathan Byrne Reviewed By: Megan Watson KTS-3056 "Create a script to check if Open Office is running (SUP-614)" Fixed. Added the script to the scheduled tasks. Committed by: Megan Watson Reviewed by: Conrad Vermeulen KTS-3083 "Import from Server Location, you get a Fatal Error" Fixed. Added document object error checking. Committed By: Kevin Fourie Reviewed By: Jonnathan Byrne git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8139 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent 522b7c1c
Showing 6 changed files with 101 additions and 4 deletions
bin/checkopenoffice.php
lib/documentmanagement/documentutil.inc.php
resources/css/kt-framing.css
sql/mysql/install/data.sql
sql/mysql/upgrade/3.5.2/scheduler_tasks.sql
templates/kt3/standard_page.smarty
+<?php
+
+/**
+ *
+ * $Id:
+ *
+ * KnowledgeTree Open Source Edition
+ * Document Management Made Simple
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 3 as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
+ * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
+ * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+ * must display the words "Powered by KnowledgeTree" and retain the original
+ * copyright notice.
+ * Contributor( s): ______________________________________
+ */
+
+chdir(realpath(dirname(__FILE__)));
+require_once('../config/dmsDefaults.php');
+
+// Check if open office is running
+$sCheckOO = SearchHelper::checkOpenOfficeAvailablity();
+
+
+// If it is running - exit, we don't need to do anything otherwise start it
+if(!empty($sCheckOO)){
+	
+	$default->log->debug('Check Open Office Task: Open office service is not running... trying to start it.');
+	
+    if(OS_WINDOWS){
+    	
+        // Check the path first
+        $sPath = realpath('../../winserv.exe');
+
+        if(file_exists($sPath)){
+            $sCmd = "\"$sPath\" start kt_openoffice";
+            KTUtil::pexec($sCmd);
+            exit;
+        }
+        // If that doesn't work, check for the all start
+        $sPath = realpath('../../bin/allctl.bat');
+        if(file_exists($sPath)){
+            $sCmd = "\"$sPath\" start";
+            KTUtil::pexec($sCmd);
+            exit;
+        }
+        // Might be a source install ... ???
+        $default->log->debug('Check Open Office Task: Can\'t start Open office, this may be a source install.');
+        exit;
+    }else{
+        $sPath = realpath('../../dmsctl.sh');
+        if(file_exists($sPath)){
+            $sCmd = "\"$sPath\" start";
+            KTUtil::pexec($sCmd);
+            exit;
+        }
+        // might be a source install
+        $default->log->debug('Check Open Office Task: Can\'t start Open office, this may be a source install.');
+        exit;
+    }
+}
+
+exit;
+?>
 \ No newline at end of file
@@ -695,6 +695,10 @@ class KTDocumentUtil {
         if (is_null($aOptions)) {
             $aOptions = array();
         }
+        if (PEAR::isError($oDocument)) {
+            return PEAR::raiseError(sprintf(_kt("Couldn't store contents: %s"), $oDocument->getMessage()));
+        }
+
         $bCanMove = KTUtil::arrayGet($aOptions, 'move');
         $oStorage =& KTStorageManagerUtil::getSingleton();
@@ -1022,7 +1022,7 @@ a.main_nav_item {
 /* block level. */
 .ktError {
-    padding: 0.1em 1em;
+    padding: 0.1em 1em 1em 1em;
     margin: 1em 0 0 0.5em;
 }
@@ -1034,7 +1034,7 @@ a.main_nav_item {
 /* block level. */
 .ktInfo {
-    padding: 0.1em 1em;
+    padding: 0.1em 1em 1em 1em;
     margin: 1em 0 0 0.5em;
 }
@@ -808,7 +808,8 @@ INSERT INTO `scheduler_tasks` VALUES
 (2,'Index Migration','search2/indexing/bin/cronMigration.php','',0,'5mins','2007-10-01',NULL,0,'system'),
 (3,'Index Optimisation','search2/indexing/bin/optimise.php','',0,'weekly','2007-10-01',NULL,0,'system'),
 (4,'Periodic Document Expunge','bin/expungeall.php','',0,'weekly','2007-10-01',NULL,0,'disabled'),
-(5,'Database Maintenance','bin/dbmaint.php','optimize',0,'monthly','2007-10-01',NULL,0,'disabled');
+(5,'Database Maintenance','bin/dbmaint.php','optimize',0,'monthly','2007-10-01',NULL,0,'disabled'),
+(6,'Open Office test','bin/checkopenoffice.php','',0,'1min','2007-10-01',NULL,0,'enabled');
 /*!40000 ALTER TABLE `scheduler_tasks` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -1720,7 +1721,7 @@ UNLOCK TABLES;
 LOCK TABLES `zseq_scheduler_tasks` WRITE;
 /*!40000 ALTER TABLE `zseq_scheduler_tasks` DISABLE KEYS */;
-INSERT INTO `zseq_scheduler_tasks` VALUES (5);
+INSERT INTO `zseq_scheduler_tasks` VALUES (6);
 /*!40000 ALTER TABLE `zseq_scheduler_tasks` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -8,4 +8,7 @@ INSERT INTO `scheduler_tasks` VALUES (@id,&#39;Periodic Document Expunge&#39;,&#39;bin/expun
 select @id:=max(id)+1 from scheduler_tasks;
 INSERT INTO `scheduler_tasks` VALUES (@id,'Database Maintenance','bin/dbmaint.php','optimize',0,'monthly','2007-10-01',NULL,0,'disabled');
+select @id:=max(id)+1 from scheduler_tasks;
+INSERT INTO `scheduler_tasks` VALUES (@id,'Open Office Test','bin/checkopenoffice.php','',0,'1min','2007-10-01',NULL,0,'enabled');
+
 UPDATE zseq_scheduler_tasks set id=@id;
 \ No newline at end of file
@@ -252,6 +252,8 @@
 			                <!-- any status / error messages get added here. -->
                 {if (!empty($page->errStack))}
                     <div class="ktError">
+				    	<div class="error_dashlet_rightrepeat_top"></div>
+				    	<div class="error_dashlet_leftrepeat_top"></div>
 				    	<div class="error_dashlet_rightrepeat_bottom"></div>
 				    	<div class="error_dashlet_leftrepeat_bottom"></div>
                         {foreach item=sError from=$page->errStack}
@@ -275,6 +277,8 @@
                 {if (!empty($page->infoStack))}
                     <div class="ktInfo">
+                    	<div class="info_dashlet_rightrepeat_top"></div>
+				    	<div class="info_dashlet_leftrepeat_top"></div>
                     	<div class="info_dashlet_rightrepeat_bottom"></div>
 				    	<div class="info_dashlet_leftrepeat_bottom"></div>
                         {foreach item=sInfo from=$page->infoStack}