Merged in from DEV trunk...

KTS-3168 "Searching integer field types results in SQL error" Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTS-3164 "Removed Title from being part of GeneralText criteria for search as it is catered for by the FullPath" Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTC-433 "Full Path Search Broken - says field not found: Full" Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTS-3163 "Wildcard search on metadata inconsistent with full text content search" Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTS-3165 "Remove background task permissions problems by making web server user deal with background tasks" Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson WSA-116 "Update unit tests to be compatible with 3.5.2" Updated. Made sure unit tests ran as expected. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie KTS-3169 "Provide some actions for portlets that allow javascript to be called rather than requiring the action framework" Implemented. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie KTS-3171 "Add extra validation for Permission::userIsSystemAdministrator()" Updated. Committed By: Conrad Vermeulen Reviewed By: Megan Watson git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8265 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from DEV trunk...
KTS-3168 "Searching integer field types results in SQL error" Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTS-3164 "Removed Title from being part of GeneralText criteria for search as it is catered for by the FullPath" Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTC-433 "Full Path Search Broken - says field not found: Full" Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTS-3163 "Wildcard search on metadata inconsistent with full text content search" Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTS-3165 "Remove background task permissions problems by making web server user deal with background tasks" Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson WSA-116 "Update unit tests to be compatible with 3.5.2" Updated. Made sure unit tests ran as expected. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie KTS-3169 "Provide some actions for portlets that allow javascript to be called rather than requiring the action framework" Implemented. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie KTS-3171 "Add extra validation for Permission::userIsSystemAdministrator()" Updated. Committed By: Conrad Vermeulen Reviewed By: Megan Watson git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8265 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent 533f9f97
Showing 20 changed files with 479 additions and 71 deletions
ktwebservice/nunit/document_contents.cs
ktwebservice/nunit/document_detail.cs
ktwebservice/nunit/document_metadata.cs
ktwebservice/nunit/document_system_metadata.cs
ktwebservice/nunit/makefile
lib/actions/documentaction.inc.php
lib/actions/folderaction.inc.php
lib/security/Permission.inc
lib/util/ktutil.inc
search2/bin/cronIndexer.php
search2/bin/cronMigration.php
search2/bin/optimise.php
search2/search/expr.inc.php
search2/search/fieldRegistry.inc.php
search2/search/fields/FullPathField.inc.php
search2/search/fields/TitleField.inc.php
sql/mysql/install/data.sql
sql/mysql/upgrade/3.5.2/scheduler_permissions.sql
templates/kt3/portlets/actions_portlet.smarty
templates/ktcore/forms/widgets/string.smarty
@@ -57,7 +57,7 @@ namespace MonoTests.KnowledgeTree
 			Assert.AreEqual("Administrator", response.items[1].owned_by);
 			Assert.AreEqual("0.1", response.items[1].version);
 			Assert.AreEqual("false", response.items[1].is_immutable);
-			Assert.AreEqual("n/a", response.items[1].permissions);
+			Assert.AreEqual("RW", response.items[1].permissions);
 			Assert.AreEqual("n/a", response.items[1].workflow);
 			Assert.AreEqual("n/a", response.items[1].workflow_state);
 			Assert.AreEqual("text/plain", response.items[1].mime_type);
@@ -79,7 +79,7 @@ namespace MonoTests.KnowledgeTree
 			Assert.AreEqual("n/a", response.items[0].owned_by);
 			Assert.AreEqual("n/a", response.items[0].version);
 			Assert.AreEqual("n/a", response.items[0].is_immutable);
-			Assert.AreEqual("n/a", response.items[0].permissions);
+			Assert.AreEqual("RW", response.items[0].permissions);
 			Assert.AreEqual("n/a", response.items[0].workflow);
 			Assert.AreEqual("n/a", response.items[0].workflow_state);
 			Assert.AreEqual("folder", response.items[0].mime_type);
@@ -81,14 +81,14 @@ namespace MonoTests.KnowledgeTree
 			Assert.AreEqual("Administrator", response.owned_by);
 			Assert.AreEqual(0.1, response.version);
 			Assert.AreEqual(false, response.is_immutable);
-			Assert.AreEqual("n/a", response.permissions);
+			Assert.AreEqual("RW", response.permissions);
 			Assert.AreEqual("n/a", response.workflow);
 			Assert.AreEqual("n/a", response.workflow_state);
 			Assert.AreEqual("text/plain", response.mime_type);
 			Assert.AreEqual("text", response.mime_icon_path);
 			Assert.AreEqual("Plain Text", response.mime_display);
 			Assert.IsTrue("" != response.storage_path);
-			Assert.AreEqual(2, response.metadata.Length);
+			Assert.AreEqual(3, response.metadata.Length);
 			Assert.AreEqual(null, response.links);
 			Assert.AreEqual(1, response.transaction_history.Length);
@@ -81,11 +81,11 @@ namespace MonoTests.KnowledgeTree
 			fs[0].fieldset = "General information";
 			fs[0].fields = new kt_metadata_field[3];
 			fs[0].fields[0] = new kt_metadata_field();
-			fs[0].fields[0].name = "Document Author";
-			fs[0].fields[0].value = "Joe Soap";
+			fs[0].fields[0].name = "Category";
+			fs[0].fields[0].value = "Technical";
 			fs[0].fields[1] = new kt_metadata_field();
-			fs[0].fields[1].name = "Category";
-			fs[0].fields[1].value = "Technical";
+			fs[0].fields[1].name = "Document Author";
+			fs[0].fields[1].value = "Joe Soap";
 			fs[0].fields[2] = new kt_metadata_field();
 			fs[0].fields[2].name = "Media Type";
 			fs[0].fields[2].value = "Text";
@@ -96,11 +96,11 @@ namespace MonoTests.KnowledgeTree
 			Assert.AreEqual(0, update_resp.status_code);
 			Assert.AreEqual("General information", update_resp.metadata[1].fieldset);
-			Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name);
-			Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[0].value);
+			Assert.AreEqual("Category", update_resp.metadata[1].fields[0].name);
+			Assert.AreEqual("Technical", update_resp.metadata[1].fields[0].value);
-			Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name);
-			Assert.AreEqual("Technical", update_resp.metadata[1].fields[1].value);
+			Assert.AreEqual("Document Author", update_resp.metadata[1].fields[1].name);
+			Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[1].value);
 			Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name);
 			Assert.AreEqual("Text", update_resp.metadata[1].fields[2].value);
@@ -131,11 +131,13 @@ namespace MonoTests.KnowledgeTree
 			Assert.AreEqual(0, update_resp.status_code);
 			Assert.AreEqual("General information", update_resp.metadata[1].fieldset);
-			Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name);
-			Assert.AreEqual("Joe \\Soap", update_resp.metadata[1].fields[0].value);
+			Assert.AreEqual("Category", update_resp.metadata[1].fields[0].name);
+			Assert.AreEqual("Tec/hn\\ical/", update_resp.metadata[1].fields[0].value);
+
+
+			Assert.AreEqual("Document Author", update_resp.metadata[1].fields[1].name);
+			Assert.AreEqual("Joe \\Soap", update_resp.metadata[1].fields[1].value);
-			Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name);
-			Assert.AreEqual("Tec/hn\\ical/", update_resp.metadata[1].fields[1].value);
 			Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name);
 			Assert.AreEqual("Text'", update_resp.metadata[1].fields[2].value);
@@ -66,11 +66,11 @@ namespace MonoTests.KnowledgeTree
 			Assert.AreEqual(0, update_resp.status_code);
 			Assert.AreEqual("General information", update_resp.metadata[1].fieldset);
-			Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name);
-			Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[0].value);
+			Assert.AreEqual("Category", update_resp.metadata[1].fields[0].name);
+			Assert.AreEqual("Technical", update_resp.metadata[1].fields[0].value);
-			Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name);
-			Assert.AreEqual("Technical", update_resp.metadata[1].fields[1].value);
+			Assert.AreEqual("Document Author", update_resp.metadata[1].fields[1].name);
+			Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[1].value);
 			Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name);
 			Assert.AreEqual("Text", update_resp.metadata[1].fields[2].value);
@@ -112,11 +112,11 @@ namespace MonoTests.KnowledgeTree
 			Assert.AreEqual(0, update_resp.status_code);
 			Assert.AreEqual("General information", update_resp.metadata[1].fieldset);
-			Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name);
-			Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[0].value);
+			Assert.AreEqual("Category", update_resp.metadata[1].fields[0].name);
+			Assert.AreEqual("Technical", update_resp.metadata[1].fields[0].value);
-			Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name);
-			Assert.AreEqual("Technical", update_resp.metadata[1].fields[1].value);
+			Assert.AreEqual("Document Author", update_resp.metadata[1].fields[1].name);
+			Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[1].value);
 			Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name);
 			Assert.AreEqual("Text", update_resp.metadata[1].fields[2].value);
@@ -167,11 +167,11 @@ namespace MonoTests.KnowledgeTree
 			Assert.AreEqual(0, update_resp.status_code);
 			Assert.AreEqual("General information", update_resp.metadata[1].fieldset);
-			Assert.AreEqual("Document Author", update_resp.metadata[1].fields[0].name);
-			Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[0].value);
+			Assert.AreEqual("Category", update_resp.metadata[1].fields[0].name);
+			Assert.AreEqual("Technical", update_resp.metadata[1].fields[0].value);
-			Assert.AreEqual("Category", update_resp.metadata[1].fields[1].name);
-			Assert.AreEqual("Technical", update_resp.metadata[1].fields[1].value);
+			Assert.AreEqual("Document Author", update_resp.metadata[1].fields[1].name);
+			Assert.AreEqual("Joe Soap", update_resp.metadata[1].fields[1].value);
 			Assert.AreEqual("Media Type", update_resp.metadata[1].fields[2].name);
 			Assert.AreEqual("Text", update_resp.metadata[1].fields[2].value);
-RESULTS=folder.result document_metadata.result authentication.result document_contents.result document_detail.result  document_history.result   document_add.result document_checkout.result  document_links.result document_owner.result document_rename.result  document_workflow.result document_copy.result  document_move.result document_system_metadata.result query.result document_download.result document_type.result document_oem_no.result
+RESULTS=folder.result document_metadata.result authentication.result document_contents.result document_detail.result  document_history.result   document_add.result document_checkout.result  document_links.result document_owner.result document_rename.result  document_copy.result  document_move.result document_system_metadata.result query.result document_download.result document_type.result document_oem_no.result document_workflow.result
 PROXY=KTproxy.cs
 WSDL=ktdms.wsdl
 ROOT_URL=http://ktdms.trunk
@@ -5,32 +5,32 @@
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
  * Copyright (C) 2004 - 2008 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 The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
  * Blake Street, Observatory, 7925 South Africa. 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 
- * copyright notice. 
+ * must display the words "Powered by KnowledgeTree" and retain the original
+ * copyright notice.
  * Contributor( s): ______________________________________
  *
  */
@@ -203,6 +203,121 @@ class KTDocumentAction extends KTStandardDispatcher {
     }
 }
+class JavascriptDocumentAction extends KTDocumentAction
+{
+	/**
+	 * This is an array of js files to be included for this action
+	 *
+	 * @var array
+	 */
+	var $js_paths = array();
+	/**
+	 * This is custom javascript that should be included
+	 *
+	 * @var array
+	 */
+	var $js = array();
+	/**
+	 * Indicates if a custom function should be provided, or if the function is part of an existing js file.
+	 * If true
+	 *
+	 * @var boolean
+	 */
+	var $function_provided_by_action = true;
+
+	/**
+	 * Set the function name if you have a custom name you want to provide.
+	 *
+	 * @var string
+	 */
+	var $function_name = null;
+
+	 function JavascriptDocumentAction($oDocument = null, $oUser = null, $oPlugin = null)
+	 {
+	 	parent::KTDocumentAction($oDocument, $oUser, $oPlugin);
+	 	$this->js_initialise();
+	 }
+
+	function js_initialise()
+	{
+		// this will be overridden
+	}
+
+	function js_include($js)
+	{
+		$this->js[] = $js;
+	}
+
+	function js_include_file($path)
+	{
+		global $AjaxDocumentJSPaths;
+
+		if (!isset($AjaxDocumentJSPaths))
+		{
+			$AjaxDocumentJSPaths = array();
+		}
+
+		if (!in_array($AjaxDocumentJSPaths))
+		{
+			$AjaxDocumentJSPaths[] = $path;
+			$this->js_paths [] = $path;
+		}
+	}
+
+	function customiseInfo($aInfo)
+	{
+		$js = '';
+		foreach($this->js_paths as $path)
+		{
+			$js .= "<script language=\"javascript\" src=\"$path\"></script>\n";
+		}
+
+		$js .= '<script language="javascript">'. "\n";
+		foreach($this->js as $js2)
+		{
+			$js .= $js2 . "\n";
+		}
+
+		$js .= $this->getScript() . '</script>'. "\n";
+
+		$js .= '<div onclick="' . $this->getScriptActivation() . '"><a>' . $this->getDisplayName() . '</a></div>'. "\n";
+
+
+		$aInfo['js'] = $js;
+
+        return $aInfo;
+    }
+
+    function getScript()
+    {
+    	if ($this->function_provided_by_action === false)
+    	{
+    		return '';
+    	}
+    	return "function " . $this->getScriptActivation() . '{'.$this->getFunctionScript().'}';
+    }
+
+	function getFunctionScript()
+	{
+		return 'alert(\''. $this->getDisplayName()  .' not implemented!\');';
+	}
+
+    function getScriptActivation()
+    {
+    	if (!is_null($this->function_name))
+    	{
+    		return $this->function_name;
+    	}
+
+    	global $AjaxDocumentActions;
+    	$class = get_class($this);
+    	return 'js' .  $class. 'Dispatcher()';
+    }
+
+
+
+}
+
 class KTDocumentActionUtil {
     function getDocumentActionInfo($slot = 'documentaction') {
         $oRegistry =& KTActionRegistry::getSingleton();
@@ -5,32 +5,32 @@
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
  * Copyright (C) 2004 - 2008 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 The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
  * Blake Street, Observatory, 7925 South Africa. 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 
- * copyright notice. 
+ * must display the words "Powered by KnowledgeTree" and retain the original
+ * copyright notice.
  * Contributor( s): ______________________________________
  *
  */
@@ -177,6 +177,122 @@ class KTFolderAction extends KTStandardDispatcher {
 }
+class JavascriptFolderAction extends KTFolderAction
+{
+	/**
+	 * This is an array of js files to be included for this action
+	 *
+	 * @var array
+	 */
+	var $js_paths = array();
+	/**
+	 * This is custom javascript that should be included
+	 *
+	 * @var array
+	 */
+	var $js = array();
+	/**
+	 * Indicates if a custom function should be provided, or if the function is part of an existing js file.
+	 * If true
+	 *
+	 * @var boolean
+	 */
+	var $function_provided_by_action = true;
+
+	/**
+	 * Set the function name if you have a custom name you want to provide.
+	 *
+	 * @var string
+	 */
+	var $function_name = null;
+
+	 function JavascriptFolderAction($oFolder = null, $oUser = null, $oPlugin = null)
+	 {
+	 	parent::KTFolderAction($oFolder, $oUser, $oPlugin);
+	 	$this->js_initialise();
+	 }
+
+	function js_initialise()
+	{
+		// this will be overridden
+	}
+
+	function js_include($js)
+	{
+		$this->js[] = $js;
+	}
+
+	function js_include_file($path)
+	{
+		global $AjaxDocumentJSPaths;
+
+		if (!isset($AjaxDocumentJSPaths))
+		{
+			$AjaxDocumentJSPaths = array();
+		}
+
+		if (!in_array($AjaxDocumentJSPaths))
+		{
+			$AjaxDocumentJSPaths[] = $path;
+			$this->js_paths [] = $path;
+		}
+	}
+
+	function customiseInfo($aInfo)
+	{
+		$js = '';
+		foreach($this->js_paths as $path)
+		{
+			$js .= "<script language=\"javascript\" src=\"$path\"></script>\n";
+		}
+
+		$js .= '<script language="javascript">'. "\n";
+		foreach($this->js as $js2)
+		{
+			$js .= $js2 . "\n";
+		}
+
+		$js .= $this->getScript() . '</script>'. "\n";
+
+		$js .= '<div onclick="' . $this->getScriptActivation() . '"><a>' . $this->getDisplayName() . '</a></div>'. "\n";
+
+
+		$aInfo['js'] = $js;
+
+        return $aInfo;
+    }
+
+    function getScript()
+    {
+    	if ($this->function_provided_by_action === false)
+    	{
+    		return '';
+    	}
+    	return "function " . $this->getScriptActivation() . '{'.$this->getFunctionScript().'}';
+    }
+
+	function getFunctionScript()
+	{
+		return 'alert(\''. $this->getDisplayName()  .' not implemented!\');';
+	}
+
+    function getScriptActivation()
+    {
+    	if (!is_null($this->function_name))
+    	{
+    		return $this->function_name;
+    	}
+
+    	global $AjaxDocumentActions;
+    	$class = get_class($this);
+    	return 'js' .  $class. 'Dispatcher()';
+    }
+
+
+
+}
+
+
 class KTFolderActionUtil {
     function getFolderActions() {
         $oRegistry =& KTActionRegistry::getSingleton();
@@ -118,7 +118,14 @@ class Permission {
         if ($iUserID == '') {
             $iUserID = $_SESSION['userID'];
         }
+        if (empty($iUserID)) {
+        	return false;
+        }
         $iUserID = KTUtil::getId($iUserID);
+        if (PEAR::isError($iUserID))
+        {
+        	return false;
+        }
         $query = 'SELECT UGL.group_id
             FROM '.$default->users_groups_table.' AS UGL
@@ -53,8 +53,22 @@ class KTUtil {
 	{
 		global $default;
-		return ($default->sslEnabled ? 'https' : 'http') .'://'.$_SERVER['HTTP_HOST'] . $default->rootUrl;
+		$config = KTConfig::getSingleton();
+		$serverName = $config->get('knowledgeTree/serverName', $_SERVER['HTTP_HOST']);
+		return ($default->sslEnabled ? 'https' : 'http') .'://'.$serverName . $default->rootUrl;
+
+	}
+
+	static function call_page($path)
+	{
+		$kt_url = KTUtil::kt_url();
+
+		$full_url = $kt_url . '/' . $path;
+
+		$ch = curl_init($full_url);
+		curl_exec($ch);
+		curl_close($ch);
 	}
 	static function computePeriod($diff, $suffix = null, $returnArray=false)
+<?php
+
+/**
+ * $Id:$
+ *
+ * KnowledgeTree Open Source Edition
+ * Document Management Made Simple
+ * Copyright (C) 2004 - 2008 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 The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
+ * Blake Street, Observatory, 7925 South Africa. 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): ______________________________________
+ *
+ */
+
+chdir(dirname(__FILE__));
+require_once(realpath('../../config/dmsDefaults.php'));
+
+KTUtil::call_page('search2/indexing/bin/cronIndexer.php');
+
+
+?>
 \ No newline at end of file
+<?php
+
+/**
+ * $Id:$
+ *
+ * KnowledgeTree Open Source Edition
+ * Document Management Made Simple
+ * Copyright (C) 2004 - 2008 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 The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
+ * Blake Street, Observatory, 7925 South Africa. 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): ______________________________________
+ *
+ */
+
+chdir(dirname(__FILE__));
+require_once(realpath('../../config/dmsDefaults.php'));
+
+KTUtil::call_page('search2/indexing/bin/cronMigration.php');
+
+?>
 \ No newline at end of file
+<?php
+
+/**
+ * $Id:$
+ *
+ * KnowledgeTree Open Source Edition
+ * Document Management Made Simple
+ * Copyright (C) 2004 - 2008 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 The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
+ * Blake Street, Observatory, 7925 South Africa. 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): ______________________________________
+ *
+ */
+
+chdir(dirname(__FILE__));
+require_once(realpath('../../config/dmsDefaults.php'));
+
+KTUtil::call_page('search2/indexing/bin/optimise.php');
+
+
+?>
 \ No newline at end of file
@@ -591,22 +591,25 @@ class ValueExpr extends Expr
 	public function getSQL($field, $fieldname, $op, $not=false)
     {
     	$val = $this->getValue();
-    	switch($op)
-        {
-            case ExprOp::LIKE:
-
-                break;
-            case ExprOp::CONTAINS:
-            	$val = "%$val%";
-                break;
-            case ExprOp::STARTS_WITH:
-            	$val = "$val%";
-                break;
-            case ExprOp::ENDS_WITH:
-            	$val = "%$val";
-                break;
-        }
+    	if (strpos($val, '*') !== false || strpos($val, '?') !== false)
+    	{
+			$val = str_replace(array('?','*'), array('%','%'), $val);
+    	}
+    	switch($op)
+    	{
+    		case ExprOp::LIKE:
+    			break;
+    		case ExprOp::CONTAINS:
+    			$val = "%$val%";
+    			break;
+    		case ExprOp::STARTS_WITH:
+    			$val = "$val%";
+    			break;
+    		case ExprOp::ENDS_WITH:
+    			$val = "%$val";
+    			break;
+    	}
     	$val = $field->modifyValue($val);
     	$quote = '';
@@ -158,10 +158,18 @@ class ExprFieldRegistry
     public function resolveMetadataField($fieldset, $field)
     {
+    	if ($fieldset instanceof ValueExpr)
+    	{
+    		$fieldset = $fieldset->getValue();
+    	}
     	if (!array_key_exists($fieldset,$this->metadata))
     	{
     		throw new ResolutionException("Metadata class for fieldset '$fieldset' and field '$field' not found.");
     	}
+    	if ($field instanceof ValueExpr)
+    	{
+    		$field = $field->getValue();
+    	}
     	if (!array_key_exists($field,$this->metadata[$fieldset]))
     	{
     		throw new ResolutionException("Metadata class for fieldset '$fieldset' and field '$field' not found.");
@@ -249,7 +257,7 @@ class ExprFieldRegistry
     private function registerMetdataFields()
     {
 		$sql = "SELECT
-					fs.name as fieldset, f.name as field, fs.id as fsid, f.id as fid
+					fs.name as fieldset, f.name as field, fs.id as fsid, f.id as fid, f.data_type
 				FROM
 					fieldsets fs
 					INNER JOIN document_fields f ON f.parent_fieldset=fs.id
@@ -263,6 +271,7 @@ class ExprFieldRegistry
 			$field = addslashes($record['field']);
 			$fieldsetid = $record['fsid'];
 			$fieldid = $record['fid'];
+			$type = $record['data_type'];
 			$classname = "MetadataField$fieldid";
 			$classdefn = "
@@ -270,7 +279,9 @@ class ExprFieldRegistry
 				{
 					public function __construct()
 					{
-						parent::__construct('$fieldset','$field',$fieldsetid, $fieldid);
+						parent::__construct('$fieldset','$field',$fieldsetid, $fieldid);" .
+
+			 (($type=='INT')?'$this->isValueQuoted(false);':'') . "
 					}
 				}";
 			eval($classdefn);
@@ -43,7 +43,7 @@ class FullPathField extends DBFieldExpr
     public function __construct()
     {
         parent::__construct('full_path', 'documents', _kt('Full Path'));
-        $this->setAlias('Full Path');
+        $this->setAlias('FullPath');
     }
     public function getInputRequirements()
@@ -38,7 +38,6 @@
 class TitleField extends DBFieldExpr
 {
-	public $general_op = ExprOp::CONTAINS;
     public function __construct()
     {
@@ -804,9 +804,9 @@ UNLOCK TABLES;
 LOCK TABLES `scheduler_tasks` WRITE;
 /*!40000 ALTER TABLE `scheduler_tasks` DISABLE KEYS */;
 INSERT INTO `scheduler_tasks` VALUES
-(1,'Indexing','search2/indexing/bin/cronIndexer.php','',0,'1min','2007-10-01',NULL,0,'system'),
-(2,'Index Migration','search2/indexing/bin/cronMigration.php','',0,'5mins','2007-10-01',NULL,0,'system'),
-(3,'Index Optimisation','search2/indexing/bin/optimise.php','',0,'weekly','2007-10-01',NULL,0,'system'),
+(1,'Indexing','search2/bin/cronIndexer.php','',0,'1min','2007-10-01',NULL,0,'system'),
+(2,'Index Migration','search2/bin/cronMigration.php','',0,'5mins','2007-10-01',NULL,0,'system'),
+(3,'Index Optimisation','search2/bin/optimise.php','',0,'weekly','2007-10-01',NULL,0,'system'),
 (4,'Periodic Document Expunge','bin/expungeall.php','',0,'weekly','2007-10-01',NULL,0,'disabled'),
 (5,'Database Maintenance','bin/dbmaint.php','optimize',0,'monthly','2007-10-01',NULL,0,'disabled'),
 (6,'Open Office test','bin/checkopenoffice.php','',0,'1min','2007-10-01',NULL,0,'enabled');
+UPDATE scheduler_tasks SET script_url='search2/bin/cronIndexer.php' WHERE task='Indexing';
+UPDATE scheduler_tasks SET script_url='search2/bin/cronMigration.php' WHERE task='Index Migration';
+UPDATE scheduler_tasks SET script_url='search2/bin/optimise.php' WHERE task='Index Optimisation';
 \ No newline at end of file
@@ -2,6 +2,9 @@
 {foreach item=action from=$context->actions }
 {if $action != null}
 <li {if $action.active}class="active"{/if}>
+{if $action.js}
+	{$action.js}
+{else}
 {if ($action.url)}
 <a href="{$action.url}" {if $action.description}title="{$action.description}"{/if}>
 	{$action.name}
@@ -10,5 +13,6 @@
 	{$action.name}
 {/if}</li>
 {/if}
+{/if}
 {/foreach}
 </ul>
-  <input type="text" name="{$name}" {if $has_id}id="{$id}"{/if} {if $has_value}value="{$value|sanitize_input}"{/if}{if ($options.autocomplete === false)}autocomplete="off"{/if}  {if $options.width}size="{$options.width}"{/if} />
+  <input type="text" name="{$name}" {if $has_id}id="{$id}"{/if} {if $has_value}value="{$value|sanitize_input}"{/if}{if ($options.autocomplete === false)}autocomplete="off"{/if}  {if $options.width}size="{$options.width}"{/if} {if $options.onchange}onchange="{$options.onchange}" {/if}/>