diff --git a/plugins/ktstandard/documentpreview/documentPreview.php b/plugins/ktstandard/documentpreview/documentPreview.php index 7ace091..b558c3f 100755 --- a/plugins/ktstandard/documentpreview/documentPreview.php +++ b/plugins/ktstandard/documentpreview/documentPreview.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): ______________________________________ */ $kt_dir = $_REQUEST['kt_dir']; diff --git a/plugins/ktstandard/documentpreview/documentPreviewPlugin.php b/plugins/ktstandard/documentpreview/documentPreviewPlugin.php index 5b6d18c..d2688cb 100755 --- a/plugins/ktstandard/documentpreview/documentPreviewPlugin.php +++ b/plugins/ktstandard/documentpreview/documentPreviewPlugin.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/pdfConverter/pdfConverter.php b/plugins/pdfConverter/pdfConverter.php index 9d89753..0ef3c56 100644 --- a/plugins/pdfConverter/pdfConverter.php +++ b/plugins/pdfConverter/pdfConverter.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_DIR . '/search2/documentProcessor/documentProcessor.inc.php'); diff --git a/plugins/pdfConverter/pdfConverterPlugin.php b/plugins/pdfConverter/pdfConverterPlugin.php index 5664ed1..d78cb20 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..c0dd99d 100755 --- a/plugins/thumbnails/thumbnails.php +++ b/plugins/thumbnails/thumbnails.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 . "/actions/documentviewlet.inc.php"); diff --git a/plugins/thumbnails/thumbnailsPlugin.php b/plugins/thumbnails/thumbnailsPlugin.php index 2d32844..75dce24 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/steps/migrateDatabase.php b/setup/migrate/steps/migrateDatabase.php index 8b706b1..20a0ceb 100644 --- a/setup/migrate/steps/migrateDatabase.php +++ b/setup/migrate/steps/migrateDatabase.php @@ -211,6 +211,7 @@ class migrateDatabase extends Step $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 @@ -222,7 +223,7 @@ 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'); - $this->temp_variables['location'] = $location; + return true; } diff --git a/setup/migrate/templates/database.tpl b/setup/migrate/templates/database.tpl index d6feef7..cafd054 100644 --- a/setup/migrate/templates/database.tpl +++ b/setup/migrate/templates/database.tpl @@ -54,7 +54,7 @@

Click Next to continue.

- + @@ -81,8 +81,7 @@ // echo $error['cmd']; // } } - } - ?> +?>

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

@@ -119,6 +118,10 @@


+ +
diff --git a/setup/wizard/steps/dependencies.php b/setup/wizard/steps/dependencies.php index 72fce53..bbeb813 100644 --- a/setup/wizard/steps/dependencies.php +++ b/setup/wizard/steps/dependencies.php @@ -375,7 +375,7 @@ 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) { + if(!WINDOWS_OS) { // Remove linux settings unset($conf[1]); unset($conf[2]); } diff --git a/sql/mysql/upgrade/3.7.0.2/reprocess_all.sql b/sql/mysql/upgrade/3.7.0.2/reprocess_all.sql new file mode 100644 index 0000000..af8af87 --- /dev/null +++ b/sql/mysql/upgrade/3.7.0.2/reprocess_all.sql @@ -0,0 +1 @@ +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); \ No newline at end of file diff --git a/templates/ktcore/search2/reporting/rescheduledocuments.smarty b/templates/ktcore/search2/reporting/rescheduledocuments.smarty index 77bdbf9..1cbd24b 100644 --- a/templates/ktcore/search2/reporting/rescheduledocuments.smarty +++ b/templates/ktcore/search2/reporting/rescheduledocuments.smarty @@ -4,12 +4,25 @@

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