Merged in from DEV trunk...

KTS-1644 "Untranslateable strings in /lib/browse/Criteria.inc" Fixed. Added _kt() so that strings are now translatable. Committed By: Jonathan Byrne Reviewed By: Megan Watson WSA-113 "Implement returning of basic permissions returned by get_listing() and document detail." Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson WSA-113 "Implement returning of basic permissions returned by get_listing() and document detail." Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTS-3136 "Implement Open Search with new search" Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson Version Bump to 3.5.3 beta1 git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8239 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from DEV trunk...
KTS-1644 "Untranslateable strings in /lib/browse/Criteria.inc" Fixed. Added _kt() so that strings are now translatable. Committed By: Jonathan Byrne Reviewed By: Megan Watson WSA-113 "Implement returning of basic permissions returned by get_listing() and document detail." Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson WSA-113 "Implement returning of basic permissions returned by get_listing() and document detail." Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTS-3136 "Implement Open Search with new search" Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson Version Bump to 3.5.3 beta1 git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8239 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent ee2ca5bc
Showing 9 changed files with 91 additions and 21 deletions
docs/VERSION-NAME.txt
docs/VERSION-OSS.txt
docs/VERSION.txt
ktapi/KTAPIDocument.inc.php
ktapi/KTAPIFolder.inc.php
lib/browse/Criteria.inc
lib/util/ktutil.inc
plugins/search2/openSearchDescription.php
templates/kt3/standard_page.smarty
-3.5.2
+3.5.3 beta1
-3.5.2
+3.5.3 beta1
-3.5.2
+3.5.3 beta1
@@ -1443,6 +1443,24 @@ class KTAPI_Document extends KTAPI_FolderItem
 	}
+	function get_permission_string($document)
+	{
+		$perms = 'R';
+		if (Permission::userHasDocumentWritePermission($document))
+		{
+			$perms .= 'W';
+
+			$user_id = $_SESSION['userID'];
+			$co_user_id = $document->getCheckedOutUserID();
+
+			if (!empty($co_user_id) && ($user_id == $co_user_id))
+			{
+				$perms .= 'E';
+			}
+		}
+		return $perms;
+	}
+
 	/**
 	 * This returns detailed information on the document.
 	 *
@@ -1587,7 +1605,7 @@ class KTAPI_Document extends KTAPI_FolderItem
 		$detail['is_immutable'] = (bool) $document->getImmutable();
 		// check permissions
-		$detail['permissions'] = 'n/a';
+		$detail['permissions'] = KTWSAPI_Document::get_permission_string($document);
 		// get workflow name
 		$workflowid = $document->getWorkflowId();
@@ -321,6 +321,16 @@ class KTAPI_Folder extends KTAPI_FolderItem
 		return $user;
 	}
+	function get_permission_string($folder)
+	{
+		$perms = 'R';
+		if (Permission::userHasFolderWritePermission($folder))
+		{
+			$perms .= 'W';
+		}
+		return $perms;
+	}
+
 	function get_listing($depth=1, $what='DF')
 	{
 		if ($depth < 1)
@@ -389,7 +399,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 							'version' => 'n/a',
 							'is_immutable'=> 'n/a',
-							'permissions' => 'n/a',
+							'permissions' => KTWSAPI_Folder::get_permission_string($folder),
 							'workflow'=>'n/a',
 							'workflow_state'=>'n/a',
@@ -523,7 +533,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 							'version' =>  $document->getMajorVersionNumber() . '.' . $document->getMinorVersionNumber(),
 							'is_immutable'=> $document->getImmutable()?'true':'false',
-							'permissions' => 'n/a',
+							'permissions' => KTWSAPI_Document::get_permission_string($document),
 							'workflow'=> $workflow,
 							'workflow_state'=> $state,
@@ -731,16 +731,21 @@ class SizeCriterion extends BrowseCriterion {
 			'M'=>'Megabytes');
     var $aTypeAssocs = array('B' => 1, 'KB' => 1024, 'M' => 1048576);
+    
+    var $aCmps = array();
-    var $aCmps = array('LT'=>'Less than',
-		       'GT'=>'Greater than',
-		       'EQ'=>'Equal to',
-		       'NEQ'=>'Not equal to');
-
-    var $aCmpAssocs = array('LT' => '<', 'GT' => '>', 'EQ' => '=', 'NEQ' => '!=');
+    var $aCmpAssocs = array();
     function SizeCriterion() {
-	$this->sDisplay = _kt('File Size');
+		$this->sDisplay = _kt('File Size');
+		
+		$this->aCmps = array('LT'=>_kt('Less than'),
+		       'GT'=>_kt('Greater than'),
+		       'EQ'=>_kt('Equal to'),
+		       'NEQ'=>_kt('Not equal to'));
+		       
+		$this->aCmpAssocs = array('LT' => '<', 'GT' => '>', 'EQ' => '=', 'NEQ' => '!=');
+		
     }
     function documentDisplay ($oDocument) {
@@ -918,15 +923,18 @@ class TagCloudCriterion extends BrowseCriterion {
 class DateCreatedDeltaCriterion extends DateCreatedCriterion {
     var $sDocumentField = 'created';
     var $sSortField = 'created';
-    var $aTypes = array('MINUTE'=>'Minutes',
-			'HOUR'=>'Hours',
-			'DAY'=>'Days',
-			'MONTH'=>'Months',
-			'YEAR'=>'Years');
+	var $aTypes = array();
     var $sNamespace = 'ktcore.criteria.datecreateddelta';
     function DateCreatedDeltaCriterion() {
-	$this->sDisplay = _kt('Date Created Delta');
+		$this->sDisplay = _kt('Date Created Delta');
+		
+		$this->aTypes = array('MINUTE'=>_kt('Minutes'),
+			'HOUR'=>_kt('Hours'),
+			'DAY'=>_kt('Days'),
+			'MONTH'=>_kt('Months'),
+			'YEAR'=>_kt('Years')
+			);
     }
     function parameterDisplay($aData) {
@@ -951,7 +959,7 @@ class DateCreatedDeltaCriterion extends DateCreatedCriterion {
         $sToRender = $this->getNotWidget($aPreValue);
-	$sToRender .= '<input name="'.$sNumWidget.'" value="'.$aPreValue[$sNumWidget].'"/>'.$sSelect.' ago';
+	$sToRender .= '<input name="'.$sNumWidget.'" value="'.$aPreValue[$sNumWidget].'"/>'.$sSelect._kt(' ago');
         return $sToRender;
     }
@@ -49,6 +49,14 @@ class KTUtil {
     const TB = 1099511627776;
     const PB = 1125899906842624;
+    static function kt_url()
+	{
+		global $default;
+
+		return ($default->sslEnabled ? 'https' : 'http') .'://'.$_SERVER['HTTP_HOST'] . $default->rootUrl;
+
+	}
+
 	static function computePeriod($diff, $suffix = null, $returnArray=false)
 	{
 		if (is_null($suffix))
@@ -229,7 +237,7 @@ class KTUtil {
         if (!is_array($aArray)) {
             $aArray = (array) $aArray;
         }
-        
+
         if ($aArray !== 0 && $aArray !== '0' && empty($aArray)) {
             return $mDefault;
         }
+<?php
+
+require_once('../../config/dmsDefaults.php');
+
+//header('Content-Type: text/xml');
+
+$url = KTUtil::kt_url();
+
+$search_url = $url . "/search2.php?action=process&amp;txtQuery=GeneralText+contains+%22{searchTerms}%22";
+
+$xml .= "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
+
+$xml = "<OpenSearchDescription xmlns=\"http://a9.com/-/spec/opensearch/1.1/\">\r\n";
+$xml .= "<ShortName>KnowledgeTree " ._kt('Quick Search') . "</ShortName>\r\n";
+$xml .= "<Description>" . _kt('Search metadata and content on KnowledgeTree') . "</Description>\r\n";
+$xml .= "<Image width=\"16\" height=\"16\" type=\"image/x-icon\">$url/resources/favicon.ico</Image>\r\n";
+$xml .= "<Url type=\"text/html\" template=\"$search_url\"/>\r\n";
+$xml .= "<OutputEncoding>UTF-8</OutputEncoding>\n";
+$xml .= "<InputEncoding>UTF-8</InputEncoding>\n";
+$xml .= "</OpenSearchDescription>";
+
+print $xml;
+
+?>
 \ No newline at end of file
@@ -20,6 +20,8 @@
     <link rel="icon" href="{$rootUrl}/resources/favicon.ico" type="image/x-icon">
     <link rel="shortcut icon" href="{$rootUrl}/resources/favicon.ico" type="image/x-icon">
+    <link rel="search" type="application/opensearchdescription+xml" title="KnowledgeTree Quick Search" href="{$rootUrl}/plugins/search2/openSearchDescription.php">
+
 {if $refreshTimeout}
        <meta http-equiv="refresh" content="{$refreshTimeout}" />