Merge branch 'master' of git@github.com:ktgit/knowledgetree

Paul Barrett
2 parents 686b2b7a a5055f62
Showing 24 changed files with 164 additions and 77 deletions
docs/kt-phpdoc.ini
i18n/knowledgeTree.pot
ktwebdav/lib/KTWebDAVServer.inc.php
ktwebservice/KTUploadManager.inc.php
lib/foldermanagement/compressionArchiveUtil.inc.php
lib/groups/Group.inc
lib/storage/ondiskhashedstoragemanager.inc.php
lib/util/ktutil.inc
plugins/i18n/french/translations/fr_FR/knowledgeTree.po
plugins/i18n/german/translations/de_DE/knowledgeTree.po
plugins/i18n/italian/translations/it_IT/knowledgeTree.po
plugins/ktcore/KTBulkActions.php
plugins/ktcore/admin/documentFieldsv2.php
plugins/ktstandard/KTEmail.php
resources/css/kt-framing.css
resources/graphics/download_arrow.gif
resources/graphics/upload_arrow.gif
resources/js/search2widget.js
search2/documentProcessor/documentProcessor.inc.php
search2/indexing/indexers/PHPLuceneIndexer.inc.php
@@ -95,7 +95,9 @@ ignore = thirdparty/
 ;;               HTML:Smarty:default,HTML:Smarty:PHP,HTML:Smarty:HandS
 ;;               PDF:default:default,CHM:default:default,XML:DocBook/peardoc2:default
 ;output=HTML:frames:earthli,HTML:frames:default,HTML:frames:l0l33t,HTML:frames:phpdoc.de,HTML:frames:phphtmllib,HTML:frames:DOM/default,HTML:frames:DOM/l0l33t,HTML:frames:DOM/phpdoc.de,HTML:frames:DOM/earthli,HTML:frames:DOM/phphtmllib,HTML:frames:phpedit,HTML:Smarty:default,HTML:Smarty:PHP,HTML:Smarty:HandS
-output=HTML:frames:DOM/earthli
+;output=HTML:frames:earthli,HTML:frames:default,HTML:frames:l0l33t,HTML:frames:phpdoc.de,HTML:frames:phphtmllib,HTML:frames:DOM/default,HTML:frames:DOM/l0l33t,HTML:frames:DOM/phpdoc.de,HTML:frames:DOM/earthli,HTML:frames:DOM/phphtmllib,HTML:frames:phpedit,HTML:Smarty:default,HTML:Smarty:PHP,HTML:Smarty:HandS
+output=HTML:Smarty:PHP
+;output=HTML:frames:DOM/earthli
 ;; turn this option on if you want highlighted source code for every file
 ;; legal values: on/off
@@ -6669,7 +6669,7 @@ msgid &quot;It is not possible to archive a shortcut. Please archive the target docum
 msgstr ""
 #: plugins/ktcore/admin/documentFieldsv2.php:115
-msgid "It is possibler to create different types of fieldsets.  The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields.  The administrator may have installed additional plugins which provide different types of fieldsets."
+msgid "It is possible to create different types of fieldsets.  The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields.  The administrator may have installed additional plugins which provide different types of fieldsets."
 msgstr ""
 #: i18n/templates.c:7529
@@ -7,31 +7,31 @@
  * 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
  * Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, 
+ *
+ * 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 
+ * 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 
+ * must display the words "Powered by KnowledgeTree" and retain the original
  * copyright notice.
  * Contributor( s): ______________________________________
  *
@@ -228,7 +228,7 @@ class KTWebDAVServer extends HTTP_WebDAV_Server
         $ident = 'KTWEBDAV';
         $conf = array('mode' => 0644, 'timeFormat' => '%X %x');
-        $logger = &Log::singleton('file', '../var/log/ktwebdav-' . date('Y-m-d') . '.txt', $ident, $conf);
+        $logger = &Log::singleton('file', '../../var/log/ktwebdav-' . date('Y-m-d') . '.txt', $ident, $conf);
         if ($type == 'error') $logger->log($entry, PEAR_LOG_ERR);
         else $logger->log($entry, PEAR_LOG_INFO);
         return true;
@@ -272,6 +272,27 @@ class KTWebDAVServer extends HTTP_WebDAV_Server
             $this->ktwebdavLog('_SERVER is ' . print_r($_SERVER, true), 'info', true);
         }
+        // Check for electronic signatures - if enabled exit
+        $oConfig =& KTConfig::getSingleton();
+        $enabled = $oConfig->get('e_signatures/enableApiSignatures', false);
+        if($enabled){
+            $this->ktwebdavLog('Electronic Signatures have been enabled, disabling WebDAV.', 'info');
+
+            $data = "<html><head><title>KTWebDAV - The KnowledgeTree WebDAV Server</title></head>";
+            $data .= "<body>";
+            $data .= "<div align=\"center\"><IMG src=\"../resources/graphics/ktlogo-topbar_base.png\" width=\"308\" height=\"61\" border=\"0\"></div><br>";
+            $data .= "<div align=\"center\"><h2><strong>Welcome to KnowledgeTree WebDAV Server</strong></h2></div><br><br>";
+            $data .= "<div align=\"center\">The WebDAV Server has been disabled!</div><br><br>";
+            $data .= "<div align=\"center\">Electronic Signatures are enabled.</div><br><br>";
+            $data .= "</body>";
+
+            header('HTTP/1.1 403 Forbidden');
+            header('Content-Type: text/html; charset="utf-8"');
+            echo $data;
+
+            exit(0);
+        }
+
         // Get the client info
         $this->checkSafeMode();
@@ -147,6 +147,11 @@ class KTUploadManager
 		$now=date('Y-m-d H:i:s');
 		$now_str=date('YmdHis');
+		// Ensure the temp directory exists otherwise an error is thrown.
+        if (realpath($this->temp_dir) == FALSE) {
+            mkdir($this->temp_dir, 0777, true);
+        }
+
 		$newtempfile = realpath($this->temp_dir) . '/' . $_SESSION['userID'] . '-'. $now_str;
 		if (OS_WINDOWS)
 		{
@@ -289,7 +289,7 @@ class ZipFolder {
         if (!file_exists($sZipFile)) {
             return PEAR::raiseError(_kt('The zip file has not been created, if you are downloading a large number of documents
-            or a large document then it may take a few seconds to finish. Try refreshing the page.'));
+            or a large document then it may take a few minutes to finish.'));
         }
         $mimeType = 'application/zip; charset=utf-8;';
@@ -163,13 +163,16 @@ class Group extends KTEntity {
 	/**
 	 * Returns an array of Users in this group.
+     *
+	 * @param 	Boolean		Return Disabled Users or Not (defaults false)
+	 *
 	 */
-	function &getUsers() {
+	function &getUsers($disabled = false) {
 	    // legacy api.
-		return $this->getMembers();
+		return $this->getMembers($disabled);
 	}
-    function &getMembers() {
+    function &getMembers($disabled = false) {
         global $default;
         require_once(KT_LIB_DIR . '/users/User.inc');
         $sQuery = "SELECT user_id FROM $default->users_groups_table WHERE group_id = ?";
@@ -178,10 +181,12 @@ class Group extends KTEntity {
         $aMembers = array();
         foreach ($aUserIds as $iUserId) {
             $oUser = User::get($iUserId);
-            if ((!PEAR::isError($oUser)) && ($oUser !== false)) {
+            $is_disabled = ($disabled) ? false : $oUser->getDisabled();
+            if ((!PEAR::isError($oUser)) && ($oUser !== false) && !$is_disabled) {
                 $aMembers[] = $oUser;
             }
         }
+            
         return $aMembers;
     }
@@ -185,7 +185,10 @@ class KTOnDiskHashedStorageManager extends KTStorageManager {
         global $default;
         //get the path to the document on the server
-        $docRoot = $default->documentRoot;
+        //$docRoot = $default->documentRoot;
+        $oConfig =& KTConfig::getSingleton();
+        $docRoot  = $oConfig->get('urls/documentRoot');
+
         $path = $docRoot .'/'. $oDocument->getStoragePath();
         // Ensure the file exists
@@ -171,7 +171,7 @@ class KTUtil {
 	    $internal_url .= !empty($default->internal_server_port) ? ':' . $default->internal_server_port : '';
 	    $internal_url .= !empty($default->rootUrl) ? $default->rootUrl : '';
-	    $pos = strpos($internal_url, '://');
+	    $pos = strpos($internal_url, 'http');
         if($pos === false){
             $port = $default->internal_server_port;
             $internal_url = (($port == 443 || $port == 8443) ? 'https://' : 'http://') . $internal_url;
@@ -1184,6 +1184,11 @@ class KTUtil {
         }
     }
+    /**
+     * The system identifier is a unique ID defined in every installation of KnowledgeTree
+     *
+     * @return string The system identifier
+     */
     function getSystemIdentifier() {
         $sIdentifier = KTUtil::getSystemSetting('kt_system_identifier');
         if (empty($sIdentifier)) {
@@ -1343,7 +1348,7 @@ class KTUtil {
             return false;
         }
     }
-    
+
     static
     function camelize($string) {
     	$result = "";
@@ -6779,7 +6779,7 @@ msgid &quot;It is not possible to archive a shortcut. Please archive the target docum
 msgstr "Il est impossible d'archiver un raccourci. Veuillez archiver à la place le document ou le dossier ciblé."
 #: plugins/ktcore/admin/documentFieldsv2.php:115
-msgid "It is possibler to create different types of fieldsets.  The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields.  The administrator may have installed additional plugins which provide different types of fieldsets."
+msgid "It is possible to create different types of fieldsets.  The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields.  The administrator may have installed additional plugins which provide different types of fieldsets."
 msgstr "Il est possible de créer différents types de formulaires.  Le plus commun est un formulaire \"normal\" , qui peut être configuré de facon à disposer de différents types de champs. L'administrateur peut avoir installé des plugins supplémentaires qui fournissent différents types de formulaires."
 #: i18n/templates.c:7160
@@ -6785,7 +6785,7 @@ msgid &quot;It is not possible to archive a shortcut. Please archive the target docum
 msgstr "Verknüpfungen können nicht archiviert werden. Bitte archivieren Sie das Zieldokument oder den Zielordner."
 #: plugins/ktcore/admin/documentFieldsv2.php:115
-msgid "It is possibler to create different types of fieldsets.  The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields.  The administrator may have installed additional plugins which provide different types of fieldsets."
+msgid "It is possible to create different types of fieldsets.  The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields.  The administrator may have installed additional plugins which provide different types of fieldsets."
 msgstr "Es ist möglich verschiedene Typen von Feldgruppen zu erstellen. Die übliche Form ist eine \"normale\" Feldgruppe, welche unterschiedliche Felder beinhalten kann. Der Administrator hat eventuell weitere Plugins installiert die verschiedene Typen von Feldgruppen bereitstellen."
 #: i18n/templates.c:7160
@@ -6926,7 +6926,7 @@ msgid &quot;It is not possible to archive a shortcut. Please archive the target docum
 msgstr "Non è possibile archiviare un collegamento. Si prega di archiviare il documento scelto o la cartella."
 #: plugins/ktcore/admin/documentFieldsv2.php:115
-msgid "It is possibler to create different types of fieldsets.  The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields.  The administrator may have installed additional plugins which provide different types of fieldsets."
+msgid "It is possible to create different types of fieldsets.  The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields.  The administrator may have installed additional plugins which provide different types of fieldsets."
 msgstr "E' possibile crare tipi diversi di gruppi di attributi. Il tipo pi&ugrave; comune &egrave; un gruppo di attributi \"normale\", che pu&ograve; essere configurato in modo da avere vari tipi di campi. L'amministratore potrebbe avere installato dei componenti aggiuntivi addizionali che forniscono tipi diversi di gruppi di attributi."
 #: i18n/templates.c:7175
@@ -1081,7 +1081,10 @@ class KTBrowseBulkExportAction extends KTBulkAction {
         $this->sExportCode = KTUtil::randomString();
         $_SESSION['exportcode'] = $this->sExportCode;
+        // Save the return url in session so it is not lost when doing the download
         $folderurl = $this->getReturnUrl();
+        $_SESSION['export_return_url'] = $folderurl;
+
         $sReturn = sprintf('<p>' . _kt('Return to the original <a href="%s">folder</a>') . "</p>\n", $folderurl);
         $download_url = KTUtil::addQueryStringSelf("action=downloadZipFile&fFolderId={$this->oFolder->getId()}&exportcode={$this->sExportCode}");
@@ -1194,7 +1197,8 @@ class KTBrowseBulkExportAction extends KTBulkAction {
         if(PEAR::isError($res)){
             $this->addErrorMessage($res->getMessage());
-            $redirectUrl = $this->getReturnUrl();
+            $redirectUrl = $_SESSION['export_return_url'];
+            unset($_SESSION['export_return_url']);
             redirect($redirectUrl);
         }
         exit(0);
@@ -112,7 +112,7 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher {
             $widgets[] = array('ktcore.widgets.selection', array(
                 'label' => _kt("Fieldset Type"),
                 'use_simple' => false,
-                'description' => _kt("It is possibler to create different types of fieldsets.  The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields.  The administrator may have installed additional plugins which provide different types of fieldsets."),
+                'description' => _kt("It is possible to create different types of fieldsets.  The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields.  The administrator may have installed additional plugins which provide different types of fieldsets."),
                 'important_description' => _kt('Note that it is not possible to convert between different types of fieldsets, so please choose carefully.'),
                 'name' => 'fieldset_type',
                 'required' => true,
@@ -66,6 +66,7 @@ function sendGroupEmails($aGroupIDs, &amp;$aUserEmails, &amp;$aEmailErrors) {
 		    $default->log->info('sendingEmail to group ' . $oDestGroup->getName());
 		    // for each group, retrieve all the users
 		    foreach($aDestinationGroups as $oGroup){
+                // Need to only retrieve users that are not diabled.
 		    	$aUsers = kt_array_merge($aUsers, $oGroup->getUsers());
 		    }
@@ -245,7 +246,7 @@ function sendEmailDocument($aDestEmailAddress, $iDocumentID, $sDocumentName, $sC
     $sMessage .= sprintf(_kt("Your colleague, %s, wishes you to view the attached document entitled '%s'."), $oSendingUser->getName(), $sDocumentName);
     $sMessage .= "\n\n";
 	if (strlen($sComment) > 0) {
-		$sMessage .= '<br><br>' . _kt('Comments') . ':<br>' . $sComment;
+		$sMessage .= '<br><br>' . _kt('Comments') . ':<br>' . nl2br($sComment);
 	}
     $sTitle = sprintf(_kt("Document (ID %s): %s from %s"), $iDocumentID, $sDocumentName, $oSendingUser->getName());
@@ -310,7 +311,7 @@ function sendEmailHyperlink($aDestEmailAddress, $iDocumentID, $sDocumentName, $s
 	$sMessage .= '<br>' . generateControllerLink('viewDocument', "fDocumentID=$iDocumentID", $sDocumentName, true);
 	// add optional comment
 	if (strlen($sComment) > 0) {
-		$sMessage .= '<br><br>' . _kt('Comments') . ':<br>' . $sComment;
+		$sMessage .= '<br><br>' . _kt('Comments') . ':<br>' . nl2br($sComment);
 	}
 	$sMessage .= '</font>';
 	$sTitle = sprintf(_kt("Link (ID %s): %s from %s"), $iDocumentID, $sDocumentName, $oSendingUser->getName());
@@ -441,7 +442,6 @@ class KTDocumentEmailAction extends KTDocumentAction {
     function json_getGroups() {
         $oConfig = KTConfig::getSingleton();
         $bOnlyOwnGroup = $oConfig->get('email/onlyOwnGroups', false);
-
         $sFilter = KTUtil::arrayGet($_REQUEST, 'filter', false);
         $aGroupList = array('off'=> _kt('-- Please filter --'));
@@ -452,7 +452,6 @@ class KTDocumentEmailAction extends KTDocumentAction {
             } else {
                 $aGroups = GroupUtil::listGroupsForUser($this->oUser, array('where' => $sWhere));
             }
-
             $aGroupList = array();
             foreach($aGroups as $g) {
                 $aGroupList[$g->getId()] = $g->getName();
@@ -545,13 +544,12 @@ class KTDocumentEmailAction extends KTDocumentAction {
             $this->errorRedirectToMain(_kt('No recipients set'), sprintf('fDocumentId=%d', $this->oDocument->getId()));
             exit(0);
         }
-
+        
         $iDocumentID = $this->oDocument->getID();
         $sDocumentName = $this->oDocument->getName();
         $aEmailErrors = array();
         $aUserEmails = array();
-
         // send group emails
         sendGroupEmails($aGroupIDs, $aUserEmails, $aEmailErrors);
         // send user emails
@@ -569,12 +567,12 @@ class KTDocumentEmailAction extends KTDocumentAction {
             $aListEmails = array_keys($aUserEmails);
             sendEmail($aListEmails, $iDocumentID, $sDocumentName, $fComment, (boolean)$fAttachDocument, $aEmailErrors);
         }
-
+        // Display success or error, not both
         if (count($aEmailErrors)) {
             $_SESSION['KTErrorMessage'][] = join('<br />\n', $aEmailErrors);
+        } else {
+            $_SESSION['KTInfoMessage'][] = _kt('Email sent');
         }
-
-        $_SESSION['KTInfoMessage'][] = _kt('Email sent');
         //go back to the document view page
         controllerRedirect('viewDocument', sprintf("fDocumentId=%d", $this->oDocument->getId()));
     }
@@ -1217,15 +1217,15 @@ The text will be hidden for screen view.  The generic fahrner-ish approach comes
 }
 .portlet_button a .arrow_download {
-    background: transparent url(../../resources/graphics/download_arrow.gif) top right no-repeat;
-    width: 27px;
+    background: transparent url(../../resources/graphics/download_arrow.gif) center right no-repeat;
+    width: 20px;
     height: 47px;
     float: right;
 }
 .portlet_button a .arrow_upload {
-    background: transparent url(../../resources/graphics/upload_arrow.gif) top right no-repeat;
-    width: 27px;
+    background: transparent url(../../resources/graphics/upload_arrow.gif) center right no-repeat;
+    width: 20px;
     height: 47px;
     float: right;
 }
@@ -87,6 +87,8 @@ function populateSavedSearch(menu)
 	var item = menu.addMenuItem({
 		text: sSearchTranslations[5], /*Saved Searches*/
 		menu:	{
+		    shadow: false,
+		    minWidth: '150px',
 			items: []
 		}
 	});
@@ -118,6 +120,7 @@ function createSearchBar(div, suffix)
 	{
 		var menu = new Ext.menu.Menu({
 		    shadow: false,
+		    minWidth: '200px',
 			items: [
 				{
 					text: sSearchTranslations[6], /* Advanced Search */
@@ -131,6 +134,7 @@ function createSearchBar(div, suffix)
 					text: sSearchTranslations[8] , /*Quick Search Options*/
 					menu: {
 					    shadow: false,
+					    minWidth: '150px',
 						items: [
 							new Ext.menu.CheckItem({
 								text: sSearchTranslations[9], /* content and metadata */
@@ -153,6 +157,7 @@ function createSearchBar(div, suffix)
 					text: sSearchTranslations[13] , /*Toggle results format*/
 					menu: {
 					    shadow: false,
+					    minWidth: '150px',
 						items: [
 							new Ext.menu.CheckItem({
 								text: sSearchTranslations[14], /* search engine format */
@@ -144,6 +144,16 @@ class DocumentProcessor
         global $default;
         $default->log->debug('documentProcessor: starting');
+        // Check for lock file to ensure processor is not currently running
+        $cacheDir = $default->cacheDirectory;
+        $lockFile = $cacheDir . DIRECTORY_SEPARATOR . 'document_processor.lock';
+
+        if(file_exists($lockFile)){
+            // lock file exists, exit
+            $default->log->debug('documentProcessor: stopping, lock file in place '.$lockFile);
+            return ;
+        }
+
         if($default->enableIndexing){
             // Setup indexing - load extractors, run diagnostics
             if($this->indexer->preIndexingSetup() === false){
@@ -160,6 +170,10 @@ class DocumentProcessor
             return ;
         }
+        // indexing starting - create lock file
+        touch($lockFile);
+
+
         // Process queue
         foreach($queue as $item){
@@ -198,6 +212,11 @@ class DocumentProcessor
         // update the indexer statistics
         $this->indexer->updateIndexStats();
+        // Remove lock file to indicate processing has completed
+        if(file_exists($lockFile)){
+            @unlink($lockFile);
+        }
+
         $default->log->debug('documentProcessor: stopping');
     }
@@ -7,31 +7,31 @@
  * 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
  * Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, 
+ *
+ * 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 
+ * 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 
+ * must display the words "Powered by KnowledgeTree" and retain the original
  * copyright notice.
  * Contributor( s): ______________________________________
  *
@@ -67,9 +67,13 @@ class PHPLuceneIndexer extends Indexer
 		}
 		catch(Exception $ex)
 		{
-			$this->lucene = null;
-			if (!$catchException)
-				throw $ex;
+            if($ex->getMessage() == "Index doesn't exists in the specified directory."){
+                $this->lucene = new Zend_Search_Lucene($indexPath, true);
+            }else {
+                $this->lucene = null;
+                if (!$catchException)
+                    throw $ex;
+            }
 		}
 	}
@@ -94,13 +98,16 @@ class PHPLuceneIndexer extends Indexer
 	 */
 	private function addDocument($docid, $content, $discussion, $title, $version)
 	{
-		$doc = new Zend_Search_Lucene_Document();
-		$doc->addField(Zend_Search_Lucene_Field::Text('DocumentID', PHPLuceneIndexer::longToString($docid)));
-		$doc->addField(Zend_Search_Lucene_Field::Text('Content', $content, 'UTF-8'));
-		$doc->addField(Zend_Search_Lucene_Field::Text('Discussion', $discussion, 'UTF-8'));
-		$doc->addField(Zend_Search_Lucene_Field::Text('Title', $title, 'UTF-8'));
-		$doc->addField(Zend_Search_Lucene_Field::Text('Version', $version, 'UTF-8'));
-		$this->lucene->addDocument($doc);
+        $teaser = substr($content, 0, 250);
+
+        $doc = new Zend_Search_Lucene_Document();
+        $doc->addField(Zend_Search_Lucene_Field::Text('DocumentID', PHPLuceneIndexer::longToString($docid)));
+        $doc->addField(Zend_Search_Lucene_Field::Text('Content', $content, 'UTF-8'));
+        $doc->addField(Zend_Search_Lucene_Field::unStored('Discussion', $discussion, 'UTF-8'));
+        $doc->addField(Zend_Search_Lucene_Field::Text('Title', $title, 'UTF-8'));
+        $doc->addField(Zend_Search_Lucene_Field::Text('Version', $version, 'UTF-8'));
+        $doc->addField(Zend_Search_Lucene_Field::unIndexed('Summary', $teaser, 'UTF-8'));
+        $this->lucene->addDocument($doc);
 	}
 	/**
@@ -232,6 +239,7 @@ class PHPLuceneIndexer extends Indexer
             $document_id = PHPLuceneIndexer::stringToLong($document->DocumentID);
+            /*
             $coreText = '';
             if ($queryContent)
             {
@@ -243,6 +251,11 @@ class PHPLuceneIndexer extends Indexer
             }
             $content = $query->highlightMatches($coreText);
+            */
+
+            $teaser = $document->Summary;
+
+            $content = $query->highlightMatches($teaser);
             $title = $document->Title;
             $score = $hit->score;
@@ -250,6 +263,7 @@ class PHPLuceneIndexer extends Indexer
             // avoid adding duplicates. If it is in already, it has higher priority.
             if (!array_key_exists($document_id, $results) || $score > $results[$document_id]->Score)
             {
+                $item = new DocumentResultItem($document_id, $score, $title, $content);
                 $item = new QueryResultItem($document_id,  $score, $title,  $content);
                 if ($item->CanBeReadByUser)
                 {
@@ -284,4 +298,8 @@ class PHPLuceneIndexer extends Indexer
 		return _kt('Document Indexer Library');
 	}
 }
-?>
+
+    public function isDocumentIndexed($documentId){
+        // do something
+    }
+?>
 \ No newline at end of file
@@ -297,7 +297,7 @@ class XmlRpcLucene
             );
         $result =& $this->client->send($function);
-        unset($buffer);
+        unset($content);
         if($result->faultCode()) {
             $this->error($result, 'extractTextContent');
@@ -1459,7 +1459,7 @@ LOCK TABLES `system_settings` WRITE;
 INSERT INTO `system_settings` VALUES
 (1,'lastIndexUpdate','0'),
 (2,'knowledgeTreeVersion','3.6.1'),
-(3,'databaseVersion','3.6.0'),
+(3,'databaseVersion','3.6.1'),
 (4,'server_name','127.0.0.1');
 /*!40000 ALTER TABLE `system_settings` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -1753,7 +1753,8 @@ INSERT INTO `upgrades` VALUES
 (214,'func*3.5.4a*0*removeOldFilesAndFolders354a','Remove old files and folders that are no longer needed.','2008-10-01 00:00:00',1,'upgrade*3.5.4a*99*upgrade3.5.4a'),
 (215,'func*3.5.4a*0*removeOldFilesAndFolders354a1','Remove old files and folders that are no longer needed.','2008-10-01 00:00:00',1,'upgrade*3.5.4a*99*upgrade3.5.4a'),
 (216,'upgrade*3.5.4a*99*upgrade3.5.4a','Upgrade from version 3.5.4 to 3.5.4a','2008-12-01 00:00:00',1,'upgrade*3.5.4a*99*upgrade3.5.4a'),
-(217,'upgrade*3.6.0*99*upgrade3.6.0','Upgrade from version 3.5.4a to 3.6.0','2009-01-01 00:00:00',1,'upgrade*3.6.0*99*upgrade3.6.0');
+(217,'upgrade*3.6.0*99*upgrade3.6.0','Upgrade from version 3.5.4a to 3.6.0','2009-01-01 00:00:00',1,'upgrade*3.6.0*99*upgrade3.6.0'),
+(218,'upgrade*3.6.1*99*upgrade3.6.1','Upgrade from version 3.6.0 to 3.6.1','2009-04-01 00:00:00',1,'upgrade*3.6.1*99*upgrade3.6.1');
 /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -183,15 +183,16 @@ function createRange(groupid, fid, type)
 			html += "<option value=\"is not\">{/literal}{i18n}not on{/i18n}{literal}";
 			break;
 		default:
-			html += "<option value=\"is\">=";
-			html += "<option value=\"is not\">!=";
-			html += "<option value=\"\>\">\>";
-			html += "<option value=\"\>=\">\>=";
-			html += "<option value=\"\<\">\<";
-			html += "<option value=\"\<=\">\<=";
+			html += "<option value=\"is\">{/literal}{i18n}equal to{/i18n}";
+			html += "<option value=\"is not\">{i18n}not equal to{/i18n}";
+			html += "<option value=\"\>\">{i18n}greater than{/i18n}";
+			html += "<option value=\"\>=\">{i18n}greater than or equal to{/i18n}";
+			html += "<option value=\"\<\">{i18n}less than{/i18n}";
+			html += "<option value=\"\<=\">{i18n}less than or equal to{/i18n}";
 			html += "<option value=\"between\">{/literal}{i18n}between{/i18n}{literal}";
 			break;
 	}
+
 	html += "</SELECT>";
 	html += "<td valign=top width=\"100\"><div id=\"field"+ groupid + '_' + fid +"start\"></div>";
@@ -296,18 +297,17 @@ function onFilesizeChange(groupid, fid)
 function createFilesize(groupid, fid)
 {
-	var html = "<table><tr><td width=\"140\"";
+	var html = "<table><tr><td width=\"140\">";
 	html += "<SELECT style=\"width: 140px\" id=\"field" + groupid + "_" + fid + "op\">";
-	html += "<option value=\"\<\">\<";
-	html += "<option value=\"\<=\">\<=";
-	html += "<option value=\"\>\">\>";
-	html += "<option value=\"\>=\">\>=";
-	html += "<option value=\"=\">=";
-	html += "<option value=\"!=\">!=";
+	html += "<option value=\"\<\">{/literal}{i18n}less than{/i18n}"; // <
+	html += "<option value=\"\<=\">{i18n}less than or equal to{/i18n}"; // <=
+	html += "<option value=\"\>\">{i18n}greater than{/i18n}"; // >
+	html += "<option value=\"\>=\">{i18n}greater than or equal to{/i18n}"; // >=
+	html += "<option value=\"=\">{i18n}equal to{/i18n}"; // =
+	html += "<option value=\"!=\">{i18n}not equal to{/i18n}{literal}"; // !=
 	html += "</SELECT>"
-
 	html += "<td valign=top width=\"50px\"><div id=\"field"+ groupid + '_' + fid +"input\"></div>";
 	html += "<td>";
 	html += "<SELECT  id=\"field" + groupid + "_" + fid + "factor\" onchange=\"onFilesizeChange( " + groupid + "," + fid + ")\">";
@@ -15,12 +15,13 @@
     <refsect1 id="{@id intro}">
         <title>Introduction</title>
             <para>
-                This is an introductory blurb about the KTAPI Package.
+                PLEASE NOTE: This is currently just a place holder for the API documentation and tutorials that are coming.
+                Many examples can already be found in the classes and methods documentation so have a look at the specific area you are interested in in the index. We intend updating and adding to this documentation each iteration.
             </para>
         <refsect2 id="{@id examples}">
             <title>Examples</title>
             <para>
-                This is a blurb about the KTAPI examples offered here.
+                KTAPI examples can be found here.
             </para>
             <refsect3 id="{@id example1}">
                 <title>Example 1</title>