Merge branch 'edge'

Conflicts: ktapi/KTAPIDocument.inc.php ktapi/KTAPIFolder.inc.php

Merge branch 'edge'
Conflicts: ktapi/KTAPIDocument.inc.php ktapi/KTAPIFolder.inc.php
Megan Watson
2 parents 379c1a11 ae916961
Showing 957 changed files with 44033 additions and 15937 deletions
.gitattributes
about.php
action.php
admin.php
bin/.htaccess
bin/automated_upgrade.php
bin/checkopenoffice.php
bin/cleanup.php
bin/expungeall.php
bin/md5_validation.php
bin/recreateIndexes.php
bin/scheduler.php
bin/storageverification.php
bin/system_info.php
bin/upgrade/pear-upgrade.bat
bin/upgrade/pre-upgrade-3.0b3.php
bin/upgrade/upgrade-to-2.0.6.php
bin/win32/installScheduler.php
bin/win32/schedulerService.php
bin/win32/schedulerServiceStatus.php
+.cvsignore export-ignore
+docs/phpdoc/.empty export-ignore
+thirdparty/simpletest/simpletest/docs/fr/server_stubs_documentation.html export-ignore
+thirdparty/simpletest/simpletest/test/support/collector/collectable.2 export-ignore
+thirdparty/simpletest/simpletest/test/support/collector/collectable.1 export-ignore
+templates/ktcore/forms/widgets/info.smarty export-ignore
+tests/util/ktutil/dataset1/a export-ignore
+tests/util/ktutil/dataset1/f export-ignore
+tests/util/ktutil/dataset1/y export-ignore
+tests/util/ktutil/dataset1/b/q export-ignore
+tests/util/ktutil/dataset1/b/t export-ignore
+tests/util/ktutil/dataset1/b/w export-ignore
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  *  
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  *  
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  *  
  *
  * This program is free software; you can redistribute it and/or modify it under
-Order deny,allow
-Allow from all 
-
-IndexIgnore *.*
+Order allow,deny
+Allow from 127.0.0.1, localhost
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -6,7 +6,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -6,7 +6,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -6,7 +6,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -6,7 +6,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  *
  *
  * This program is free software; you can redistribute it and/or modify it under
-
-; TEST ALL PEAR LIBRARIES BEFORE UPGRADING INTO RELEASE
-
-PATH=%PATH%;c:\php5\PEAR
-
-pear channel-update pear.php.net
-pear config-set php_dir "C:\kt\kt.trunk\thirdparty\pear"
-
-pear config-set preferred_state stable
-
-pear upgrade --alldeps PEAR
-pear upgrade --alldeps Cache_Lite
-pear upgrade --alldeps Config
-pear upgrade --alldeps DB
-pear upgrade --alldeps File
-
-;pear upgrade --alldeps MDB2#mysql
-
-pear upgrade --alldeps Log
-pear upgrade --alldeps PHP_Compat
-
-pear config-set preferred_state beta
-pear upgrade --alldeps File_Gettext
-pear upgrade --alldeps Net_LDAP
-pear upgrade --alldeps SOAP
-pear config-set preferred_state stable
-
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  *  
  *
  * This program is free software; you can redistribute it and/or modify it under
-<?php
-/*
-* Data incoming format: <installation guid>|<user count>|<document count>|<KT version>|<KT edition>|<OS info>
-*/
-
-$data = isset($_REQUEST['system_info']) ? strip_tags($_REQUEST['system_info']) : '';
-
-if(empty($data)){
-    exit(0);
-}
-
-$file = 'var/system_info.txt';
-$fp = fopen($file, 'a');
-fwrite($fp, $data."\n");
-fclose($fp);
-
-exit(0);
-?>
 \ No newline at end of file
@@ -6,7 +6,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  *
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -6,7 +6,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -6,7 +6,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  *  
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -44,7 +44,6 @@ if(!$iu-&gt;isSystemInstalled()) {
 	$iu->redirect("setup/wizard");
 	exit(0);
 }
-
 // main library routines and defaults
 require_once('config/dmsDefaults.php');
  
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  *  
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -8,7 +8,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  *  
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -135,9 +135,25 @@ class DashboardDispatcher extends KTStandardDispatcher {
               'dashlets_left' => $aDashletsLeft,
               'dashlets_right' => $aDashletsRight,
         );
+        
+		// TODO : Is this ok?
+		if(file_exists(KT_DIR.DIRECTORY_SEPARATOR.'var'.DIRECTORY_SEPARATOR.'bin'.DIRECTORY_SEPARATOR."firstlogin.lock")) {
+			$this->runFirstLoginWizard($oTemplate, $aTemplateData);
+		}
+		
         return $oTemplate->render($aTemplateData);
     }
  
+    // 
+    function runFirstLoginWizard($oTemplate, $aTemplateData) {
+    	$this->oPage->requireCSSResource('setup/wizard/resources/css/modal.css');
+    	$this->oPage->requireJSResource('setup/wizard/resources/js/jquery-1.4.2.min.js');
+    	//$this->oPage->requireJSResource('thirdpartyjs/jquery/jquery-1.3.2.min.js');
+    	$this->oPage->requireJSResource('thirdpartyjs/jquery/jquery_noconflict.js');
+    	$this->oPage->requireJSResource('setup/wizard/resources/js/firstlogin.js');
+    	
+    }
+    
     // return some kind of ID for each dashlet
     // currently uses the class name
     function _getDashletId($oDashlet) {
 KnowledgeTree Community Edition
 Document Management Made Simple
-Copyright (C) 2008, 2009 KnowledgeTree Inc.
+Copyright (C) 2008-2010 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
-3.7.0.3
 \ No newline at end of file
+3.7.0.4
 \ No newline at end of file
-3.7.0.3
 \ No newline at end of file
+3.7.0.4
 \ No newline at end of file
-3.7.0.3
 \ No newline at end of file
+3.7.0.4
 \ No newline at end of file
-3.7.0.3
 \ No newline at end of file
+3.7.0.4
 \ No newline at end of file
 <?php
 /*
- * Electronic Signatures ajax functionality
  *
- * 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, 2010 KnowledgeTree Inc.
  *
- * 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.
  *
- * (c) 2008, 2009 KnowledgeTree Inc.
- * All Rights Reserved.
+ * 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.
  *
- * @copyright 2008-2009, KnowledgeTree Inc.
+ * 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,
+ * 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): ______________________________________
+ *
+ */
+
+/**
+ *
+ * @copyright 2008-2010, KnowledgeTree Inc.
  * @license GNU General Public License version 3
  * @author KnowledgeTree Team
  * @package Electronic Signatures
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  *  
  * 
  * This program is free software; you can redistribute it and/or modify it under
 <?php
  
 /**
- * Contains the basic Acl functionality for KTAPI.
+ *
+ * $Id$
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * 
+ * Copyright (C) 2008, 2009, 2010 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
@@ -33,8 +34,13 @@
  * 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): ______________________________________
+ */
+
+/**
+ * Contains the basic Acl functionality for KTAPI.
  *
- * @copyright 2008-2009, KnowledgeTree Inc.
+ * @copyright 2008-2010, KnowledgeTree Inc.
  * @license GNU General Public License version 3
  * @author KnowledgeTree Team
  * @package KTAPI
@@ -814,14 +820,10 @@ abstract class KTAPI_AllocationBase extends KTAPI_Dynamic
  
                 break;
             case 'KTAPI_Document':
-                DocumentTransaction::createFromArray(array(
-                    'folderid' => $objectId,
-                    'comment' => $comment,
-                    'transactionNS' => $namespace,
-                    'userid' => $_SESSION['userID'],
-                    'ip' => Session::getClientIP(),
-                ));
+                $oDocumentTransaction = new DocumentTransaction($object, $comment, $namespace);
+        		$res = $oDocumentTransaction->create();
                 break;
+
             default:
                 throw new Exception('Unexpected type: ' . $type);
         }
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,8 +32,11 @@
  * 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.
- *
- * @copyright 2008-2009, KnowledgeTree Inc.
+ * Contributor( s): ______________________________________
+ */
+
+/**
+ * @copyright 2008-2010, KnowledgeTree Inc.
  * @license GNU General Public License version 3
  * @author KnowledgeTree Team
  * @package KTAPI
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -33,8 +33,11 @@
  * 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.
- *
- * @copyright 2008-2009, KnowledgeTree Inc.
+ * Contributor( s): ______________________________________
+ */
+
+/**
+ * @copyright 2008-2010, KnowledgeTree Inc.
  * @license GNU General Public License version 3
  * @author KnowledgeTree Team
  * @package KTAPI
@@ -4,36 +4,39 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * 
- * 
+ * Copyright (C) 2008, 2009, 2010 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/>.
- * 
- * 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.
- *
- * @copyright 2008-2009, KnowledgeTree Inc.
+ * Contributor( s): ______________________________________
+ */
+
+/**
+ * @copyright 2008-2010, KnowledgeTree Inc.
  * @license GNU General Public License version 3
  * @author KnowledgeTree Team
  * @package KTAPI
@@ -50,6 +53,7 @@ define(&#39;KTAPI_ERROR_SESSION_INVALID&#39;, 			&#39;The session could not be resolved.&#39;);
 define('KTAPI_ERROR_PERMISSION_INVALID', 		'The permission could not be resolved.');
 define('KTAPI_ERROR_FOLDER_INVALID', 			'The folder could not be resolved.');
 define('KTAPI_ERROR_DOCUMENT_INVALID', 			'The document could not be resolved.');
+define('KTAPI_ERROR_VERSION_INVALID', 			'The document version could not be resolved.');
 define('KTAPI_ERROR_USER_INVALID', 				'The user could not be resolved.');
 define('KTAPI_ERROR_KTAPI_INVALID', 			'The ktapi could not be resolved.');
 define('KTAPI_ERROR_INSUFFICIENT_PERMISSIONS', 	'The user does not have sufficient permissions to access the resource.');
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  *
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,8 +32,11 @@
  * 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.
- *
- * @copyright 2008-2009, KnowledgeTree Inc.
+ * Contributor( s): ______________________________________
+ */
+
+/**
+ * @copyright 2008-2010, KnowledgeTree Inc.
  * @license GNU General Public License version 3
  * @author KnowledgeTree Team
  * @package KTAPI
@@ -88,24 +91,30 @@ class KTAPI_Document extends KTAPI_FolderItem
 	}
  
 	/**
-	 * This is used to get a document based on document id.
+	 * This is used to get a document based on document id. Or a version of the document based on the metadata version id
 	 *
 	 * @author KnowledgeTree Team
 	 * @static
 	 * @access public
 	 * @param KTAPI $ktapi The ktapi object
 	 * @param int $documentid The document id
+	 * @param int $iMetadataVersionId Optional. The metadata version id
 	 * @return KTAPI_Document The document object
 	 */
-	function &get(&$ktapi, $documentid)
+	function &get(&$ktapi, $documentid, $iMetadataVersionId = null)
 	{
-		assert(!is_null($ktapi));
-		assert(is_a($ktapi, 'KTAPI'));
-		assert(is_numeric($documentid));
+	    if(is_null($ktapi) || !is_a($ktapi, 'KTAPI')){
+	        return PEAR::raiseError('A valid KTAPI object is needed');
+	    }
  
+	    if(!is_numeric($documentid)){
+	        return PEAR::raiseError('A valid document id is required');
+	    }
+
+	    // ensure documentid is an integer
 		$documentid += 0;
  
-		$document = &Document::get($documentid);
+		$document = &Document::get($documentid, $iMetadataVersionId);
 		if (is_null($document) || PEAR::isError($document))
 		{
 			return new KTAPI_Error(KTAPI_ERROR_DOCUMENT_INVALID,$document );
@@ -134,6 +143,30 @@ class KTAPI_Document extends KTAPI_FolderItem
 	}
  
 	/**
+	 * This is used to get a document based on the document id and the metadata version
+	 *
+	 * @author KnowledgeTree Team
+	 * @static
+	 * @access public
+	 * @param KTAPI $ktapi The ktapi object
+	 * @param int $documentid The document id
+	 * @param int $metadataVersion The metadata version (0,1,2)
+	 * @return KTAPI_Document The document object
+	 */
+	function &get_by_metadata_version(&$ktapi, $documentid, $metadataVersion)
+	{
+	    // get the metadata version id
+	    $iMetadataVersionId = Document::getMetadataVersionIdFromVersion($documentid, $metadataVersion);
+		if (is_null($iMetadataVersionId) || PEAR::isError($iMetadataVersionId))
+		{
+			return new KTAPI_Error(KTAPI_ERROR_VERSION_INVALID, $iMetadataVersionId );
+		}
+
+	    // get the KTAPI_Document object
+	    return self::get($ktapi, $documentid, $iMetadataVersionId);
+	}
+
+	/**
 	 * Checks if a document has been deleted
 	 *
 	 * @author KnowledgeTree Team
@@ -2108,6 +2141,18 @@ class KTAPI_Document extends KTAPI_FolderItem
 	}
  
 	/**
+	 * Gets the content version id of the document
+	 *
+	 * @author KnowledgeTree Team
+	 * @access public
+	 * @return integer the content version id
+	*/
+	function get_content_version()
+	{
+		return $this->document->getContentVersionId();
+	}
+
+	/**
 	 * Gets the url which can be used to download the document.
 	 *
 	 * @param int $version Not implemented. The content version of the document
@@ -2134,13 +2179,14 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 * @author KnowledgeTree Team
 	 * @access public
 	 */
-	function download()
+	function download($version = null)
 	{
 		$storage =& KTStorageManagerUtil::getSingleton();
         $options = array();
  
+        $comment = (!is_null($version)) ? 'Document version '.$version.' downloaded' : 'Document downloaded';
         $oDocumentTransaction = new DocumentTransaction($this->document, 'Document downloaded', 'ktcore.transactions.download', $aOptions);
-        $oDocumentTransaction->create();
+        return $oDocumentTransaction->create();
 	}
  
     /**
@@ -2238,6 +2284,17 @@ class KTAPI_Document extends KTAPI_FolderItem
 	}
  
 	/**
+	 * Get the content version id using the document (content) version - major/minor version
+	 *
+	 * @param string $version
+	 * @return int
+	 */
+	function get_content_version_id_from_version($version)
+	{
+	    return $this->document->getContentVersionIdFromVersion($version);
+	}
+
+	/**
 	 * This expunges a document from the system.
 	 *
 	 * <code>
@@ -2557,10 +2614,13 @@ class KTAPI_Document extends KTAPI_FolderItem
 	 */
 	public function addDocumentToUserHistory()
 	{
-		require_once(KT_DIR . '/plugins/commercial/network/userhistory/UserHistoryActions.php');
-		
-		$docAction = new UserHistoryDocumentAction($this->document, $this->ktapi->get_user());
-		$docAction->_show();
+		if (KTPluginUtil::pluginIsActive('brad.UserHistory.plugin')) {
+			$path = KTPluginUtil::getPluginPath('brad.UserHistory.plugin');
+            require_once($path .  'UserHistoryActions.php');
+
+			$docAction = new UserHistoryDocumentAction($this->document, $this->ktapi->get_user());
+			$docAction->_show();
+		}
 	}
  
     /**
@@ -2575,4 +2635,4 @@ class KTAPI_Document extends KTAPI_FolderItem
     }
 }
  
 -?>
+?>
 \ No newline at end of file
 <?php
 /**
- * Folder API for KnowledgeTree
+ *
+ * $Id$
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  *
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,8 +33,13 @@
  * 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): ______________________________________
+ */
+
+/**
+ * Folder API for KnowledgeTree
  *
- * @copyright 2008-2009, KnowledgeTree Inc.
+ * @copyright 2008-2010, KnowledgeTree Inc.
  * @license GNU General Public License version 3
  * @author KnowledgeTree Team
  * @package KTAPI
@@ -80,9 +86,13 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 */
 	function get(&$ktapi, $folderid)
 	{
-		assert(!is_null($ktapi));
-		assert(is_a($ktapi, 'KTAPI'));
-		assert(is_numeric($folderid));
+	    if(is_null($ktapi) || !is_a($ktapi, 'KTAPI')){
+	        return PEAR::raiseError('A valid KTAPI object is needed');
+	    }
+
+	    if(!is_numeric($folderid)){
+	        return PEAR::raiseError('A valid folder id is required');
+	    }
  
 		$folderid += 0;
  
@@ -288,7 +298,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 * @access public
 	 * @param KTAPI $ktapi
 	 * @param string $foldername
-	 * @param int $folderid
+	 * @param int $folderid The parent folder id
 	 * @return KTAPI_Folder
 	 */
 	function _get_folder_by_name($ktapi, $foldername, $folderid)
@@ -377,7 +387,8 @@ class KTAPI_Folder extends KTAPI_FolderItem
  
 		if (!empty($foldername) && ($foldername != '.'))
 		{
-			$ktapi_folder = $this->get_folder_by_name($foldername);
+			// TODO confirm that this addition of the parent folder id as second parameter is correct and necessary
+			$ktapi_folder = $this->get_folder_by_name($foldername, $this->folderid);
 		}
  
 		$currentFolderName = $this->get_folder_name();
@@ -391,7 +402,8 @@ class KTAPI_Folder extends KTAPI_FolderItem
 			else
 			{
 				$foldername = substr($foldername, strlen($currentFolderName)+1);
-				$ktapi_folder = $this->get_folder_by_name($foldername);
+				// TODO confirm that this addition of the parent folder id as second parameter is correct and necessary
+				$ktapi_folder = $this->get_folder_by_name($foldername, $this->folderid);
 			}
 		}
  
@@ -550,8 +562,8 @@ class KTAPI_Folder extends KTAPI_FolderItem
  
 			foreach ($folder_children as $folder)
 			{
-			
-				if(KTPermissionUtil::userHasPermissionOnItem($user, $folder_permission, $folder) 
+
+				if(KTPermissionUtil::userHasPermissionOnItem($user, $folder_permission, $folder)
 				    /*|| KTPermissionUtil::userHasPermissionOnItem($user, $read_permission, $folder)*/)
 				{
 					if ($depth-1 > 0)
@@ -1594,7 +1606,7 @@ class KTAPI_Folder extends KTAPI_FolderItem
  
         return $_SESSION['errorMessage'];
 	}
-	
+
 	/**
 	 * Method to add a Document to the User's History
 	 *
@@ -1604,11 +1616,25 @@ class KTAPI_Folder extends KTAPI_FolderItem
 	 */
 	public function addFolderToUserHistory()
 	{
-		require_once(KT_DIR . '/plugins/commercial/network/userhistory/UserHistoryActions.php');
-		
-		$docAction = new UserHistoryFolderAction($this->folder, $this->ktapi->get_user());
-		$docAction->_show();
+		if (KTPluginUtil::pluginIsActive('brad.UserHistory.plugin')) {
+			$path = KTPluginUtil::getPluginPath('brad.UserHistory.plugin');
+            require_once($path.'UserHistoryActions.php');
+
+			$folderAction = new UserHistoryFolderAction($this->folder, $this->ktapi->get_user());
+			$folderAction->_show();
+		}
+	}
+
+	/**
+	 * Method to get the Ids of all the Parent Folders
+	 *
+	 * @author KnowledgeTree Team
+	 * @access public
+	 */
+	public function getParentFolderIDs()
+	{
+		return $this->folder->getParentFolderIDs();
 	}
 }
  
 -?>
+?>
 \ No newline at end of file
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,8 +32,11 @@
  * 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.
- *
- * @copyright 2008-2009, KnowledgeTree Inc.
+ * Contributor( s): ______________________________________
+ */
+
+/**
+ * @copyright 2008-2010, KnowledgeTree Inc.
  * @license GNU General Public License version 3
  * @author KnowledgeTree Team
  * @package KTAPI
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -4,7 +4,7 @@
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
-* Copyright (C) 2008,2009 KnowledgeTree Inc.
+* Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
 *
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -32,8 +32,12 @@
 * 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): ______________________________________
+*/
+
+/**
 *
-* @copyright 2008-2009, KnowledgeTree Inc.
+* @copyright 2008-2010, KnowledgeTree Inc.
 * @license GNU General Public License version 3
 * @author KnowledgeTree Team
 * @package KTAPI
@@ -842,11 +846,12 @@ class KTAPI
     * @author KnowledgeTree Team
     * @access public
 	* @param string $foldername The folder name
+	* @param int $parent_id The folder in which to search for the requested child folder
 	* @return object $folder The KTAPI_Folder object
     */
-	public function &get_folder_by_name($foldername, $parentId = 1)
+	public function &get_folder_by_name($foldername, $parent_id = 1)
 	{
-		$folder = KTAPI_Folder::_get_folder_by_name($this, $foldername, $parentId);
+		$folder = KTAPI_Folder::_get_folder_by_name($this, $foldername, $parent_id);
 		return $folder;
 	}
  
@@ -865,6 +870,22 @@ class KTAPI
 	}
  
 	/**
+	* This returns a refererence to a document based on document id.
+	*
+    * @author KnowledgeTree Team
+    * @access public
+	* @param integer $documentid The document id
+	* @param integer $metadataVersion The metadata version of the document (not the id)
+	* @return object $document The KTAPI_Document object
+	*/
+	public function &get_document_by_metadata_version($documentid, $metadataVersion)
+	{
+	    // Get the document using the metadata version
+		$document = KTAPI_Document::get_by_metadata_version($this, $documentid, $metadataVersion);
+		return $document;
+	}
+
+	/**
     * This returns a document type id based on the name or an error object.
 	*
     * @author KnowledgeTree Team
@@ -2027,14 +2048,14 @@ class KTAPI
     function get_folder_shortcuts($folder_id)
     {
         $folder = $this->get_folder_by_id($folder_id);
-        if(PEAR::isError($folder)){
+        if(PEAR::isError($folder)) {
     	    $response['status_code'] = 1;
     	    $response['message']= $folder->getMessage();
     	    return $response;
         }
  
         $shortcuts = $folder->get_shortcuts();
-    	if(PEAR::isError($shortcuts)){
+    	if(PEAR::isError($shortcuts)) {
     	    $response['status_code'] = 1;
     	    $response['message']= $shortcuts->getMessage();
     	    return $response;
@@ -2054,10 +2075,10 @@ class KTAPI
      * @param string $folder_name The name of the folder
      * @return array Response 'results' contains kt_folder_detail | 'message' contains error message on failure
      */
-    function get_folder_detail_by_name($folder_name)
+    function get_folder_detail_by_name($folder_name, $parent_id = 1)
     {
-        $folder = &$this->get_folder_by_name($folder_name);
-        if(PEAR::isError($folder)){
+        $folder = &$this->get_folder_by_name($folder_name, $parent_id);
+        if(PEAR::isError($folder)) {
     	    $response['status_code'] = 1;
     	    $response['message']= $folder->getMessage();
     	    return $response;
@@ -2343,7 +2364,7 @@ class KTAPI
         	$sourceName = $src_folder->get_folder_name();
         	$targetPath = $tgt_folder->get_full_path();
  
-        	$response['results'] = $this->get_folder_detail_by_name($targetPath . '/' . $sourceName);
+        	$response['results'] = $this->get_folder_detail_by_name($targetPath . '/' . $sourceName, $source_id);
         	return $response;
     	}
  
@@ -4714,21 +4735,28 @@ class KTAPI
 	    }
         return $response;
 	}
-
+	
+	/**
+	* Method to check whether content version is the latest for a specific document
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @param string $documentID The id of the document
+	* @param string $contentID The id of the content version to check
+	* @return bool $response The formatted response array
+	*/
 	public function is_latest_version($documentID, $contentID)
-	{
-		$sql = 'SELECT COUNT(document_content_version.id) AS newdocumentcount
-		FROM document_content_version
-		WHERE document_content_version.document_id ="'.$documentID.'" AND
-		document_content_version.id > "'.$contentID.'"';
+	{		
+		$document = $this->get_document_by_id($documentID);
  
-		$row = DBUtil::getOneResult($sql);
- 		$row = (int)$row['newdocumentcount'];
+ 		$maxcontentID = $document->get_content_version();
  
-		if ($row > 0) {
+		if ($maxcontentID > $contentID) {
 			$response['is_latest'] = 'FALSE';
+			$response['max_contentID'] = $maxcontentID;
 		} else {
 			$response['is_latest'] = 'TRUE';
+			$response['max_contentID'] = $contentID;
 		}
  
 		$response['status_code'] = 0;
@@ -4811,6 +4839,58 @@ class KTAPI
  
         return $response;
     }
+	
+	/**
+	 * Method to get the Recently Viewed Documents
+	 *
+	 * @author KnowledgeTree Team
+	 * @access public
+	 */
+	public function getRecentlyViewedDocuments()
+	{
+		if (KTPluginUtil::pluginIsActive('brad.UserHistory.plugin')) {
+			$path = KTPluginUtil::getPluginPath('brad.UserHistory.plugin');
+            require_once($path.'UserHistoryActions.php');
+			$user = $this->get_user();
+			
+			if (is_null($user) || PEAR::isError($user))
+			{
+				$result =  new PEAR_Error(KTAPI_ERROR_USER_INVALID);
+				return $result;
+			}
+			
+			return UserHistoryDocumentEntry::getByUser($user);
+			
+		} else {
+			return array();
+		}
+	}
+	
+	/**
+	 * Method to get the Recently Viewed Folders
+	 *
+	 * @author KnowledgeTree Team
+	 * @access public
+	 */
+	public function getRecentlyViewedFolders()
+	{
+		if (KTPluginUtil::pluginIsActive('brad.UserHistory.plugin')) {
+			$path = KTPluginUtil::getPluginPath('brad.UserHistory.plugin');
+            require_once($path.'UserHistoryActions.php');
+			$user = $this->get_user();
+			
+			if (is_null($user) || PEAR::isError($user))
+			{
+				$result =  new PEAR_Error(KTAPI_ERROR_USER_INVALID);
+				return $result;
+			}
+			
+			return UserHistoryFolderEntry::getByUser($user);
+			
+		} else {
+			return array();
+		}
+	}
 }
  
  
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -8,8 +8,8 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * 
+ * Copyright (C) 2008, 2009, 2010 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
@@ -76,44 +76,41 @@ class KTDownloadManager
 	{
 		$this->session = $session;
 	}
-	
+
 	/**
 	 * This returns
 	 *
 	 * @access public
 	 * @param KTAPI_Document $document
+	 * @param int $content_version_id Optional. The id of the requested content version
 	 * @return string
 	 */
-	function allow_download($document, $content_version = null, $multipart = false) {
+	function allow_download($document, $content_version_id = null, $multipart = false) {
 		assert ( ! is_null ( $document ) );
-		
-		$content_version = 0;
+
 		$filesize = 0;
-		
+
 		if ($document instanceof KTAPI_Document) {
 			$doc_id = $document->documentid;
-			$content_version = $document->document->getContentVersionId ();
+			//$content_version_id = (is_numeric($content_version_id)) ? $content_version_id : $document->document->getContentVersionId();
 			$filesize = $document->document->getFileSize ();
 		} else if ($document instanceof Document || $document instanceof DocumentProxy) {
 			$doc_id = $document->getId ();
-			$content_version = $document->getContentVersionId ();
+			//$content_version_id = (is_numeric($content_version_id)) ? $content_version_id : $document->getContentVersionId();
 			$filesize = $document->getFileSize ();
 		} else if (is_numeric ( $document )) {
 			$doc_id = $document;
 		} else
 			die ( 'gracefully' );
-			
-		//assert(is_a($document, 'KTAPI_Document'));
-		
-
-		$hash = sha1 ( "$doc_id $this->session $this->random" );
-		
-		$id = DBUtil::autoInsert ( 'download_files', array ('document_id' => $doc_id, 'session' => $this->session, 'download_date' => date ( 'Y-m-d H:i:s' ), 'content_version' => $content_version, 'filesize' => $filesize, 'hash' => $hash ), array ('noid' => true ) );
-		
-		return $multipart?$this->build_multipart_url( $hash, $doc_id ):$this->build_url ( $hash, $doc_id );
+
+		$hash = sha1 ( "$doc_id $content_version_id $this->session $this->random" );
+
+		$id = DBUtil::autoInsert ( 'download_files', array ('document_id' => $doc_id, 'session' => $this->session, 'download_date' => date ( 'Y-m-d H:i:s' ), 'content_version' => $content_version_id, 'filesize' => $filesize, 'hash' => $hash ), array ('noid' => true ) );
+
+		return $multipart ? $this->build_multipart_url( $hash, $doc_id ) : $this->build_url ( $hash, $doc_id );
 	}
-	
-	
+
+
 	/**
 	 * This returns the url used to download a document.
 	 *
@@ -125,21 +122,24 @@ class KTDownloadManager
 	function build_url($hash, $documentid) {
 		return $this->download_url . "?code=$hash&d=$documentid&u=$this->session";
 	}
-	
+
 	function build_multipart_url($hash, $documentId) {
-//		return '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@';
 		return $this->multipart_download_url . "?code=$hash&d=$documentId&u=$this->session";
 	}
  
-
 	/**
 	 * This starts a download.
 	 *
 	 * @access public
+	 *
+	 * @param int $document_id
+	 * @param string $hash
+	 * @param string $apptype
+	 * @return mixed
 	 */
-	function download($document_id, $hash, $version = null, $apptype = 'ws')
+	function download($document_id, $hash, $apptype = 'ws')
 	{
-		$sql = "SELECT 1 FROM download_files WHERE hash=? AND session=? AND document_id=?";
+		$sql = "SELECT content_version FROM download_files WHERE hash=? AND session=? AND document_id=?";
 		$rows = DBUtil::getResultArray(array($sql, array($hash, $this->session, $document_id)));
 		if (PEAR::isError($rows))
 		{
@@ -151,11 +151,14 @@ class KTDownloadManager
 			return new PEAR_Error('Invalid session.');
 		}
  
+		// Get the content version id
+		$content_version_id = $rows[0]['content_version'];
+
 		// If document is being downloaded by an external user bypass the session checking
 		$check = strstr($this->session, 'ktext_'.$document_id);
 		if($check == 0 && $check !== false){
 		    // Use external download function
-		    return $this->download_ext($document_id, $hash, $version = null);
+		    return $this->download_ext($document_id, $hash, $content_version_id);
 		}
  
 		$storage =& KTStorageManagerUtil::getSingleton();
@@ -173,11 +176,9 @@ class KTDownloadManager
         	return $document;
         }
  
-        if (!empty($version))
+        if (!empty($content_version_id))
         {
-            $version = KTDocumentContentVersion::get($version);
-
-            $res = $storage->downloadVersion($document->document, $version);
+            $res = $storage->downloadVersion($document->document, $content_version_id);
         }
         else
         {
@@ -193,8 +194,8 @@ class KTDownloadManager
  
         return true;
 	}
-	
-	function download_ext($document_id, $hash, $version = null)
+
+	function download_ext($document_id, $hash, $content_version_id = null)
 	{
 	    $storage =& KTStorageManagerUtil::getSingleton();
 	    $document = Document::get($document_id);
@@ -203,11 +204,9 @@ class KTDownloadManager
 	        return $document;
 	    }
  
-	    if (!empty($version))
+	    if (!empty($content_version_id))
 	    {
-	        $version = KTDocumentContentVersion::get($version);
-
-	        $res = $storage->downloadVersion($document, $version);
+	        $res = $storage->downloadVersion($document, $content_version_id);
 	    }
 	    else
 	    {
@@ -237,4 +236,4 @@ class KTDownloadManager
 		DBUtil::runQuery($sql);
 	}
 }
 -?>
+?>
 \ No newline at end of file
@@ -8,7 +8,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  *
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -6,8 +6,8 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * 
+ * Copyright (C) 2008, 2009, 2010 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
@@ -73,7 +73,7 @@ require_once(&#39;KTDownloadManager.inc.php&#39;);
 $download_manager = new KTDownloadManager();
 $download_manager->set_session($session);
  
-$response = $download_manager->download($document_id, $hash, null, $apptype);
+$response = $download_manager->download($document_id, $hash, $apptype);
 if (PEAR::isError($response))
 {
 	$msg = urlencode($response->getMessage());
@@ -8,7 +8,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -8,7 +8,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -8,7 +8,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  *
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -8,7 +8,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -8,7 +8,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  *
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -60,8 +60,6 @@ if (defined(&#39;HAS_SEARCH_FUNCTIONALITY&#39;))
 	require_once(KT_DIR . '/search2/search/search.inc.php');
 }
  
-// TODO: allow downloading of metadata versions
-// TODO: allow downloading of document versions
 // TODO: chunking search results
 // TODO: add basic permissions management - add permissions to folder based on user/groups
 // TODO: refactor!!! download manager, split this file into a few smaller ones, etc
@@ -72,7 +70,7 @@ if (defined(&#39;HAS_SEARCH_FUNCTIONALITY&#39;))
 // TODO: ktwsapi/php must be made compatible with v2/v3
 // TODO: subscriptions/notifications
  
-// NOTE: some features are not implemented yet. most expected for v3. e.g. oem_document_no, custom_document_no, download($version)., get_metadata($version)
+// NOTE: some features are not implemented yet. most expected for v3. e.g. oem_document_no, custom_document_no
  
 // Status Codes as defined in the specification.
  
@@ -100,19 +98,19 @@ if (!defined(&#39;LATEST_WEBSERVICE_VERSION&#39;))
 	define('LATEST_WEBSERVICE_VERSION', 2);
 }
  
-	function bool2str($bool)
+function bool2str($bool)
+{
+	if (is_bool($bool))
 	{
-		if (is_bool($bool))
-		{
-			return $bool?'true':'false';
-		}
-		if (is_numeric($bool))
-		{
-			return ($bool+0)?'true':'false';
-		}
-		// assume str
-		return (strtolower($bool) == 'true')?'true':'false';
+		return $bool?'true':'false';
+	}
+	if (is_numeric($bool))
+	{
+		return ($bool+0)?'true':'false';
 	}
+	// assume str
+	return (strtolower($bool) == 'true')?'true':'false';
+}
  
 class KTWebService
 {
@@ -769,13 +767,17 @@ class KTWebService
  
          // get_folder_detail_by_name
          $this->__dispatch_map['get_folder_detail_by_name'] =
-            array('in' => array('session_id' => 'string', 'folder_name' => 'string' ),
+            array('in' => array('session_id' => 'string', 'folder_name' => 'string'),
              'out' => array('return' => "{urn:$this->namespace}kt_folder_detail"),
             );
  
          if ($this->version >=3)
          {
-         	 $this->__dispatch_map['get_folder_detail_by_name']['in'] = array('session_id' => 'string', 'folder_id' => 'int', 'create'=>'boolean' );
+             // NOTE that there was a bug: folder_id should be folder_name and be of type int - this is fixed in the second version below
+             //      additionally the function has no "create" parameter
+         	 //$this->__dispatch_map['get_folder_detail_by_name']['in'] = array('session_id' => 'string', 'folder_id' => 'int', 'create'=>'boolean' );
+             // now
+         	 $this->__dispatch_map['get_folder_detail_by_name']['in'] = array('session_id' => 'string', 'folder_name' => 'string', 'parent_id'=>'int' );
          }
  
          // get_folder_contents
@@ -1521,22 +1523,23 @@ class KTWebService
      *
      * @param string $session_id
      * @param string $folder_name
+     * @param integer $parent_id The parent folder in which to look for the named folder
      * @return kt_folder_detail. status_code can be KTWS_ERR_INVALID_SESSION, KTWS_ERR_INVALID_FOLDER, or KTWS_SUCCESS.
      */
-    function get_folder_detail_by_name($session_id, $folder_name)
+    function get_folder_detail_by_name($session_id, $folder_name, $parent_id = 1)
     {
-    	$this->debug("get_folder_detail_by_name('$session_id','$folder_name')");
+    	$this->debug("get_folder_detail_by_name('$session_id','$folder_name','$parent_id')");
     	$kt = &$this->get_ktapi($session_id);
     	if (is_array($kt))
     	{
     		return new SOAP_Value('return',"{urn:$this->namespace}kt_folder_detail", $kt);
     	}
  
-    	$folder = &$kt->get_folder_by_name($folder_name);
+    	$folder = &$kt->get_folder_by_name($folder_name, $parent_id);
     	if (PEAR::isError($folder))
     	{
     		$response = KTWebService::_status(KTWS_ERR_INVALID_FOLDER,$folder);
-    		$this->debug("get_folder_detail_by_name - cannot get folder $folder_name - "  . $folder->getMessage(), $session_id);
+    		$this->debug("get_folder_detail_by_name - cannot get folder $folder_name (looking in folder $parent_id) - "  . $folder->getMessage(), $session_id);
     		return new SOAP_Value('return',"{urn:$this->namespace}kt_folder_detail", $response);
     	}
  
@@ -1897,11 +1900,10 @@ class KTWebService
  
     	if ($this->version >=2)
     	{
-
 	    	$sourceName = $src_folder->get_folder_name();
 	    	$targetPath = $tgt_folder->get_full_path();
  
-	    	$response = $this->get_folder_detail_by_name($session_id, $targetPath . '/' . $sourceName);
+	    	$response = $this->get_folder_detail_by_name($session_id, $targetPath . '/' . $sourceName, $source_id);
  
     		return $response;
     	}
@@ -2940,12 +2942,13 @@ class KTWebService
      *
      * @param string $session_id
      * @param int $document_id
+     * @param string $version The document (content) version - "major version" . "minor version"
  
      * @return kt_response. status_code can be KTWS_ERR_INVALID_SESSION, KTWS_ERR_INVALID_DOCUMENT or KTWS_SUCCESS
      */
     function download_document($session_id, $document_id, $version=null)
     {
-    	$this->debug("download_document('$session_id',$document_id)");
+    	$this->debug("download_document('$session_id',$document_id, '$version')");
  
     	$kt = &$this->get_ktapi($session_id );
     	if (is_array($kt))
@@ -2964,11 +2967,23 @@ class KTWebService
     		return new SOAP_Value('return',"{urn:$this->namespace}kt_response", $response);
     	}
  
-    	$result = $document->download();
+    	$content_version_id = null;
+    	if(!empty($version)){
+    		// Get the content version id for the given document version
+    		$content_version_id = $document->get_content_version_id_from_version($version);
+    		if (PEAR::isError($content_version_id))
+        	{
+        		$response['message'] = $result->getMessage();
+        		$this->debug("download_document - cannot get version $version - "  . $result->getMessage(), $session_id);
+        		return new SOAP_Value('return',"{urn:$this->namespace}kt_response", $response);
+        	}
+    	}
+
+    	$result = $document->download($version);
 		if (PEAR::isError($result))
     	{
     		$response['message'] = $result->getMessage();
-    		$this->debug("download_document - cannot download - "  . $result->getMessage(), $session_id);
+    		$this->debug("download_document - cannot download (version $version) - "  . $result->getMessage(), $session_id);
     		return new SOAP_Value('return',"{urn:$this->namespace}kt_response", $response);
     	}
  
@@ -2976,7 +2991,7 @@ class KTWebService
     	$download_manager = new KTDownloadManager();
     	$download_manager->set_session($session->session);
     	$download_manager->cleanup();
-    	$url = $download_manager->allow_download($document);
+    	$url = $download_manager->allow_download($document, $content_version_id);
  
     	$response['status_code'] = KTWS_SUCCESS;
 		$response['message'] = $url;
@@ -3012,7 +3027,19 @@ class KTWebService
     		return new SOAP_Value('return',"{urn:$this->namespace}kt_response", $response);
     	}
  
-    	$result = $document->download();
+    	$content_version_id = null;
+    	if(!empty($version)){
+    		// Get the content version id for the given document version
+    		$content_version_id = $document->get_content_version_id_from_version($version);
+    		if (PEAR::isError($content_version_id))
+        	{
+        		$response['message'] = $result->getMessage();
+        		$this->debug("download_document - cannot get version $version - "  . $result->getMessage(), $session_id);
+        		return new SOAP_Value('return',"{urn:$this->namespace}kt_response", $response);
+        	}
+    	}
+
+    	$result = $document->download($version);
 		if (PEAR::isError($result))
     	{
     		$response['message'] = $result->getMessage();
@@ -3020,24 +3047,33 @@ class KTWebService
     		return new SOAP_Value('return',"{urn:$this->namespace}kt_response", $response);
     	}
  
-    	$content='';
+    	$content = '';
+    	$oStorage =& KTStorageManagerUtil::getSingleton();
  
-    		$document = $document->document;
+    	// for a specified version
+    	if(is_numeric($content_version_id)){
+    	    $filename = $oStorage->temporaryFileForVersion($content_version_id);
  
-    		$oStorage =& KTStorageManagerUtil::getSingleton();
-            $filename = $oStorage->temporaryFile($document);
-
-    		$fp=fopen($filename,'rb');
-    		if ($fp === false)
-    		{
+    	    if(!$filename){
     			$response['message'] = 'The file is not in the storage system. Please contact an administrator!';
-    			$this->debug("download_small_document - cannot write $filename", $session_id);
+    			$this->debug("download_small_document - $filename cannot be found in the storage system", $session_id);
     			return new SOAP_Value('return',"{urn:$this->namespace}kt_response", $response);
-    		}
-    		$content = fread($fp, filesize($filename));
-    		fclose($fp);
-    		$content = base64_encode($content);
+    	    }
+    	}else{
+    	    $document = $document->document;
+    	    $filename = $oStorage->temporaryFile($document);
+    	}
  
+		$fp=fopen($filename,'rb');
+		if ($fp === false)
+		{
+			$response['message'] = 'The file is not in the storage system. Please contact an administrator!';
+			$this->debug("download_small_document - cannot read $filename", $session_id);
+			return new SOAP_Value('return',"{urn:$this->namespace}kt_response", $response);
+		}
+		$content = fread($fp, filesize($filename));
+		fclose($fp);
+		$content = base64_encode($content);
  
     	$response['status_code'] = KTWS_SUCCESS;
 		$response['message'] = $content;
@@ -3739,9 +3775,9 @@ class KTWebService
      * @param int $document_id
      * @return kt_metadata_response
      */
-	function get_document_metadata($session_id,$document_id)
+	function get_document_metadata($session_id, $document_id, $version = null)
 	{
-    	$this->debug("get_document_metadata('$session_id',$document_id)");
+    	$this->debug("get_document_metadata('$session_id',$document_id, $version)");
  
     	$kt = &$this->get_ktapi($session_id );
     	if (is_array($kt))
@@ -3751,7 +3787,12 @@ class KTWebService
  
     	$response = KTWebService::_status(KTWS_ERR_INVALID_DOCUMENT);
  
-    	$document = &$kt->get_document_by_id($document_id);
+    	if(is_numeric($version)){
+            $document = &$kt->get_document_by_metadata_version($document_id, $version);
+    	}else {
+    	    $document = &$kt->get_document_by_id($document_id);
+    	}
+
 		if (PEAR::isError($document))
     	{
     		$response['message'] = $document->getMessage();
@@ -4,8 +4,8 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * John
+ * Copyright (C) 2008, 2009, 2010 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
@@ -5,8 +5,8 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * John
+ * Copyright (C) 2008, 2009, 2010 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
@@ -4,8 +4,8 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * John
+ * Copyright (C) 2008, 2009, 2010 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
@@ -5,8 +5,8 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * John
+ * Copyright (C) 2008, 2009, 2010 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
@@ -5,8 +5,8 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * John
+ * Copyright (C) 2008, 2009, 2010 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
@@ -4,8 +4,8 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * John
+ * Copyright (C) 2008, 2009, 2010 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
@@ -4,8 +4,8 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * John
+ * Copyright (C) 2008, 2009, 2010 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
@@ -6,7 +6,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -6,7 +6,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008,2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,8 +32,12 @@
  * 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): ______________________________________
+ */
+
+/**
  *
- * @copyright 2008-2009, KnowledgeTree Inc.
+ * @copyright 2008-2010, KnowledgeTree Inc.
  * @license GNU General Public License version 3
  * @author KnowledgeTree Team
  * @package KTCMIS
@@ -47,35 +51,35 @@ require_once(CMIS_DIR . &#39;/classes/CMISPropertyCollection.inc.php&#39;);
  */
 class CMISDocumentPropertyCollection extends CMISPropertyCollection {
  
-    static $Name;
-    static $IsImmutable;
-    static $IsLatestVersion;
-    static $IsMajorVersion;
-    static $IsLatestMajorVersion;
-    static $VersionLabel;
-    static $VersionSeriesId;
-    static $IsVersionSeriesCheckedOut;
-    static $VersionSeriesCheckedOutBy;
-    static $VersionSeriesCheckedOutId;
-    static $CheckinComment;
-    static $ContentStreamLength;
-    static $ContentStreamMimeType;
-    static $ContentStreamFilename;
-    static $ContentStreamUri;
+    static $name;
+    static $isImmutable;
+    static $isLatestVersion;
+    static $isMajorVersion;
+    static $isLatestMajorVersion;
+    static $versionLabel;
+    static $versionSeriesId;
+    static $isVersionSeriesCheckedOut;
+    static $versionSeriesCheckedOutBy;
+    static $versionSeriesCheckedOutId;
+    static $checkinComment;
+    static $contentStreamLength;
+    static $contentStreamMimeType;
+    static $contentStreamFilename;
+    static $contentStreamUri;
  
     function __construct()
     {
         parent::__construct();
-        self::$propertyTypes = array_merge(self::$propertyTypes, array('ContentStreamAllowed' => 'propertyString',
-                                     'ContentStreamLength' => 'propertyInteger',
-                                     'ContentStreamMimeType' => 'propertyString',
-                                     'ContentStreamFilename' => 'propertyString',
-                                     'ContentStreamUri' => 'propertyUri',
-                                     'IsLatestVersion' => 'propertyBoolean',
-                                     'IsVersionSeriesCheckedOut' => 'propertyBoolean',
-                                     'VersionSeriesCheckedOutBy' => 'propertyString',
-                                     'VersionSeriesCheckedOutId' => 'propertyId', 
-                                     'VersionLabel' => 'propertyString'));
+        self::$propertyTypes = array_merge(self::$propertyTypes, array('contentStreamAllowed' => 'propertyString',
+                                     'contentStreamLength' => 'propertyInteger',
+                                     'contentStreamMimeType' => 'propertyString',
+                                     'contentStreamFilename' => 'propertyString',
+                                     'contentStreamUri' => 'propertyUri',
+                                     'isLatestVersion' => 'propertyBoolean',
+                                     'isVersionSeriesCheckedOut' => 'propertyBoolean',
+                                     'versionSeriesCheckedOutBy' => 'propertyString',
+                                     'versionSeriesCheckedOutId' => 'propertyId', 
+                                     'versionLabel' => 'propertyString'));
     }
  
 }
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008,2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,8 +32,12 @@
  * 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): ______________________________________
+ */
+
+/**
  *
- * @copyright 2008-2009, KnowledgeTree Inc.
+ * @copyright 2008-2010, KnowledgeTree Inc.
  * @license GNU General Public License version 3
  * @author KnowledgeTree Team
  * @package KTCMIS
@@ -47,9 +51,9 @@ require_once(CMIS_DIR . &#39;/classes/CMISPropertyCollection.inc.php&#39;);
  */
 class CMISFolderPropertyCollection extends CMISPropertyCollection {
  
-    static $Name;
-    static $ParentId;
-    static $AllowedChildObjectTypeIds;
+    static $name;
+    static $parentId;
+    static $allowedChildObjectTypeIds;
  
     function __construct()
     {
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008,2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,30 +32,45 @@
  * 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): ______________________________________
+ */
+
+/**
  *
- * @copyright 2008-2009, KnowledgeTree Inc.
+ * @copyright 2008-2010, KnowledgeTree Inc.
  * @license GNU General Public License version 3
  * @author KnowledgeTree Team
  * @package KTCMIS
  * @version Version 0.1
  */
  
-abstract class CMISObject {
+// NOTE designation "opaque" means the value may not be changed
+
+// TODO consider attributes as a class similar to property definitions, in order to more easily extract without having 
+//      to have attribute specific code
  
-    protected $typeId;
-    protected $queryName;
-    protected $displayName;
-    protected $baseType;
-    protected $baseTypeQueryName;
-    protected $parentId;
-    protected $description;
-    protected $creatable;
-    protected $fileable;
-    protected $queryable;
-    protected $includedInSupertypeQuery;
-    protected $controllable; // NOTE deprecated?  part of policy objects specification, policy objects are indicated as TODO remove
-    protected $contentStreamAllowed = 'notAllowed';
+abstract class CMISObject {
  
+    protected $id; // ID (opaque); identifies the object-type in the repository
+    protected $localName; // String (opaque, optional); local name for object-type - need not be set
+    protected $localNamespace; // String (opaque, optional); optional local namespace for object-type - need not be set
+    // NOTE queryName should not contain characters that negatively interact with BNF grammar
+    protected $queryName; // String (opaque); used for query and filter operations on object-types
+    protected $displayName; // String (optional); used for presentation by application
+    protected $baseId; // Enum; indicates base type
+    protected $parentId; // ID; id of immediate parent type; must be "not set" for a base type (Document, Folder, Relationship, Policy)
+    protected $description; // String (optional); used for presentation by application
+    protected $creatable; // Boolean; indicates whether new objects of this type may be created
+    protected $fileable; // Boolean; indicates whether objects of this type are fileable
+    protected $queryable; // Boolean; indicates whether this object-type can appear inthe FROM clause of a query statement
+    protected $controllablePolicy; // Boolean; indicates whether objects of this type are controllable via policies
+    protected $controllableACL; // Boolean; indicates whether objects of this type are controllable by ACLs
+    protected $fulltextIndexed; // Boolean; indicates whether objects of this type are indexed for full-text search 
+                                //          for querying via the CONTAINS() query predicate
+    protected $includedInSupertypeQuery; // Boolean; indicates whether this type and sub-types appear in a query of this type's ancestor types
+                                         // For example: if Invoice is a sub-type of cmis:document, if this is TRUE on Invoice then for a query 
+                                         // 391 on cmis:document, instances of Invoice will be returned if they match.
+    
     protected $properties; // list of property objects which define the additional properties for this object
  
     // TODO all we have here so far is getAttributes & getProperties
@@ -63,6 +78,9 @@ abstract class CMISObject {
  
     public function __construct()
     {
+        // set properties shared by all objects of this type
+        $this->_setSharedProperties();
+        
 //        $propertyDef = new PropertyDefinition();
 //        $this->properties[] = $propertyDef;
     }
@@ -78,18 +96,21 @@ abstract class CMISObject {
  
         // TODO look at how chemistry does this and implement something similar
         //      for now this is fine as we are just trying to get things up and running :)
-        $attributes['typeId'] = $this->typeId;
+        $attributes['id'] = $this->id;
+        $attributes['localName'] = $this->localName;
+        $attributes['localNamespace'] = $this->localNamespace;
         $attributes['queryName'] = $this->queryName;
         $attributes['displayName'] = $this->displayName;
-        $attributes['baseType'] = $this->baseType;
-        $attributes['baseTypeQueryName'] = $this->baseTypeQueryName;
+        $attributes['baseId'] = $this->baseId;
         $attributes['parentId'] = $this->parentId;
         $attributes['description'] = $this->description;
         $attributes['creatable'] = $this->creatable;
         $attributes['fileable'] = $this->fileable;
         $attributes['queryable'] = $this->queryable;
+        $attributes['controllablePolicy'] = $this->controllablePolicy;
+        $attributes['controllableACL'] = $this->controllableACL;
+        $attributes['fulltextIndexed'] = $this->fulltextIndexed;
         $attributes['includedInSupertypeQuery'] = $this->includedInSupertypeQuery;
-        $attributes['controllable'] = $this->includedInSupertypeQuery;
  
         return $attributes;
     }
@@ -132,15 +153,25 @@ abstract class CMISObject {
         return $this->properties->getValue($property);
     }
  
-    public function reload($documentId)
+    public function reload($objectId)
     {
-        $this->_get($documentId);
+        $this->_get($objectId);
     }
  
-    private function _get($documentId)
+    protected function _get($objectId)
     {
         // override in child classes
     }
+    
+    /**
+     * Sets properties which are shared between all objects of this type
+     */
+    protected function _setSharedProperties()
+    {
+        $this->_setPropertyInternal('objectTypeId', strtolower($this->getAttribute('id')));
+        // Needed to distinguish type
+        $this->_setPropertyInternal('baseTypeId', strtolower($this->getAttribute('id')));
+    }
  
 }
  
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008,2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,8 +32,12 @@
  * 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): ______________________________________
+ */
+
+/**
  *
- * @copyright 2008-2009, KnowledgeTree Inc.
+ * @copyright 2008-2010, KnowledgeTree Inc.
  * @license GNU General Public License version 3
  * @author KnowledgeTree Team
  * @package KTCMIS
@@ -45,41 +49,41 @@
  */
 abstract class CMISPropertyCollection {
  
-    static $ObjectId;
-    static $BaseType;
-    static $Uri;
-    static $ObjectTypeId;
-    static $CreatedBy;
-    static $CreationDate;
-    static $LastModifiedBy;
-    static $LastModificationDate;
-    static $ChangeToken;
+    static $objectId;
+    static $baseTypeId;
+    static $uri;
+    static $objectTypeId;
+    static $createdBy;
+    static $creationDate;
+    static $lastModifiedBy;
+    static $lastModificationDate;
+    static $changeToken;
     // TODO these definitions belong in their own classe definition (see property type definions,) but here will do for now
     static public $propertyTypes;
  
-    function __construct()
+    public function __construct()
     {
-        self::$propertyTypes = array('ObjectId' => 'propertyId',
-                                     'Author' => 'propertyString',
-                                     'BaseType' => 'propertyString',
-                                     'ObjectTypeId' => 'propertyId',
-                                     'CreatedBy' => 'propertyString',
-                                     'CreationDate' => 'propertyDateTime',
-                                     'LastModifiedBy' => 'propertyString',
-                                     'LastModificationDate' => 'propertyDateTime',
-                                     'Name' => 'propertyString',
-                                     'Uri' => 'propertyUri',
-                                     'AllowedChildObjectTypeIds' => 'propertyId',
-                                     'CreatedBy' => 'propertyString',
-                                     'CreationDate' => 'propertyDateTime',
-                                     'ChangeToken' => 'propertyString',
-                                     'ParentId' => 'propertyId');
+        self::$propertyTypes = array('objectId' => 'propertyId',
+                                     'author' => 'propertyString',
+                                     'baseTypeId' => 'propertyId',
+                                     'objectTypeId' => 'propertyId',
+                                     'createdBy' => 'propertyString',
+                                     'creationDate' => 'propertyDateTime',
+                                     'lastModifiedBy' => 'propertyString',
+                                     'lastModificationDate' => 'propertyDateTime',
+                                     'name' => 'propertyString',
+                                     'uri' => 'propertyUri',
+                                     'allowedChildObjectTypeIds' => 'propertyId',
+                                     'createdBy' => 'propertyString',
+                                     'creationDate' => 'propertyDateTime',
+                                     'changeToken' => 'propertyString',
+                                     'parentId' => 'propertyId');
     }
  
     /**
      * Gets the property value.
      */
-    function getValue($field)
+    public function getValue($field)
     {
         return $this->{$field};
     }
@@ -88,12 +92,12 @@ abstract class CMISPropertyCollection {
      * Sets the property value.
      */
     // for connection-tied live objects
-    function setValue($field, $value)
+    public function setValue($field, $value)
     {
         $this->{$field} = $value;
     }
  
-    function getFieldType($field)
+    public function getFieldType($field)
     {
         return $this->propertyTypes[$field];
     }
@@ -5,7 +5,7 @@
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
-* Copyright (C) 2008,2009 KnowledgeTree Inc.
+* Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
 * 
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -33,8 +33,12 @@
 * 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): ______________________________________
+*/
+
+/**
 *
-* @copyright 2008-2009, KnowledgeTree Inc.
+* @copyright 2008-2010, KnowledgeTree Inc.
 * @license GNU General Public License version 3
 * @author KnowledgeTree Team
 * @package KTCMIS
@@ -80,6 +84,7 @@ class CMISRepository {
             foreach($xml->repository as $repository)
             {
                 $currentRepo = $repository->repositoryInfo[0]->repositoryId;
+                // TODO this is no longer correct - is an object of SimpleXMLElement and not a string or int
                 if ((int)$currentRepo == $this->repositoryId)
                 {
                     $config = $repository;
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008,2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -33,8 +33,12 @@
  * 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): ______________________________________
+ */
+
+/**
  *
- * @copyright 2008-2009, KnowledgeTree Inc.
+ * @copyright 2008-2010, KnowledgeTree Inc.
  * @license GNU General Public License version 3
  * @author KnowledgeTree Team
  * @package KTCMIS
@@ -42,20 +46,34 @@
  */
  
 class CMISRepositoryCapabilities {
-
-    // boolean values
-    protected $capabilityMultifiling;
-    protected $capabilityUnfiling;
-    protected $capabilityVersionSpecificFiling;
-    protected $capabilityPWCUpdateable;
-    protected $capabilityPWCSearchable;
-    protected $capabilityAllVersionsSearchable;
-
-    // non-boolean values
-    // TODO these should be defined as classes/enums which will only accept the defined values when set
-    protected $capabilityQuery;
-    protected $capabilityFullText;
-    protected $capabilityJoin;
+    
+    // TODO we need an enum equivalent class which can be used to define acceptable values for all which are not boolean
+    
+    // navigation capabilities
+    protected $capabilityGetDescendants; // true/false
+    protected $capabilityGetFolderTree; // true/false
+    
+    // object capabilities
+    protected $capabilityContentStreamUpdatability; // none/anytime/pwconly
+    protected $capabilityChanges; // none/objectidsonly/properties/all
+    protected $capabilityRenditions; // none/read
+    
+    // filing capabilities
+    protected $capabilityMultifiling; // true/false
+    protected $capabilityUnfiling; // true/false
+    protected $capabilityVersionSpecificFiling; // true/false
+    
+    // versioning capabilities
+    protected $capabilityPWCUpdateable; // true/false
+    protected $capabilityPWCSearchable; // true/false
+    protected $capabilityAllVersionsSearchable; // true/false
+    
+    // query capabilities
+    protected $capabilityQuery; // none/metadataonly/fulltextonly/bothseparate/bothcombined
+    protected $capabilityJoin; // none/inneronly/innerandouter
+    
+    // acl capabilities
+    protected $capabilityACL; // none/discover/manage
  
     /**
      * Set a single field value
@@ -63,90 +81,105 @@ class CMISRepositoryCapabilities {
      * @param string $field
      * @param string/int $value
      * @return a collection of repository entries
+     * 
+     * TODO when we have the enum class in place we will need to check whether the value is of type enum and call its set function
+     *      to ensure that the rules are followed
      */
     function setFieldValue($field, $value)
     {
         $this->{$field} = ($value == 'true' ? true : ($value == 'false' ? false : $value));
     }
-
+    
     /**
      * Gets the value of the capabilityMultifiling property.
      *
      */
-    public function hasCapabilityMultifiling() {
-        return $this->capabilityMultifiling;
+    public function hasCapabilityGetDescendants() {
+        return $this->capabilityGetDescendants;
     }
-
+    
     /**
-     * Sets the value of the capabilityMultifiling property.
+     * Gets the value of the capabilityMultifiling property.
      *
      */
-    public function setCapabilityMultifiling($value) {
-        $this->capabilityMultifiling = $value;
+    public function hasCapabilityGetFolderTree() {
+        return $this->capabilityGetFolderTree;
     }
-
+    
     /**
-     * Gets the value of the capabilityUnfiling property.
+     * Gets the value of the capabilityContentStreamUpdatability property.
+     *
+     * @return
+     *     possible object is
+     *     {@link EnumCapabilityContentStreamUpdatability }
      *
      */
-    public function hasCapabilityUnfiling() {
-        return $this->capabilityUnfiling;
+    public function getCapabilityContentStreamUpdatability() {
+        return $this->capabilityContentStreamUpdatability;
     }
-
+    
     /**
-     * Sets the value of the capabilityUnfiling property.
+     * Gets the value of the capabilityChanges property.
+     *
+     * @return
+     *     possible object is
+     *     {@link EnumCapabilityChanges }
      *
      */
-    public function setCapabilityUnfiling($value) {
-        $this->capabilityUnfiling = $value;
+    public function getCapabilityChanges() {
+        return $this->capabilityChanges;
     }
-
+    
     /**
-     * Gets the value of the capabilityVersionSpecificFiling property.
+     * Gets the value of the capabilityRenditions property.
+     *
+     * @return
+     *     possible object is
+     *     {@link EnumCapabilityRenditions }
      *
      */
-    public function hasCapabilityVersionSpecificFiling() {
-        return $this->capabilityVersionSpecificFiling;
+    public function getCapabilityRenditions() {
+        return $this->capabilityRenditions;
     }
-
+    
     /**
-     * Sets the value of the capabilityVersionSpecificFiling property.
+     * Gets the value of the capabilityMultifiling property.
      *
      */
-    public function setCapabilityVersionSpecificFiling($value) {
-        $this->capabilityVersionSpecificFiling = $value;
+    public function hasCapabilityMultifiling() {
+        return $this->capabilityMultifiling;
     }
  
     /**
-     * Gets the value of the capabilityPWCUpdateable property.
+     * Gets the value of the capabilityUnfiling property.
      *
      */
-    public function hasCapabilityPWCUpdateable() {
-        return $this->capabilityPWCUpdateable;
+    public function hasCapabilityUnfiling() {
+        return $this->capabilityUnfiling;
     }
-
+    
     /**
-     * Sets the value of the capabilityPWCUpdateable property.
+     * Gets the value of the capabilityVersionSpecificFiling property.
      *
      */
-    public function setCapabilityPWCUpdateable($value) {
-        $this->capabilityPWCUpdateable = $value;
+    public function hasCapabilityVersionSpecificFiling() {
+        return $this->capabilityVersionSpecificFiling;
     }
  
     /**
-     * Gets the value of the capabilityPWCSearchable property.
+     * Gets the value of the capabilityPWCUpdateable property.
      *
      */
-    public function hasCapabilityPWCSearchable() {
-        return $this->capabilityPWCSearchable;
+    public function hasCapabilityPWCUpdateable() {
+        return $this->capabilityPWCUpdateable;
     }
  
     /**
-     * Sets the value of the capabilityPWCSearchable property.
+     * Gets the value of the capabilityPWCSearchable property.
      *
      */
-    public function setCapabilityPWCSearchable($value) {
-        $this->capabilityPWCSearchable = $value;
+    public function hasCapabilityPWCSearchable() {
+        return $this->capabilityPWCSearchable;
     }
  
     /**
@@ -156,15 +189,7 @@ class CMISRepositoryCapabilities {
     public function hasCapabilityAllVersionsSearchable() {
         return $this->capabilityAllVersionsSearchable;
     }
-
-    /**
-     * Sets the value of the capabilityAllVersionsSearchable property.
-     *
-     */
-    public function setCapabilityAllVersionsSearchable($value) {
-        $this->capabilityAllVersionsSearchable = $value;
-    }
-
+    
     /**
      * Gets the value of the capabilityQuery property.
      *
@@ -178,18 +203,6 @@ class CMISRepositoryCapabilities {
     }
  
     /**
-     * Sets the value of the capabilityQuery property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link EnumCapabilityQuery }
-     *
-     */
-    public function setCapabilityQuery($value) {
-        $this->capabilityQuery = $value;
-    }
-
-    /**
      * Gets the value of the capabilityJoin property.
      *
      * @return
@@ -202,39 +215,15 @@ class CMISRepositoryCapabilities {
     }
  
     /**
-     * Sets the value of the capabilityJoin property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link EnumCapabilityJoin }
-     *
-     */
-    public function setCapabilityJoin($value) {
-        $this->capabilityJoin = $value;
-    }
-
-    /**
-     * Gets the value of the capabilityFullText property.
+     * Gets the value of the capabilityACL property.
      *
      * @return
      *     possible object is
-     *     {@link EnumCapabilityFullText }
-     *
-     */
-    public function getCapabilityFullText() {
-        return $this->capabilityFullText;
-    }
-
-    /**
-     * Sets the value of the capabilityFullText property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link EnumCapabilityFullText }
+     *     {@link EnumCapabilityACL }
      *
      */
-    public function setCapabilityFullText($value) {
-        $this->capabilityFullText = $value;
+    public function getCapabilityACL() {
+        return $this->capabilityACL;
     }
  
 //    /**
@@ -5,7 +5,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008,2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -33,8 +33,12 @@
  * 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): ______________________________________
+ */
+
+/**
  *
- * @copyright 2008-2009, KnowledgeTree Inc.
+ * @copyright 2008-2010, KnowledgeTree Inc.
  * @license GNU General Public License version 3
  * @author KnowledgeTree Team
  * @package KTCMIS
+<?php
+
+/**
+ * Base class for enumerators
+ */
+
+// TODO enable creation of enum instances on the fly - this will most likely be done in an extending class
+
+abstract class Enum {
+    
+    // actual implementation of these will be in child classes
+    static protected $name;
+    static protected $values;
+    static protected $value;
+    
+    /**
+     * Sets the value of the enumerator
+     *
+     * @param unknown_type $value
+     * @throws invalidArgumentException if the given value does not match one of the allowed values
+     * 
+     * Extending classes may override this function to add their own additional rules for how an enum may be set, 
+     * but they should always call this parent function afterward to invoke the base rule that the value must be
+     * one of the defined values
+     */
+    static protected function set($value)
+    {        
+        if (!in_array($value, self::$values)) {
+            throw new InvalidArgumentException("Unable to set value for $name: Illegal input ($value)");
+        }
+        
+        self::$value = $value;
+    }
+    
+    /**
+     * Returns the currently set value, or null if unset
+     *
+     * @return $value the currently set value
+     */
+    static protected function get()
+    {
+        return self::$value;
+    }
+    
+}
+
+?>
 \ No newline at end of file
@@ -4,8 +4,7 @@
     Document   : repositories.xml
     Created on : 25 May 2009, 10:33 AM
     Author     : KnowledgeTree Team
-    Description:
-        Contains definitions for all repositories accessible via the CMIS API.
+    Description: Contains definitions for all repositories accessible via the CMIS API.
 -->
  
 <!--
@@ -30,15 +29,20 @@
             <cmisVersionsSupported>0.61</cmisVersionsSupported>
         </repositoryInfo>
         <repositoryCapabilities>
+            <capabilityGetDescendants>true</capabilityGetDescendants>
+            <capabilityGetFolderTree>true</capabilityGetFolderTree>
+            <capabilityContentStreamUpdatability>pwconly</capabilityContentStreamUpdatability>
+            <capabilityChanges>none</capabilityChanges>
+            <capabilityRenditions>none</capabilityRenditions>
             <capabilityMultifiling>false</capabilityMultifiling>
             <capabilityUnfiling>false</capabilityUnfiling>
             <capabilityVersionSpecificFiling>false</capabilityVersionSpecificFiling>
             <capabilityPWCUpdateable>false</capabilityPWCUpdateable>
             <capabilityPWCSearchable>false</capabilityPWCSearchable>
             <capabilityAllVersionsSearchable>false</capabilityAllVersionsSearchable>
-            <capabilityQuery>None</capabilityQuery>
-            <capabilityFullText>None</capabilityFullText>
-            <capabilityJoin>NoJoin</capabilityJoin>
+            <capabilityQuery>none</capabilityQuery>
+            <capabilityJoin>none</capabilityJoin>
+            <capabilityACL>none</capabilityACL>
         </repositoryCapabilities>
         <supportedTypes>
             <objectType>Document</objectType>
+<?php
+
+/**
+ * Enumaerator class for capabilityACL
+ */
+
+require_once(realpath(dirname(__FILE__) . '/../../../../config/dmsDefaults.php'));
+
+define ('CMIS_DIR', KT_LIB_DIR . '/api/ktcmis');
+require_once(CMIS_DIR . '/classes/Enum.inc.php');
+
+class EnumCapabilityACL extends Enum {
+    
+    static protected $name = 'capabilityACL';
+    static protected $values = array('none', 'discover', 'manage');
+    
+    /**
+     * Sets the value of the enumerator
+     *
+     * @param unknown_type $value
+     * @throws invalidArgumentException if the given value does not match one of the allowed values
+     *         (exception is thrown in parent class function)
+     */
+    static protected function set($value)
+    {
+        parent::set($value);
+    }
+    
+}
+
+?>
 \ No newline at end of file
+<?php
+
+/**
+ * Enumaerator class for capabilityChanges
+ */
+
+require_once(realpath(dirname(__FILE__) . '/../../../../config/dmsDefaults.php'));
+
+define ('CMIS_DIR', KT_LIB_DIR . '/api/ktcmis');
+require_once(CMIS_DIR . '/classes/Enum.inc.php');
+
+class EnumCapabilityChanges extends Enum {
+    
+    static protected $name = 'capabilityChanges';
+    static protected $values = array('none', 'objectidsonly', 'properties', 'all');
+    
+    /**
+     * Sets the value of the enumerator
+     *
+     * @param unknown_type $value
+     * @throws invalidArgumentException if the given value does not match one of the allowed values
+     *         (exception is thrown in parent class function)
+     */
+    static protected function set($value)
+    {
+        parent::set($value);
+    }
+    
+}
+
+?>
 \ No newline at end of file
+<?php
+
+/**
+ * Enumaerator class for capabilityContentStreamUpdatability
+ */
+
+require_once(realpath(dirname(__FILE__) . '/../../../../config/dmsDefaults.php'));
+
+define ('CMIS_DIR', KT_LIB_DIR . '/api/ktcmis');
+require_once(CMIS_DIR . '/classes/Enum.inc.php');
+
+class EnumCapabilityContentStreamUpdatability extends Enum {
+    
+    static protected $name = 'capabilityContentStreamUpdatability';
+    static protected $values = array('none', 'anytime', 'pwconly');
+    
+    /**
+     * Sets the value of the enumerator
+     *
+     * @param unknown_type $value
+     * @throws invalidArgumentException if the given value does not match one of the allowed values
+     *         (exception is thrown in parent class function)
+     */
+    static protected function set($value)
+    {
+        parent::set($value);
+    }
+    
+}
+
+?>
 \ No newline at end of file
+<?php
+
+/**
+ * Enumaerator class for capabilityJoin
+ */
+
+require_once(realpath(dirname(__FILE__) . '/../../../../config/dmsDefaults.php'));
+
+define ('CMIS_DIR', KT_LIB_DIR . '/api/ktcmis');
+require_once(CMIS_DIR . '/classes/Enum.inc.php');
+
+class EnumCapabilityJoin extends Enum {
+    
+    static protected $name = 'capabilityJoin';
+    static protected $values = array('none', 'inneronly', 'innerandouter');
+    
+    /**
+     * Sets the value of the enumerator
+     *
+     * @param unknown_type $value
+     * @throws invalidArgumentException if the given value does not match one of the allowed values
+     *         (exception is thrown in parent class function)
+     */
+    static protected function set($value)
+    {
+        parent::set($value);
+    }
+    
+}
+
+?>
 \ No newline at end of file
+<?php
+
+/**
+ * Enumaerator class for capabilityQuery
+ */
+
+require_once(realpath(dirname(__FILE__) . '/../../../../config/dmsDefaults.php'));
+
+define ('CMIS_DIR', KT_LIB_DIR . '/api/ktcmis');
+require_once(CMIS_DIR . '/classes/Enum.inc.php');
+
+class EnumCapabilityQuery extends Enum {
+    
+    static protected $name = 'capabilityQuery';
+    static protected $values = array('none', 'metadataonly', 'fulltextonly', 'bothseparate', 'bothcombined');
+    
+    /**
+     * Sets the value of the enumerator
+     *
+     * @param unknown_type $value
+     * @throws invalidArgumentException if the given value does not match one of the allowed values
+     *         (exception is thrown in parent class function)
+     */
+    static protected function set($value)
+    {
+        parent::set($value);
+    }
+    
+}
+
+?>
 \ No newline at end of file
+<?php
+
+/**
+ * Enumaerator class for capabilityRenditions
+ */
+
+require_once(realpath(dirname(__FILE__) . '/../../../../config/dmsDefaults.php'));
+
+define ('CMIS_DIR', KT_LIB_DIR . '/api/ktcmis');
+require_once(CMIS_DIR . '/classes/Enum.inc.php');
+
+class EnumCapabilityRenditions extends Enum {
+    
+    static protected $name = 'capabilityRenditions';
+    static protected $values = array('none', 'objectidsonly', 'properties', 'all');
+    
+    /**
+     * Sets the value of the enumerator
+     *
+     * @param unknown_type $value
+     * @throws invalidArgumentException if the given value does not match one of the allowed values
+     *         (exception is thrown in parent class function)
+     */
+    static protected function set($value)
+    {
+        parent::set($value);
+    }
+    
+}
+
+?>
 \ No newline at end of file
 <?php
  
-class PermissionDeniedException extends Exception {
+class NameConstraintViolationException extends Exception {
  
 }
  
@@ -4,7 +4,7 @@
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
-* Copyright (C) 2008,2009 KnowledgeTree Inc.
+* Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
 * 
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -32,8 +32,12 @@
 * 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): ______________________________________
+*/
+
+/**
 *
-* @copyright 2008-2009, KnowledgeTree Inc.
+* @copyright 2008-2010, KnowledgeTree Inc.
 * @license GNU General Public License version 3
 * @author KnowledgeTree Team
 * @package KTCMIS
@@ -76,19 +80,20 @@ class KTNavigationService extends KTCMISBase {
      *
      * @param string $repositoryId
      * @param string $folderId
-     * @param boolean $includeAllowableActions
-     * @param boolean $includeRelationships
-     * @param string $typeID
      * @param int $depth
      * @param string $filter
+     * @param boolean $includeRelationships
+     * @param string $renditionFilter
+     * @param boolean $includeAllowableAc
      * @return array $descendants
      */
-    public function getDescendants($repositoryId, $folderId, $includeAllowableActions, $includeRelationships,
-                            $depth = 1, $typeID = 'Any', $filter = '')
+    public function getDescendants($repositoryId, $folderId, $depth = 2, $filter = '', $includeRelationships = false, $renditionFilter = '', 
+                                   $includeAllowableActions = false, $includePathSegment = false)
     {
         // TODO optional parameters
-        $descendantsResult = $this->NavigationService->getDescendants($repositoryId, $folderId, $includeAllowableActions,
-                                                                        $includeRelationships, $depth);
+        $descendantsResult = $this->NavigationService->getDescendants($repositoryId, $folderId, $depth, $filter, 
+                                                                      $includeRelationships = false, $renditionFilter = '', 
+                                                                      $includeAllowableActions = false, $includePathSegment = false);
  
         if (PEAR::isError($descendantsResult))
         {
@@ -97,11 +102,11 @@ class KTNavigationService extends KTCMISBase {
                 "message" => "Failed getting descendants for folder"
             );
         }
-
+        
         // format for webservices consumption
         // NOTE this will almost definitely be changing in the future, this is just to get something working
-        $descendants = CMISUtil::decodeObjectHierarchy($descendantsResult, 'child');
-
+        $descendants = CMISUtil::decodeObjectHierarchy($descendantsResult, 'children');
+        
         return array (
             "status_code" => 0,
             "results" => $descendants
@@ -122,7 +127,7 @@ class KTNavigationService extends KTCMISBase {
      * @return array $descendants
      */
     public function getChildren($repositoryId, $folderId, $includeAllowableActions, $includeRelationships,
-                         $typeID = 'Any', $filter = '', $maxItems = 0, $skipCount = 0)
+                                $typeID = 'Any', $filter = '', $maxItems = 0, $skipCount = 0)
     {
         // TODO paging
         // TODO optional parameters
@@ -132,11 +137,11 @@ class KTNavigationService extends KTCMISBase {
         {
             return array(
                 "status_code" => 1,
-                "message" => "Failed getting descendants for folder"
+                "message" => "Failed getting children for folder"
             );
         }
  
-        $children = CMISUtil::decodeObjectHierarchy($childrenResult, 'child');
+        $children = CMISUtil::decodeObjectHierarchy($childrenResult, 'children');
  
         return array(
 			"status_code" => 0,
@@ -149,38 +154,32 @@ class KTNavigationService extends KTCMISBase {
      *
      * @param string $repositoryId
      * @param string $folderId
-     * @param boolean $includeAllowableActions
-     * @param boolean $includeRelationships
-     * @param boolean $returnToRoot
      * @param string $filter
-     * @return ancestry[]
+     * @return parent[]
      */
-    public function getFolderParent($repositoryId, $folderId, $includeAllowableActions, $includeRelationships, $returnToRoot, $filter = '')
+    public function getFolderParent($repositoryId, $folderId, $filter = '')
     {
         try {
-            $ancestryResult = $this->NavigationService->getFolderParent($repositoryId, $folderId, $includeAllowableActions,
-                                                                        $includeRelationships, $returnToRoot);
+            $parent = $this->NavigationService->getFolderParent($repositoryId, $folderId, $filter);
         }
         catch (Exception $e) {
             return array(
                 "status_code" => 1,
-                "message" => "Failed getting ancestry for folder: " . $e->getMessage()
+                "message" => "Failed getting folder parent: " . $e->getMessage()
             );
         }
-
-        if (PEAR::isError($ancestryResult))
+        
+        if (PEAR::isError($parent))
         {
             return array(
                 "status_code" => 1,
-                "message" => "Failed getting ancestry for folder"
+                "message" => "Failed getting folder parent"
             );
         }
-
-        $ancestry = CMISUtil::decodeObjectHierarchy($ancestryResult, 'child');
-
+        
         return array(
 			"status_code" => 0,
-			"results" => $ancestry
+			"results" => CMISUtil::createObjectPropertiesEntry($parent->getProperties())
 		);
     }
  
@@ -196,10 +195,18 @@ class KTNavigationService extends KTCMISBase {
      */
     function getObjectParents($repositoryId, $objectId, $includeAllowableActions, $includeRelationships, $filter = '')
     {
-        $ancestryResult = $this->NavigationService->getObjectParents($repositoryId, $objectId, $includeAllowableActions,
-                                                                     $includeRelationships);
+        try {
+            $ancestry = $this->NavigationService->getObjectParents($repositoryId, $objectId, $includeAllowableActions,
+                                                                   $includeRelationships);
+        }
+        catch (Exception $e) {
+            return array(
+                "status_code" => 1,
+                "message" => $e->getMessage()
+            );
+        }
  
-        if (PEAR::isError($ancestryResult))
+        if (PEAR::isError($ancestry))
         {
             return array(
                 "status_code" => 1,
@@ -207,8 +214,6 @@ class KTNavigationService extends KTCMISBase {
             );
         }
  
-        $ancestry = CMISUtil::decodeObjectHierarchy($ancestryResult, 'child');
-
         return array(
             "status_code" => 0,
             "results" => $ancestry
@@ -220,18 +225,27 @@ class KTNavigationService extends KTCMISBase {
      *
      * @param string $repositoryId
      * @param string $folderId The folder for which checked out docs are requested
-     * @param string $filter
-     * @param boolean $includeAllowableActions
-     * @param boolean $includeRelationships
      * @param int $maxItems
      * @param int $skipCount
-     * @return array $checkedout The collection of checked out documents
+     * @param string $filter
+     * @param enum $includeRelationships
+     * @param boolean $includeAllowableActions
+     * @param string $renditionFilter
+     * @return array $checkedout The collection of checked out document objects
+     *               MUST include (unless not requested) for each object:
+     *               array $properties
+     *               array $relationships
+     *               array $renditions
+     *               $allowableActions
+     * @return boolean $hasMoreItems
+     * @return int $numItems [optional]
      */
-    function getCheckedOutDocs($repositoryId, $includeAllowableActions, $includeRelationships, $folderId = null, $filter = '', 
-                               $maxItems = 0, $skipCount = 0)
+    function getCheckedOutDocs($repositoryId, $folderId = null, $maxItems = 0, $skipCount = 0, $orderBy = '', 
+                               $filter = '', $includeRelationships = null, $includeAllowableActions = false, $renditionFilter = '')
     {
-        $checkedout = $this->NavigationService->getCheckedOutDocs($repositoryId, $includeAllowableActions, $includeRelationships, 
-                                                                  $folderId, $filter, $maxItems, $skipCount);
+        $checkedout = $this->NavigationService->getCheckedOutDocs($repositoryId, $folderId = null, $maxItems = 0, $skipCount = 0, 
+                                                                  $orderBy, $filter, $includeRelationships, $includeAllowableActions, 
+                                                                  $renditionFilter);
  
         if (PEAR::isError($checkedout))
         {
@@ -4,7 +4,7 @@
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
-* Copyright (C) 2008,2009 KnowledgeTree Inc.
+* Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
 * 
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -32,8 +32,12 @@
 * 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): ______________________________________
+*/
+
+/**
 *
-* @copyright 2008-2009, KnowledgeTree Inc.
+* @copyright 2008-2010, KnowledgeTree Inc.
 * @license GNU General Public License version 3
 * @author KnowledgeTree Team
 * @package KTCMIS
@@ -76,17 +80,13 @@ class KTObjectService extends KTCMISBase {
      *
      * @param string $repositoryId
      * @param string $objectId
-     * @param boolean $includeAllowableActions
-     * @param boolean $includeRelationships
-     * @param string $returnVersion
      * @param string $filter
      * @return properties[]
      */
-    public function getProperties($repositoryId, $objectId, $includeAllowableActions, $includeRelationships,
-                           $returnVersion = false, $filter = '')
+    public function getProperties($repositoryId, $objectId, $filter = '')
     {
         try {
-            $propertyCollection = $this->ObjectService->getProperties($repositoryId, $objectId, $includeAllowableActions,
+            $properties = $this->ObjectService->getProperties($repositoryId, $objectId, $includeAllowableActions,
                                                                       $includeRelationships);
         }
         catch (Exception $e)
@@ -97,8 +97,6 @@ class KTObjectService extends KTCMISBase {
             );
         }
  
-        $properties = CMISUtil::createObjectPropertiesEntry($propertyCollection);
-
         return array(
 			"status_code" => 0,
 			"results" => $properties
@@ -109,22 +107,24 @@ class KTObjectService extends KTCMISBase {
      * Creates a new document within the repository
      *
      * @param string $repositoryId The repository to which the document must be added
-     * @param string $typeId Object Type id for the document object being created
      * @param array $properties Array of properties which must be applied to the created document object
      * @param string $folderId The id of the folder which will be the parent of the created document object
      *                         This parameter is optional IF unfilingCapability is supported
-     * @param contentStream $contentStream optional content stream data
-     * @param string $versioningState optional version state value: checkedout/major/minor
+     * @param string $contentStream optional content stream data - expected as a base64 encoded string
+     * @param string $versioningState optional version state value: none/checkedout/major/minor
+     * @param $policies List of policy ids that MUST be applied
+     * @param $addACEs List of ACEs that MUST be added
+     * @param $removeACEs List of ACEs that MUST be removed
      * @return string $objectId The id of the created folder object
      */
-    public function createDocument($repositoryId, $typeId, $properties, $folderId = null,
-                            $contentStream = null, $versioningState = null)
+    public function createDocument($repositoryId, $properties, $folderId = null, $contentStream = null, $versioningState = 'none', 
+                                   $policies = array(), $addACEs = array(), $removeACEs = array())
     {
         $objectId = null;
  
         try {
-            $objectId = $this->ObjectService->createDocument($repositoryId, $typeId, $properties, $folderId,
-                                                             $contentStream, $versioningState);
+            $objectId = $this->ObjectService->createDocument($repositoryId, $properties, $folderId, $contentStream, 
+                                                             $versioningState,$policies, $addACEs, $removeACEs);
         }
         catch (Exception $e)
         {
@@ -144,17 +144,19 @@ class KTObjectService extends KTCMISBase {
      * Creates a new folder within the repository
      *
      * @param string $repositoryId The repository to which the folder must be added
-     * @param string $typeId Object Type id for the folder object being created
      * @param array $properties Array of properties which must be applied to the created folder object
      * @param string $folderId The id of the folder which will be the parent of the created folder object
+     * @param array $policies List of policy ids that MUST be applied
+     * @param $addACEs List of ACEs that MUST be added
+     * @param $removeACEs List of ACEs that MUST be removed
      * @return string $objectId The id of the created folder object
      */
-    public function createFolder($repositoryId, $typeId, $properties, $folderId)
+    public function createFolder($repositoryId, $properties, $folderId, $policies = array(), $addACEs = array(), $removeACEs = array())
     {
         $objectId = null;
  
         try {
-            $objectId = $this->ObjectService->createFolder($repositoryId, $typeId, $properties, $folderId);
+            $objectId = $this->ObjectService->createFolder($repositoryId, $properties, $folderId, $policies, $addACEs, $removeACEs);
         }
         catch (Exception $e)
         {
@@ -175,12 +177,13 @@ class KTObjectService extends KTCMISBase {
      *  
      * @param string $repositoryId
      * @param string $objectId
+     * @param string $streamId [optional for documents] Specifies the rendition to retrieve if not original document
      * @return string $contentStream (binary or text data)
      */
-    function getContentStream($repositoryId, $objectId)
+    function getContentStream($repositoryId, $objectId, $streamId = null)
     {
         try {
-            $contentStream = $this->ObjectService->getContentStream($repositoryId, $objectId);
+            $contentStream = $this->ObjectService->getContentStream($repositoryId, $objectId, $streamId);
         }
         catch (Exception $e)
         {
@@ -199,16 +202,16 @@ class KTObjectService extends KTCMISBase {
     /**
      * Moves a fileable object from one folder to another.
      * 
-     * @param object $repositoryId
-     * @param object $objectId
-     * @param object $changeToken [optional]
-     * @param object $targetFolderId
-     * @param object $sourceFolderId [optional] 
+     * @param string $repositoryId
+     * @param string $objectId
+     * @param string $targetFolderId
+     * @param string $sourceFolderId
+     * @return string $objectId
      */
-    public function moveObject($repositoryId, $objectId, $changeToken = '', $targetFolderId, $sourceFolderId = null)
+    public function moveObject($repositoryId, $objectId, $targetFolderId, $sourceFolderId)
     {
         try {
-            $this->ObjectService->moveObject($repositoryId, $objectId, $changeToken, $targetFolderId, $sourceFolderId);
+            $this->ObjectService->moveObject($repositoryId, $objectId, $targetFolderId, $sourceFolderId);
         }
         catch (Exception $e)
         {
@@ -229,15 +232,13 @@ class KTObjectService extends KTCMISBase {
      * 
      * @param string $repositoryId
      * @param string $objectId
-     * @param string $changeToken [optional]
+     * @param string $allVersions [optional] If true, delete all versions
      * @return array
      */
-    // NOTE Invoking this service method on an object SHALL not delete the entire version series for a Document Object. 
-    //      To delete an entire version series, use the deleteAllVersions() service
-    public function deleteObject($repositoryId, $objectId, $changeToken = null)
+    public function deleteObject($repositoryId, $objectId, $allVersions = true)
     {
         try {
-            $this->ObjectService->deleteObject($repositoryId, $objectId, $changeToken);
+            $this->ObjectService->deleteObject($repositoryId, $objectId, $allVersions);
         }
         catch (Exception $e)
         {
@@ -4,7 +4,7 @@
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
-* Copyright (C) 2008,2009 KnowledgeTree Inc.
+* Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
 * 
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -32,8 +32,12 @@
 * 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): ______________________________________
+*/
+
+/**
 *
-* @copyright 2008-2009, KnowledgeTree Inc.
+* @copyright 2008-2010, KnowledgeTree Inc.
 * @license GNU General Public License version 3
 * @author KnowledgeTree Team
 * @package KTCMIS
@@ -82,7 +86,7 @@ class KTRepositoryService extends KTCMISBase {
         {
             $repositoryList[$count]['repositoryId'] = $repository->getRepositoryId();
             $repositoryList[$count]['repositoryName'] = $repository->getRepositoryName();
-            $repositoryList[$count]['repositoryURI'] = $repository->getRepositoryURI();
+            //$repositoryList[$count]['repositoryURI'] = $repository->getRepositoryURI();
             ++$count;
         }
  
@@ -161,25 +165,14 @@ class KTRepositoryService extends KTCMISBase {
     public function getTypeDefinition($repositoryId, $typeId)
     {
         try {
-            $typeDefinitionResult = $this->RepositoryService->getTypeDefinition($repositoryId, $typeId);
+            $typeDefinition = $this->RepositoryService->getTypeDefinition($repositoryId, $typeId);
         }
-        catch (Exception $e)
-        {
-            return array(
-                "status_code" => 1,
-                "message" => $e->getMessage()
-            );
+        catch (Exception $e) {
+            // propogate upward
+            throw $e;
         }
-
-        // format as array style output
-        // NOTE only concerned with attributes at this time
-        // TODO add support for properties
-        $typeDefinition = $typeDefinitionResult['attributes'];
-
-        return array (
-            "status_code" => 0,
-            "results" => $typeDefinition
-        );
+        
+        return $typeDefinition;
     }
  
 }
@@ -4,7 +4,7 @@
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
-* Copyright (C) 2008,2009 KnowledgeTree Inc.
+* Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
 * 
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -32,8 +32,12 @@
 * 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): ______________________________________
+*/
+
+/**
 *
-* @copyright 2008-2009, KnowledgeTree Inc.
+* @copyright 2008-2010, KnowledgeTree Inc.
 * @license GNU General Public License version 3
 * @author KnowledgeTree Team
 * @package KTCMIS
@@ -44,7 +48,6 @@ require_once(realpath(dirname(__FILE__) . &#39;/../../../config/dmsDefaults.php&#39;));
 require_once(KT_DIR . '/ktapi/ktapi.inc.php');
  
 define ('CMIS_DIR', KT_LIB_DIR . '/api/ktcmis');
-require_once(CMIS_DIR . '/exceptions/PermissionDeniedException.inc.php');
 require_once(CMIS_DIR . '/util/CMISUtil.inc.php');
  
 /**
@@ -4,7 +4,7 @@
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
-* Copyright (C) 2008,2009 KnowledgeTree Inc.
+* Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
 * 
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -32,8 +32,12 @@
 * 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): ______________________________________
+*/
+
+/**
 *
-* @copyright 2008-2009, KnowledgeTree Inc.
+* @copyright 2008-2010, KnowledgeTree Inc.
 * @license GNU General Public License version 3
 * @author KnowledgeTree Team
 * @package KTCMIS
@@ -77,44 +81,17 @@ class KTVersioningService extends KTCMISBase {
     }
  
     /**
-     * Deletes all Document Objects in the specified Version Series, including the Private Working Copy
-     * 
-     * @param string $repositoryId
-     * @param string $versionSeriesId
-     * @return boolean true if successful
-     */
-    public function deleteAllVersions($repositoryId, $versionSeriesId)
-    {
-        try {
-            $result = $this->VersioningService->deleteAllVersions($repositoryId, $versionSeriesId);
-        }
-        catch (Exception $e)
-        {
-            return array(
-                "status_code" => 1,
-                "message" => $e->getMessage()
-            );
-        }
-
-        return array(
-            'status_code' => 0,
-            'results' => $result
-        );
-    }
-    
-    /**
      * Checks out a document and creates the PWC (Private Working Copy) which will represent the checked out document
      * 
      * @param string $repositoryId
-     * @param string $documentId
-     * @param string $changeToken [optional]
+     * @param string $objectId
      * @return array results
      */
     // TODO set up delivery of content stream? or is that up to the CMIS client?
-    public function checkOut($repositoryId, $documentId, $changeToken = '')
+    public function checkOut($repositoryId, $objectId)
     {
         try {
-            $result = $this->VersioningService->checkOut($repositoryId, $documentId, $changeToken);
+            $result = $this->VersioningService->checkOut($repositoryId, $objectId);
         }
         catch (Exception $e)
         {
@@ -134,18 +111,17 @@ class KTVersioningService extends KTCMISBase {
      * Reverses the effect of a checkout: I.E. deletes the PWC (Private Working Copy) and re-sets the status of the document to "not checked out" 
      * 
      * @param string $repositoryId
-     * @param string $documentId
-     * @param string $changeToken [optional]
+     * @param string $objectId
      */
     // TODO exceptions:
     //      •	ConstraintViolationException: The Repository SHALL throw this exception if ANY of the following conditions are met:
     //      o	The Document’s Object-Type definition’s versionable attribute is FALSE. 
     //      •	updateConflictException
     //      •	versioningException
-    public function cancelCheckOut($repositoryId, $documentId, $changeToken = '')
+    public function cancelCheckOut($repositoryId, $objectId)
     {
         try {
-            $result = $this->VersioningService->cancelCheckOut($repositoryId, $documentId, $changeToken);
+            $result = $this->VersioningService->cancelCheckOut($repositoryId, $objectId);
         }
         catch (Exception $e)
         {
@@ -165,18 +141,22 @@ class KTVersioningService extends KTCMISBase {
      * Checks in a checked out document
      * 
      * @param string $repositoryId
-     * @param string $documentId
-     * @param boolean $major
-     * @param string $changeToken [optional]
+     * @param string $objectId
+     * @param boolean $major [optional] defaults to true
      * @param array $properties [optional]
      * @param contentStream $contentStream [optional]
      * @param string $checkinComment [optional]
-     * @return string $documentId
+     * @param array $policies
+     * @param array $addACEs
+     * @param array $removeACEs
+     * @return string $objectId
      */
-    public function checkIn($repositoryId, $documentId, $major, $contentStream = null, $changeToken = '', $properties = array(), $checkinComment = '')
+    public function checkIn($repositoryId, $objectId, $major = true, $properties = array(), $contentStream = null, 
+    						$checkinComment = '', $policies = array(), $addACEs = array(), $removeACEs = array())
     {
         try {
-            $result = $this->VersioningService->checkIn($repositoryId, $documentId, $major, $contentStream, $changeToken, $properties, $checkinComment);
+            $result = $this->VersioningService->checkIn($repositoryId, $objectId, $major, $properties, $contentStream, 
+            											$checkinComment, $policies, $addACEs, $removeACEs);
         }
         catch (Exception $e)
         {
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008,2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,8 +32,12 @@
  * 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): ______________________________________
+ */
+
+/**
  *
- * @copyright 2008-2009, KnowledgeTree Inc.
+ * @copyright 2008-2010, KnowledgeTree Inc.
  * @license GNU General Public License version 3
  * @author KnowledgeTree Team
  * @package KTCMIS
@@ -48,41 +52,34 @@ require_once(CMIS_DIR . &#39;/util/CMISUtil.inc.php&#39;);
  
 class CMISDocumentObject extends CMISObject {
  
-    protected $versionable;
-    private $ktapi;
-    private $uri;
-
+    protected $versionable; // Bolean; indicates whether objects of this type are versionable
+    protected $contentStreamAllowed; // Enum; notallowed, allowed, required
+    protected $ktapi;
+    
     // TODO some of this should probably come from configuration files as it is repository specific
-    function __construct($documentId = null, &$ktapi = null, $uri = null)
+    public function __construct($documentId = null, &$ktapi = null, $uri = null)
     {
         $this->ktapi = $ktapi;
-        // uri to use for document links
-        $this->uri = $uri;
  
         // attributes
-        $this->typeId = 'Document'; // <repository-specific>
-        $this->queryName = 'Document';
-        $this->displayName = ''; // <repository-specific>
-        $this->baseType = 'document';
-        $this->baseTypeQueryName = 'Document';
-        $this->parentId = null; // MUST NOT be set
-        $this->description = ''; // <repository-specific>
-        $this->creatable = ''; // <repository-specific>
-        /*
-         * fileable SHOULD be set as follows:
-         * If the repository does NOT support the “un-filing” capability:
-         * TRUE
-         * If the repository does support the “un-filing” capability:
-         * <repository-specific>, but SHOULD be TRUE
-         */
-        $this->fileable = true; // TODO implement check for whether un-filing is supported
+        $this->id = 'cmis:document';
+        $this->localName = null; // <repository-specific>
+        $this->localNamespace = null; // <repository-specific>
+        $this->queryName = 'cmis:document';
+        $this->displayName = 'Document'; // <repository-specific>
+        $this->baseId = 'cmis:document';
+        $this->parentId = null; // MUST NOT be set for base document object-type
+        $this->description = null; // <repository-specific>
+        $this->creatable = true; // <repository-specific>
+        $this->fileable = true;
         $this->queryable = true; // SHOULD be true
-        $this->includedInSupertypeQuery = true; //
-        // TODO determine what these next 3 should be
-        $this->controllable = false; // <repository-specific>
+        $this->controllablePolicy = false; // <repository-specific>
+        $this->includedInSupertypeQuery = true; // <repository-specific>
         $this->versionable = true; // <repository-specific>
-        $this->contentStreamAllowed = 'required'; // <repository-specific> notAllowed/allowed/required
-
+        $this->contentStreamAllowed = 'required'; // <repository-specific> notallowed/allowed/required
+        $this->controllableACL = false; // <repository-specific>
+        $this->fulltextIndexed = false; // <repository-specific>
+        
         // properties
         $this->properties = new CMISDocumentPropertyCollection();
  
@@ -94,17 +91,18 @@ class CMISDocumentObject extends CMISObject {
         if (!is_null($documentId))
         {
             try {
-                $this->get($documentId);
+                $this->_get($documentId);
             }
             catch (exception $e) {
                 throw new ObjectNotFoundException($e->getMessage());
             }
         }
  
-        // TODO throw exception if unable to create?
+        parent::__construct();
     }
-
-    private function get($documentId)
+    
+    // TODO abstract shared stuff to base class where possible
+    protected function _get($documentId)
     {
         $object = $this->ktapi->get_document_by_id((int)$documentId);
  
@@ -115,7 +113,7 @@ class CMISDocumentObject extends CMISObject {
  
         $objectProperties = $object->get_detail();
  
-        $this->_setPropertyInternal('ObjectId', CMISUtil::encodeObjectId($this->typeId, $objectProperties['document_id']));
+        $this->_setPropertyInternal('objectId', CMISUtil::encodeObjectId($this->id, $objectProperties['document_id']));
         // prevent doubled '/' chars
         $uri = preg_replace_callback('/([^:]\/)\//',
                                      create_function('$matches', 'return $matches[1];'),
@@ -124,33 +122,29 @@ class CMISDocumentObject extends CMISObject {
                                      . $objectProperties['document_id']);
         // NOTE what about instead creating a downloadable version with appropriate link?  see ktapi::download_document
         //      also ktapidocument::get_download_url
-//        $this->_setPropertyInternal('Uri', $uri);
-        $this->_setPropertyInternal('Uri', '');
-        // TODO what is this?  Assuming it is the object type id, and not OUR document type?
-        $this->_setPropertyInternal('ObjectTypeId', $this->getAttribute('typeId'));
-        // Needed to distinguish type
-        $this->_setPropertyInternal('BaseType', strtolower($this->getAttribute('typeId')));
-        $this->_setPropertyInternal('CreatedBy', $objectProperties['created_by']);
-        $this->_setPropertyInternal('CreationDate', $objectProperties['created_date']);
-        $this->_setPropertyInternal('LastModifiedBy', $objectProperties['modified_by']);
-        $this->_setPropertyInternal('LastModificationDate', $objectProperties['modified_date']);
-        $this->_setPropertyInternal('ChangeToken', null);
-        $this->_setPropertyInternal('Name', $objectProperties['title']);
-        $this->_setPropertyInternal('ParentId', $objectProperties['folder_id']);
-        $this->_setPropertyInternal('IsImmutable', $objectProperties['is_immutable']);
+//        $this->_setPropertyInternal('uri', $uri);
+        $this->_setPropertyInternal('uri', '');
+        $this->_setPropertyInternal('createdBy', $objectProperties['created_by']);
+        $this->_setPropertyInternal('creationDate', $objectProperties['created_date']);
+        $this->_setPropertyInternal('lastModifiedBy', $objectProperties['modified_by']);
+        $this->_setPropertyInternal('lastModificationDate', $objectProperties['modified_date']);
+        $this->_setPropertyInternal('changeToken', null);
+        $this->_setPropertyInternal('name', $objectProperties['title']);
+        $this->_setPropertyInternal('parentId', CMISUtil::encodeObjectId(FOLDER, $objectProperties['folder_id']));
+        $this->_setPropertyInternal('isImmutable', $objectProperties['is_immutable']);
         // NOTE if access to older versions is allowed, this will need to be checked, else just set to yes
         //      see ktapi::get_document_version_history
         // NOTE see ktapi::is_latest_version
-        $this->_setPropertyInternal('IsLatestVersion', true);
-        $this->_setPropertyInternal('IsMajorVersion', (strstr($objectProperties['version'], '.') ? false : true));
+        $this->_setPropertyInternal('isLatestVersion', true);
+        $this->_setPropertyInternal('isMajorVersion', (strstr($objectProperties['version'], '.') ? false : true));
         // NOTE if access to older versions is allowed, this will need to be checked, else just set to yes
         //      see ktapi::get_document_version_history
         // NOTE see ktapi::is_latest_version
-        $this->_setPropertyInternal('IsLatestMajorVersion', true);
-        $this->_setPropertyInternal('VersionLabel', $objectProperties['version']);
+        $this->_setPropertyInternal('isLatestMajorVersion', true);
+        $this->_setPropertyInternal('versionLabel', $objectProperties['version']);
         // VersionSeriesId should be the id of the latest version
         // NOTE this may change in the future but is easiest for the current implementation
-        $this->_setPropertyInternal('VersionSeriesId', $objectProperties['version']);
+        $this->_setPropertyInternal('versionSeriesId', $objectProperties['version']);
         if ($objectProperties['checked_out_by'] != 'n/a')
         {
             $checkedOut = true;
@@ -164,18 +158,34 @@ class CMISDocumentObject extends CMISObject {
             $checkedOutBy = null;
             $checkedOutId = null;
         }
-        $this->_setPropertyInternal('IsVersionSeriesCheckedOut', $checkedOut);
-        $this->_setPropertyInternal('VersionSeriesCheckedOutBy', $checkedOutBy);
+        $this->_setPropertyInternal('isVersionSeriesCheckedOut', $checkedOut);
+        $this->_setPropertyInternal('versionSeriesCheckedOutBy', $checkedOutBy);
         // TODO presumably this is the ID of the Private Working Copy created on checkout?
         //      will find out more when we do checkout/checkin
-        $this->_setPropertyInternal('VersionSeriesCheckedOutId', $checkedOutId);
+        $this->_setPropertyInternal('versionSeriesCheckedOutId', $checkedOutId);
         // TODO currently not returned by KnowledgeTree?
-        $this->_setPropertyInternal('CheckinComment', null);
-        $this->_setPropertyInternal('ContentStreamLength', $objectProperties['filesize']);
-        $this->_setPropertyInternal('ContentStreamMimeType', $objectProperties['mime_type']);
-        $this->_setPropertyInternal('ContentStreamFilename', $objectProperties['filename']);
-        $this->_setPropertyInternal('ContentStreamUri', $this->getProperty('ObjectId') . '/' . $objectProperties['filename']);
-        $this->_setPropertyInternal('Author', $objectProperties['created_by']);
+        $this->_setPropertyInternal('checkinComment', null);
+        $this->_setPropertyInternal('contentStreamLength', $objectProperties['filesize']);
+        $this->_setPropertyInternal('contentStreamMimeType', $objectProperties['mime_type']);
+        $this->_setPropertyInternal('contentStreamFilename', $objectProperties['filename']);
+        $this->_setPropertyInternal('contentStreamUri', $this->getProperty('objectId') . '/' . $objectProperties['filename']);
+        $this->_setPropertyInternal('author', $objectProperties['created_by']);
+    }
+    
+    /**
+     * Returns a listing of all attributes in an array
+     *
+     * @return array $attributes
+     */
+    public function getAttributes()
+    {
+        $attributes = parent::getAttributes();
+
+        // add document object-type specific attributes
+        $attributes['versionable'] = $this->versionable;
+        $attributes['contentStreamAllowed'] = $this->contentStreamAllowed;
+
+        return $attributes;
     }
  
 }
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008,2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,8 +32,12 @@
  * 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): ______________________________________
+ */
+
+/**
  *
- * @copyright 2008-2009, KnowledgeTree Inc.
+ * @copyright 2008-2010, KnowledgeTree Inc.
  * @license GNU General Public License version 3
  * @author KnowledgeTree Team
  * @package KTCMIS
@@ -46,42 +50,47 @@ require_once(CMIS_DIR . &#39;/util/CMISUtil.inc.php&#39;);
  
 class CMISFolderObject extends CMISObject {
  
-    private $ktapi;
-    private $uri;
+    protected $ktapi;
  
     public function __construct($folderId = null, &$ktapi = null, $uri = null)
     {
         $this->ktapi = $ktapi;
-        $this->uri = $uri;
  
-        $this->typeId = 'Folder'; // <repository-specific>
-        $this->queryName = 'Folder';
-        $this->displayName = ''; // <repository-specific>
-        $this->baseType = 'folder';
-        $this->baseTypeQueryName = 'Folder';
+        $this->id = 'cmis:folder'; // <repository-specific>
+        $this->localName = null; // <repository-specific>
+        $this->localNamespace = null; // <repository-specific>
+        $this->queryName = 'cmis:folder';
+        $this->displayName = 'Folder'; // <repository-specific>
+        $this->baseId = 'cmis:folder';
         $this->parentId = null; // MUST NOT be set
-        $this->description = ''; // <repository-specific>
-        $this->creatable = ''; // <repository-specific>
+        $this->description = null; // <repository-specific>
+        $this->creatable = true; // <repository-specific>
         $this->fileable = true;
         $this->queryable = true; // SHOULD be true
-        $this->includedInSupertypeQuery = true; //
-        $this->controllable = ''; // <repository-specific>
- 
+        $this->controllablePolicy = false; // <repository-specific>
+        $this->includedInSupertypeQuery = true; // <repository-specific>
+        $this->contentStreamAllowed = 'required'; // <repository-specific> notallowed/allowed/required
+        $this->controllableACL = false; // <repository-specific>
+        $this->fulltextIndexed = false; // <repository-specific>      
+        
         // properties
         $this->properties = new CMISFolderPropertyCollection();
  
         if (!is_null($folderId))
         {
             try {
-                $this->get($folderId);
+                $this->_get($folderId);
             }
             catch (exception $e) {
                 throw new ObjectNotFoundException($e->getMessage());
             }
         }
+        
+        parent::__construct();
     }
  
-    private function get($folderId)
+    // TODO abstract shared stuff to base class where possible
+    protected function _get($folderId)
     {
         $object = $this->ktapi->get_folder_by_id((int)$folderId);
  
@@ -94,7 +103,7 @@ class CMISFolderObject extends CMISObject {
  
         $objectProperties = $object->get_detail();
  
-        $this->_setPropertyInternal('ObjectId', CMISUtil::encodeObjectId($this->typeId, $objectProperties['id']));
+        $this->_setPropertyInternal('objectId', CMISUtil::encodeObjectId($this->id, $objectProperties['id']));
         // prevent doubled '/' chars
         $uri = preg_replace_callback('/([^:]\/)\//',
                                      create_function('$matches', 'return $matches[1];'),
@@ -102,24 +111,28 @@ class CMISFolderObject extends CMISObject {
                                      . '/browse.php?fFolderId='
                                      . $objectProperties['id']);
         // TODO this url is probably incorrect...needs to be checked
-//        $this->_setPropertyInternal('Uri', $uri);
-        $this->_setPropertyInternal('Uri', '');
-        // TODO what is this?  Assuming it is the object type id, and not OUR document type?
-        $this->_setPropertyInternal('ObjectTypeId', $this->getAttribute('typeId'));
-        // Needed to distinguish type
-        $this->_setPropertyInternal('BaseType', strtolower($this->getAttribute('typeId')));
-        $this->_setPropertyInternal('CreatedBy', $objectProperties['created_by']);
+//        $this->_setPropertyInternal('uri', $uri);
+        $this->_setPropertyInternal('uri', '');
+        $this->_setPropertyInternal('createdBy', $objectProperties['created_by']);
         // TODO cannot currently retrieve via ktapi or regular folder code - add as with created by
-        $this->_setPropertyInternal('CreationDate', $objectProperties['created_date']);
+        $this->_setPropertyInternal('creationDate', $objectProperties['created_date']);
         // TODO cannot currently retrieve via ktapi or regular folder code - add as with created by
-        $this->_setPropertyInternal('LastModifiedBy', $objectProperties['modified_by']);
+        $this->_setPropertyInternal('lastModifiedBy', $objectProperties['modified_by']);
         // TODO cannot currently retrieve via ktapi or regular folder code - add as with created by
-        $this->_setPropertyInternal('LastModificationDate', $objectProperties['modified_date']);
-        $this->_setPropertyInternal('ChangeToken', null);
-        $this->_setPropertyInternal('Name', $objectProperties['folder_name']);
-        $this->_setPropertyInternal('ParentId', $objectProperties['parent_id']);
-        $this->_setPropertyInternal('AllowedChildObjectTypeIds', array('Document', 'Folder'));
-        $this->_setPropertyInternal('Author', $objectProperties['created_by']);
+        $this->_setPropertyInternal('lastModificationDate', $objectProperties['modified_date']);
+        $this->_setPropertyInternal('changeToken', null);
+        $this->_setPropertyInternal('name', $objectProperties['folder_name']);
+        $this->_setPropertyInternal('parentId', CMISUtil::encodeObjectId(FOLDER, $objectProperties['parent_id']));
+        $this->_setPropertyInternal('author', $objectProperties['created_by']);
+    }
+    
+    /**
+     * Sets properties shared between all objects of this type
+     */
+    protected function _setSharedProperties()
+    {
+        parent::_setSharedProperties();
+        $this->_setPropertyInternal('allowedChildObjectTypeIds', array('cmis:document', 'cmis:folder'));
     }
  
 }
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008,2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,8 +32,12 @@
  * 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): ______________________________________
+ */
+
+/**
  *
- * @copyright 2008-2009, KnowledgeTree Inc.
+ * @copyright 2008-2010, KnowledgeTree Inc.
  * @license GNU General Public License version 3
  * @author KnowledgeTree Team
  * @package KTCMIS
@@ -58,85 +62,108 @@ class CMISNavigationService {
     }
  
     /**
-     * Get descendents of the specified folder, up to the depth indicated
+     * Get direct children of the specified folder
      *
      * @param string $repositoryId
      * @param string $folderId
      * @param boolean $includeAllowableActions
      * @param boolean $includeRelationships
      * @param string $typeId
-     * @param int $depth
      * @param string $filter
+     * @param int $maxItems
+     * @param int $skipCount
      * @return array $descendants
+     *               MUST include (unless not requested) for each object:
+     *               array $properties
+     *               array $relationships
+     *               array $renditions
+     *               $allowableActions
+     *               string $pathSegment
+     *        boolean $hasMoreItems
+     *        int $numItems [optional]
      */
-
-    // NOTE This method does NOT support paging as defined in the paging section
-    // NOTE If the Repository supports the optional â€œVersionSpecificFilingâ€? capability,
+    // NOTE If the Repository supports the optional â€œVersionSpecificFilingï¿½ï¿½? capability,
     //      then the repository SHALL return the document versions filed in the specified folder or its descendant folders.
     //      Otherwise, the latest version of the documents SHALL be returned.
     // TODO FilterNotValidException: The Repository SHALL throw this exception if this property filter input parameter is not valid
-    function getDescendants($repositoryId, $folderId, $includeAllowableActions, $includeRelationships,
-                            $depth = 1, $typeId = 'Any', $filter = '')
+    function getChildren($repositoryId, $folderId, $includeAllowableActions = null, $includeRelationships = null,
+    $typeId = 'Any', $filter = '', $maxItems = 0, $skipCount = 0, $orderBy = '', $renditionFilter = null,
+    $includePathSegment = false)
     {
+        // TODO paging
         // TODO optional parameters
-        $descendants = array();
+        $children = array();
         $repository = new CMISRepository($repositoryId);
  
-        // if this is not a folder, cannot get descendants
+        // if this is not a folder, cannot get children
         $folderId = CMISUtil::decodeObjectId($folderId, $type);
-        
-        if ($type != 'Folder')
-        {
-            return $descendants;
+
+        if ($type != 'cmis:folder') {
+            throw new invalidArgumentException('The specified object is not a folder');
         }
  
         $folder = $this->ktapi->get_folder_by_id($folderId);
-        $descendants = $folder->get_listing($depth);
+        $children = $folder->get_listing();
  
-        // parse ktapi descendants result into a list of CMIS objects
-        $descendants = CMISUtil::createChildObjectHierarchy($descendants, $repository->getRepositoryURI, $this->ktapi);
+        $children = CMISUtil::createChildObjectHierarchy($children, $repository->getRepositoryURI, $this->ktapi);
  
-        return $descendants;
+        return $children;
     }
  
     /**
-     * Get direct children of the specified folder
+     * Get descendents of the specified folder, up to the depth indicated
      *
      * @param string $repositoryId
      * @param string $folderId
-     * @param boolean $includeAllowableActions
-     * @param boolean $includeRelationships
-     * @param string $typeId
+     * @param int $depth
      * @param string $filter
-     * @param int $maxItems
-     * @param int $skipCount
+     * @param boolean $includeRelationships
+     * @param string $renditionFilter
+     * @param boolean $includeAllowableActions
+     * @param boolean $includePathSegment
      * @return array $descendants
+     *               MUST include (unless not requested) for each object:
+     *               array $properties
+     *               array $relationships
+     *               array $renditions
+     *               $allowableActions
+     *               string $pathSegment
      */
-    // NOTE If the Repository supports the optional â€œVersionSpecificFilingâ€? capability,
+
+    // NOTE This method does NOT support paging as defined in the paging section
+    // NOTE If the Repository supports the optional â€œVersionSpecificFilingï¿½ï¿½? capability,
     //      then the repository SHALL return the document versions filed in the specified folder or its descendant folders.
     //      Otherwise, the latest version of the documents SHALL be returned.
+    // NOTE If the Repository supports the optional capability capabilityMutlifiling and the same document is encountered
+    //      multiple times in the hierarchy, then the repository MUST return that document each time is encountered.
+    // NOTE The default value for the $depth parameter is repository specific and SHOULD be at least 2 or -1
+    //      Chosen 2 as the underlying code currently has no concept of digging all the way down
     // TODO FilterNotValidException: The Repository SHALL throw this exception if this property filter input parameter is not valid
-    function getChildren($repositoryId, $folderId, $includeAllowableActions, $includeRelationships,
-                         $typeId = 'Any', $filter = '', $maxItems = 0, $skipCount = 0)
+    function getDescendants($repositoryId, $folderId, $depth = 2, $filter = '', $includeRelationships = false, $renditionFilter = '',
+    $includeAllowableActions = false, $includePathSegment = false)
     {
-        // TODO paging
-        // TODO optional parameters
-        $children = array();
-        $repository = new CMISRepository($repositoryId);
+        if ($depth == 0) {
+            throw new InvalidArgumentException('Invalid depth argument supplied');
+        }
  
-        // if this is not a folder, cannot get children
+        // if this is not a folder, cannot get descendants
         $folderId = CMISUtil::decodeObjectId($folderId, $type);
-        // NOTE this will quite possibly break the webservices
-        if ($type != 'Folder') {
-            return $children;
+
+        if ($type != 'cmis:folder') {
+            throw new InvalidArgumentException('The supplied object is not a folder, unable to return descendants');
         }
  
+        // TODO optional parameters
+        $descendants = array();
+        $repository = new CMISRepository($repositoryId);
+
         $folder = $this->ktapi->get_folder_by_id($folderId);
-        $children = $folder->get_listing();
+        $descendants = $folder->get_listing($depth);
  
-        $children = CMISUtil::createChildObjectHierarchy($children, $repository->getRepositoryURI, $this->ktapi);
+        // parse ktapi descendants result into a list of CMIS objects
+        $descendants = CMISUtil::createChildObjectHierarchy($descendants, $repository->getRepositoryURI, $this->ktapi);
  
-        return $children;
+        return $descendants;
     }
  
     /**
@@ -144,105 +171,102 @@ class CMISNavigationService {
      *
      * @param string $repositoryId
      * @param string $folderId
-     * @param boolean $includeAllowableActions
-     * @param boolean $includeRelationships
-     * @param boolean $returnToRoot If TRUE, then the repository SHALL return all folder objects
-     *                           that are ancestors of the specified folder.
-     *                           If FALSE, the repository SHALL return only the parent folder of the specified folder.
      * @param string $filter
-     * @return array $ancestry
+     * @return object $parent The parent folder object
      */
     // TODO FilterNotValidException: The Repository SHALL throw this exception if this property filter input parameter is not valid
-    // TODO If this service method is invoked on the root folder of the Repository, then the Repository SHALL return an empty result set.
-    // NOTE SHOULD always include the â€œObjectIdâ€? and â€œParentIdâ€? properties for all objects returned
-    function getFolderParent($repositoryId, $folderId, $includeAllowableActions, $includeRelationships, $returnToRoot, $filter = '')
+    function getFolderParent($repositoryId, $folderId, $filter = '')
     {
         // NOTE the root folder obviously has no parent, throw an ObjectNotFoundException here if this is the root folder
         if (CMISUtil::isRootFolder($repositoryId, $folderId, $this->ktapi)) {
-            throw new ObjectNotFoundException('Root folder has no parent');
+            throw new InvalidArgumentException('Root folder has no parent');
         }
-        
-        $ancestry = array();
-        $repository = new CMISRepository($repositoryId);
+
+        $parent = null;
  
         // if this is not a folder, cannot get folder parent :)
         $folderId = CMISUtil::decodeObjectId($folderId, $type);
-        // NOTE this will quite possibly break the webservices
-        if ($type != 'Folder')
-        {
-            return $ancestry;
+        // this exception is not indicated in the CMIS Specification, but it just makes sense and so we include it here
+        if ($type != 'cmis:folder') {
+            throw new InvalidArgumentException('The specified object is not a folder');
         }
  
         $ktapiFolder = $this->ktapi->get_folder_by_id($folderId);
-
-        if ($returnToRoot)
-        {
-            $folder = $ktapiFolder->get_folder();
-            $parents = $folder->generateFolderIDs($folderId);
-            // remove the id of the requesting folder and convert to array
-            $ancestry = explode(',', str_replace(','.$folderId, '', $parents));
-            // reverse to get bottom up listing?  don't think so with the current implementation
-            // specifying that objectTypes may have children but do not have parents listed.
-//            $ancestry = array_reverse($ancestry);
-        }
-        else
-        {
-            $parent = $ktapiFolder->get_parent_folder_id();
-            $ancestry[] = $parent;
+        if (PEAR::isError($ktapiFolder)) {
+            throw new RuntimeException($ktapiFolder->getMessage());
         }
  
-        // need some info about the parent(s) in order to correctly create the hierarchy
-        $tmpArray = array();
-        foreach ($ancestry as $key => $ancestor)
-        {
-            $tmpArray[$key] = $this->ktapi->get_folder_by_id($ancestor);
-        }
-        $ancestry = $tmpArray;
-        unset($tmpArray);
-        
-        $ancestry = CMISUtil::createParentObjectHierarchy($ancestry, $repository->getRepositoryURI, $this->ktapi);
-        
-        return $ancestry;
+        $parentId = $ktapiFolder->get_parent_folder_id();
+        $parent = new CMISFolderObject($parentId, $this->ktapi);
+
+        return $parent;
     }
  
     /**
-     * Fetches the parent(s) of the specified object
+     * Gets the parent folder(s) for the specified non-folder, fileable object.
      * Multiple parents may exist if a repository supports multi-filing
      * It is also possible that linked documents/folders may qualify as having multiple parents
      * as they are essentially the same object
      *
      * @param string $repositoryId
      * @param string $objectId
-     * @param boolean $includeAllowableActions
-     * @param boolean $includeRelationships
-     * @param string $filter
-     * @return array $parents
+     * @param string $filter [optional]
+     * @param enum $includeRelationships [optional]
+     * @param string $renditionFilter  [optional]
+     * @param boolean $includeAllowableActions [optional]
+     * @param boolean $includeRelativePathSegment [optional]
+     * @return array $parents - empty for unfiled objects or the root folder
+     *               MUST include (unless not requested) for each object:
+     *               array $properties
+     *               array $relationships
+     *               array $renditions
+     *               $allowableActions
+     *               string $relativePathSegment
      */
-    // TODO ConstraintViolationException: The Repository SHALL throw this exception if this method is invoked
-    //      on an object who Object-Type Definition specifies that it is not fileable.
-    //      FilterNotValidException: The Repository SHALL throw this exception if this property filter input parameter is not valid.
-    function getObjectParents($repositoryId, $objectId, $includeAllowableActions, $includeRelationships, $filter = '')
+    // TODO FilterNotValidException: The Repository SHALL throw this exception if this property filter input parameter is not valid.
+    function getObjectParents($repositoryId, $objectId, $filter = '', $includeRelationships = null, $renditionFilter = '',
+                              $includeAllowableActions = false, $includeRelativePathSegment = false)
     {
         $ancestry = array();
  
         $objectId = CMISUtil::decodeObjectId($objectId, $typeId);
+        
+        // if type is a folder, this function does not apply
+        if ($typeId == 'cmis:folder') {
+            throw new InvalidArgumentException('Cannot call this function for a folder object');
+        }
+        
+        $objectTypeId = ucwords(str_replace('cmis:', '', $typeId));
+        $object = 'CMIS' . $objectTypeId . 'Object';
+        
+        if (!file_exists(CMIS_DIR . '/objecttypes/' . $object . '.inc.php')) {
+            throw new InvalidArgumentException('Type ' . $typeId . ' is not supported');
+        }
+
+        require_once(CMIS_DIR . '/objecttypes/' . $object . '.inc.php');
+        $cmisObject = new $object;
+        
+        if (!$cmisObject->getAttribute('fileable')) {
+            throw new ConstraintViolationException('Unable to get parents of non-filable object');
+        }
  
         // TODO - what about other types?  only implementing folders and documents at the moment so ignore for now
+        // NOTE this will change if we implement multi-filing and/or unfiling
         switch($typeId)
         {
-            case 'Document':
+            case 'cmis:document':
                 $document = $this->ktapi->get_document_by_id($objectId);
-                $parent = $document->ktapi_folder;
-                $ancestry[] = $parent;
-                break;
-            case 'Folder':
-                $folder = $this->ktapi->get_folder_by_id($objectId);
-                $parent = $this->ktapi->get_folder_by_id($folder->get_parent_folder_id());
-                $ancestry[] = $parent;
-                break;
+                if ($document->is_deleted()) {
+                    throw new InvalidArgumentException('The requested object has been deleted');
+                }
+                $ancestry[] = $document->ktapi_folder->get_folderid();
+            break;
+        }
+        
+        foreach ($ancestry as $key => $parentId) {
+            $CMISObject = new CMISFolderObject($parentId, $this->ktapi, $repositoryURI);
+            $ancestry[$key] = CMISUtil::createObjectPropertiesEntry($CMISObject->getProperties());
         }
-
-        $ancestry = CMISUtil::createParentObjectHierarchy($ancestry, $repository->getRepositoryURI, $this->ktapi);
  
         return $ancestry;
     }
@@ -252,19 +276,25 @@ class CMISNavigationService {
      *
      * @param string $repositoryId
      * @param string $folderId The folder for which checked out docs are requested
-     * @param string $filter
-     * @param boolean $includeAllowableActions
-     * @param boolean $includeRelationships
      * @param int $maxItems
      * @param int $skipCount
+     * @param string $filter
+     * @param enum $includeRelationships
+     * @param boolean $includeAllowableActions
+     * @param string $renditionFilter
      * @return array $checkedout The collection of checked out document objects
+     *               MUST include (unless not requested) for each object:
+     *               array $properties
+     *               array $relationships
+     *               array $renditions
+     *               $allowableActions
+     * @return boolean $hasMoreItems
+     * @return int $numItems [optional]
      */
-    // NOTE NOT YET IMPLEMENTED (this function is just a place holder at the moment :))
     // TODO exceptions: â€¢	FilterNotValidException: The Repository SHALL throw this exception if this property filter input parameter is not valid.
-    // TODO filter by folder id
     // TODO $filter and paging
-    function getCheckedOutDocs($repositoryId, $folderId = null, $filter = '', $includeAllowableActions, $includeRelationships, 
-                               $maxItems = 0, $skipCount = 0)
+    function getCheckedOutDocs($repositoryId, $folderId = null, $maxItems = 0, $skipCount = 0, $orderBy = '',
+    $filter = '', $includeRelationships = null, $includeAllowableActions = false, $renditionFilter = '')
     {
         $checkedout = array();
  
@@ -273,7 +303,7 @@ class CMISNavigationService {
         {
             $CMISDocument = new CMISDocumentObject($document->getId(), $this->ktapi);
             // set version label property - possibly belongs in document class
-            $CMISDocument->setProperty('VersionLabel', $CMISDocument->getProperty('VersionSeriesCheckedOutId'));
+            $CMISDocument->setProperty('versionLabel', $CMISDocument->getProperty('versionSeriesCheckedOutId'));
             $checkedout[] = $CMISDocument->getProperties();
         }
  
@@ -4,6 +4,7 @@ require_once(KT_DIR . &#39;/ktapi/ktapi.inc.php&#39;);
 require_once(KT_DIR . '/ktwebservice/KTUploadManager.inc.php');
 require_once(CMIS_DIR . '/exceptions/ConstraintViolationException.inc.php');
 require_once(CMIS_DIR . '/exceptions/ContentAlreadyExistsException.inc.php');
+require_once(CMIS_DIR . '/exceptions/NameConstraintViolationException.inc.php');
 require_once(CMIS_DIR . '/exceptions/ObjectNotFoundException.inc.php');
 require_once(CMIS_DIR . '/exceptions/StorageException.inc.php');
 require_once(CMIS_DIR . '/exceptions/StreamNotSupportedException.inc.php');
@@ -34,38 +35,42 @@ class CMISObjectService {
      * Creates a new document within the repository
      *
      * @param string $repositoryId The repository to which the document must be added
-     * @param string $typeId Object Type id for the document object being created
      * @param array $properties Array of properties which must be applied to the created document object
      * @param string $folderId The id of the folder which will be the parent of the created document object
      *                         This parameter is optional IF unfilingCapability is supported
      * @param string $contentStream optional content stream data - expected as a base64 encoded string
-     * @param string $versioningState optional version state value: checkedout/major/minor
+     * @param string $versioningState optional version state value: none/checkedout/major/minor
+     * @param $policies List of policy ids that MUST be applied
+     * @param $addACEs List of ACEs that MUST be added
+     * @param $removeACEs List of ACEs that MUST be removed
      * @return string $objectId The id of the created folder object
      */
     // TODO throw ConstraintViolationException if:
     //      value of any of the properties violates the min/max/required/length constraints
     //      specified in the property definition in the Object-Type. 
-    public function createDocument($repositoryId, $typeId, $properties, $folderId = null,
-                                   $contentStream = null, $versioningState = null)
+    // TODO throw ConstraintViolationException if At least one of the permissions is used in 
+    //      an ACE provided which is not supported by the repository.
+    // NOTE typeId is supplied in the cmis:objectTypeId property in the properties array
+    // TODO support submission of content stream as an array containing mimetype and stream;
+    //      for now we just filter on the other side so that only the stream comes through
+    //      and continue to check the mime type dynamically (may need that anyway if none specified
+    //      by CMIS client)
+    public function createDocument($repositoryId, $properties, $folderId = null, $contentStream = null, 
+                                   $versioningState = 'none', $policies = array(), $addACEs = array(), 
+                                   $removeACEs = array())
     {        
         $objectId = null;
  
         // fetch type definition of supplied type and check for base type "document", if not true throw exception
         $RepositoryService = new CMISRepositoryService();
         try {
-            $typeDefinition = $RepositoryService->getTypeDefinition($repositoryId, $typeId);
+            $typeDefinition = $RepositoryService->getTypeDefinition($repositoryId, $properties['objectTypeId']);
         }
-        // NOTE Not sure that we should throw this specific exception, maybe just let the underlying
-        //      exception propogate upward...
-        //      Alternatively: throw new exception with original exception message appended
-        // NOTE The latter method has been adopted for the moment
-        catch (Exception $e)
-        {
+        catch (Exception $e) {
             throw new ConstraintViolationException('Object base type could not be determined. ' . $e->getMessage());
         }
  
-        if ($typeDefinition['attributes']['baseType'] != 'document')
-        {
+        if ($typeDefinition['attributes']['baseId'] != 'cmis:document') {
             throw new ConstraintViolationException('Object is not of base type document');
         }
  
@@ -83,19 +88,19 @@ class CMISObjectService {
         // Attempt to decode $folderId, use as is if not detected as encoded
         $tmpObjectId = $folderId;
         $tmpObjectId = CMISUtil::decodeObjectId($tmpObjectId, $tmpTypeId);
-        if ($tmpTypeId != 'Unknown')
+        if ($tmpTypeId != 'unknown')
             $folderId = $tmpObjectId;
  
         // if parent folder is not allowed to hold this type, throw exception
         $CMISFolder = new CMISFolderObject($folderId, $this->ktapi);
-        $allowed = $CMISFolder->getProperty('AllowedChildObjectTypeIds');
+        $allowed = $CMISFolder->getProperty('allowedChildObjectTypeIds');
         $typeAllowed = false;
  
         if (is_array($allowed))
         {
             foreach($allowed as $type)
             {
-                if (strtolower($type) == strtolower($typeId))
+                if (strtolower($type) == strtolower($properties['objectTypeId']))
                 {
                     $typeAllowed = true;
                     break;
@@ -117,8 +122,19 @@ class CMISObjectService {
         }
  
         // if versionable attribute is set to false and versioningState is supplied, throw a ConstraintViolationException
-        if (!$typeDefinition['attributes']['versionable'] && !empty($versioningState)) {
-            throw new ConstraintViolationException('This repository does not support versioning');
+        if (!$typeDefinition['attributes']['versionable'] && (!empty($versioningState) || $versioningState != 'none')) {
+            throw new ConstraintViolationException('This object-type does not support versioning');
+        }
+        else if ($typeDefinition['attributes']['versionable'] && (empty($versioningState) || $versioningState == 'none')) {
+            throw new ConstraintViolationException('Invalid versioning state supplied');
+        }
+        
+        if (!$typeDefinition['attributes']['controllablePolicy'] && count($policies)) {
+            throw new ConstraintViolationException('This object-type does not support policies');
+        }
+        
+        if (!$typeDefinition['attributes']['controllableACL'] && (count($addACEs) || count($removeACEs))) {
+            throw new ConstraintViolationException('This object-type does not support ACLs');
         }
  
         // TODO deal with $versioningState when supplied
@@ -131,9 +147,10 @@ class CMISObjectService {
             $properties['name'] = $properties['title'];
         }
  
-        // if name is blank throw exception (check type) - using invalidArgument Exception for now
+        // throw NameConstraintViolation if there is a violation with the given cmis:name property value
+        // OR choose a name which does not conflict
         if (trim($properties['name']) == '') {
-            throw new InvalidArgumentException('Refusing to create an un-named document');
+            throw new NameConstraintViolationException('Refusing to create an un-named document');
         }
  
         // TODO also set to Default if a non-supported type is submitted
@@ -146,6 +163,10 @@ class CMISObjectService {
         //      this check isn't strictly necessary;  however it is needed for a repository which does not support content streams
         if (!is_null($contentStream))
         {
+            if (!$typeDefinition['attributes']['contentStreamAllowed']) {
+                throw new StreamNotSupportedException('Content streams are not supported by this object-type');
+            }
+
             $tempfilename = CMISUtil::createTemporaryFile($contentStream);
  
             // metadata
@@ -210,6 +231,7 @@ class CMISObjectService {
             include_once(KT_LIB_DIR . '/mime.inc.php');
             $KTMime = new KTMime();
             $mimetype = $KTMime->getMimeTypeFromFile($tempfilename);
+            // extract type string from mimetype response
             preg_match('/^([^\/]*)\/([^\/]*)/', $mimetype, $matches);
             if (($matches[1] == 'text') || ($matches[1] == 'image') || ($matches[1] == 'audio')) {
                 $mediatype = ucwords($matches[1]);
@@ -244,7 +266,7 @@ class CMISObjectService {
                 throw new StorageException('The repository was unable to create the document.  ' . $response['message']);
             }
             else {
-                $objectId = CMISUtil::encodeObjectId('Document', $response['results']['document_id']);
+                $objectId = CMISUtil::encodeObjectId(DOCUMENT, $response['results']['document_id']);
             }
  
             // remove temporary file
@@ -269,22 +291,26 @@ class CMISObjectService {
      * Creates a new folder within the repository
      *
      * @param string $repositoryId The repository to which the folder must be added
-     * @param string $typeId Object Type id for the folder object being created
      * @param array $properties Array of properties which must be applied to the created folder object
      * @param string $folderId The id of the folder which will be the parent of the created folder object
+     * @param array $policies List of policy ids that MUST be applied
+     * @param $addACEs List of ACEs that MUST be added
+     * @param $removeACEs List of ACEs that MUST be removed
      * @return string $objectId The id of the created folder object
      */
     // TODO throw ConstraintViolationException if:
     //      value of any of the properties violates the min/max/required/length constraints
     //      specified in the property definition in the Object-Type.
-    public function createFolder($repositoryId, $typeId, $properties, $folderId)
+    // TODO throw ConstraintViolationException if At least one of the permissions is used in 
+    //      an ACE provided which is not supported by the repository.
+    public function createFolder($repositoryId, $properties, $folderId, $policies = array(), $addACEs = array(), $removeACEs = array())
     {
         $objectId = null;
  
         // fetch type definition of supplied type and check for base type "folder", if not true throw exception
         $RepositoryService = new CMISRepositoryService();
         try {
-            $typeDefinition = $RepositoryService->getTypeDefinition($repositoryId, $typeId);
+            $typeDefinition = $RepositoryService->getTypeDefinition($repositoryId, $properties['objectTypeId']);
         }
         // NOTE Not sure that we should throw this specific exception, maybe just let the underlying
         //      exception propogate upward...
@@ -294,35 +320,51 @@ class CMISObjectService {
             throw new ConstraintViolationException('Object is not of base type folder. ' . $e->getMessage());
         }
  
-        if ($typeDefinition['attributes']['baseType'] != 'folder') {
+        if ($typeDefinition['attributes']['baseId'] != 'cmis:folder') {
             throw new ConstraintViolationException('Object is not of base type folder');
         }
  
         // Attempt to decode $folderId, use as is if not detected as encoded
         $tmpObjectId = $folderId;
         $tmpObjectId = CMISUtil::decodeObjectId($tmpObjectId, $tmpTypeId);
-        if ($tmpTypeId != 'Unknown')
+        if ($tmpTypeId != 'unknown')
             $folderId = $tmpObjectId;
  
         // if parent folder is not allowed to hold this type, throw exception
         $CMISFolder = new CMISFolderObject($folderId, $this->ktapi);
-        $allowed = $CMISFolder->getProperty('AllowedChildObjectTypeIds');
-        if (!is_array($allowed) || !in_array($typeId, $allowed)) {
-            throw new ConstraintViolationException('Parent folder may not hold objects of this type (' . $typeId . ')');
+        $allowed = $CMISFolder->getProperty('allowedChildObjectTypeIds');
+        if (!is_array($allowed) || !in_array($properties['objectTypeId'], $allowed)) {
+            throw new ConstraintViolationException('Parent folder may not hold objects of this type (' . $properties['objectTypeId'] . ')');
         }
-
-        // TODO if name is blank! throw another exception (check type) - using invalidArgument Exception for now
+        
+        if (!$typeDefinition['attributes']['controllablePolicy'] && count($policies)) {
+            throw new ConstraintViolationException('This object-type does not support policies');
+        }
+        
+        if (!$typeDefinition['attributes']['controllableACL'] && (count($addACEs) || count($removeACEs))) {
+            throw new ConstraintViolationException('This object-type does not support ACLs');
+        }
+        
+        // set title and name identical if only one submitted
+        if ($properties['title'] == '') {
+            $properties['title'] = $properties['name'];
+        }
+        else if ($properties['name'] == '') {
+            $properties['name'] = $properties['title'];
+        }
+        
+        // throw NameConstraintViolation if there is a violation with the given cmis:name property value
+        // OR choose a name which does not conflict
         if (trim($properties['name']) == '') {
-            throw new InvalidArgumentException('Refusing to create an un-named folder');
+            throw new NameConstraintViolationException('Refusing to create an un-named folder');
         }
  
         $response = $this->ktapi->create_folder((int)$folderId, $properties['name'], $sig_username = '', $sig_password = '', $reason = '');
         if ($response['status_code'] != 0) {
             throw new StorageException('The repository was unable to create the folder: ' . $response['message']);
         }
-        else
-        {
-            $objectId = CMISUtil::encodeObjectId('Folder', $response['results']['id']);
+        else {
+            $objectId = CMISUtil::encodeObjectId(FOLDER, $response['results']['id']);
         }
  
         return $objectId;
@@ -333,82 +375,74 @@ class CMISObjectService {
      *
      * @param string $repositoryId
      * @param string $objectId
-     * @param boolean $includeAllowableActions
-     * @param boolean $includeRelationships
-     * @param boolean $returnVersion
      * @param string $filter
      * @return object CMIS object properties
      */
     // TODO optional parameter support
     // TODO FilterNotValidException: The Repository SHALL throw this exception if this property filter input parameter is not valid
-    public function getProperties($repositoryId, $objectId, $includeAllowableActions, $includeRelationships,
-                                  $returnVersion = false, $filter = '')
+    public function getProperties($repositoryId, $objectId, $filter = '')
     {
         $repository = new CMISRepository($repositoryId);
-
-        // TODO a better default value?
         $properties = array();
-
         $objectId = CMISUtil::decodeObjectId($objectId, $typeId);
  
-        if ($typeId == 'Unknown') {
+        if ($typeId == 'unknown') {
             throw new ObjectNotFoundException('The type of the requested object could not be determined');
         }
  
         switch($typeId)
         {
-            case 'Document':
+            case 'cmis:document':
                 $CMISObject = new CMISDocumentObject($objectId, $this->ktapi, $repository->getRepositoryURI());
                 break;
-            case 'Folder':
+            case 'cmis:folder':
                 $CMISObject = new CMISFolderObject($objectId, $this->ktapi, $repository->getRepositoryURI());
                 break;
         }
  
         // check that we were actually able to retrieve a real object
-        $objectId = $CMISObject->getProperty('ObjectId');
+        $objectId = $CMISObject->getProperty('objectId');
         if (empty($objectId)) {
             throw new ObjectNotFoundException('The requested object could not be found');
         }
  
-        $properties = $CMISObject->getProperties();
+        $propertyCollection = $CMISObject->getProperties();
+        $properties = CMISUtil::createObjectPropertiesEntry($propertyCollection);
  
         return $properties;
     }
  
     /**
-     * Fetches the content stream data for an object
+     * Fetches the content stream data for an object, or fetched a rendition stream for a specified rendition
      *  
      * @param string $repositoryId
      * @param string $objectId
-     * @return string $contentStream (binary or text data)
+     * @param string $streamId [optional for documents] Specifies the rendition to retrieve if not original document
+     * @return string $contentStream (binary [base64 encoded] or text data)
      */
-    // NOTE streamNotSupportedException: The Repository SHALL throw this exception if the Object-Type definition 
-    //      specified by the objectId parameter’s “contentStreamAllowed” attribute is set to “not allowed”.
-    //      
-    function getContentStream($repositoryId, $objectId)
+    // NOTE Each CMIS protocol binding MAY provide a way for fetching a sub-range within a content stream, 
+    //      in a manner appropriate to that protocol.
+    function getContentStream($repositoryId, $objectId, $streamId = null)
     {
         $contentStream = null;
  
         // decode $objectId
-        $objectId = CMISUtil::decodeObjectId($objectId, $typeId);
+        $objectId = CMISUtil::decodeObjectId($objectId, $typeId, $className);
  
         // unknown object type?
-        if ($typeId == 'Unknown') {
+        if ($typeId == 'unknown') {
             throw new ObjectNotFoundException('The type of the requested object could not be determined');
         }
  
         // fetch type definition of supplied object type
-        $objectClass = 'CMIS' . $typeId . 'Object';
+        $objectClass = 'CMIS' . $className . 'Object';
         $CMISObject = new $objectClass($objectId, $this->ktapi);
  
-        // if content stream is not allowed for this object type definition, throw a ConstraintViolationException
+        // if content stream is not allowed for this object type definition, or the specified object does not have 
+        // a content/rendition stream, throw a ConstraintViolationException
         if (($CMISObject->getAttribute('contentStreamAllowed') == 'notAllowed'))
         {
-            // NOTE spec version 0.61c specifies both a ConstraintViolationException and a StreamNotSupportedException
-            //      for this case.  Choosing to throw StreamNotSupportedException until the specification is clarified
-            //      as it is a more specific exception
-            throw new StreamNotSupportedException('Content Streams are not allowed for this object type');
+            throw new ConstraintViolationException('This object does not have a content stream of the requested type');
         }
  
         // now go on to fetching the content stream
@@ -428,40 +462,35 @@ class CMISObjectService {
     /**
      * Moves a fileable object from one folder to another.
      * 
-     * @param object $repositoryId
-     * @param object $objectId
-     * @param object $changeToken [optional]
-     * @param object $targetFolderId
-     * @param object $sourceFolderId [optional] 
+     * @param string $repositoryId
+     * @param string $objectId
+     * @param string $targetFolderId
+     * @param string $sourceFolderId
+     * @return string $objectId
      */
     // TODO versioningException: The repository MAY throw this exception if the object is a non-current Document Version.
-    // TODO check whether object is in fact fileable?  not strictly needed, but possibly should be here.
-    public function moveObject($repositoryId, $objectId, $changeToken = '', $targetFolderId, $sourceFolderId = null)
+    // TODO check whether object is in fact fileable?  perhaps not strictly needed, but possibly should be here.
+    public function moveObject($repositoryId, $objectId, $targetFolderId, $sourceFolderId)
     {
-        // The $sourceFolderId parameter SHALL be specified if the Repository supports the optional 'unfiling' capability
-        if (is_null($sourceFolderId))
-        {
-            $RepositoryService = new CMISRepositoryService();
-            $info = $RepositoryService->getRepositoryInfo($repositoryId);
-            $capabilities = $info->getCapabilities();
-            // check for unfiling capability
-            // NOTE this is only required once/if KnowledgeTree allows the source folder id to be optional, 
-            //      but it is required for CMIS specification compliance.
-            if ($capabilities->hasCapabilityUnfiling() === 'true') {
-                throw new RuntimeException('The source folder id MUST be supplied when unfiling is supported.');
-            }
-        }
-        
-        // Attempt to decode $objectId, use as is if not detected as encoded
+        // attempt to decode $objectId, use as is if not detected as encoded
         $tmpObjectId = $objectId;
-        $tmpObjectId = CMISUtil::decodeObjectId($tmpObjectId, $typeId);
-        if ($tmpTypeId != 'Unknown') $objectId = $tmpObjectId;
+        $tmpObjectId = CMISUtil::decodeObjectId($tmpObjectId, $typeId, $className);
+        if ($tmpTypeId != 'unknown') $objectId = $tmpObjectId;
+        
+        $objectClass = 'CMIS' . $className . 'Object';
+        $CMISObject = new $objectClass($objectId, $this->ktapi);
  
         $targetFolderId = CMISUtil::decodeObjectId($targetFolderId);
  
+        // check the $sourceFolderId parameter - if empty or does not match (at least one) parent of the specified object, 
+        // throw exception
+        if (empty($sourceFolderId) || $CMISObject->getProperty('parentId') != $sourceFolderId) {
+            throw new InvalidArgumentException('The source folder id is invalid');
+        }
+        
         // check type id of object against allowed child types for destination folder
         $CMISFolder = new CMISFolderObject($targetFolderId, $this->ktapi);
-        $allowed = $CMISFolder->getProperty('AllowedChildObjectTypeIds');
+        $allowed = $CMISFolder->getProperty('allowedChildObjectTypeIds');
         if (!is_array($allowed) || !in_array($typeId, $allowed)) {
             throw new ConstraintViolationException('Parent folder may not hold objects of this type (' . $typeId . ')');
         }
@@ -474,21 +503,26 @@ class CMISObjectService {
  
         // TODO add reasons and sig data
         // attempt to move object
-        if ($typeId == 'Folder') {
+        if ($typeId == 'cmis:folder') {
             $response = $this->ktapi->move_folder($objectId, $targetFolderId, $reason, $sig_username, $sig_password);
         }
-        else if ($typeId == 'Document') {
+        else if ($typeId == 'cmis:document') {
             $response = $this->ktapi->move_document($objectId, $targetFolderId, $reason, null, null, $sig_username, $sig_password);
         }
         else {
             $response['status_code'] = 1;
             $response['message'] = 'The object type could not be determined.';
         }
+        
+        // TODO The repository may throw a NameConstrainViolationException if there is a name conflict (determined by KTAPI) 
+        //      or may choose a name which does not conflict
  
         // if failed, throw StorageException
         if ($response['status_code'] != 0) {
             throw new StorageException('The repository was unable to move the object: ' . $response['message']);
-        } 
+        }
+        
+        return CMISUtil::encodeObjectId($objectId, $typeId);
     }
  
     /**
@@ -496,12 +530,11 @@ class CMISObjectService {
      * 
      * @param string $repositoryId
      * @param string $objectId
-     * @param string $changeToken [optional]
-     * @return boolean true on success (exception should be thrown otherwise)
+     * @param string $allVersions [optional] If true, delete all versions
      */
-    // NOTE Invoking this service method on an object SHALL not delete the entire version series for a Document Object. 
-    //      To delete an entire version series, use the deleteAllVersions() service
-    public function deleteObject($repositoryId, $objectId, $changeToken = null)
+    // NOTE Invoking this service method on an object SHALL not delete the entire version series for a Document Object 
+    //      if $allVersions is false. 
+    public function deleteObject($repositoryId, $objectId, $allVersions = true)
     {
         // determine object type and internal id
         $objectId = CMISUtil::decodeObjectId($objectId, $typeId);
@@ -509,14 +542,14 @@ class CMISObjectService {
         // TODO this should probably be a function, it is now used in two places...
         // throw updateConflictException if the operation is attempting to update an object that is no longer current (as determined by the repository).
         $exists = true;
-        if ($typeId == 'Folder')
+        if ($typeId == 'cmis:folder')
         {
             $object = $this->ktapi->get_folder_by_id($objectId);
             if (PEAR::isError($object)) {
                 $exists = false;
             }
         }
-        else if ($typeId == 'Document')
+        else if ($typeId == 'cmis:document')
         {
             $object = $this->ktapi->get_document_by_id($objectId);
             if (PEAR::isError($object)) {
@@ -533,7 +566,7 @@ class CMISObjectService {
         }
  
         // throw ConstraintViolationException if method is invoked on a Folder object that contains one or more objects
-        if ($typeId == 'Folder')
+        if ($typeId == 'cmis:folder')
         {
             $folderContent = $object->get_listing();
             if (!PEAR::isError($folderContent))
@@ -548,16 +581,19 @@ class CMISObjectService {
             // TODO add the electronic signature capability
             $result = $this->ktapi->delete_folder($objectId, $reason, $sig_username, $sig_password);
         }
-        else if ($typeId == 'Document')
+        else if ($typeId == 'cmis:document')
         {
+            // NOTE KnowledgeTree does not support deleting of individual versions and will always delete all versions
+            //      Throw an exception instead if individual version requested for delete
             // since we do not allow deleting of only the latest version we must throw an exception when this function is called on any document
             // which has more than one version.  Okay to delete if there is only the one version.
-            $versions = $object->get_version_history();
-            if (count($versions) > 1)
-            {
-                // NOTE possibly may want to just throw a RuntimeException rather than this CMIS specific exception.
-                throw new ConstraintViolationException('This function may not be used to delete an object which has multiple versions.  '
-                                                     . 'Since the repository does not allow deleting of only the latest version, nothing can be deleted.');
+            if (!$allVersions) {
+                $versions = $object->get_version_history();
+                if (count($versions) > 1)
+                {
+                    // NOTE possibly may want to just throw a RuntimeException rather than this CMIS specific exception.
+                    throw new ConstraintViolationException('This repository does not allow deleting of only the latest version.');
+                }
             }
  
             // do not allow deletion of a checked out document - this is actually handled by the ktapi code, 
@@ -583,9 +619,9 @@ class CMISObjectService {
      * Deletes an entire tree including all subfolders and other filed objects
      * 
      * @param string $repositoryId
-     * @param string $objectId
-     * @param string $changeToken [optional]
-     * @param boolean $unfileNonfolderObject [optional] - note that since KnowledgeTree does not allow unfiling this will be ignored
+     * @param string $folderId
+     * @param boolean $unfileObjects [optional] unfile/deletesinglefiles/delete - note that since KnowledgeTree does not 
+     *                                          allow unfiling this will be ignored
      * @param boolean $continueOnFailure [optional] - note that since KnowledgeTree does not allow continue on failure this will be ignored
      * @return array $failedToDelete A list of identifiers of objects in the folder tree that were not deleted.
      */
@@ -594,57 +630,52 @@ class CMISObjectService {
     //      • This is not transactional.
     //      • However, if DeleteSingleFiled is chosen and some objects fail to delete, then single-filed objects are either deleted or kept, 
     //        never just unfiled. This is so that a user can call this command again to recover from the error by using the same tree.
-    public function deleteTree($repositoryId, $objectId, $changeToken = null, $unfileNonfolderObject = 'delete', $continueOnFailure = false)
+    // NOTE when $continueOnFailure is false, the repository SHOULD abort this method when it fails to delete a single child- or 
+    //      descendant-object
+    public function deleteTree($repositoryId, $folderId, $unfileObjects = 'delete', $continueOnFailure = false)
     {
         // NOTE since we do not currently allow partial deletes this will always be empty
         //      (unless there is a failure at the requested folder level - what do we do then?  exception or array of all objects?)
         $failedToDelete = array();
  
         // determine object type and internal id
-        $objectId = CMISUtil::decodeObjectId($objectId, $typeId);
+        $folderId = CMISUtil::decodeObjectId($folderId, $typeId);
  
-        // throw updateConflictException if the operation is attempting to update an object that is no longer current (as determined by the repository).
-        $exists = true;
-        if ($typeId == 'Folder') {
-            $object = $this->ktapi->get_folder_by_id($objectId);
+        // throw updateConflictException if the operation is attempting to update an object that is no longer current 
+        // (as determined by the repository)
+        if ($typeId == 'cmis:folder') {
+            $object = $this->ktapi->get_folder_by_id($folderId);
             if (PEAR::isError($object)) {
-                $exists = false;
+                throw new updateConflictException('Unable to delete the object as it cannot be found.');
             }
         }
         // if not of type folder then we have a general problem, throw exception
         else {
             throw new RuntimeException('Cannot call deleteTree on a non-folder object.');
         }
-
-        if (!$exists) {
-            throw new updateConflictException('Unable to delete the object as it cannot be found.');
-        }
  
         // attempt to delete tree, throw RuntimeException if failed
         // TODO add a default reason
         // TODO add the electronic signature capability
-        $result = $this->ktapi->delete_folder($objectId, $reason, $sig_username, $sig_password);
-        // if there was an error performing the delete, throw exception
-        // TODO list of objects which failed in $failedToDelete array;
-        //      since we do not delete the folder or any contents if anything cannot be deleted, this will contain the entire tree listing
-        // NOTE once we do this we will need to deal with it externally as well, since we can no longer just catch an exception.
-        if ($result['status_code'] == 1)
+        // TODO support of $continueOnFailure == false - this is not supported by the underlying code and so is left out for now
+        $result = $this->ktapi->delete_folder($folderId, $reason, $sig_username, $sig_password);
+        // if there was an error performing the delete, list objects not deleted
+       if ($result['status_code'] == 1)
         {
             // TODO consider sending back full properties on each object?
             //      Not sure yet what this output may be used for by a client, and the current specification (0.61c) says:
             //      "A list of identifiers of objects in the folder tree that were not deleted", so let's leave it returning just ids for now.
-            $failedToDelete[] = CMISUtil::encodeObjectId('Folder', $objectId);
+            $failedToDelete[] = CMISUtil::encodeObjectId(FOLDER, $folderId);
             $folderContents = $object->get_full_listing();
             foreach($folderContents as $folderObject)
             {
-                if ($folderObject['item_type'] == 'F') $type = 'Folder';
-                else if ($folderObject['item_type'] == 'D') $type = 'Document';
-                // TODO deal with non-folder and non-document content
-                else continue;
+                if ($folderObject['item_type'] == 'F') {
+                    $type = 'cmis:folder';
+                }
+                else if ($folderObject['item_type'] == 'D') {
+                    $type = 'cmis:document';
+                }
  
-                // TODO find out whether this is meant to be a hierarchical list or simply a list.
-                //      for now we are just returning the list in non-hierarchical form 
-                //      (seeing as we don't really know how CMIS AtomPub is planning to deal with hierarchies at this time.)
                 $failedToDelete[] = CMISUtil::encodeObjectId($type, $folderObject['id']); 
             }
         }
@@ -652,14 +683,8 @@ class CMISObjectService {
         return $failedToDelete;
     }
  
-    // NOTE this function is presently incomplete and untested.  Completion deferred to implementation of Checkout/Checkin
-    //      functionality
-    // NOTE I am not sure yet when this function would ever be called - checkin would be able to update the content stream
-    //      already and the only easy method we have (via KTAPI as it stands) to update the content is on checkin anyway.
-    //      Additionally this function doesn't take a value for the versioning status (major/minor) and so cannot pass it
-    //      on to the ktapi checkin function.
-    //      I imagine this function may be called if we ever allow updating document content independent of checkin,
-    //      or if we change some of the underlying code and call direct to the document functions and not via KTAPI.
+    // NOTE this function is presently incomplete and untested.  Completion deferred until Knowledgetree supports setting
+    //      content streams independent of checkin (which may be necessary for proper client interaction with some clients)
     /**
      * Sets the content stream data for an existing document
      *
@@ -690,7 +715,7 @@ class CMISObjectService {
         // Attempt to decode $documentId, use as is if not detected as encoded
         $tmpObjectId = $documentId;
         $tmpObjectId = CMISUtil::decodeObjectId($tmpObjectId, $tmpTypeId);
-        if ($tmpTypeId != 'Unknown')
+        if ($tmpTypeId != 'unknown')
             $documentId = $tmpObjectId;
  
         // TODO deal with other types except documents
@@ -707,9 +732,8 @@ class CMISObjectService {
             throw new StreamNotSupportedException('Content Streams are not allowed for this object type');
         }
  
-        $csFileName = $CMISDocument->getProperty('ContentStreamFilename');
-        if (!empty($csFileName) && (!$overwriteFlag))
-        {
+        $csFileName = $CMISDocument->getProperty('contentStreamFilename');
+        if (!empty($csFileName) && (!$overwriteFlag)) {
             throw new ContentAlreadyExistsException('Unable to overwrite existing content stream');
         }
  
@@ -717,20 +741,19 @@ class CMISObjectService {
         // update the document content from this temporary file as per usual
         // TODO Use checkin_document_with_metadata instead if metadata content submitted || update metadata separately?
         $response = $this->ktapi->checkin_document($documentId,  $csFileName, 'CMIS setContentStream action', $tempfilename, false);
-        if ($response['status_code'] != 0)
-        {
+        if ($response['status_code'] != 0) {
             throw new StorageException('Unable to update the content stream.  ' . $response['message']);
         }
 //        else
 //        {
-//            $objectId = CMISUtil::encodeObjectId('Document', $response['results']['id']);
+//            $objectId = CMISUtil::encodeObjectId(DOCUMENT, $response['results']['id']);
 //        }
  
         @unlink($csFile);
         // update the CMIS document object with the content stream information
 //        $CMISDocument->reload($document['result']['document_id']);
  
-        return $CMISDocument->getProperty('ObjectId');
+        return $CMISDocument->getProperty('objectId');
     }
  
 }
@@ -5,7 +5,7 @@
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
-* Copyright (C) 2008,2009 KnowledgeTree Inc.
+* Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
 * 
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -33,8 +33,12 @@
 * 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): ______________________________________
+*/
+
+/**
 *
-* @copyright 2008-2009, KnowledgeTree Inc.
+* @copyright 2008-2010, KnowledgeTree Inc.
 * @license GNU General Public License version 3
 * @author KnowledgeTree Team
 * @package KTCMIS
@@ -97,12 +101,16 @@ class CMISRepositoryService {
      * @param boolean $hasMoreItems TRUE if there are more items to return than were requested
      * @return array $objectTypes
      */
-    // NOTE this code may fit better within the Repository Class
     // TODO return for specific type when $typeId is specified
     // TODO other optional parameters
-    function getTypes($repositoryId, $typeId = '', $returnPropertyDefinitions = false,
+    // This code is superseded by getTypeChildren and getTypeDescendants - when implementing those, check
+    // whether it is possible to entirely remove this function or if it is to remain and be shared by the
+    // other two functions (when no type is specified they will return base types [children] amd all types
+    // [descendants] respectively
+    public function getTypes($repositoryId, $typeId = '', $returnPropertyDefinitions = false,
                       $maxItems = 0, $skipCount = 0, &$hasMoreItems = false)
-    {        
+    {   
+        /*     
         if ($typeId != '')
         {
             try {
@@ -113,6 +121,7 @@ class CMISRepositoryService {
                 throw new InvalidArgumentException('Type ' . $typeId . ' is not supported');
             }
         }
+        */
  
         $repository = new CMISRepository($repositoryId);
         $supportedTypes = $repository->getTypes();
@@ -154,12 +163,12 @@ class CMISRepositoryService {
     // NOTE this code may fit better in the Repository Class
     function getTypeDefinition($repositoryId, $typeId)
     {
+        $typeId = ucwords(str_replace('cmis:', '', $typeId));
         $object = 'CMIS' . $typeId . 'Object';
  
         // check whether the object type exists, return error if not
         // consider throwing an exception instead (see General Exceptions)
-        if (!file_exists(CMIS_DIR . '/objecttypes/' . $object . '.inc.php'))
-        {
+        if (!file_exists(CMIS_DIR . '/objecttypes/' . $object . '.inc.php')) {
             throw new InvalidArgumentException('Type ' . $typeId . ' is not supported');
         }
  
@@ -167,8 +176,11 @@ class CMISRepositoryService {
  
         require_once(CMIS_DIR . '/objecttypes/' . $object . '.inc.php');
         $cmisObject = new $object;
+        
+        // NOTE The specification is ambigous here: it states that this function must return the type properties, but 
+        //      the atompub example shows the type attributes, not properties;  since most properties are only populated
+        //      on creation of an instance of an object-type, we choose to go with the attributes and not the properties
         $typeDefinition['attributes'] = $cmisObject->getAttributes();
-        $typeDefinition['properties'] = $cmisObject->getProperties();
  
         return $typeDefinition;
     }
@@ -25,110 +25,71 @@ class CMISVersioningService {
     }
  
     /**
-     * Deletes all Document Objects in the specified Version Series, including the Private Working Copy if it exists
-     * 
-     * @param string $repositoryId
-     * @param string $versionSeriesId
-     * @return boolean true if successful
-     */
-    // NOTE For KnowledgeTree the $versionSeriesId should be the latest version, if not it will be taken as implied.
-    //      Should we decide to implement the ability to delete individual versions, 
-    //      then an exception may be thrown under certain circumstances (to be determined)
-    // NOTE I am not really sure how this is going to be handled by CMIS clients.
-    //      Testing with CMISSpaces we have it sending the actual document id, not a version series id.
-    //      This may be due to the data sent back from our code, or it may just be how CMISSpaces does it.
-    //      There is a note in their source code about this.
-    //      Meantime we will try based on document id and adjust as needed later
-    public function deleteAllVersions($repositoryId, $versionSeriesId)
-    {
-        // attempt to delete based on versionSeriesId as document/object id
-        // determine object type and internal id
-        $objectId = CMISUtil::decodeObjectId($versionSeriesId, $typeId);
-        
-        // if not a versionable object, throw exception
-        // NOTE that we are assuming only documents are versionable at the moment
-        if ($typeId != 'Document') {
-            throw new RuntimeException('The object type is not versionable and cannot be deleted using deleteAllVersions.');
-        }
-        
-        // try to delete
-        // TODO add a default reason
-        // TODO add the electronic signature capability
-        $auth_sig = true;
-        $result = $this->ktapi->delete_document($objectId, $reason, $auth_sig, $sig_username, $sig_password);
-        
-        // TODO delete any PWC which may exist (NOTE added 24 August 2009 - we did not have any PWC functionality when this function was originally created)
-
-        // if there was an error performing the delete, throw exception
-        if ($result['status_code'] == 1) {
-            throw new RuntimeException('There was an error deleting the object: ' . $result['message']);
-        }
-        
-        return true;
-    }
-    
-    /**
      * Checks out a document and creates the PWC (Private Working Copy) which will represent the checked out document
      * 
      * @param string $repositoryId
-     * @param string $documentId
-     * @param string $changeToken [optional]
-     * @return string $documentId The id of the PWC object
+     * @param string $objectId
+     * @return string $objectId The id of the PWC object
      * @return boolean $contentCopied TRUE if contentStream is a copy of the document content stream, FALSE if contentStream not set
      */
-    // TODO exceptions:
-    //      â€¢	versioningException: The repository MAY throw this exception if the object is a non-current Document Version.
     // NOTE since we need to return two values, we return one via argument by reference
-    //      since $documentId already exists in the argument list, that was chosen as the "return by reference" value
+    //      since $objectId already exists in the argument list, that was chosen as the "return by reference" value
     // TODO set up delivery of content stream? or is that up to the CMIS client?
-    public function checkOut($repositoryId, &$documentId, $changeToken = '')
+    public function checkOut($repositoryId, &$objectId)
     {
         $contentCopied = false;
-        
-        $documentId = CMISUtil::decodeObjectId($documentId, $typeId);
+
+        $objectId = CMISUtil::decodeObjectId($objectId, $typeId);
  
         // NOTE We are not planning on persisting the PWC beyond the current session, it will be re-created on access of the checked out document
         // TODO consider persisting in the database?  How will this relate to JSR if we are switching to that?
         // NOTE within the current system it is assumed if a new document metadata version is created that this is the latest version of the document
         // TODO see if there is an easy way to modify this, else we may not have an easy way to persist PWC objects
-        
+
         // throw updateConflictException if the operation is attempting to update an object that is no longer current (as determined by the repository).
         try {
-            $pwc = new CMISDocumentObject($documentId, $this->ktapi);
+            $pwc = new CMISDocumentObject($objectId, $this->ktapi);
         }
         catch (exception $e) {
             throw new UpdateConflictException($e->getMessage());
         }
-        
+
         // throw exception if the object is not versionable
         if (!$pwc->getAttribute('versionable')) {
             throw new ConstraintViolationException('This document is not versionable and may not be checked out');
         }
-        
+
+        // check that this is the latest version
+        if ($pwc->getProperty('isLatestVersion') != true) {
+            throw new VersioningException('The document is not the latest version and cannot be checked out');
+        }
+
         // NOTE KTAPI as currently implemented does not give a direct response which indicates if the document is already checked out,
         //      as long as the same user is calling the checkout again, so should we add a check here specifically?
  
         // run checkout process - set $download = false (third function argument) as we want to return the document content via the contentStream
-        $response = $this->ktapi->checkout_document($documentId, 'CMIS Checkout Action', false, $sig_username, $sig_password);
+        $response = $this->ktapi->checkout_document($objectId, 'CMIS Checkout Action', false, $sig_username, $sig_password);
         // if there was an error, throw an exception
         if ($response['status_code'] == 1) {
             throw new StorageException($response['message']);
-        };
-        
+        }
+
         // if successful, set $contentCopied = true; unless contentStream is not set
-        if ($pwc->getProperty('ContentStreamFilename') != '') $contentCopied = true;
-        $documentId = CMISUtil::encodeObjectId('Document', $documentId);
-        
+        if ($pwc->getProperty('contentStreamFilename') != '') {
+            $contentCopied = true;
+        }
+        $objectId = CMISUtil::encodeObjectId(DOCUMENT, $objectId);
+
         // mark document object as checked out
-        $pwc->setProperty('IsVersionSeriesCheckedOut', true);
+        $pwc->setProperty('isVersionSeriesCheckedOut', true);
         $userName = '';
         $user = $this->ktapi->get_user();
         if (!PEAR::isError($user)) {
             $userName = $user->getName();
         }
-        $pwc->setProperty('VersionSeriesCheckedOutBy', $userName);
-        $pwc->setProperty('VersionSeriesCheckedOutId', $documentId);
-        
+        $pwc->setProperty('versionSeriesCheckedOutBy', $userName);
+        $pwc->setProperty('versionSeriesCheckedOutId', $objectId);
+
         return $contentCopied;
     }
  
@@ -136,19 +97,18 @@ class CMISVersioningService {
      * Reverses the effect of a checkout: I.E. deletes the PWC (Private Working Copy) and re-sets the status of the document to "not checked out" 
      * 
      * @param string $repositoryId
-     * @param string $documentId
-     * @param string $changeToken [optional]
+     * @param string $objectId
      */
     // TODO exceptions:
     //      â€¢	versioningException - The repository MAY throw this exception if the object is a non-current Document Version.
-    public function cancelCheckOut($repositoryId, $documentId, $changeToken = '')
+    public function cancelCheckOut($repositoryId, $objectId)
     {
-        $documentId = CMISUtil::decodeObjectId($documentId, $typeId);
+        $objectId = CMISUtil::decodeObjectId($objectId, $typeId);
  
         /* re-generate PWC object */
         // throw updateConflictException if the operation is attempting to update an object that is no longer current (as determined by the repository).
         try {
-            $pwc = new CMISDocumentObject($documentId, $this->ktapi);
+            $pwc = new CMISDocumentObject($objectId, $this->ktapi);
         }
         catch (exception $e) {
             throw new UpdateConflictException($e->getMessage());
@@ -159,10 +119,15 @@ class CMISVersioningService {
             throw new ConstraintViolationException('This document is not versionable and may not be checked out');
         }
  
+        // check that this is the latest version
+        if ($pwc->getProperty('isLatestVersion') != true) {
+            throw new VersioningException('The document is not the latest version');
+        }
+        
         // TODO delete PWC - since we are not persisting the PWC this is not necessary at the moment
  
         // cancel checkout
-        $response = $this->ktapi->undo_document_checkout($documentId, 'CMIS Cancel Checkout Action', $sig_username, $sig_password);
+        $response = $this->ktapi->undo_document_checkout($objectId, 'CMIS Cancel Checkout Action', $sig_username, $sig_password);
  
         // if there was any error in cancelling the checkout
         if ($response['status_code'] == 1) {
@@ -174,23 +139,31 @@ class CMISVersioningService {
      * Checks in a checked out document
      * 
      * @param string $repositoryId
-     * @param string $documentId
-     * @param boolean $major
-     * @param string $changeToken [optional]
+     * @param string $objectId
+     * @param boolean $major [optional] defaults to true
      * @param array $properties [optional]
      * @param contentStream $contentStream [optional]
      * @param string $checkinComment [optional]
-     * @return string $documentId
+     * @param array $policies
+     * @param array $addACEs
+     * @param array $removeACEs
+     * @return string $objectId
      */
-    // TODO Exceptions:
-    //        â€¢	versioningException - The repository MAY throw this exception if the object is a non-current Document Version
-    public function checkIn($repositoryId, $documentId, $major, $contentStream = null, $changeToken = '', $properties = array(), $checkinComment = '')
+    // NOTE For repositories that do NOT support the optional “capabilityPWCUpdatable” capability, the properties
+    //      and contentStream input parameters MUST be provided on the checkIn method for updates to happen as part
+    //      of checkIn.
+    // NOTE Only those properties whose values are different than the original value of the object need to be submitted.
+    // NOTE we are not actually doing anything with the properties at this time, only the content stream
+    // TODO filename changes and anything else supported in web interface, possibly additional supported by CMIS clients
+    public function checkIn($repositoryId, $objectId, $major = true, $properties = array(), $contentStream = null,
+                            $checkinComment = '', $policies = array(), $addACEs = array(), $removeACEs = array())
     {
-        $documentId = CMISUtil::decodeObjectId($documentId, $typeId);
+        
+        $objectId = CMISUtil::decodeObjectId($objectId, $typeId);
  
         // throw updateConflictException if the operation is attempting to update an object that is no longer current (as determined by the repository).
         try {
-            $pwc = new CMISDocumentObject($documentId, $this->ktapi);
+            $pwc = new CMISDocumentObject($objectId, $this->ktapi);
         }
         catch (exception $e) {
             throw new UpdateConflictException($e->getMessage());
@@ -210,26 +183,33 @@ class CMISVersioningService {
             throw new StorageException($e->getMessage());
         }
  
-        if (($typeDefinition['attributes']['contentStreamAllowed'] == 'notAllowed') && !empty($contentStream)) {
+        // if content stream is required (capabilityPWCUpdatability == false) and no content stream is supplied, 
+        // throw a ConstraintViolationException
+        if (($typeDefinition['attributes']['contentStreamAllowed'] == 'required') && is_null($contentStream)) {
+            throw new RuntimeException('This repository requires a content stream for document update on checkin.  '
+                                     . 'Refusing to checkin an empty document');
+        }
+        else if (($typeDefinition['attributes']['contentStreamAllowed'] == 'notAllowed') && !empty($contentStream)) {
             throw new StreamNotSupportedException('Content Streams are not supported');
         }
-        
+
         // check that this is the latest version
-        if ($pwc->getProperty('IsLatestVersion') != true) {
+        if ($pwc->getProperty('isLatestVersion') != true) {
             throw new VersioningException('The document is not the latest version and cannot be checked in');
         }
  
         // now do the checkin
         $tempfilename = CMISUtil::createTemporaryFile($contentStream);
-        $response = $this->ktapi->checkin_document($documentId, $pwc->getProperty('ContentStreamFilename'), $reason, $tempfilename, $major,
+        $reason = 'CMIS object checkin';
+        $response = $this->ktapi->checkin_document($objectId, $pwc->getProperty('contentStreamFilename'), $reason, $tempfilename, $major,
                                                    $sig_username, $sig_password);
-                                       
-        // if there was any error in cancelling the checkout
+
+        // if there was any error checking in
         if ($response['status_code'] == 1) {
             throw new RuntimeException('There was an error checking in the document: ' . $response['message']);
         }
  
-        return CMISUtil::encodeObjectId(DOCUMENT, $documentId);
+        return CMISUtil::encodeObjectId(DOCUMENT, $objectId);
     }
  
 }
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008,2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,8 +32,12 @@
  * 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): ______________________________________
+ */
+
+/**
  *
- * @copyright 2008-2009, KnowledgeTree Inc.
+ * @copyright 2008-2010, KnowledgeTree Inc.
  * @license GNU General Public License version 3
  * @author KnowledgeTree Team
  * @package KTCMIS
@@ -65,11 +69,13 @@ class CMISUtil {
         {
             case 'D':
             case 'Document':
+            case 'cmis:document':
             case DOCUMENT:
                 $encoded = 'D' . $objectId;
                 break;
             case 'F':
             case 'Folder':
+            case 'cmis:folder':
             case FOLDER:
                 $encoded = 'F' . $objectId;
                 break;
@@ -91,14 +97,14 @@ class CMISUtil {
      * @param string &$typeId
      * @return string $objectId
      */
-    static public function decodeObjectId($objectId, &$typeId = null)
+    static public function decodeObjectId($objectId, &$typeId = null, &$className = '')
     {
         if (!is_string($objectId))
         {
-            $typeId = 'Unknown';
+            $typeId = 'unknown';
             return null;
         }
-        
+
         $typeId = null;
  
         // NOTE Not sure whether this really belongs here, but probably this is the safest and most reliable place
@@ -117,7 +123,8 @@ class CMISUtil {
             //      method of doing this.
             //      meantime this minor hack will get things working for the existing system structure, as the root
             //      folder should always be id 1.
-            $typeId = 'Folder';
+            $typeId = 'cmis:folder';
+            $className = 'Folder';
             return '1';
         }
  
@@ -128,13 +135,15 @@ class CMISUtil {
         switch($type)
         {
             case 'D':
-                $typeId = 'Document';
+                $typeId = 'cmis:document';
+                $className = 'Document';
                 break;
             case 'F':
-                $typeId = 'Folder';
+                $typeId = 'cmis:folder';
+                $className = 'Folder';
                 break;
             default:
-                $typeId = 'Unknown';
+                $typeId = 'unknown';
                 break;
         }
  
@@ -172,20 +181,19 @@ class CMISUtil {
                             $CMISObject = new CMISFolderObject($object['id'], $ktapi, $repositoryURI);
                             break;
                     }
-                    
+
                     $CMISArray[$count]['object'] = $CMISObject;
-                    
+
                     // if sub-array
-                    if (count($object['items']) > 0)
-                    {
-                        $CMISArray[$count]['items'] = self::createChildObjectHierarchy($object['items'], $repositoryURI, $ktapi);
+                    if (count($object['items']) > 0) {
+                        $CMISArray[$count]['children'] = self::createChildObjectHierarchy($object['items'], $repositoryURI, $ktapi);
                     }
                 }
                 else
                 {
                     // NOTE why is this necessary?  That's what you get for not commenting it at the time
-                    // TODO comment this properly
-                    $CMISArray[$count] = self::createChildObjectHierarchy($object, $repositoryURI, $ktapi);
+                    // TODO comment this properly, once we know why it is happening
+                    //                    $CMISArray[$count] = self::createChildObjectHierarchy($object, $repositoryURI, $ktapi);
                 }
             }
         }
@@ -205,6 +213,7 @@ class CMISUtil {
      * @return array $CMISArray
      */
     // NOTE this will have to change if we implement multi-filing
+    // NOTE this function probably serves no purpose, the parents are to be returned as a flat array
     static public function createParentObjectHierarchy($input, $repositoryURI, &$ktapi)
     {
         $CMISArray = array();
@@ -220,9 +229,8 @@ class CMISUtil {
             $CMISElement['object'] = $CMISObject;
  
             // if more parent elements
-            if (count($input) > 0)
-            {
-                $CMISElement['items'] = self::createParentObjectHierarchy($input, $repositoryURI, $ktapi);
+            if (count($input) > 0) {
+                $CMISElement['parents'] = self::createParentObjectHierarchy($input, $repositoryURI, $ktapi);
             }
  
             $CMISArray[] = $CMISElement;
@@ -239,20 +247,23 @@ class CMISUtil {
      * though the output may well be different to what went into that function
      *
      * @param array $input // input hierarchy to decode
-     * @param string $linkText // 'child' or 'parent' - indicates direction of hierarchy => descending or ascending
+     * @param string $linkText // 'children' or 'parents' - indicates direction of hierarchy => descending or ascending
      * @return array $hierarchy
      */
-    static public function decodeObjectHierarchy($input, $linkText)
+    static public function decodeObjectHierarchy($input, $linkText = 'children')
     {
         $hierarchy = array();
-        
+
         // first, run through the base array to get the initial children
         foreach ($input as $key => $entry)
         {
             $object = $entry['object'];
             $properties = $object->getProperties();
-
             $hierarchy[$key] = self::createObjectPropertiesEntry($properties);
+
+            if (isset($entry[$linkText]) && count($entry[$linkText])) {
+                $hierarchy[$key][$linkText] = self::decodeObjectHierarchy($entry[$linkText], $linkText);
+            }
         }
  
         return $hierarchy;
@@ -270,11 +281,11 @@ class CMISUtil {
     static public function createObjectPropertiesEntry($properties)
     {
         $object = array();
-        
+
         foreach(CMISPropertyCollection::$propertyTypes as $property => $type)
         {
-            // hack for Author property
-            if ($property == 'Author') {
+            // author property does not work the same as the others
+            if ($property == 'author') {
                 $object[$property] = array('value' => $properties->getValue($property));
             }
             else {
@@ -282,83 +293,6 @@ class CMISUtil {
             }
         }
  
-        /* old static method */
-        /*
-        $object['Author'] = array('value' => $properties->getValue('Author'));
-        
-        $object['properties']['BaseType'] = array('type' => $properties->getFieldType('BaseType'),
-                                                           'value' => $properties->getValue('BaseType'));
-        
-		$object['properties']['Name'] = array('type' => $properties->getFieldType('Name'),
-                                                           'value' => $properties->getValue('Name'));
-        
-		$object['properties']['ParentId'] = array('type' => $properties->getFieldType('ParentId'),
-                                                  'value' => self::encodeObjectId('Folder',
-                                                  $properties->getValue('ParentId')));
-												  
-		$object['properties']['Uri'] = array('type' => $properties->getFieldType('Uri'),
-                               'value' => $properties->getValue('Uri'));	
-							   
-        // TODO ensure format of date is always correct
-        $object['properties']['LastModificationDate'] = array('type' => $properties->getFieldType('LastModificationDate'),
-                                                           'value' => $properties->getValue('LastModificationDate'));					   									  
-
-        $object['properties']['CreatedBy'] = array('type' => $properties->getFieldType('CreatedBy'),
-                                                   'value' => $properties->getValue('CreatedBy'));
-												   
-        $object['properties']['AllowedChildObjectTypeIds'] = array('type' => $properties->getFieldType('AllowedChildObjectTypeIds'),
-                                                                   'value' => $properties->getValue('AllowedChildObjectTypeIds'));
-
-        $object['properties']['CreationDate'] = array('type' => $properties->getFieldType('CreationDate'),
-                                                       'value' => $properties->getValue('CreationDate'));
-
-        $object['properties']['LastModifiedBy'] = array('type' => $properties->getFieldType('LastModifiedBy'),
-                                                       'value' => $properties->getValue('LastModifiedBy'));
-
-        $object['properties']['ChangeToken'] = array('type' => $properties->getFieldType('ChangeToken'),
-                                                       'value' => $properties->getValue('ChangeToken'));
-														   
-        $object['properties']['ObjectTypeId'] = array('type' => $properties->getFieldType('ObjectTypeId'),
-                                                           'value' => $properties->getValue('ObjectTypeId'));
-													   
-        $object['properties']['ObjectId'] = array('type' => $properties->getFieldType('ObjectId'),
-                                                           'value' => $properties->getValue('ObjectId'));
-        
-        if (strtolower($properties->getValue('ObjectTypeId')) == 'document')
-        {
-            $object['properties']['ChangeToken'] = array('type' => $properties->getFieldType('ChangeToken'),
-                                                                   'value' => $properties->getValue('ChangeToken'));
-            $contentStreamLength = $properties->getValue('ContentStreamLength');
-            if (!empty($contentStreamLength))
-            {
-                $contentStreamLength = $properties->getValue('ContentStreamLength');
-                $object['properties']['ContentStreamAllowed'] = array('type' => $properties->getFieldType('ContentStreamAllowed'),
-                                                               'value' => $properties->getValue('ContentStreamAllowed'));
-                $object['properties']['ContentStreamLength'] = array('type' => $properties->getFieldType('ContentStreamLength'),
-                                                               'value' => $properties->getValue('ContentStreamLength'));
-                $object['properties']['ContentStreamMimeType'] = array('type' => $properties->getFieldType('ContentStreamMimeType'),
-                                                               'value' => $properties->getValue('ContentStreamMimeType'));
-                $object['properties']['ContentStreamFilename'] = array('type' => $properties->getFieldType('ContentStreamFilename'),
-                                                               'value' => $properties->getValue('ContentStreamFilename'));
-                $object['properties']['ContentStreamUri'] = array('type' => $properties->getFieldType('ContentStreamUri'),
-                                                               'value' => $properties->getValue('ContentStreamUri'));
-            }
-        }
-        */
-
-        /* what on earth was this for? */
-        /*
-        // if we have found a child/parent with one or more children/parents, recurse into the child/parent object
-        if (count($entry['items']) > 0) {
-            $object[$linkText] = self::decodeObjectHierarchy($entry['items'], $linkText);
-        }
-        // NOTE may need to set a null value here in case webservices don't like it unset
-        //      so we'll set it just in case...
-        else {
-            $object[$linkText] = null;
-        }
-        */
-
         return $object;
     }
  
@@ -367,8 +301,11 @@ class CMISUtil {
      * via var_export (which returns a useable PHP string for creating the object from array content)
      * and regular expressions to extract the array definitions and structure without the class specific code
      *
-     * NOTE this function is not reliable for objects which contain ktapi instances, as it appears there is a recursive reference
-     * TODO attempt to deal with recursive references?
+     * NOTE this function is not reliable for objects which contain ktapi instances, as it appears there is a recursive reference;
+     *      this will apply to any class which contains recursive references (which is bad practice and should not be done - the
+     *      problem is with the object and not this code
+     * 
+     * TODO attempt to deal with recursive references? - better to fix the objects in question, if possible
      *
      * @param object $data
      * @return array $array
@@ -378,12 +315,12 @@ class CMISUtil {
         $array = array();
  
         $stringdata = var_export($data, true);
-        // clean up ", )" - NOTE this may not be necessary
+        // clean up ", )" - NOTE this may not be necessary, but is included for safety
         $stringdata = preg_replace('/, *\r?\n? *\)/', ')', $stringdata);
  
-        // NOTE is this while loop even needed?
-        while (preg_match('/\b[\w]*::__set_state\(/', $stringdata, $matches))
-        {
+        // NOTE is this while loop even needed, or can we just run a preg_replace without the while?
+        // TODO find out...
+        while (preg_match('/\b[\w]*::__set_state\(/', $stringdata, $matches)) {
             $stringdata = preg_replace('/\b[\w]*::__set_state\(/', $matches[1], $stringdata);
         }
  
@@ -407,18 +344,18 @@ class CMISUtil {
     }
  
     // TODO more robust base64 encoding detection, if possible
-    
+
     /**
      * Checks the contentStream and ensures that it is a correct base64 string;
      * This is purely for clients such as CMISSpaces breaking the content into 
-     * chunks before base64 encoding.
+     * chunks before base64 encoding each and this coming through as a single string containing multiple base64 chunks.
      * 
      * If the stream is chunked, it is decoded in chunks and sent back as a single stream.
      * If it is not chunked it is decoded as is and sent back as a single stream.
      * 
      * NOTE there is an alternative version of this function called decodeChunkedContentStreamLong.
      *      that version checks line lengths, which should not be necessary.
-     *      this version merely splits on one or two "=" which is less complex and possibly faster (test this assumption)
+     *      this version merely splits on one or two "=" which is less complex and appears to be faster
      *      (one or two "=" signs is the specified padding used for base64 encoding at the end of an encoded string, when needed)
      * 
      * @param object $contentStream
@@ -428,23 +365,23 @@ class CMISUtil {
     {
         // always trim content, just in case, as the AtomPub specification says content may be padded with whitespace at the start and end.
         $contentStream = trim($contentStream);
-        
+
         // check whether the content is encoded first, return as is if not
         // A–Z, a–z, 0–9, +, /
         // NOTE this makes the (fairly reasonable) assumption that text content contains at least one space or punctuation character.
         //      of course this may fail should something be sent in plain text such as a passwords file containing sha1 or md5 hashes only.
         if (preg_match('/[^\w\/\+=\n]+/', $content)) return $contentStream;
-        
+
         $decoded = '';
-        
+
         // split the content stream on ={1,2}
         $parts = preg_split('/(={1,2})/', $contentStream, null, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
         foreach($parts as $part)
-        {       
+        {
             if (preg_match('/={1,2}/', $part)) {
                 continue;
             }
-        
+
             // lookahead for delimiter, because we may need it back.
             // NOTE that decoding appears to work fine without this, so this is just an "in case".
             // NOTE that even with this it seems the present function works faster than the alternative below.
@@ -453,14 +390,14 @@ class CMISUtil {
                     $part .= $parts[$key+1];
                 }
             }
-            
-            // decode, append to output to be re-encoded
+
+            // decode, append to output
             $decoded .= base64_decode($part);
         }
  
         return $decoded;
     }
-    
+
     /**
      * Checks the contentStream and ensures that it is a correct base64 string;
      * This is purely for clients such as CMISSpaces breaking the content into 
@@ -470,7 +407,7 @@ class CMISUtil {
      * If it is not chunked it is decoded as is and sent back as a single stream.
      * 
      * NOTE this function and the above need to be checked for efficiency.
-     *      The current one appears to be miles better (1/0/3 vs 14/4/57 on respective test files)
+     *      The other one appears to be miles better (1/0/3 vs 14/4/57 on respective test files)
      * 
      * @param object $contentStream
      * @return string decoded
@@ -479,13 +416,13 @@ class CMISUtil {
     {
         // always trim content, just in case, as the AtomPub specification says content may be padded with whitespace at the start and end.
         $contentStream = trim($contentStream);
-        
+
         // check whether the content is encoded first, return as is if not
         // A–Z, a–z, 0–9, +, /
         // NOTE this makes the (fairly reasonable) assumption that text content contains at least one space or punctuation character.
         //      of course this may fail should something be sent in plain text such as a passwords file containing sha1 or md5 hashes only.
         if (preg_match('/[^\w\/\+=\n]+/', $content)) return $contentStream;
-        
+
         // check the content stream for any lines of unusual length (except the last line, which can be any length)
         $count = -1;
         $length = 0;
@@ -500,11 +437,11 @@ class CMISUtil {
         foreach ($splitStream as $line)
         {
             $curlen = strlen($line);
-            
+
             if ($length == 0) {
                 $length = $curlen;
             }
-                
+
             // if we find one we know that we must split the line here and end the previous base64 string
             if ($curlen > $length)
             {
@@ -522,7 +459,7 @@ class CMISUtil {
                 }
  
                 $decode[++$count] = $b64String . $lastChunk;
-        
+
                 $b64String = $nextChunk . "\n";
                 $length = strlen($nextChunk);
  
@@ -553,7 +490,7 @@ class CMISUtil {
  
         return $decoded;
     }
-    
+
     /**
      * Function to check whether a specified object exists within the KnowledgeTree system
      * 
@@ -565,14 +502,14 @@ class CMISUtil {
     public function contentExists($typeId, $objectId, &$ktapi)
     {
         $exists = true;
-        if ($typeId == 'Folder')
+        if ($typeId == 'cmis:folder')
         {
             $object = $ktapi->get_folder_by_id($objectId);
             if (PEAR::isError($object)) {
                 $exists = false;
             }
         }
-        else if ($typeId == 'Document')
+        else if ($typeId == 'cmis:document')
         {
             $object = $ktapi->get_document_by_id($objectId);
             if (PEAR::isError($object)) {
@@ -583,10 +520,10 @@ class CMISUtil {
         else {
             $exists = false;
         }
-        
+
         return $exists;
     }
-    
+
     /**
      * Creates a temporary file
      * Cleanup is the responsibility of the calling code
@@ -598,22 +535,22 @@ class CMISUtil {
     {
         // if contentStream is empty, cannot create file
         if (empty($contentStream)) return null;
-        
+
         // TODO consider checking whether content is encoded (currently we expect encoded)
         // TODO choose between this and the alternative decode function (see CMISUtil class)
         //      this will require some basic benchmarking
         $contentStream = self::decodeChunkedContentStream($contentStream);
-     
+
         // NOTE There is a function in CMISUtil to do this, written for the unit tests but since KTUploadManager exists
         //      and has more functionality which could come in useful at some point I decided to go with that instead
         //      (did not know this existed when I wrote the CMISUtil function)
         $uploadManager = new KTUploadManager();
         // assumes already decoded from base64, should use store_base64_file if not
         $tempfilename = $uploadManager->store_file($contentStream, 'cmis_');
-        
+
         return $tempfilename;
     }
-    
+
     /**
      * attempts to fetch the folder id from a name
      * 
@@ -627,28 +564,28 @@ class CMISUtil {
     static public function getIdFromName($name, &$ktapi)
     {
         $folder = $ktapi->get_folder_by_name($name);
-        
+
         return self::encodeObjectId(FOLDER, $folder->get_folderid());
     }
-    
+
     /**
      * Checks for the root folder
      *
-     * @param unknown_type $repositoryId
-     * @param unknown_type $folderId
-     * @param unknown_type $ktapi
-     * @return unknown
+     * @param string $repositoryId
+     * @param string $folderId
+     * @param object $ktapi
+     * @return boolean
      */
     static public function isRootFolder($repositoryId, $folderId, &$ktapi)
     {
         $repository = new CMISRepository($repositoryId);
         $repositoryInfo = $repository->getRepositoryInfo();
-        
+
         // NOTE this call is required to accomodate the definition of the root folder id in the config as required by the drupal module
         //      we should try to update the drupal module to not require this, but this way is just easier at the moment, and most of
         //      the code accomodates it without any serious hacks
         $rootFolder = self::getIdFromName($repositoryInfo->getRootFolderId(), $ktapi);
-        
+
         return $folderId == $rootFolder;
     }
  
@@ -6,7 +6,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -6,7 +6,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -4,7 +4,7 @@
  *
  * KnowledgeTree Community Edition
  * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ * Copyright (C) 2008, 2009, 2010 KnowledgeTree Inc.
  * 
  * 
  * This program is free software; you can redistribute it and/or modify it under