diff --git a/dmsctl.bat b/dmsctl.bat index 7cf4d18..8802d4b 100644 --- a/dmsctl.bat +++ b/dmsctl.bat @@ -100,7 +100,6 @@ IF EXIST "%INSTALL_PATH%\var\bin\officeinstall.bat" 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 diff --git a/dmsctl.sh b/dmsctl.sh index 4de67f5..b84946e 100755 --- a/dmsctl.sh +++ b/dmsctl.sh @@ -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" diff --git a/plugins/ktstandard/documentpreview/documentPreview.php b/plugins/ktstandard/documentpreview/documentPreview.php index 7ace091..da58fa1 100755 --- a/plugins/ktstandard/documentpreview/documentPreview.php +++ b/plugins/ktstandard/documentpreview/documentPreview.php @@ -1,24 +1,38 @@ . * - * 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']; diff --git a/plugins/ktstandard/documentpreview/documentPreviewPlugin.php b/plugins/ktstandard/documentpreview/documentPreviewPlugin.php index 5b6d18c..4f6a364 100755 --- a/plugins/ktstandard/documentpreview/documentPreviewPlugin.php +++ b/plugins/ktstandard/documentpreview/documentPreviewPlugin.php @@ -1,24 +1,38 @@ . + * + * 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'); diff --git a/plugins/pdfConverter/pdfConverter.php b/plugins/pdfConverter/pdfConverter.php index 9d89753..4dd6afa 100644 --- a/plugins/pdfConverter/pdfConverter.php +++ b/plugins/pdfConverter/pdfConverter.php @@ -1,24 +1,38 @@ . * - * 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'); diff --git a/plugins/pdfConverter/pdfConverterPlugin.php b/plugins/pdfConverter/pdfConverterPlugin.php index 5664ed1..1724e59 100644 --- a/plugins/pdfConverter/pdfConverterPlugin.php +++ b/plugins/pdfConverter/pdfConverterPlugin.php @@ -1,24 +1,39 @@ . * - * 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'); diff --git a/plugins/search2/reporting/RescheduleDocuments.php b/plugins/search2/reporting/RescheduleDocuments.php index a54b059..008a7fc 100644 --- a/plugins/search2/reporting/RescheduleDocuments.php +++ b/plugins/search2/reporting/RescheduleDocuments.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 . '/templating/templating.inc.php'); 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; diff --git a/plugins/thumbnails/thumbnails.php b/plugins/thumbnails/thumbnails.php index 4fbf99b..6a89c0d 100755 --- a/plugins/thumbnails/thumbnails.php +++ b/plugins/thumbnails/thumbnails.php @@ -1,24 +1,38 @@ . * - * 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"); diff --git a/plugins/thumbnails/thumbnailsPlugin.php b/plugins/thumbnails/thumbnailsPlugin.php index 2d32844..c07b03b 100755 --- a/plugins/thumbnails/thumbnailsPlugin.php +++ b/plugins/thumbnails/thumbnailsPlugin.php @@ -1,24 +1,39 @@ . * + * 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); diff --git a/search2/indexing/indexerCore.inc.php b/search2/indexing/indexerCore.inc.php index 9b26082..3fc224c 100755 --- a/search2/indexing/indexerCore.inc.php +++ b/search2/indexing/indexerCore.inc.php @@ -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']; diff --git a/setup/migrate/migrateUtil.php b/setup/migrate/migrateUtil.php index 6792e23..67bdc96 100644 --- a/setup/migrate/migrateUtil.php +++ b/setup/migrate/migrateUtil.php @@ -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 diff --git a/setup/migrate/session.php b/setup/migrate/session.php index 4d5489a..9a022fb 100644 --- a/setup/migrate/session.php +++ b/setup/migrate/session.php @@ -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 diff --git a/setup/migrate/step.php b/setup/migrate/step.php index 06d4ef1..2457e49 100644 --- a/setup/migrate/step.php +++ b/setup/migrate/step.php @@ -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 diff --git a/setup/migrate/steps/migrateComplete.php b/setup/migrate/steps/migrateComplete.php index 1fe77e8..cf99ec9 100644 --- a/setup/migrate/steps/migrateComplete.php +++ b/setup/migrate/steps/migrateComplete.php @@ -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 diff --git a/setup/migrate/steps/migrateDatabase.php b/setup/migrate/steps/migrateDatabase.php index ca4fbdc..b4a6bc0 100644 --- a/setup/migrate/steps/migrateDatabase.php +++ b/setup/migrate/steps/migrateDatabase.php @@ -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 Next 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; } diff --git a/setup/migrate/steps/migrateErrors.php b/setup/migrate/steps/migrateErrors.php index bdd8687..8890d12 100644 --- a/setup/migrate/steps/migrateErrors.php +++ b/setup/migrate/steps/migrateErrors.php @@ -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 diff --git a/setup/migrate/steps/migrateInstallation.php b/setup/migrate/steps/migrateInstallation.php index e97c313..97a16fe 100644 --- a/setup/migrate/steps/migrateInstallation.php +++ b/setup/migrate/steps/migrateInstallation.php @@ -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; diff --git a/setup/migrate/steps/migrateServices.php b/setup/migrate/steps/migrateServices.php index acd6d87..9b3b507 100644 --- a/setup/migrate/steps/migrateServices.php +++ b/setup/migrate/steps/migrateServices.php @@ -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.
"; $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 diff --git a/setup/migrate/templates/complete.tpl b/setup/migrate/templates/complete.tpl index f1fd284..4e97df3 100644 --- a/setup/migrate/templates/complete.tpl +++ b/setup/migrate/templates/complete.tpl @@ -1,7 +1,7 @@

Migration Completed

-

Your database migration was successfully completed. Please check the section below for details of the migration and final instructions

+

Your database migration was successfully completed. Check the section below for details of the migration and final instructions

@@ -9,13 +9,35 @@ '>     

Start new MySQL service

- In order to complete the upgrade process please start the Zend Server MySQL service and then click Next to continue (Click here for help). -

+ In order to complete the upgrade process, start the Zend Server MySQL service and then click Next to continue (Click here for help). +
+
'>      +
+
+ +

+ + [START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [Mysql] +
+ Right-Click and run [Start Mysql] as administrator, if applicable, or +
+ Click [Start Mysql] + + #Ubuntu +
+ sudo /etc/init.d/mysql start +
+ #RedHat +
+ sudo /etc/init.d/mysqld start + +

+
diff --git a/setup/migrate/templates/database.tpl b/setup/migrate/templates/database.tpl index b1d0399..cafd054 100644 --- a/setup/migrate/templates/database.tpl +++ b/setup/migrate/templates/database.tpl @@ -6,43 +6,123 @@
-

The Setup Wizard will now export your existing database in preparation for the migration to the new KnowledgeTree Stack.


- Please ensure that your database is backed up before proceeding. If you need assistance with backing up see the  'Backing up and restoring KnowledgeTree'  wiki entry. +

The Setup Wizard will now export your existing database in preparation for the migration to the new KnowledgeTree Stack.

+
+

+ Ensure that the new Mysql server installed from your operating system's repository is not running +

+
+

+ + [START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [Mysql] +
+ Right-Click and run [Stop Mysql] as administrator, if applicable, or +
+ Click [Stop Mysql] + + #Ubuntu +
+ sudo /etc/init.d/mysql stop +
+ #RedHat +
+ sudo /etc/init.d/mysqld stop + +

+
+

+ Ensure that the old KnowledgeTree 3.6.1 Mysql server is running +

+

+ + [START MENU] => [Programs] => [KnowledgeTree 3.6.x] => [Control] +
+ Right-Click and run [Start Services] as administrator, if applicable, or +
+ Click [Start Services] + + sudo dmsctl.sh start mysql + +

+
+ + Ensure that your database is backed up before proceeding. If you need assistance with backing up see the   + 'Backing up and restoring KnowledgeTree'  wiki entry. -

-

Click Next to continue.

+
+
+

Click Next to continue.

- - + + + - - -

- - - -

- - -
+ + ?> + + + + + +

+ Ensure that the new Mysql server installed from your operating system's repository is not running +

+

+ + [START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [Mysql] +
+ Right-Click and run [Stop Mysql] as administrator, if applicable, or +
+ Click [Stop Mysql] + + #Ubuntu +
+ sudo /etc/init.d/mysql stop +
+ #RedHat +
+ sudo /etc/init.d/mysqld stop + +

+
+

+ Ensure that the old KnowledgeTree 3.6.1 Mysql server is running +

+

+ + [START MENU] => [Programs] => [KnowledgeTree 3.6.x] => [Control] +
+ Right-Click and run [Start Services] as administrator, if applicable, or +
+ Click [Start Services] + + sudo dmsctl.sh start mysql + +

+
+ + +
diff --git a/setup/migrate/templates/installation.tpl b/setup/migrate/templates/installation.tpl index ffcd8da..1470467 100644 --- a/setup/migrate/templates/installation.tpl +++ b/setup/migrate/templates/installation.tpl @@ -20,7 +20,7 @@

- Please enter the full path of the installation you wish to upgrade: + Enter the full path of the installation you wish to upgrade:

diff --git a/setup/migrate/templates/installation_confirm.tpl b/setup/migrate/templates/installation_confirm.tpl index 75ef017..967ba98 100644 --- a/setup/migrate/templates/installation_confirm.tpl +++ b/setup/migrate/templates/installation_confirm.tpl @@ -5,7 +5,7 @@ if(!$errors && !$warnings) { ?>       - Installation has been detected. Please confirm system settings. + Installation has been detected. Confirm system settings.

- Please verify your current installation settings. + Verify your current installation settings.

Installation Settings

diff --git a/setup/migrate/templates/services.tpl b/setup/migrate/templates/services.tpl index 37e6ea7..693509b 100644 --- a/setup/migrate/templates/services.tpl +++ b/setup/migrate/templates/services.tpl @@ -9,7 +9,7 @@ if(!$errors && !$warnings) { ?>       - All services have been shut down. Please click next to continue. + All services have been shut down. Click next to continue.

All services are uninstalled. -

     "; ?>Please shutdown the following services

+

     "; ?>Shutdown the following services

util->getVersionType() == "community") + return true; + return false; + } } ?> \ No newline at end of file diff --git a/setup/upgrade/steps/upgradeBackup.php b/setup/upgrade/steps/upgradeBackup.php index 757ca22..d34d720 100644 --- a/setup/upgrade/steps/upgradeBackup.php +++ b/setup/upgrade/steps/upgradeBackup.php @@ -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 diff --git a/setup/upgrade/steps/upgradeComplete.php b/setup/upgrade/steps/upgradeComplete.php index 89f5378..6621909 100644 --- a/setup/upgrade/steps/upgradeComplete.php +++ b/setup/upgrade/steps/upgradeComplete.php @@ -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 diff --git a/setup/upgrade/steps/upgradeDatabase.php b/setup/upgrade/steps/upgradeDatabase.php index 4ebbbfe..dd3ff82 100644 --- a/setup/upgrade/steps/upgradeDatabase.php +++ b/setup/upgrade/steps/upgradeDatabase.php @@ -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 diff --git a/setup/upgrade/steps/upgradeErrors.php b/setup/upgrade/steps/upgradeErrors.php index ac6db1c..cdf681e 100644 --- a/setup/upgrade/steps/upgradeErrors.php +++ b/setup/upgrade/steps/upgradeErrors.php @@ -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 diff --git a/setup/upgrade/steps/upgradeInstallation.php b/setup/upgrade/steps/upgradeInstallation.php index b65e6b2..417f834 100644 --- a/setup/upgrade/steps/upgradeInstallation.php +++ b/setup/upgrade/steps/upgradeInstallation.php @@ -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 diff --git a/setup/upgrade/steps/upgradeRestore.php b/setup/upgrade/steps/upgradeRestore.php index db08022..fee78dc 100644 --- a/setup/upgrade/steps/upgradeRestore.php +++ b/setup/upgrade/steps/upgradeRestore.php @@ -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 diff --git a/setup/upgrade/steps/upgradeWelcome.php b/setup/upgrade/steps/upgradeWelcome.php index a33502d..338b294 100644 --- a/setup/upgrade/steps/upgradeWelcome.php +++ b/setup/upgrade/steps/upgradeWelcome.php @@ -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 diff --git a/setup/upgrade/upgradeUtil.php b/setup/upgrade/upgradeUtil.php index f099d76..6bfd6f2 100644 --- a/setup/upgrade/upgradeUtil.php +++ b/setup/upgrade/upgradeUtil.php @@ -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 diff --git a/setup/wizard/installUtil.php b/setup/wizard/installUtil.php index d127fdc..0e4d47f 100644 --- a/setup/wizard/installUtil.php +++ b/setup/wizard/installUtil.php @@ -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 diff --git a/setup/wizard/lib/helpers/htmlHelper.php b/setup/wizard/lib/helpers/htmlHelper.php index f106573..0e2ae5b 100644 --- a/setup/wizard/lib/helpers/htmlHelper.php +++ b/setup/wizard/lib/helpers/htmlHelper.php @@ -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 diff --git a/setup/wizard/lib/services/service.php b/setup/wizard/lib/services/service.php index cb02daa..6037ab8 100644 --- a/setup/wizard/lib/services/service.php +++ b/setup/wizard/lib/services/service.php @@ -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 diff --git a/setup/wizard/lib/services/unixAgent.php b/setup/wizard/lib/services/unixAgent.php index 0089a05..5e93b38 100644 --- a/setup/wizard/lib/services/unixAgent.php +++ b/setup/wizard/lib/services/unixAgent.php @@ -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 diff --git a/setup/wizard/lib/services/unixLucene.php b/setup/wizard/lib/services/unixLucene.php index ea5c97d..ed14df7 100644 --- a/setup/wizard/lib/services/unixLucene.php +++ b/setup/wizard/lib/services/unixLucene.php @@ -1,11 +1,10 @@ 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); diff --git a/setup/wizard/lib/services/unixOpenOffice.php b/setup/wizard/lib/services/unixOpenOffice.php index cf4cd9a..7cda9c4 100644 --- a/setup/wizard/lib/services/unixOpenOffice.php +++ b/setup/wizard/lib/services/unixOpenOffice.php @@ -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 diff --git a/setup/wizard/lib/services/unixScheduler.php b/setup/wizard/lib/services/unixScheduler.php index a1235eb..a1b3a57 100644 --- a/setup/wizard/lib/services/unixScheduler.php +++ b/setup/wizard/lib/services/unixScheduler.php @@ -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 diff --git a/setup/wizard/lib/services/unixService.php b/setup/wizard/lib/services/unixService.php index 8e42ed2..ce9cda5 100644 --- a/setup/wizard/lib/services/unixService.php +++ b/setup/wizard/lib/services/unixService.php @@ -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 diff --git a/setup/wizard/lib/services/windowsAgent.php b/setup/wizard/lib/services/windowsAgent.php index cb4e60b..6b7f1a2 100644 --- a/setup/wizard/lib/services/windowsAgent.php +++ b/setup/wizard/lib/services/windowsAgent.php @@ -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 diff --git a/setup/wizard/lib/services/windowsLucene.php b/setup/wizard/lib/services/windowsLucene.php index 4a8c4a2..efdf603 100644 --- a/setup/wizard/lib/services/windowsLucene.php +++ b/setup/wizard/lib/services/windowsLucene.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 @@ -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); diff --git a/setup/wizard/lib/services/windowsOpenOffice.php b/setup/wizard/lib/services/windowsOpenOffice.php index 8ac99ac..a48eb9f 100644 --- a/setup/wizard/lib/services/windowsOpenOffice.php +++ b/setup/wizard/lib/services/windowsOpenOffice.php @@ -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 diff --git a/setup/wizard/lib/services/windowsService.php b/setup/wizard/lib/services/windowsService.php index eebe002..6f671fc 100644 --- a/setup/wizard/lib/services/windowsService.php +++ b/setup/wizard/lib/services/windowsService.php @@ -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 diff --git a/setup/wizard/lib/tests/configurationStep.php b/setup/wizard/lib/tests/configurationStep.php index a7805a8..f63cb05 100644 --- a/setup/wizard/lib/tests/configurationStep.php +++ b/setup/wizard/lib/tests/configurationStep.php @@ -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 diff --git a/setup/wizard/lib/tests/databaseStep.php b/setup/wizard/lib/tests/databaseStep.php index 1d26f08..ac04c1e 100644 --- a/setup/wizard/lib/tests/databaseStep.php +++ b/setup/wizard/lib/tests/databaseStep.php @@ -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 diff --git a/setup/wizard/lib/tests/servicesStep.php b/setup/wizard/lib/tests/servicesStep.php index d9fff14..ced445c 100644 --- a/setup/wizard/lib/tests/servicesStep.php +++ b/setup/wizard/lib/tests/servicesStep.php @@ -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 diff --git a/setup/wizard/lib/tests/tests.php b/setup/wizard/lib/tests/tests.php index d961860..f2ed68b 100644 --- a/setup/wizard/lib/tests/tests.php +++ b/setup/wizard/lib/tests/tests.php @@ -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 diff --git a/setup/wizard/lib/validation/luceneValidation.php b/setup/wizard/lib/validation/luceneValidation.php index 9c1c79b..80dcf47 100644 --- a/setup/wizard/lib/validation/luceneValidation.php +++ b/setup/wizard/lib/validation/luceneValidation.php @@ -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 diff --git a/setup/wizard/lib/validation/openofficeValidation.php b/setup/wizard/lib/validation/openofficeValidation.php index d0f937d..7286ac8 100644 --- a/setup/wizard/lib/validation/openofficeValidation.php +++ b/setup/wizard/lib/validation/openofficeValidation.php @@ -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 diff --git a/setup/wizard/lib/validation/schedulerValidation.php b/setup/wizard/lib/validation/schedulerValidation.php index 1c88f7c..1faa6a1 100644 --- a/setup/wizard/lib/validation/schedulerValidation.php +++ b/setup/wizard/lib/validation/schedulerValidation.php @@ -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 diff --git a/setup/wizard/lib/validation/serviceValidation.php b/setup/wizard/lib/validation/serviceValidation.php index ba77226..42cbb17 100644 --- a/setup/wizard/lib/validation/serviceValidation.php +++ b/setup/wizard/lib/validation/serviceValidation.php @@ -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 diff --git a/setup/wizard/resources/js/wizard.js b/setup/wizard/resources/js/wizard.js index 275e828..e133216 100644 --- a/setup/wizard/resources/js/wizard.js +++ b/setup/wizard/resources/js/wizard.js @@ -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; } diff --git a/setup/wizard/session.php b/setup/wizard/session.php index e3d5137..cdaa443 100644 --- a/setup/wizard/session.php +++ b/setup/wizard/session.php @@ -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 diff --git a/setup/wizard/step.php b/setup/wizard/step.php index 0c75811..38e87d9 100644 --- a/setup/wizard/step.php +++ b/setup/wizard/step.php @@ -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 diff --git a/setup/wizard/steps/complete.php b/setup/wizard/steps/complete.php index 6309b5f..d478f85 100644 --- a/setup/wizard/steps/complete.php +++ b/setup/wizard/steps/complete.php @@ -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 diff --git a/setup/wizard/steps/configuration.php b/setup/wizard/steps/configuration.php index 2a0ffc6..c8019b7 100644 --- a/setup/wizard/steps/configuration.php +++ b/setup/wizard/steps/configuration.php @@ -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 server\'s host name'; + $this->error[] = 'Enter the server\'s host name'; if(empty($server['port']['value'])) - $this->error[] = 'Please enter the server\'s port'; + $this->error[] = 'Enter the server\'s 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; } diff --git a/setup/wizard/steps/database.php b/setup/wizard/steps/database.php index 568a873..c8dbb2b 100644 --- a/setup/wizard/steps/database.php +++ b/setup/wizard/steps/database.php @@ -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 diff --git a/setup/wizard/steps/dependencies.php b/setup/wizard/steps/dependencies.php index 3dda4d4..65634b8 100644 --- a/setup/wizard/steps/dependencies.php +++ b/setup/wizard/steps/dependencies.php @@ -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; } /** diff --git a/setup/wizard/steps/errors.php b/setup/wizard/steps/errors.php index 21ea5c6..538e686 100644 --- a/setup/wizard/steps/errors.php +++ b/setup/wizard/steps/errors.php @@ -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 diff --git a/setup/wizard/steps/install.php b/setup/wizard/steps/install.php index e30ba6a..f510914 100644 --- a/setup/wizard/steps/install.php +++ b/setup/wizard/steps/install.php @@ -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 diff --git a/setup/wizard/steps/installtype.php b/setup/wizard/steps/installtype.php index 252845c..574e71b 100644 --- a/setup/wizard/steps/installtype.php +++ b/setup/wizard/steps/installtype.php @@ -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 diff --git a/setup/wizard/steps/license.php b/setup/wizard/steps/license.php index 05b843f..581a8c2 100644 --- a/setup/wizard/steps/license.php +++ b/setup/wizard/steps/license.php @@ -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; } diff --git a/setup/wizard/steps/registration.php b/setup/wizard/steps/registration.php index 6ec0c2c..abc4fea 100644 --- a/setup/wizard/steps/registration.php +++ b/setup/wizard/steps/registration.php @@ -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 diff --git a/setup/wizard/steps/services.php b/setup/wizard/steps/services.php index a7e528e..1ef70bf 100644 --- a/setup/wizard/steps/services.php +++ b/setup/wizard/steps/services.php @@ -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 diff --git a/setup/wizard/steps/welcome.php b/setup/wizard/steps/welcome.php index 9ec2a99..82ca642 100644 --- a/setup/wizard/steps/welcome.php +++ b/setup/wizard/steps/welcome.php @@ -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 diff --git a/setup/wizard/templates/configuration.tpl b/setup/wizard/templates/configuration.tpl index dcbd3dc..14afe6c 100644 --- a/setup/wizard/templates/configuration.tpl +++ b/setup/wizard/templates/configuration.tpl @@ -9,7 +9,7 @@ if(!$errors && !$warnings) { ?>       - All configuration settings are correctly set. Please click next to continue. + All configuration settings are correctly set. Click next to continue.

-      All configuration settings are correctly set. Please click next to continue.

+      All configuration settings are correctly set. Click next to continue.

diff --git a/setup/wizard/templates/database.tpl b/setup/wizard/templates/database.tpl index 86fc6bb..68dd248 100644 --- a/setup/wizard/templates/database.tpl +++ b/setup/wizard/templates/database.tpl @@ -68,12 +68,12 @@ - + - +
 
 
 
 
@@ -96,17 +96,17 @@ An administrative user is required for creating tables within the database. - Please Enter A Username + Enter A Username - Please Enter A Password + Enter A Password - + - Please Confirm Password + Confirm Password Passwords Do Not Match @@ -125,17 +125,17 @@ An second user is required for normal database interaction, the reading and writ - Please Enter A Username + Enter A Username - Please Enter A Password + Enter A Password - + - Please Confirm Password + Confirm Password Passwords Do Not Match diff --git a/setup/wizard/templates/database_confirm.tpl b/setup/wizard/templates/database_confirm.tpl index d8456b2..c2abdd1 100644 --- a/setup/wizard/templates/database_confirm.tpl +++ b/setup/wizard/templates/database_confirm.tpl @@ -2,7 +2,7 @@

Confirming Database Configurations

- Please confirm whether KnowledgeTree has correctly determined your database settings before proceeding. Print this page for future use. Click to Print This Page + Confirm whether KnowledgeTree has correctly determined your database settings before proceeding. Print this page for future use. Click to Print This Page

Database Settings

diff --git a/setup/wizard/templates/license.tpl b/setup/wizard/templates/license.tpl index 989654a..c72562b 100644 --- a/setup/wizard/templates/license.tpl +++ b/setup/wizard/templates/license.tpl @@ -6,7 +6,7 @@ } }?>

-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.

diff --git a/setup/wizard/templates/registration.tpl b/setup/wizard/templates/registration.tpl index e4cbd60..6cadc39 100644 --- a/setup/wizard/templates/registration.tpl +++ b/setup/wizard/templates/registration.tpl @@ -21,7 +21,7 @@

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 Privacy and Data Retention policies for more information. + and services. See our Privacy and Data Retention policies for more information.


diff --git a/setup/wizard/templates/services.tpl b/setup/wizard/templates/services.tpl index 7b843b1..08c2c24 100644 --- a/setup/wizard/templates/services.tpl +++ b/setup/wizard/templates/services.tpl @@ -15,7 +15,7 @@ if(!$errors && !$warnings) { ?>       - All service dependencies are met. Please click next to continue. + All service dependencies are met. Click next to continue.


-{if $rescheduleDone == true} -

Documents Rescheduled

-

You can view the schedule queue here

+

{i18n}Reschedule All Documents for Indexing{/i18n}

+

{i18n}Schedule all documents in the repository to be indexed.{/i18n}

+{if $rescheduleDone == 'true'} +

{i18n}All documents have been rescheduled for indexing.{/i18n}

+

{i18n}View the indexing queue.{/i18n}

+{/if}
+ + +


+

{i18n}Reschedule All Documents for Processing{/i18n}

+

{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}

+{if $reprocessDone == 'true'} +

{i18n}All documents have been rescheduled for processing.{/i18n}

{/if} - - +
+ + + + \ No newline at end of file