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

Mark Holtzhausen
2 parents 01238db5 c389d347
Showing 75 changed files with 530 additions and 289 deletions
dmsctl.bat
dmsctl.sh
plugins/ktstandard/documentpreview/documentPreview.php
plugins/ktstandard/documentpreview/documentPreviewPlugin.php
plugins/pdfConverter/pdfConverter.php
plugins/pdfConverter/pdfConverterPlugin.php
plugins/search2/reporting/RescheduleDocuments.php
plugins/thumbnails/thumbnails.php
plugins/thumbnails/thumbnailsPlugin.php
search2/indexing/indexerCore.inc.php
setup/migrate/migrateUtil.php
setup/migrate/session.php
setup/migrate/step.php
setup/migrate/steps/migrateComplete.php
setup/migrate/steps/migrateDatabase.php
setup/migrate/steps/migrateErrors.php
setup/migrate/steps/migrateInstallation.php
setup/migrate/steps/migrateServices.php
setup/migrate/templates/complete.tpl
setup/migrate/templates/database.tpl
@@ -100,7 +100,6 @@ IF EXIST &quot;%INSTALL_PATH%\var\bin\officeinstall.bat&quot; echo The Open Office automat
 IF EXIST "%INSTALL_PATH%\var\bin\schedulerinstall.bat" call "%INSTALL_PATH%\var\bin\schedulerinstall.bat"
 IF EXIST "%INSTALL_PATH%\var\bin\schedulerinstall.bat" echo The Scheduler automatic service was successfully installed.
 IF EXIST "%INSTALL_PATH%\var\bin\luceneinstall.bat" call "%INSTALL_PATH%\var\bin\luceneinstall.bat"
-IF EXIST "%INSTALL_PATH%\var\bin\luceneinstall.bat" echo The Lucene automatic service was successfully installed.
 goto end
 :end
@@ -267,8 +267,9 @@ stop_lucene() {
     get_lucene_pid
     cd $INSTALL_PATH/search2/indexing/bin
     $ZEND_DIR/bin/php shutdown.php positive &> $INSTALL_PATH/var/log/dmsctl.log
+    exit=$?
     sleep 5
-    if [ $? -eq 0 ]; then
+    if [ $exit -eq 0 ]; then
 	    echo "$0 $ARG: lucene stopped"
 	else
 	    echo "$0 $ARG: lucene could not be stopped"
 <?php
-/*
+/**
  * $Id: $
  *
- * The contents of this file are subject to the KnowledgeTree
- * Commercial Editions On-Premise License ("License");
- * You may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.knowledgetree.com/about/legal/
- * The terms of this license may change from time to time and the latest
- * license will be published from time to time at the above Internet address.
+ * KnowledgeTree Community Edition
+ * Document Management Made Simple
+ * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ *
+ *
+ * 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/>.
  *
- * This edition of the KnowledgeTree software
- * is NOT licensed to you under Open Source terms.
- * You may not redistribute this source code.
- * For more information please see the License above.
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+ * California 94120-7775, or email info@knowledgetree.com.
  *
- * (c) 2008 KnowledgeTree Inc.
- * Portions copyright The Jam Warehouse Software (Pty) Ltd;
- * All Rights Reserved.
+ * 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): ______________________________________
  */
 $kt_dir = $_REQUEST['kt_dir'];
 <?php
-/*
+/**
  * $Id: $
  *
- * The contents of this file are subject to the KnowledgeTree
- * Commercial Editions On-Premise License ("License");
- * You may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.knowledgetree.com/about/legal/
- * The terms of this license may change from time to time and the latest
- * license will be published from time to time at the above Internet address.
+ * KnowledgeTree Community Edition
+ * Document Management Made Simple
+ * Copyright (C) 2008, 2009 KnowledgeTree Inc.
  *
- * This edition of the KnowledgeTree software
- * is NOT licensed to you under Open Source terms.
- * You may not redistribute this source code.
- * For more information please see the License above.
  *
- * (c) 2008 KnowledgeTree Inc.
- * Portions copyright The Jam Warehouse Software (Pty) Ltd;
- * All Rights Reserved.
+ * 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 KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+ * California 94120-7775, 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): ______________________________________
  */
 require_once(KT_LIB_DIR . '/plugins/plugin.inc.php');
 <?php
-/*
+/**
  * $Id: $
  *
- * The contents of this file are subject to the KnowledgeTree
- * Commercial Editions On-Premise License ("License");
- * You may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.knowledgetree.com/about/legal/
- * The terms of this license may change from time to time and the latest
- * license will be published from time to time at the above Internet address.
+ * KnowledgeTree Community Edition
+ * Document Management Made Simple
+ * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ *
+ *
+ * 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/>.
  *
- * This edition of the KnowledgeTree software
- * is NOT licensed to you under Open Source terms.
- * You may not redistribute this source code.
- * For more information please see the License above.
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+ * California 94120-7775, or email info@knowledgetree.com.
  *
- * (c) 2008 KnowledgeTree Inc.
- * Portions copyright The Jam Warehouse Software (Pty) Ltd;
- * All Rights Reserved.
+ * 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): ______________________________________
  */
 require_once(KT_DIR . '/search2/documentProcessor/documentProcessor.inc.php');
 <?php
+
 /**
- * $Id: $
+ * $Id$
+ *
+ * KnowledgeTree Community Edition
+ * Document Management Made Simple
+ * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ *
+ *
+ * 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.
  *
- * The contents of this file are subject to the KnowledgeTree
- * Commercial Editions On-Premise License ("License");
- * You may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.knowledgetree.com/about/legal/
- * The terms of this license may change from time to time and the latest
- * license will be published from time to time at the above Internet address.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * This edition of the KnowledgeTree software
- * is NOT licensed to you under Open Source terms.
- * You may not redistribute this source code.
- * For more information please see the License above.
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+ * California 94120-7775, or email info@knowledgetree.com.
  *
- * (c) 2008 KnowledgeTree Inc.
- * Portions copyright The Jam Warehouse Software (Pty) Ltd;
- * All Rights Reserved.
+ * 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): ______________________________________
  */
 require_once(KT_LIB_DIR . '/plugins/plugin.inc.php');
@@ -5,7 +5,7 @@
  * KnowledgeTree Community Edition
  * Document Management Made Simple
  * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * 
+ *
  *
  * 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
@@ -41,7 +41,8 @@ require_once(KT_LIB_DIR . &#39;/templating/templating.inc.php&#39;);
 class RescheduleDocumentsDispatcher extends KTAdminDispatcher
 {
-    function check() {
+    function check()
+    {
         $this->aBreadcrumbs[] = array(
             'url' => $_SERVER['PHP_SELF'],
             'name' => _kt('Reschedule all documents'),
@@ -49,28 +50,34 @@ class RescheduleDocumentsDispatcher extends KTAdminDispatcher
         return parent::check();
     }
-    function do_main() {
-
-        //registerTypes registers the mime types and populates the needed tables.
-        $indexer = Indexer::get();
-        $indexer->registerTypes();
-
+    function do_main()
+    {
         $oTemplating =& KTTemplating::getSingleton();
         $oTemplate =& $oTemplating->loadTemplate('ktcore/search2/reporting/rescheduledocuments');
+        $rescheduleDone = ($_REQUEST['rescheduleDone'] == 'true') ? 'true' : 'false';
+        $reprocessDone = ($_REQUEST['reprocessDone'] == 'true') ? 'true' : 'false';
+
         if ($_REQUEST['rescheduleValue'] == 'reschedule')
  		{
+            //registerTypes registers the mime types and populates the needed tables.
+            $indexer = Indexer::get();
+            $indexer->registerTypes();
+
  			Indexer::indexAll();
- 			$oTemplate->setData(array(
-            'context' => $this,
-            'rescheduleDone' => true
-        	));
-        	return $oTemplate;
+            $rescheduleDone = 'true';
+ 		}
+
+        if ($_REQUEST['rescheduleValue'] == 'reprocess')
+ 		{
+ 			Indexer::processAll();
+ 			$reprocessDone = 'true';
  		}
         $oTemplate->setData(array(
             'context' => $this,
-            'rescheduleDone' => false
+            'rescheduleDone' => $rescheduleDone,
+            'reprocessDone' => $reprocessDone
         ));
         return $oTemplate;
 <?php
-/*
+/**
  * $Id: $
  *
- * The contents of this file are subject to the KnowledgeTree
- * Commercial Editions On-Premise License ("License");
- * You may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.knowledgetree.com/about/legal/
- * The terms of this license may change from time to time and the latest
- * license will be published from time to time at the above Internet address.
+ * KnowledgeTree Community Edition
+ * Document Management Made Simple
+ * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ *
+ *
+ * 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/>.
  *
- * This edition of the KnowledgeTree software
- * is NOT licensed to you under Open Source terms.
- * You may not redistribute this source code.
- * For more information please see the License above.
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+ * California 94120-7775, or email info@knowledgetree.com.
  *
- * (c) 2008 KnowledgeTree Inc.
- * Portions copyright The Jam Warehouse Software (Pty) Ltd;
- * All Rights Reserved.
+ * 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): ______________________________________
  */
 require_once(KT_LIB_DIR . "/actions/documentviewlet.inc.php");
 <?php
+
 /**
- * $Id: $
+ * $Id$
+ *
+ * KnowledgeTree Community Edition
+ * Document Management Made Simple
+ * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ *
  *
- * The contents of this file are subject to the KnowledgeTree
- * Commercial Editions On-Premise License ("License");
- * You may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.knowledgetree.com/about/legal/
- * The terms of this license may change from time to time and the latest
- * license will be published from time to time at the above Internet address.
+ * 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 edition of the KnowledgeTree software
- * is NOT licensed to you under Open Source terms.
- * You may not redistribute this source code.
- * For more information please see the License above.
+ * 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.
  *
- * (c) 2008 KnowledgeTree Inc.
- * Portions copyright The Jam Warehouse Software (Pty) Ltd;
- * All Rights Reserved.
+ * 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 KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+ * California 94120-7775, 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): ______________________________________
  */
 require_once(KT_LIB_DIR . '/plugins/plugin.inc.php');
@@ -49,7 +64,7 @@ class thumbnailsPlugin extends KTPlugin {
         require_once(KT_LIB_DIR . '/templating/templating.inc.php');
         $oTemplating =& KTTemplating::getSingleton();
         $oTemplating->addLocation('thumbnails', $plugin_dir.'templates', 'thumbnails.generator.processor.plugin');
-        
+
 	    // check for existing config settings entry and only add if not already present
         $sql = 'SELECT id FROM `config_settings` WHERE group_name = "externalBinary" AND item = "convertPath"';
         $result = DBUtil::getOneResult($sql);
@@ -700,6 +700,17 @@ abstract class Indexer
     	DBUtil::runQuery($sql);
     }
+    public static function processAll()
+    {
+        // Empty the queue
+    	$sql = "DELETE FROM process_queue";
+    	DBUtil::runQuery($sql);
+
+    	// Add all documents to the queue
+    	$sql = "INSERT INTO process_queue(document_id, date_added) SELECT id, now() FROM documents WHERE status_id=1 and id not in (select document_id from process_queue)";
+    	DBUtil::runQuery($sql);
+    }
+
     public static function indexFolder($folder)
     {
         $userid=$_SESSION['userID'];
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -429,6 +428,20 @@ class Step
     public function setErrors($error) {
         $this->error = $error;
     }
+    
+	/**
+	* Is the installation 
+	*
+	* @author KnowledgeTree Team
+	* @param none
+	* @access public
+	* @return string
+	*/
+    public function isCe() {
+    	if($this->util->getVersionType() == "community")
+    		return true;
+    	return false;
+    }
 }
 ?>
 \ No newline at end of file
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -103,7 +102,7 @@ class migrateDatabase extends Step
 		} else if($this->previous()) {
 			return 'previous';
 		}
-
+		$this->storeSilent();
         return 'landing';
     }
@@ -171,7 +170,7 @@ class migrateDatabase extends Step
 		$cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.$dbName.' > '.$sqlFile;
 		if($noFile) {
 			$this->error[]['error'] = "The KnowledgeTree Setup Wizard was unable to connect to your KnowledgeTree 3.6.1 database.";
-			$this->error[]['msg'] = "Please ensure that your KnowledgeTree Mysql service is running.";
+			$this->error[]['msg'] = "Ensure that your KnowledgeTree Mysql service is running.";
 			$this->error[]['cmd'] = "Click <b>Next</b> after resolving the above errors.";
 			$this->temp_variables['manual_export'] = "";
 		} else {
@@ -209,6 +208,9 @@ class migrateDatabase extends Step
 	private function setDetails() {
 		$this->createMigrateFile(); // create lock file to indicate migration mode
     	$database = $this->getDataFromSession("database");
+		$installation = $this->getDataFromSession("installation"); // Get installation directory
+    	$location = $installation['location'];
+    	$this->temp_variables['location'] = $location;
     	if(isset($database['dumpLocation'])) {
     		if(!empty($database['dumpLocation'])) {
     			if(file_exists($database['dumpLocation'])) { // Maybe file has been deleted by tmp
@@ -220,7 +222,8 @@ class migrateDatabase extends Step
         $this->temp_variables['duname'] = $this->getPostSafe('duname');
         $this->temp_variables['dpassword'] = $this->getPostSafe('dpassword');
         $this->temp_variables['dumpLocation'] = $this->getPostSafe('dumpLocation');
-
+    	
+    	
         return true;
     }
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -220,7 +219,7 @@ class migrateInstallation extends step
 				$this->error[] = "KnowledgeTree installation configuration file not found";
 			}
 		} else {
-			$this->error[] = "Please Enter a Location";
+			$this->error[] = "Enter a Location";
 		}
 		return false;
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -294,7 +293,7 @@ class migrateServices extends Step
     			$state = 'cross';
     			$this->error[] = "Service : {$serv->getName()} could not be uninstalled.<br/>";
     			$this->serviceCheck = 'cross';
-    			$this->temp_variables['services'][$serv->getName()]['msg'] = "Service Stopped, please uninstall service";
+    			$this->temp_variables['services'][$serv->getName()]['msg'] = "Service Stopped, uninstall service";
     		} else {
     			$state = 'tick';
     			$this->temp_variables['services'][$serv->getName()]['msg'] = "Service has been uninstalled";
@@ -402,7 +401,7 @@ class migrateServices extends Step
     private function storeSilent() {
     	$this->temp_variables['alreadyUninstalled'] = $this->alreadyUninstalled;
     	$this->temp_variables['serviceCheck'] = $this->serviceCheck;
-    	$this->temp_variables['msg'] = "Please turn off KnowledgeTree Mysql Instance.";
+    	$this->temp_variables['msg'] = "Turn off KnowledgeTree Mysql Instance.";
     }
 }
 ?>
 \ No newline at end of file
 <form action="index.php?step_name=<?php echo $step_name; ?>" method="post" id="<?php echo $step_name; ?>">
 	<p class="title">Migration Completed</p>
-	<p class="description">Your database migration was successfully completed. Please check the section below for details of the migration and final instructions</p>
+	<p class="description">Your database migration was successfully completed. Check the section below for details of the migration and final instructions</p>
 	<div id="step_content_<?php echo $step_name; ?>" class="step">
 <!--	SQL	-->
@@ -9,13 +9,35 @@
 		<span class='<?php echo $sql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><?php echo $sql['msg']; ?>
 		<br /><br />
 		<h3>Start new MySQL service</h3>
-		In order to complete the upgrade process please start the Zend Server MySQL service and then click <b>Next</b> to continue (<a href="http://wiki.knowledgetree.com/Web_Based_Migrater#Complete" target="_blank">Click here for help</a>). 
-		<br /><br />
+		In order to complete the upgrade process, start the Zend Server MySQL service and then click <b>Next</b> to continue (<a href="http://wiki.knowledgetree.com/Web_Based_Migrater#Complete" target="_blank">Click here for help</a>). 
+		<br />
+		<br />
 		<?php if(!empty($errors)) { ?>
 			<span class='<?php echo $zmysql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
 			<?php echo $zmysql['name']; ?>
 			<?php echo $zmysql['msg']; ?>
+			<br />
+			<br />
 		<?php } ?>
+
+<p class="disclaimer">
+	<?php if(WINDOWS_OS) { ?>
+		[START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [Mysql]
+		<br/>
+		Right-Click and run [Start Mysql] as administrator, if applicable, or
+		<br/>
+		Click [Start Mysql]
+	<?php } else { ?>
+	    #Ubuntu
+	    <br/>
+		sudo /etc/init.d/mysql start
+		<br/>
+	    #RedHat
+	    <br/>
+		sudo /etc/init.d/mysqld start
+	<?php } ?>
+</p>
+<br />
 	</div>
 <!--    <input class="button_next" type="submit" value="Continue Installation" name="BInstall"/>-->
     <input class="button_next" type="submit" value="Next" name="Next"/>
@@ -6,43 +6,123 @@
 		</div>
 		<div id="step_content_<?php echo $step_name; ?>" class="step">
 		<?php if(empty($errors)) { ?>
-<p class="description">The Setup Wizard will now export your existing database in preparation for the migration to the new KnowledgeTree Stack.</p><br />
-                        <span class="error">Please ensure that your database is backed up before proceeding. If you need assistance with backing up see the &nbsp;<a class="description_click" target="_blank" href="http://wiki.knowledgetree.com/Backing_up_and_restoring_KnowledgeTree">'Backing up and restoring KnowledgeTree'</a>&nbsp; wiki entry.
+<p class="description">The Setup Wizard will now export your existing database in preparation for the migration to the new KnowledgeTree Stack.</p>
+<br />
+<p class="description">
+	Ensure that the new Mysql server installed from your operating system's repository is not running
+</p>
+<br />
+<p class="disclaimer">
+	<?php if(WINDOWS_OS) { ?>
+		[START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [Mysql]
+		<br/>
+		Right-Click and run [Stop Mysql] as administrator, if applicable, or
+		<br/>
+		Click [Stop Mysql]
+	<?php } else { ?>
+	    #Ubuntu
+	    <br/>
+		sudo /etc/init.d/mysql stop
+		<br/>
+	    #RedHat
+	    <br/>
+		sudo /etc/init.d/mysqld stop
+	<?php } ?>
+</p>
+<br/>
+<p class="description">
+	Ensure that the old KnowledgeTree 3.6.1 Mysql server is running
+</p>
+<p class="disclaimer">
+	<?php if(WINDOWS_OS) { ?>
+		[START MENU] => [Programs] => [KnowledgeTree 3.6.x] => [Control]
+		<br/>
+		Right-Click and run [Start Services] as administrator, if applicable, or
+		<br/>
+		Click [Start Services]
+	<?php } else { ?>
+		sudo <?php echo $location.DS; ?>dmsctl.sh start mysql
+	<?php } ?>
+</p>
+<br/>
+<span class="error">
+	Ensure that your database is backed up before proceeding. If you need assistance with backing up see the &nbsp;
+	<a class="description_click" target="_blank" href="http://wiki.knowledgetree.com/Backing_up_and_restoring_KnowledgeTree">'Backing up and restoring KnowledgeTree'</a>&nbsp; wiki entry.
 </span>
-                        <br /><br />
-                        <p class="description">Click <b>Next</b> to continue.</p>
+        <br />
+        <br />
+        <p class="description">Click <b>Next</b> to continue.</p>
 		<?php } ?>
 <!--Handle a failed dump-->
-			<?php if(isset($errors)) { ?>
-				<?php
-					foreach ($errors as $error) {
+<?php if(!empty($errors)) { ?>
+	<?php
+		foreach ($errors as $error) {
+		?>
+			<span class="error">
+			<?php
+				if(isset($error['error'])) {
+					echo $error['error'];
 					?>
-						<span class="error">
-						<?php
-							if(isset($error['error'])) {
-								echo $error['error'];
-								?>
-									<br/><br/>
-								<?php
-							}
-						?>
-						</span>
-						<?php
-							if(isset($error['msg'])) {
-								echo $error['msg'];
-								?>
-									<br/><br/>
-								<?php
-							}
-						?>
-
-						<?php
-							if(isset($error['cmd'])) {
-								echo $error['cmd'];
-							}
-					}
+						<br/><br/>
+					<?php
 				}
-				?>
+			?>
+			</span>
+			<?php
+				//if(isset($error['msg'])) {
+					//echo $error['msg'];
+					?>
+<!--						<br/><br/>-->
+					<?php
+				//}
+			?>
+			<?php
+				//if(isset($error['cmd'])) {
+//					echo $error['cmd'];
+	//			}
+		}
+?>
+<p class="description">
+	Ensure that the new Mysql server installed from your operating system's repository is not running
+</p>
+<p class="disclaimer">
+	<?php if(WINDOWS_OS) { ?>
+		[START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [Mysql]
+		<br/>
+		Right-Click and run [Stop Mysql] as administrator, if applicable, or
+		<br/>
+		Click [Stop Mysql]
+	<?php } else { ?>
+	    #Ubuntu
+	    <br/>
+		sudo /etc/init.d/mysql stop
+		<br/>
+	    #RedHat
+	    <br/>
+		sudo /etc/init.d/mysqld stop
+	<?php } ?>
+</p>
+<br/>
+<p class="description">
+	Ensure that the old KnowledgeTree 3.6.1 Mysql server is running
+</p>
+<p class="disclaimer">
+	<?php if(WINDOWS_OS) { ?>
+		[START MENU] => [Programs] => [KnowledgeTree 3.6.x] => [Control]
+		<br/>
+		Right-Click and run [Start Services] as administrator, if applicable, or
+		<br/>
+		Click [Start Services]
+	<?php } else { ?>
+		sudo <?php echo $location.DS; ?>dmsctl.sh start mysql
+	<?php } ?>
+</p>
+<br/>
+<?php
+	}
+	?>
+
+
 			<br/>
 		</div>
 	</div>
@@ -20,7 +20,7 @@
 			</p>
 			<p class="description">
-			Please enter the full path of the installation you wish to upgrade:
+			Enter the full path of the installation you wish to upgrade:
 		</p>
 		<input id="location" name="location" type="text" style="width:430px; float:left" value="<?php if($location) echo $location; ?>">
@@ -5,7 +5,7 @@
 		if(!$errors && !$warnings) {
 			?>
 				<span class='big_ok'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-				Installation has been detected. Please confirm system settings.
+				Installation has been detected. Confirm system settings.
 				<br/><br/>
 			<?php
 		}
@@ -27,7 +27,7 @@
 	<!--Content-->
 	<div id="step_content_<?php echo $step_name; ?>" class="step">
 		<p class="empty_space">
-			Please verify your current installation settings.
+			Verify your current installation settings.
 		</p>
 		<h3>Installation Settings</h3>
 		<table class="conf_paths">
@@ -9,7 +9,7 @@
 		if(!$errors && !$warnings) {
 			?>
 				<span class='big_ok'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-				All services have been shut down. Please click next to continue.
+				All services have been shut down. Click next to continue.
 				<br/><br/>
 			<?php
 		}
@@ -38,7 +38,7 @@
 		<?php } else { ?>
 			All services are uninstalled.
 		<?php } ?>
-		<h3><?php echo "<span class='{$serviceCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Please shutdown the following services</h3>
+		<h3><?php echo "<span class='{$serviceCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Shutdown the following services</h3>
 		<?php if($silent) { ?>
 		<?php if($serviceCheck != 'tick') {
 			$details = 'Hide Details';
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -476,6 +475,20 @@ class Step
     protected function storeSilent() {
     }
+    
+	/**
+	* Is the installation 
+	*
+	* @author KnowledgeTree Team
+	* @param none
+	* @access public
+	* @return string
+	*/
+    public function isCe() {
+    	if($this->util->getVersionType() == "community")
+    		return true;
+    	return false;
+    }
 }
 ?>
 \ No newline at end of file
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
 <?php
 /**
-* Unix Lucene Service Controller. 
+* Unix Lucene Service Controller.
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -51,7 +50,7 @@ class unixLucene extends unixService {
 	private $javaXmx;
 	public $name = "KTLucene";
 	public $hrname = "KnowledgeTree Indexer Service";
-	
+
 	/**
 	* Load defaults needed by service
 	*
@@ -70,76 +69,76 @@ class unixLucene extends unixService {
 		$this->setLuceneSourceLoc("ktlucene.jar");
 		$this->setShutdownScript("shutdown.php");
 	}
-	
-	
+
+
 	public function setIndexerDir($indexerDir) {
 		$this->indexerDir = $indexerDir;
 	}
-	
+
 	private function getIndexerDir() {
 		return $this->indexerDir;
 	}
-	
+
 	private function setShutdownScript($shutdownScript) {
 		$this->shutdownScript = $shutdownScript;
 	}
-	
+
 	public function getShutdownScript() {
 		return $this->shutdownScript;
 	}
-	
+
 	private function setLucenePidFile($lucenePidFile) {
 		$this->lucenePidFile = $lucenePidFile;
 	}
-	
+
 	private function getLucenePidFile() {
 		return $this->lucenePidFile;
 	}
-	
+
 	private function setLuceneDir($luceneDir) {
 		$this->luceneDir = $luceneDir;
 	}
-	
+
 	public function getLuceneDir() {
 		return $this->luceneDir;
 	}
-	
+
 	private function setJavaXms($javaXms) {
 		$this->javaXms = "-Xms$javaXms";
 	}
-	
+
 	public function getJavaXms() {
 		return $this->javaXms;
 	}
-	
+
 	private function setJavaXmx($javaXmx) {
 		$this->javaXmx = "-Xmx$javaXmx";
 	}
-	
+
 	public function getJavaXmx() {
 		return $this->javaXmx;
 	}
-	
+
 	private function setLuceneSource($luceneSource) {
 		$this->luceneSource = $luceneSource;
 	}
-	
+
 	public function getLuceneSource() {
 		return $this->luceneSource;
 	}
-	
+
 	private function setLuceneSourceLoc($luceneSourceLoc) {
 		$this->luceneSourceLoc = $this->getLuceneDir().$luceneSourceLoc;
 	}
-	
+
 	public function getLuceneSourceLoc() {
 		return $this->luceneSourceLoc;
 	}
-	
+
 	public function getJavaOptions() {
 		return " {$this->getJavaXmx()} {$this->getJavaXmx()} -jar ";
 	}
-	
+
 	/**
 	* Stop Service
 	*
@@ -157,7 +156,7 @@ class unixLucene extends unixService {
 		}
 		return $state;
     }
-  
+
     public function install() {
     	$status = $this->status();
     	if($status == '') {
@@ -166,7 +165,7 @@ class unixLucene extends unixService {
     		return $status;
     	}
     }
-    
+
     public function status() {
     	$cmd = "ps ax | grep ".$this->getLuceneSource();
     	$response = $this->util->pexec($cmd);
@@ -183,14 +182,14 @@ class unixLucene extends unixService {
     			return '';
     		}
     	}
-    	
+
     	return '';
     }
-    
+
     public function uninstall() {
     	$this->stop();
     }
-    
+
 	/**
 	* Start Service
 	*
@@ -213,26 +212,26 @@ class unixLucene extends unixService {
 //	    		return false;
 //	    	}
 	    	//$response = $this->util->pexec($cmd);
-	    	
+
 //	    	return $response;
 			return false;
     	}
-    	
+
     	return true;
     }
-    
+
 	public function getName() {
 		return $this->name;
 	}
-	
+
 	public function getHRName() {
 		return $this->hrname;
 	}
-	
+
 	public function getStopMsg($installDir) {
 		return "";//"Execute from terminal : $installDir/dmsctl.sh stop";
 	}
-	
+
 	/**
 	* Write Lucene Service property file
 	*
@@ -243,7 +242,7 @@ class unixLucene extends unixService {
 	*/
 	private function writeLuceneProperties() {
 		// Check if bin is readable and writable
-		$fileLoc = $this->getluceneDir()."KnowledgeTreeIndexer.properties";
+		$fileLoc = $this->getluceneDir(). "KnowledgeTreeIndexer.properties";
 		$fp = fopen($fileLoc, "w+");
 		$content = "server.port=8875\n";
 		$content .= "server.paranoid=false\n";
@@ -251,7 +250,7 @@ class unixLucene extends unixService {
 		$content .= "server.deny=\n";
 		$conf = $this->util->getDataFromSession('configuration');
 		$varDirectory = $conf['paths']['varDirectory']['path'];
-		$content .= "indexer.directory=$varDirectory\n";
+		$content .= "indexer.directory=$varDirectory" . DS . "indexes\n";
 		$content .= "indexer.analyzer=org.apache.lucene.analysis.standard.StandardAnalyzer\n";
 		fwrite($fp, $content);
 		fclose($fp);
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,7 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright (C) 2008,2009 KnowledgeTree Inc.
-* 
+*
 *
 * 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
@@ -135,7 +135,7 @@ class windowsLucene extends windowsService {
 	public $hrname = "KnowledgeTree Indexer Service. (KTLucene)";
 	public $description = "KnowledgeTree Indexer Service.";
-	
+
 	/**
 	* Load defaults needed by service
 	*
@@ -464,15 +464,15 @@ class windowsLucene extends windowsService {
 		return '';
 	}
-	
+
 	public function getHRName() {
 		return $this->hrname;
 	}
-	
+
 	public function getStopMsg($installDir) {
 		return "";//"Execute from command prompt : $installDir/dmsctl.bat stop";
 	}
-	
+
 	/**
 	* Write Lucene Service property file
 	*
@@ -483,7 +483,7 @@ class windowsLucene extends windowsService {
 	*/
 	private function writeLuceneProperties() {
 		// Check if bin is readable and writable
-		$fileLoc = $this->getluceneDir()."KnowledgeTreeIndexer.properties";
+		$fileLoc = $this->getluceneDir(). DS ."KnowledgeTreeIndexer.properties";
 		$fp = fopen($fileLoc, "w+");
 		$content = "server.port=8875\n";
 		$content .= "server.paranoid=false\n";
@@ -491,7 +491,8 @@ class windowsLucene extends windowsService {
 		$content .= "server.deny=\n";
 		$conf = $this->util->getDataFromSession('configuration');
 		$varDirectory = $conf['paths']['varDirectory']['path'];
-		$content .= "indexer.directory=$varDirectory\n";
+		// on Windows the path needs to be escaped or the Java Lucene code cannot understand it
+		$content .= "indexer.directory=" . str_replace('\\', '/', $varDirectory . DS . "indexes") . "\n";
 		$content .= "indexer.analyzer=org.apache.lucene.analysis.standard.StandardAnalyzer\n";
 		fwrite($fp, $content);
 		fclose($fp);
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -85,27 +85,27 @@ wizard.prototype.valRegHelper = function() {
 	var last = $("#last");
 	var email = $("#email");
 	if(first.attr('value').length < 1) {
-		$("#reg_error").html('Please enter a First Name');
+		$("#reg_error").html('Enter a First Name');
 		w.focusElement(first);
 		return false;
 	}
 	if(!w.nameCheck(first.attr('value'))) {
-		$("#reg_error").html('Please enter a valid First Name');
+		$("#reg_error").html('Enter a valid First Name');
 		w.focusElement(first);
 		return false;
 	}
 	if(last.attr('value').length < 1) {
-		$("#reg_error").html('Please enter a Last Name');
+		$("#reg_error").html('Enter a Last Name');
 		w.focusElement(last);
 		return false;
 	}
 	if(!w.nameCheck(last.attr('value'))) {
-		$("#reg_error").html('Please enter a valid Last Name');
+		$("#reg_error").html('Enter a valid Last Name');
 		w.focusElement(last);
 		return false;
 	}
 	if(!w.emailCheck(email.attr('value'))) {
-		$("#reg_error").html('Please enter a valid email address');
+		$("#reg_error").html('Enter a valid email address');
 		w.focusElement(email);
 		return false;
 	}
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -104,10 +103,15 @@ class Step
 	*/
     protected $silent = false;
+	/**
+	* Flag if step needs to show confirm page first
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @var boolean
+	*/
     public $displayFirst = false;
-    private $salt = 'installers';
-    
 	/**
 	* Reference to utility object
 	*
@@ -116,10 +120,20 @@ class Step
 	* @var object
 	*/
     public $util;
+
+	/**
+	* Session salt
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @var boolean
+	*/
+    private $salt = 'installers';
     public function __construct() {
     	$this->util = new InstallUtil();
     }
+    
 	/**
 	* Returns step state
 	*
@@ -445,6 +459,21 @@ class Step
     public function setErrors($error) {
         $this->error = $error;
     }
+    
+	/**
+	* Is the installation 
+	*
+	* @author KnowledgeTree Team
+	* @param none
+	* @access public
+	* @return string
+	*/
+    public function isCe() {
+    	if($this->util->getVersionType() == "community")
+    		return true;
+    	return false;
+    }
+
 }
 ?>
 \ No newline at end of file
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -408,15 +407,14 @@ class configuration extends Step
         $server['host'] = array('name' => 'Host', 'setting' => 'server_name', 'where' => 'db', 'value' => $host);
         $server['port'] = array('name' => 'Port', 'setting' => 'server_port', 'where' => 'db', 'value' => $port);
         $server['ssl_enabled'] = array('name' => 'SSL Enabled', 'section' => 'KnowledgeTree', 'setting' => 'sslEnabled', 'where' => 'file', 'value' => $ssl_enabled);
-
         if(empty($server['host']['value']))
-            $this->error[] = 'Please enter the servers host name';
+            $this->error[] = 'Enter the servers host name';
         if(empty($server['port']['value']))
-            $this->error[] = 'Please enter the servers port';
+            $this->error[] = 'Enter the servers port';
         if(empty($server['file_system_root']['value']))
-            $this->error[] = 'Please enter the file system root';
+            $this->error[] = 'Enter the file system root';
         return $server;
     }
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -311,11 +310,11 @@ class database extends Step
     	}
     	$this->util->dbUtilities->load($this->dhost, $this->dport, $this->duname, $this->dpassword, $this->dname);
         if (!$this->util->dbUtilities->getDatabaseLink()) {
-            $this->error['con'] = "Could not connect to the database, please check username and password";
+            $this->error['con'] = "Could not connect to the database, check username and password";
             return false;
         } else {
         	if ($this->dbExists()) { // Check if database Exists
-        		$this->error['dname'] = 'Database Already Exists, please specify a different name'; // Reset usage errors
+        		$this->error['dname'] = 'Database Already Exists, specify a different name'; // Reset usage errors
             	return false;
         	} else {
         		$this->error = array(); // Reset usage errors
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -360,7 +359,7 @@ class dependencies extends Step
      */
     private function getConfigurations()
     {
-        return array(
+    	$conf = array(
             array('name' => 'Safe Mode', 'configuration' => 'safe_mode', 'recommended' => 'OFF', 'type' => 'bool'),
             array('name' => 'Display Errors', 'configuration' => 'display_errors', 'recommended' => 'OFF', 'type' => 'bool'),
             array('name' => 'Display Startup Errors', 'configuration' => 'display_startup_errors', 'recommended' => 'OFF', 'type' => 'bool'),
@@ -375,6 +374,11 @@ class dependencies extends Step
             array('name' => 'Open base directory', 'configuration' => 'open_basedir', 'recommended' => 'unset', 'type' => 'empty'),
             array('name' => 'Default MIME type', 'configuration' => 'default_mimetype', 'recommended' => 'text/html', 'type' => 'string'),
         );
+        if(!WINDOWS_OS) { // Remove linux settings
+        	unset($conf[1]);
+        	unset($conf[2]);
+        }
+        return $conf;
     }
     /**
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -105,10 +104,15 @@ class install extends step
     {
 		$this->callHome();
 		if ($this->util->isMigration()) { // copy indexing directory if this is a migration
-			$migrateSessionData = $this->getDataFromPackage('migrate', 'installation'); 
-			$configSessionData = $this->getDataFromSession('configuration'); 
+			$migrateSessionData = $this->getDataFromPackage('migrate', 'installation');
+			$configSessionData = $this->getDataFromSession('configuration');
 			$src = $migrateSessionData['location'] . DS . 'var' . DS .  'indexes';
-			$dst = $configSessionData['paths']['varDirectory']['path'] . DS . 'indexes';
+
+			if(WINDOWS_OS){
+                $dst = $configSessionData['paths']['varDirectory']['path'] . DS . 'indexes';
+			}else{
+			    $dst = $configSessionData['paths']['varDirectory']['path'];
+			}
 			$this->util->copyDirectory($src, $dst);
 		}
     }
@@ -126,11 +130,11 @@ class install extends step
     	}
     	$this->temp_variables['ce_check'] = $this->ce_check;
     }
-    
+
     function registerPlugins() {
-    	
+
     }
-    
+
     public function callHome() {
         $conf = $this->getDataFromSession("install"); // retrieve database information from session
         $dbconf = $this->getDataFromSession("database");
@@ -143,7 +147,7 @@ class install extends step
         $this->util->dbUtilities->query($query);
         $this->util->dbUtilities->close(); // close the database connection
     }
-    
-    
+
+
 }
 ?>
 \ No newline at end of file
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -76,11 +75,11 @@ class license extends step {
             if($_POST['license']) {
                 return true;
             } else {
-                $this->error[] = "Please accept the license agreement";
+                $this->error[] = "Accept the license agreement";
                 return false;
             }
         }
-        $this->error[] = "Please accept the license agreement";
+        $this->error[] = "Accept the license agreement";
         return false;
     }
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -5,7 +5,6 @@
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 * Copyright(C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright 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
@@ -9,7 +9,7 @@
 		if(!$errors && !$warnings) {
 			?>
 				<span class='big_ok'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-				All configuration settings are correctly set. Please click next to continue.
+				All configuration settings are correctly set. Click next to continue.
 				<br/><br/>
 			<?php
 		}
@@ -4,7 +4,7 @@
 	<?php
 		if(!$errors && !$warnings) {
 			?>
-				<span class='big_ok'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class='continue_message'>All configuration settings are correctly set. Please click next to continue.</span><br/><br/>
+				<span class='big_ok'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class='continue_message'>All configuration settings are correctly set. Click next to continue.</span><br/><br/>
 			<?php
 		}
 	?>
@@ -68,12 +68,12 @@
 	    	</tr>
 	    	<tr>
 	    		<td> <label for='dport'>Port: </label> </td>
-	    		<td> <div id="tooltips" title="The port on which your database server is listening, if it is a non-standard port please enter the number here">&nbsp;</div> </td>
+	    		<td> <div id="tooltips" title="The port on which your database server is listening, if it is a non-standard port enter the number here">&nbsp;</div> </td>
 	    		<td> <input type="text" value="<?php echo $dport?>" id="dport" name="dport" size='10' class="textinput" style="float:left"/> </td>
 	    	</tr>
 	    	<tr>
 	    		<td> <label for='dbbinary'>Socket: </label> </td>
-	    		<td> <div id="tooltips" title="The path to the database binary. If it is not on your system path then please enter it here">&nbsp;</div> </td>
+	    		<td> <div id="tooltips" title="The path to the database binary. If it is not on your system path then enter it here">&nbsp;</div> </td>
 	    		<td> <input type="text" value="<?php echo $dbbinary?>" id="dbbinary" name="dbbinary" size='<?php echo $input_size; ?>' class="textinput"/> </td>
 	    	</tr>
 	    </table>
@@ -96,17 +96,17 @@ An administrative user is required for creating tables within the database.
 	    <tr style="<?php if ($silent) echo 'display:none' ;?>">
 	        <td><label for='dmsname'>Enter the name of the Database Administrative User: </label></td>
 	        <td><input type='text' value="<?php echo $dmsname; ?>" id='dmsname' name='dmsname' size='40' /></td>
-	        <td id="error_1_2" class="error" style="display:none">Please Enter A Username</td>
+	        <td id="error_1_2" class="error" style="display:none">Enter A Username</td>
 		</tr>
 	    <tr>
 	        <td><label for='dmspassword'>Enter a password for the Administrative User: </label></td>
 	        <td><input type='password' value="<?php echo $dmspassword; ?>" id='dmspassword' name='dmspassword' size='40' /></td>
-	        <td id="error_2_2" class="error" style="display:none">Please Enter A Password</td>
+	        <td id="error_2_2" class="error" style="display:none">Enter A Password</td>
 		</tr>
 	    <tr>
-	        <td><label for='dmspassword2'>Please confirm the password: </label></td>
+	        <td><label for='dmspassword2'>Confirm the password: </label></td>
 	        <td><input type='password' value="<?php echo $dmspassword; ?>" id='dmspassword2' name='dmspassword2' size='40' /></td>
-	        <td id="error_3_2" class="error" style="display:none">Please Confirm Password</td>
+	        <td id="error_3_2" class="error" style="display:none">Confirm Password</td>
 	        <td id="error_4_2" class="error" style="display:none">Passwords Do Not Match</td>
 		</tr>
 	</table>
@@ -125,17 +125,17 @@ An second user is required for normal database interaction, the reading and writ
 		<tr style="<?php if ($silent) echo 'display:none' ;?>">
 	        <td><label for='dmsusername'>Enter a name for the User: </label></td>
 	        <td><input type='text' value="<?php echo $dmsusername; ?>" id='dmsusername' name='dmsusername' size='40' /></td>
-	        <td id="error_1_3" class="error" style="display:none">Please Enter A Username</td>
+	        <td id="error_1_3" class="error" style="display:none">Enter A Username</td>
 		</tr>
 	    <tr>
 	        <td><label for='dmsuserpassword'>Enter a password: </label></td>
 	        <td><input type='password' value="<?php echo $dmsuserpassword?>" id='dmsuserpassword' name='dmsuserpassword' size='40' /></td>
-	        <td id="error_2_3" class="error" style="display:none">Please Enter A Password</td>
+	        <td id="error_2_3" class="error" style="display:none">Enter A Password</td>
 		</tr>
 	    <tr>
-	        <td><label for='dmsuserpassword2'>Please confirm the password: </label></td>
+	        <td><label for='dmsuserpassword2'>Confirm the password: </label></td>
 	        <td><input type='password' value="<?php echo $dmsuserpassword?>" id='dmsuserpassword2' name='dmsuserpassword2' size='40' /></td>
-	        <td id="error_3_3" class="error" style="display:none">Please Confirm Password</td>
+	        <td id="error_3_3" class="error" style="display:none">Confirm Password</td>
 	        <td id="error_4_3" class="error" style="display:none">Passwords Do Not Match</td>
 		</tr>
 	</table>
@@ -2,7 +2,7 @@
 <p class="title">Confirming Database Configurations</p>
 	<div class="description">
-	Please confirm whether KnowledgeTree has correctly determined your database settings before proceeding. Print this page for future use. <a href="javascript:window.print()">Click to Print This Page</a>
+	Confirm whether KnowledgeTree has correctly determined your database settings before proceeding. Print this page for future use. <a href="javascript:window.print()">Click to Print This Page</a>
 	</div>
 	<div id="step_content_<?php echo $step_name; ?>_confirm" class="step">
 		<h3><b>Database Settings</b></h3>
@@ -6,7 +6,7 @@
         }
     }?>
 <p class="description_1">
-Please read and accept the license agreement below before continuing with the setup.
+Read and accept the license agreement below before continuing with the setup.
 </p>
 <?php if(!empty($errors)) { ?>
@@ -21,7 +21,7 @@
 	<input type="hidden" id="state" name="" />
 	<p class='disclaimer'>
 	We will not share your information with 3rd-parties, nor will we send you information not directly related to KnowledgeTree's products
-	and services. Please see our <a href="http://www.knowledgetree.com/about/legal" target="_blank">Privacy and Data Retention policies</a> for more information.
+	and services. See our <a href="http://www.knowledgetree.com/about/legal" target="_blank">Privacy and Data Retention policies</a> for more information.
 	</p>
 	<br/>
 	<div id="step_content_<?php echo $step_name; ?>" class="step">
@@ -15,7 +15,7 @@
 		if(!$errors && !$warnings) {
 			?>
 				<span class='big_ok'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-				All service dependencies are met. Please click next to continue.
+				All service dependencies are met. Click next to continue.
 				<br/><br/>
 			<?php
 		}
@@ -4,12 +4,25 @@
 <form name="rescheduleAllDocs" action="{$smarty.server.PHP_SELF}" method="POST">
 <br>
-{if $rescheduleDone == true}
-<p>Documents Rescheduled</p>
-<p>You can view the schedule queue <a href=admin.php?kt_path_info=search/pendingdocuments>here</a></p>
+<h4>{i18n}Reschedule All Documents for Indexing{/i18n}</h4>
+<p class='descriptiveText'>{i18n}Schedule all documents in the repository to be indexed.{/i18n}</p>
+{if $rescheduleDone == 'true'}
+<p style="padding-top: 5px;">{i18n}All documents have been rescheduled for indexing.{/i18n}</p>
+<p><a href=admin.php?kt_path_info=search/pendingdocuments>{i18n}View the indexing queue.{/i18n}</a></p>
+{/if}
 <br>
+<input type="submit" name="Reschedule" value="{i18n}Reschedule All{/i18n}" onclick="document.getElementById('rescheduleValue').value='reschedule';" />
+
+<br><br><br>
+<h4>{i18n}Reschedule All Documents for Processing{/i18n}</h4>
+<p class='descriptiveText'>{i18n}Schedule all documents in the repository to be processed. Processing involves the conversion of documents into PDF format and the generation of thumbnails.{/i18n}</p>
+{if $reprocessDone == 'true'}
+<p style="padding-top: 5px;">{i18n}All documents have been rescheduled for processing.{/i18n}</p>
 {/if}
-<input type="submit" name="Reschedule" value="{i18n}Reschedule All{/i18n}" />
-<input type="hidden" name="rescheduleValue" id="rescheduleValue" value="reschedule" />
+<br>
+<input type="submit" name="Reprocess" value="{i18n}Reschedule All{/i18n}" onclick="document.getElementById('rescheduleValue').value='reprocess';" />
+<input type="hidden" name="rescheduleDone" id="rescheduleDone" value="{$rescheduleDone}" />
+<input type="hidden" name="reprocessDone" id="reprocessDone" value="{$reprocessDone}" />
+<input type="hidden" name="rescheduleValue" id="rescheduleValue" value="reschedule" />
 </form>
 \ No newline at end of file