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

Paul Barrett
2 parents db979362 25dbe600
Showing 13 changed files with 239 additions and 113 deletions
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/steps/migrateDatabase.php
setup/migrate/templates/database.tpl
setup/wizard/steps/dependencies.php
sql/mysql/upgrade/3.7.0.2/reprocess_all.sql
templates/ktcore/search2/reporting/rescheduledocuments.smarty
 <?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 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 . '/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: $
  *
- * 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 . '/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: $
  *
- * 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 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'];
@@ -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;
     }
@@ -54,7 +54,7 @@
         <p class="description">Click <b>Next</b> to continue.</p>
 		<?php } ?>
 <!--Handle a failed dump-->
-<?php if(isset($errors)) { ?>
+<?php if(!empty($errors)) { ?>
 	<?php
 		foreach ($errors as $error) {
 		?>
@@ -81,8 +81,7 @@
 //					echo $error['cmd'];
 	//			}
 		}
-	}
-	?>
+?>
 <p class="description">
 	Ensure that the new Mysql server installed from your operating system's repository is not running
 </p>
@@ -119,6 +118,10 @@
 	<?php } ?>
 </p>
 <br/>
+<?php
+	}
+	?>
+
 			<br/>
 		</div>
@@ -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]);
         }
+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
@@ -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