Merge branch 'edge' into multiselect

Kevin G Fourie
2 parents 043e6837 2f7495d0
Showing 53 changed files with 2777 additions and 1965 deletions
ktapi/ktapi.inc.php
lib/api/ktcmis/classes/CMISDocumentPropertyCollection.inc.php
lib/api/ktcmis/ktNavigationService.inc.php
lib/api/ktcmis/ktObjectService.inc.php
lib/api/ktcmis/ktRepositoryService.inc.php
lib/api/ktcmis/ktService.inc.php
lib/api/ktcmis/ktVersioningService.inc.php
lib/api/ktcmis/ktcmis.inc.php
lib/api/ktcmis/services/CMISObjectService.inc.php
lib/api/ktcmis/services/CMISVersioningService.inc.php
lib/api/ktcmis/util/CMISUtil.inc.php
plugins/thumbnails/templates/thumbnail_viewlet.smarty
plugins/thumbnails/thumbnails.php
plugins/thumbnails/thumbnailsPlugin.php
setup/wizard/config/config.xml
setup/wizard/installUtil.php
setup/wizard/installer.php
setup/wizard/lib/services/unixOpenOffice.php
setup/wizard/resources/graphics/dame/installer-header_logo.png
setup/wizard/resources/graphics/dame/installer_head.png
@@ -2928,7 +2928,7 @@ class KTAPI
      * @param string $tempfilename
      * @return kt_document_detail. status_code can be KTWS_ERR_INVALID_SESSION, KTWS_ERR_INVALID_FOLDER, KTWS_ERR_INVALID_DOCUMENT or KTWS_SUCCESS
      */
-    public function checkin_document($document_id,  $filename, $reason, $tempfilename, $major_update,
+    public function checkin_document($document_id, $filename, $reason, $tempfilename, $major_update,
                                      $sig_username = '', $sig_password = '')
     {
         $response = $this->_check_electronic_signature($document_id, $sig_username, $sig_password, $reason, $reason,
@@ -71,6 +71,7 @@ class CMISDocumentPropertyCollection extends CMISPropertyCollection {
                                      'ContentStreamMimeType' => 'propertyString',
                                      'ContentStreamFilename' => 'propertyString',
                                      'ContentStreamUri' => 'propertyUri',
+                                     'IsLatestVersion' => 'propertyBoolean',
                                      'IsVersionSeriesCheckedOut' => 'propertyBoolean',
                                      'VersionSeriesCheckedOutBy' => 'propertyString',
                                      'VersionSeriesCheckedOutId' => 'propertyId', 
+<?php
+/**
+* Navigation Service CMIS wrapper API for KnowledgeTree.
+*
+* KnowledgeTree Community Edition
+* Document Management Made Simple
+* Copyright (C) 2008,2009 KnowledgeTree Inc.
+* Portions copyright The Jam Warehouse Software (Pty) Limited
+*
+* This program is free software; you can redistribute it and/or modify it under
+* the terms of the GNU General Public License version 3 as published by the
+* Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+* details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+* 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.
+*
+* @copyright 2008-2009, KnowledgeTree Inc.
+* @license GNU General Public License version 3
+* @author KnowledgeTree Team
+* @package KTCMIS
+* @version Version 0.9
+*/
+
+require_once(realpath(dirname(__FILE__) . '/ktService.inc.php'));
+require_once(CMIS_DIR . '/services/CMISNavigationService.inc.php');
+
+/*
+ * Handles repository navigation
+ */
+class KTNavigationService extends KTCMISBase {
+
+    protected $NavigationService;
+
+    public function __construct(&$ktapi = null, $username = null, $password = null)
+    {
+        parent::__construct($ktapi, $username, $password);
+        // instantiate underlying CMIS service
+        $this->NavigationService = new CMISNavigationService();
+        $this->setInterface();
+    }
+
+    public function startSession($username, $password)
+    {
+        parent::startSession($username, $password);
+        $this->setInterface();
+        return self::$session;
+    }
+
+    public function setInterface(&$ktapi = null)
+    {
+        parent::setInterface($ktapi);
+        $this->NavigationService->setInterface(self::$ktapi);
+    }
+
+    /**
+     * 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
+     * @return array $descendants
+     */
+    public function getDescendants($repositoryId, $folderId, $includeAllowableActions, $includeRelationships,
+                            $depth = 1, $typeID = 'Any', $filter = '')
+    {
+        // TODO optional parameters
+        $descendantsResult = $this->NavigationService->getDescendants($repositoryId, $folderId, $includeAllowableActions,
+                                                                        $includeRelationships, $depth);
+
+        if (PEAR::isError($descendantsResult))
+        {
+            return array(
+                "status_code" => 1,
+                "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');
+
+        return array (
+            "status_code" => 0,
+            "results" => $descendants
+        );
+    }
+
+    /**
+     * Get direct children of the specified folder
+     *
+     * @param string $repositoryId
+     * @param string $folderId
+     * @param boolean $includeAllowableActions
+     * @param boolean $includeRelationships
+     * @param string $typeID
+     * @param string $filter
+     * @param int $maxItems
+     * @param int $skipCount
+     * @return array $descendants
+     */
+    public function getChildren($repositoryId, $folderId, $includeAllowableActions, $includeRelationships,
+                         $typeID = 'Any', $filter = '', $maxItems = 0, $skipCount = 0)
+    {
+        // TODO paging
+        // TODO optional parameters
+        $childrenResult = $this->NavigationService->getChildren($repositoryId, $folderId, $includeAllowableActions, $includeRelationships);
+
+        if (PEAR::isError($childrenResult))
+        {
+            return array(
+                "status_code" => 1,
+                "message" => "Failed getting descendants for folder"
+            );
+        }
+
+        $children = CMISUtil::decodeObjectHierarchy($childrenResult, 'child');
+
+        return array(
+			"status_code" => 0,
+			"results" => $children
+		);
+    }
+
+    /**
+     * Gets the parent of the selected folder
+     *
+     * @param string $repositoryId
+     * @param string $folderId
+     * @param boolean $includeAllowableActions
+     * @param boolean $includeRelationships
+     * @param boolean $returnToRoot
+     * @param string $filter
+     * @return ancestry[]
+     */
+    public function getFolderParent($repositoryId, $folderId, $includeAllowableActions, $includeRelationships, $returnToRoot, $filter = '')
+    {
+        $ancestryResult = $this->NavigationService->getFolderParent($repositoryId, $folderId, $includeAllowableActions,
+                                                              $includeRelationships, $returnToRoot);
+
+        if (PEAR::isError($ancestryResult))
+        {
+            return array(
+                "status_code" => 1,
+                "message" => "Failed getting ancestry for folder"
+            );
+        }
+
+        $ancestry = CMISUtil::decodeObjectHierarchy($ancestryResult, 'child');
+
+        return array(
+			"status_code" => 0,
+			"results" => $ancestry
+		);
+    }
+
+    /**
+     * Gets the parents for the selected object
+     *
+     * @param string $repositoryId
+     * @param string $folderId
+     * @param boolean $includeAllowableActions
+     * @param boolean $includeRelationships
+     * @param string $filter
+     * @return ancestry[]
+     */
+    function getObjectParents($repositoryId, $objectId, $includeAllowableActions, $includeRelationships, $filter = '')
+    {
+        $ancestryResult = $this->NavigationService->getObjectParents($repositoryId, $objectId, $includeAllowableActions,
+                                                                     $includeRelationships);
+
+        if (PEAR::isError($ancestryResult))
+        {
+            return array(
+                "status_code" => 1,
+                "message" => "Failed getting ancestry for object"
+            );
+        }
+
+        $ancestry = CMISUtil::decodeObjectHierarchy($ancestryResult, 'child');
+
+        return array(
+            "status_code" => 0,
+            "results" => $ancestry
+        );
+    }
+
+    /**
+     * Returns a list of checked out documents from the selected repository
+     *
+     * @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
+     */
+    function getCheckedOutDocs($repositoryId, $includeAllowableActions, $includeRelationships, $folderId = null, $filter = '', 
+                               $maxItems = 0, $skipCount = 0)
+    {
+        $checkedout = $this->NavigationService->getCheckedOutDocs($repositoryId, $includeAllowableActions, $includeRelationships, 
+                                                                  $folderId, $filter, $maxItems, $skipCount);
+
+        if (PEAR::isError($checkedout))
+        {
+            return array(
+                "status_code" => 1,
+                "message" => "Failed getting list of checked out documents"
+            );
+        }
+
+        // convert to array format for external code
+        $co = array();
+        foreach ($checkedout as $documentProperties)
+        {
+            $co[] = CMISUtil::createObjectPropertiesEntry($documentProperties);;
+        }
+
+        return array(
+            "status_code" => 0,
+            "results" => $co
+        );
+    }
+
+}
+
+?>
 \ No newline at end of file
+<?php
+/**
+* Object Service CMIS wrapper API for KnowledgeTree.
+*
+* KnowledgeTree Community Edition
+* Document Management Made Simple
+* Copyright (C) 2008,2009 KnowledgeTree Inc.
+* Portions copyright The Jam Warehouse Software (Pty) Limited
+*
+* This program is free software; you can redistribute it and/or modify it under
+* the terms of the GNU General Public License version 3 as published by the
+* Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+* details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+* 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.
+*
+* @copyright 2008-2009, KnowledgeTree Inc.
+* @license GNU General Public License version 3
+* @author KnowledgeTree Team
+* @package KTCMIS
+* @version Version 0.9
+*/
+
+require_once(realpath(dirname(__FILE__) . '/ktService.inc.php'));
+require_once(CMIS_DIR . '/services/CMISObjectService.inc.php');
+
+/**
+ * Handles requests for and actions on Folders and Documents
+ */
+class KTObjectService extends KTCMISBase {
+
+    protected $ObjectService;
+
+    public function __construct(&$ktapi = null, $username = null, $password = null)
+    {
+        parent::__construct($ktapi, $username, $password);
+        // instantiate underlying CMIS service
+        $this->ObjectService = new CMISObjectService();
+        $this->setInterface();
+    }
+
+    public function startSession($username, $password)
+    {
+        parent::startSession($username, $password);
+        $this->setInterface();
+        return self::$session;
+    }
+
+    public function setInterface(&$ktapi = null)
+    {
+        parent::setInterface($ktapi);
+        $this->ObjectService->setInterface(self::$ktapi);
+    }
+
+    /**
+     * Gets the properties for the selected object
+     *
+     * @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 = '')
+    {
+        try {
+            $propertyCollection = $this->ObjectService->getProperties($repositoryId, $objectId, $includeAllowableActions,
+                                                                      $includeRelationships);
+        }
+        catch (Exception $e)
+        {
+            return array(
+                "status_code" => 1,
+                "message" => $e->getMessage()
+            );
+        }
+
+        $properties = CMISUtil::createObjectPropertiesEntry($propertyCollection);
+
+        return array(
+			"status_code" => 0,
+			"results" => $properties
+		);
+    }
+
+    /**
+     * 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
+     * @return string $objectId The id of the created folder object
+     */
+    public function createDocument($repositoryId, $typeId, $properties, $folderId = null,
+                            $contentStream = null, $versioningState = null)
+    {
+        $objectId = null;
+
+        try {
+            $objectId = $this->ObjectService->createDocument($repositoryId, $typeId, $properties, $folderId,
+                                                             $contentStream, $versioningState);
+        }
+        catch (Exception $e)
+        {
+            return array(
+                "status_code" => 1,
+                "message" => $e->getMessage()
+            );
+        }
+
+        return array(
+            'status_code' => 0,
+            'results' => $objectId
+        );
+    }
+
+    /**
+     * 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
+     * @return string $objectId The id of the created folder object
+     */
+    public function createFolder($repositoryId, $typeId, $properties, $folderId)
+    {
+        $objectId = null;
+
+        try {
+            $objectId = $this->ObjectService->createFolder($repositoryId, $typeId, $properties, $folderId);
+        }
+        catch (Exception $e)
+        {
+            return array(
+                "status_code" => 1,
+                "message" => $e->getMessage()
+            );
+        }
+
+        return array(
+            'status_code' => 0,
+            'results' => $objectId
+        );
+    }
+    
+    /**
+     * Fetches the content stream data for an object
+     *  
+     * @param string $repositoryId
+     * @param string $objectId
+     * @return string $contentStream (binary or text data)
+     */
+    function getContentStream($repositoryId, $objectId)
+    {
+        try {
+            $contentStream = $this->ObjectService->getContentStream($repositoryId, $objectId);
+        }
+        catch (Exception $e)
+        {
+            return array(
+                "status_code" => 1,
+                "message" => $e->getMessage()
+            );
+        }
+
+        return array(
+            'status_code' => 0,
+            'results' => $contentStream
+        );
+    }
+    
+    /**
+     * 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] 
+     */
+    public function moveObject($repositoryId, $objectId, $changeToken = '', $targetFolderId, $sourceFolderId = null)
+    {
+        try {
+            $this->ObjectService->moveObject($repositoryId, $objectId, $changeToken, $targetFolderId, $sourceFolderId);
+        }
+        catch (Exception $e)
+        {
+            return array(
+                "status_code" => 1,
+                "message" => $e->getMessage()
+            );
+        }
+
+        return array(
+            'status_code' => 0,
+            'results' => $objectId
+        );
+    }
+    
+    /**
+     * Deletes an object from the repository
+     * 
+     * @param string $repositoryId
+     * @param string $objectId
+     * @param string $changeToken [optional]
+     * @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)
+    {
+        try {
+            $this->ObjectService->deleteObject($repositoryId, $objectId, $changeToken);
+        }
+        catch (Exception $e)
+        {
+            return array(
+                "status_code" => 1,
+                "message" => $e->getMessage()
+            );
+        }
+
+        return array(
+            'status_code' => 0,
+            'results' => $objectId
+        );
+    }
+    
+    public function deleteTree($repositoryId, $objectId, $changeToken = null, $unfileNonfolderObject = 'delete', $continueOnFailure = false)
+    {
+        try {
+            $result = $this->ObjectService->deleteTree($repositoryId, $objectId, $changeToken, $unfileNonfolderObject, $continueOnFailure);
+        }
+        catch (Exception $e)
+        {
+            return array(
+                "status_code" => 1,
+                "message" => $e->getMessage()
+            );
+        }
+
+        // check whether there is a list of items which did not delete
+        if (count($result) > 0)
+        {
+            return array(
+                "status_code" => 1,
+                "message" => $result
+            );          
+        }
+        
+        return array(
+            'status_code' => 0,
+            'results' => $objectId
+        );
+    }
+
+    /**
+     * Sets the content stream data for an existing document
+     *
+     * if $overwriteFlag = TRUE, the new content stream is applied whether or not the document has an existing content stream
+     * if $overwriteFlag = FALSE, the new content stream is applied only if the document does not have an existing content stream
+     *
+     * NOTE A Repository MAY automatically create new Document versions as part of this service method.
+     *      Therefore, the documentId output NEED NOT be identical to the documentId input.
+     *
+     * @param string $repositoryId
+     * @param string $documentId
+     * @param boolean $overwriteFlag
+     * @param string $contentStream
+     * @param string $changeToken
+     * @return string $documentId
+     */
+    function setContentStream($repositoryId, $documentId, $overwriteFlag, $contentStream, $changeToken = null)
+    {
+        try {
+            $documentId = $this->ObjectService->setContentStream($repositoryId, $documentId, $overwriteFlag, $contentStream, $changeToken);
+        }
+        catch (Exception $e)
+        {
+            return array(
+                "status_code" => 1,
+                "message" => $e->getMessage()
+            );
+        }
+
+        return array(
+            'status_code' => 0,
+            'results' => $documentId
+        );
+    }
+
+}
+
+?>
 \ No newline at end of file
+<?php
+/**
+* Repository Service CMIS wrapper API for KnowledgeTree.
+*
+* KnowledgeTree Community Edition
+* Document Management Made Simple
+* Copyright (C) 2008,2009 KnowledgeTree Inc.
+* Portions copyright The Jam Warehouse Software (Pty) Limited
+*
+* This program is free software; you can redistribute it and/or modify it under
+* the terms of the GNU General Public License version 3 as published by the
+* Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+* details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+* 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.
+*
+* @copyright 2008-2009, KnowledgeTree Inc.
+* @license GNU General Public License version 3
+* @author KnowledgeTree Team
+* @package KTCMIS
+* @version Version 0.9
+*/
+
+require_once(realpath(dirname(__FILE__) . '/ktService.inc.php'));
+require_once(CMIS_DIR . '/services/CMISRepositoryService.inc.php');
+
+/**
+ * Handles low level repository information queries
+ */
+class KTRepositoryService extends KTCMISBase {
+
+    protected $RepositoryService;
+
+    public function __construct()
+    {
+        // we don't need to call the parent constructor here as there is no ktapi involved
+        // instantiate underlying CMIS service
+        $this->RepositoryService = new CMISRepositoryService();
+    }
+
+    /**
+     * Fetch a list of all available repositories
+     *
+     * NOTE Since we only have one repository at the moment, this is expected to only return one result
+     *
+     * @return repositoryList[]
+     */
+    public function getRepositories()
+    {
+        $repositories = $this->RepositoryService->getRepositories();
+        if (PEAR::isError($repositories))
+        {
+            return array(
+                "status_code" => 1,
+                "message" => "Failed getting repositories"
+            );
+        }
+
+        // extract the required info fields into array format for easy encoding;
+        $count = 0;
+        $repositoryList = array();
+        foreach ($repositories as $repository)
+        {
+            $repositoryList[$count]['repositoryId'] = $repository->getRepositoryId();
+            $repositoryList[$count]['repositoryName'] = $repository->getRepositoryName();
+            $repositoryList[$count]['repositoryURI'] = $repository->getRepositoryURI();
+            ++$count;
+        }
+
+        return array(
+            "status_code" => 0,
+            "results" => $repositoryList
+        );
+    }
+
+    /**
+     * Fetches information about the selected repository
+     *
+     * @param string $repositoryId
+     */
+    public function getRepositoryInfo($repositoryId)
+    {
+        $repositoryInfo = $this->RepositoryService->getRepositoryInfo($repositoryId);
+        if (PEAR::isError($repositoryInfo))
+        {
+            return array(
+                "status_code" => 1,
+                "message" => "Failed getting repository information"
+            );
+        }
+
+        // TODO output this manually, the function works but only for some objects so rather avoid it completely?
+        // NOTE the problems appear to be due to recursive objects
+        return array (
+            "status_code" => 0,
+            "results" => CMISUtil::objectToArray($repositoryInfo)
+        );
+    }
+
+    /**
+     * Fetch the list of supported object types for the selected repository
+     *
+     * @param string $repositoryId
+     */
+    public function getTypes($repositoryId, $typeId = '', $returnPropertyDefinitions = false,
+                             $maxItems = 0, $skipCount = 0, &$hasMoreItems = false)
+    {
+        try {
+            $repositoryObjectTypeResult = $this->RepositoryService->getTypes($repositoryId, $typeId, $returnPropertyDefinitions,
+                                                                             $maxItems, $skipCount, $hasMoreItems);
+        }
+        catch (Exception $e)
+        {
+            return array(
+                "status_code" => 1,
+                "message" => $e->getMessage()
+            );
+        }
+
+        // format as array style output
+        // NOTE only concerned with attributes at this time
+        // TODO add support for properties
+        foreach($repositoryObjectTypeResult as $key => $objectType)
+        {
+            $repositoryObjectTypes[$key] = $objectType['attributes'];
+            // TODO properties
+            // $repositoryObjectTypes[$key]['properties'] = $objectType['properties'];
+        }
+
+        return array (
+            "status_code" => 0,
+            "results" => $repositoryObjectTypes
+        );
+    }
+
+    /**
+     * Fetch the object type definition for the requested type
+     *
+     * @param string $repositoryId
+     * @param string $typeId
+     */
+    public function getTypeDefinition($repositoryId, $typeId)
+    {
+        try {
+            $typeDefinitionResult = $this->RepositoryService->getTypeDefinition($repositoryId, $typeId);
+        }
+        catch (Exception $e)
+        {
+            return array(
+                "status_code" => 1,
+                "message" => $e->getMessage()
+            );
+        }
+
+        // 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
+        );
+    }
+
+}
+
+?>
 \ No newline at end of file
+<?php
+/**
+* Base service class for CMIS wrapper API for KnowledgeTree.
+*
+* KnowledgeTree Community Edition
+* Document Management Made Simple
+* Copyright (C) 2008,2009 KnowledgeTree Inc.
+* Portions copyright The Jam Warehouse Software (Pty) Limited
+*
+* This program is free software; you can redistribute it and/or modify it under
+* the terms of the GNU General Public License version 3 as published by the
+* Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+* details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+* 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.
+*
+* @copyright 2008-2009, KnowledgeTree Inc.
+* @license GNU General Public License version 3
+* @author KnowledgeTree Team
+* @package KTCMIS
+* @version Version 0.9
+*/
+
+require_once(realpath(dirname(__FILE__) . '/../../../config/dmsDefaults.php'));
+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');
+
+/**
+ * Base class for all KT CMIS classes
+ * Handles authentication
+ * 
+ * This class is required for all CMIS Service classes
+ */
+class KTCMISBase {
+
+    // we want all child classes to share the ktapi and session instances, no matter where they are set from,
+    // so we declare them as static
+    static protected $ktapi;
+    static protected $session;
+
+    public function __construct(&$ktapi = null, $username = null, $password = null)
+    {
+        // TODO confirm KTAPI instance active??? shouldn't really be responsibility of this code
+        if (is_null($ktapi) && (!is_null($username) && !is_null($password))) {
+            $this->startSession($username, $password);
+        }
+        else if (!is_null($ktapi)) {
+            self::$ktapi = $ktapi;
+            self::$session = self::$ktapi->get_session();
+        }
+    }
+
+    // TODO this probably does not belong here??? probably should require all auth external, handled by transport protocol.
+    //      perhaps simple refusal to execute without valid session?
+    // NOTE left in to allow transport protocol to delegate auth to this level, but not actually used in any code at present
+    public function startSession($username, $password)
+    {
+        // attempt to recover session if one exists
+        if (!is_null(self::$session) && !PEAR::isError(self::$session))
+        {
+            self::$session =& self::$ktapi->get_active_session(self::$session->get_sessionid());
+        }
+
+        // start new session if no existing session or problem getting existing session (expired, etc...)
+        if (is_null(self::$session) || PEAR::isError(self::$session))
+        {
+            self::$ktapi = new KTAPI();
+            self::$session =& self::$ktapi->start_session($username, $password);
+        }
+
+        // failed authentication?
+        if (PEAR::isError(self::$session))
+        {
+            throw new PermissionDeniedException('You must be authenticated to perform this action');
+        }
+        
+        return self::$session;
+    }
+
+    public function setInterface(&$ktapi = null)
+    {
+        if (!is_null($ktapi)) {
+            self::$ktapi = $ktapi;
+        }
+    }
+
+    public function getInterface()
+    {
+        return self::$ktapi;
+    }
+
+    public function getSession()
+    {
+        return self::$session;
+    }
+
+    // TODO what about destroying sessions? only on logout (which is not offered by the CMIS clients tested so far)
+}
+
+?>
 \ No newline at end of file
+<?php
+/**
+* Versioning Service CMIS wrapper API for KnowledgeTree.
+*
+* KnowledgeTree Community Edition
+* Document Management Made Simple
+* Copyright (C) 2008,2009 KnowledgeTree Inc.
+* Portions copyright The Jam Warehouse Software (Pty) Limited
+*
+* This program is free software; you can redistribute it and/or modify it under
+* the terms of the GNU General Public License version 3 as published by the
+* Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+* details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+* 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.
+*
+* @copyright 2008-2009, KnowledgeTree Inc.
+* @license GNU General Public License version 3
+* @author KnowledgeTree Team
+* @package KTCMIS
+* @version Version 0.9
+*/
+
+/**
+ * Split into individual classes to handle each section of functionality.
+ * This is really just a handling layer between CMIS and the web services.
+ */
+
+require_once(realpath(dirname(__FILE__) . '/ktService.inc.php'));
+require_once(CMIS_DIR . '/services/CMISVersioningService.inc.php');
+
+/**
+ * Handles requests for and actions on versionable objects
+ */
+class KTVersioningService extends KTCMISBase {
+
+    protected $VersioningService;
+
+    public function __construct(&$ktapi = null, $username = null, $password = null)
+    {
+        parent::__construct($ktapi, $username, $password);
+        // instantiate underlying CMIS service
+        $this->VersioningService = new CMISVersioningService();
+        $this->setInterface();
+    }
+
+    public function startSession($username, $password)
+    {
+        parent::startSession($username, $password);
+        $this->setInterface();
+        return self::$session;
+    }
+
+    public function setInterface(&$ktapi = null)
+    {
+        parent::setInterface($ktapi);
+        $this->VersioningService->setInterface(self::$ktapi);
+    }
+    
+    /**
+     * 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]
+     * @return array results
+     */
+    // TODO set up delivery of content stream? or is that up to the CMIS client?
+    public function checkOut($repositoryId, $documentId, $changeToken = '')
+    {
+        try {
+            $result = $this->VersioningService->checkOut($repositoryId, $documentId, $changeToken);
+        }
+        catch (Exception $e)
+        {
+            return array(
+                "status_code" => 1,
+                "message" => $e->getMessage()
+            );
+        }
+
+        return array(
+            'status_code' => 0,
+            'results' => (!empty($result) ? $result : 'Document Checked Out')
+        );
+    }
+    
+    /**
+     * 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]
+     */
+    // 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 = '')
+    {
+        try {
+            $result = $this->VersioningService->cancelCheckOut($repositoryId, $documentId, $changeToken);
+        }
+        catch (Exception $e)
+        {
+            return array(
+                "status_code" => 1,
+                "message" => $e->getMessage()
+            );
+        }
+
+        return array(
+            'status_code' => 0,
+            'results' => (!empty($result) ? $result : 'Document Checkout Cancelled')
+        );
+    }
+    
+    /**
+     * Checks in a checked out document
+     * 
+     * @param string $repositoryId
+     * @param string $documentId
+     * @param boolean $major
+     * @param string $changeToken [optional]
+     * @param array $properties [optional]
+     * @param contentStream $contentStream [optional]
+     * @param string $checkinComment [optional]
+     * @return string $documentId
+     */
+    public function checkIn($repositoryId, $documentId, $major, $contentStream = null, $changeToken = '', $properties = array(), $checkinComment = '')
+    {
+        try {
+            $result = $this->VersioningService->checkIn($repositoryId, $documentId, $major, $contentStream, $changeToken, $properties, $checkinComment);
+        }
+        catch (Exception $e)
+        {
+            return array(
+                "status_code" => 1,
+                "message" => $e->getMessage()
+            );
+        }
+
+        return array(
+            'status_code' => 0,
+            'results' => (!empty($result) ? $result : 'Document Checked In Successfully')
+        );
+    }
+
+}
+
+?>
 \ No newline at end of file
-<?php
-/**
-* Implements a CMIS wrapper API for KnowledgeTree.
-*
-* KnowledgeTree Community Edition
-* Document Management Made Simple
-* Copyright (C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright The Jam Warehouse Software (Pty) Limited
-*
-* This program is free software; you can redistribute it and/or modify it under
-* the terms of the GNU General Public License version 3 as published by the
-* Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful, but WITHOUT
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-* details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
-* 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.
-*
-* @copyright 2008-2009, KnowledgeTree Inc.
-* @license GNU General Public License version 3
-* @author KnowledgeTree Team
-* @package KTCMIS
-* @version Version 0.9
-*/
-
-/**
- * Split into individual classes to handle each section of functionality.
- * This is really just a handling layer between CMIS and the web services.
- */
-
-// TODO implement exceptions in various calls (in the underlying classes)
-// FIXME none of the error handling actually does anything, it's leftover from copy/paste of some ktapi code
-
-require_once(realpath(dirname(__FILE__) . '/../../../config/dmsDefaults.php'));
-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 . '/services/CMISRepositoryService.inc.php');
-require_once(CMIS_DIR . '/services/CMISNavigationService.inc.php');
-require_once(CMIS_DIR . '/services/CMISObjectService.inc.php');
-require_once(CMIS_DIR . '/services/CMISVersioningService.inc.php');
-require_once(CMIS_DIR . '/util/CMISUtil.inc.php');
-
-/**
- * Base class for all KT CMIS classes
- * Handles authentication
- */
-class KTCMISBase {
-
-    // we want all child classes to share the ktapi and session instances, no matter where they are set from,
-    // so we declare them as static
-    static protected $ktapi;
-    static protected $session;
-
-    public function __construct(&$ktapi = null, $username = null, $password = null)
-    {
-        // TODO confirm KTAPI instance active??? shouldn't really be responsibility of this code
-        if (is_null($ktapi) && (!is_null($username) && !is_null($password))) {
-            $this->startSession($username, $password);
-        }
-        else {
-            self::$ktapi = $ktapi;
-            self::$session = self::$ktapi->get_session();
-        }
-    }
-
-    // TODO this probably does not belong here??? probably should require all auth external, handled by transport protocol.
-    //      perhaps simple refusal to execute without valid session?
-    // NOTE left in to allow transport protocol to delegate auth to this level, but not actually used in any code at present
-    public function startSession($username, $password)
-    {
-        // attempt to recover session if one exists
-        if (!is_null(self::$session) && !PEAR::isError(self::$session))
-        {
-            self::$session =& self::$ktapi->get_active_session(self::$session->get_sessionid());
-        }
-
-        // start new session if no existing session or problem getting existing session (expired, etc...)
-        if (is_null(self::$session) || PEAR::isError(self::$session))
-        {
-            self::$ktapi = new KTAPI();
-            self::$session =& self::$ktapi->start_session($username, $password);
-        }
-
-        // failed authentication?
-        if (PEAR::isError(self::$session))
-        {
-            throw new PermissionDeniedException('You must be authenticated to perform this action');
-        }
-        
-        return self::$session;
-    }
-
-    public function setInterface(&$ktapi = null)
-    {
-        if (!is_null($ktapi)) {
-            self::$ktapi = $ktapi;
-        }
-    }
-
-    public function getInterface()
-    {
-        return self::$ktapi;
-    }
-
-    public function getSession()
-    {
-        return self::$session;
-    }
-
-    // TODO what about destroying sessions? only on logout (which is not offered by the CMIS clients tested so far)
-}
-
-/**
- * Handles low level repository information queries
- */
-class KTRepositoryService extends KTCMISBase {
-
-    protected $RepositoryService;
-
-    public function __construct()
-    {
-        // instantiate underlying CMIS service
-        $this->RepositoryService = new CMISRepositoryService();
-    }
-
-    /**
-     * Fetch a list of all available repositories
-     *
-     * NOTE Since we only have one repository at the moment, this is expected to only return one result
-     *
-     * @return repositoryList[]
-     */
-    public function getRepositories()
-    {
-        $repositories = $this->RepositoryService->getRepositories();
-        if (PEAR::isError($repositories))
-        {
-            return array(
-                "status_code" => 1,
-                "message" => "Failed getting repositories"
-            );
-        }
-
-        // extract the required info fields into array format for easy encoding;
-        $count = 0;
-        $repositoryList = array();
-        foreach ($repositories as $repository)
-        {
-            $repositoryList[$count]['repositoryId'] = $repository->getRepositoryId();
-            $repositoryList[$count]['repositoryName'] = $repository->getRepositoryName();
-            $repositoryList[$count]['repositoryURI'] = $repository->getRepositoryURI();
-            ++$count;
-        }
-
-        return array(
-            "status_code" => 0,
-            "results" => $repositoryList
-        );
-    }
-
-    /**
-     * Fetches information about the selected repository
-     *
-     * @param string $repositoryId
-     */
-    public function getRepositoryInfo($repositoryId)
-    {
-        $repositoryInfo = $this->RepositoryService->getRepositoryInfo($repositoryId);
-        if (PEAR::isError($repositoryInfo))
-        {
-            return array(
-                "status_code" => 1,
-                "message" => "Failed getting repository information"
-            );
-        }
-
-        // TODO output this manually, the function works but only for some objects so rather avoid it completely?
-        // NOTE the problems appear to be due to recursive objects
-        return array (
-            "status_code" => 0,
-            "results" => CMISUtil::objectToArray($repositoryInfo)
-        );
-    }
-
-    /**
-     * Fetch the list of supported object types for the selected repository
-     *
-     * @param string $repositoryId
-     */
-    public function getTypes($repositoryId, $typeId = '', $returnPropertyDefinitions = false,
-                             $maxItems = 0, $skipCount = 0, &$hasMoreItems = false)
-    {
-        try {
-            $repositoryObjectTypeResult = $this->RepositoryService->getTypes($repositoryId, $typeId, $returnPropertyDefinitions,
-                                                                             $maxItems, $skipCount, $hasMoreItems);
-        }
-        catch (Exception $e)
-        {
-            return array(
-                "status_code" => 1,
-                "message" => $e->getMessage()
-            );
-        }
-
-        // format as array style output
-        // NOTE only concerned with attributes at this time
-        // TODO add support for properties
-        foreach($repositoryObjectTypeResult as $key => $objectType)
-        {
-            $repositoryObjectTypes[$key] = $objectType['attributes'];
-            // TODO properties
-            // $repositoryObjectTypes[$key]['properties'] = $objectType['properties'];
-        }
-
-        return array (
-            "status_code" => 0,
-            "results" => $repositoryObjectTypes
-        );
-    }
-
-    /**
-     * Fetch the object type definition for the requested type
-     *
-     * @param string $repositoryId
-     * @param string $typeId
-     */
-    public function getTypeDefinition($repositoryId, $typeId)
-    {
-        try {
-            $typeDefinitionResult = $this->RepositoryService->getTypeDefinition($repositoryId, $typeId);
-        }
-        catch (Exception $e)
-        {
-            return array(
-                "status_code" => 1,
-                "message" => $e->getMessage()
-            );
-        }
-
-        // 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
-        );
-    }
-
-}
-
-/*
- * Handles repository navigation
- */
-class KTNavigationService extends KTCMISBase {
-
-    protected $NavigationService;
-
-    public function __construct(&$ktapi = null, $username = null, $password = null)
-    {
-        parent::__construct($ktapi, $username, $password);
-        // instantiate underlying CMIS service
-        $this->NavigationService = new CMISNavigationService();
-        $this->setInterface();
-    }
-
-    public function startSession($username, $password)
-    {
-        parent::startSession($username, $password);
-        $this->setInterface();
-        return self::$session;
-    }
-
-    public function setInterface(&$ktapi = null)
-    {
-        parent::setInterface($ktapi);
-        $this->NavigationService->setInterface(self::$ktapi);
-    }
-
-    /**
-     * 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
-     * @return array $descendants
-     */
-    public function getDescendants($repositoryId, $folderId, $includeAllowableActions, $includeRelationships,
-                            $depth = 1, $typeID = 'Any', $filter = '')
-    {
-        // TODO optional parameters
-        $descendantsResult = $this->NavigationService->getDescendants($repositoryId, $folderId, $includeAllowableActions,
-                                                                        $includeRelationships, $depth);
-
-        if (PEAR::isError($descendantsResult))
-        {
-            return array(
-                "status_code" => 1,
-                "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');
-
-        return array (
-            "status_code" => 0,
-            "results" => $descendants
-        );
-    }
-
-    /**
-     * Get direct children of the specified folder
-     *
-     * @param string $repositoryId
-     * @param string $folderId
-     * @param boolean $includeAllowableActions
-     * @param boolean $includeRelationships
-     * @param string $typeID
-     * @param string $filter
-     * @param int $maxItems
-     * @param int $skipCount
-     * @return array $descendants
-     */
-    public function getChildren($repositoryId, $folderId, $includeAllowableActions, $includeRelationships,
-                         $typeID = 'Any', $filter = '', $maxItems = 0, $skipCount = 0)
-    {
-        // TODO paging
-        // TODO optional parameters
-        $childrenResult = $this->NavigationService->getChildren($repositoryId, $folderId, $includeAllowableActions, $includeRelationships);
-
-        if (PEAR::isError($childrenResult))
-        {
-            return array(
-                "status_code" => 1,
-                "message" => "Failed getting descendants for folder"
-            );
-        }
-
-        $children = CMISUtil::decodeObjectHierarchy($childrenResult, 'child');
-
-        return array(
-			"status_code" => 0,
-			"results" => $children
-		);
-    }
-
-    /**
-     * Gets the parent of the selected folder
-     *
-     * @param string $repositoryId
-     * @param string $folderId
-     * @param boolean $includeAllowableActions
-     * @param boolean $includeRelationships
-     * @param boolean $returnToRoot
-     * @param string $filter
-     * @return ancestry[]
-     */
-    public function getFolderParent($repositoryId, $folderId, $includeAllowableActions, $includeRelationships, $returnToRoot, $filter = '')
-    {
-        $ancestryResult = $this->NavigationService->getFolderParent($repositoryId, $folderId, $includeAllowableActions,
-                                                              $includeRelationships, $returnToRoot);
-
-        if (PEAR::isError($ancestryResult))
-        {
-            return array(
-                "status_code" => 1,
-                "message" => "Failed getting ancestry for folder"
-            );
-        }
-
-        $ancestry = CMISUtil::decodeObjectHierarchy($ancestryResult, 'child');
-
-        return array(
-			"status_code" => 0,
-			"results" => $ancestry
-		);
-    }
-
-    /**
-     * Gets the parents for the selected object
-     *
-     * @param string $repositoryId
-     * @param string $folderId
-     * @param boolean $includeAllowableActions
-     * @param boolean $includeRelationships
-     * @param string $filter
-     * @return ancestry[]
-     */
-    function getObjectParents($repositoryId, $objectId, $includeAllowableActions, $includeRelationships, $filter = '')
-    {
-        $ancestryResult = $this->NavigationService->getObjectParents($repositoryId, $objectId, $includeAllowableActions,
-                                                                     $includeRelationships);
-
-        if (PEAR::isError($ancestryResult))
-        {
-            return array(
-                "status_code" => 1,
-                "message" => "Failed getting ancestry for object"
-            );
-        }
-
-        $ancestry = CMISUtil::decodeObjectHierarchy($ancestryResult, 'child');
-
-        return array(
-            "status_code" => 0,
-            "results" => $ancestry
-        );
-    }
-
-    /**
-     * Returns a list of checked out documents from the selected repository
-     *
-     * @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
-     */
-    function getCheckedOutDocs($repositoryId, $includeAllowableActions, $includeRelationships, $folderId = null, $filter = '', 
-                               $maxItems = 0, $skipCount = 0)
-    {
-        $checkedout = $this->NavigationService->getCheckedOutDocs($repositoryId, $includeAllowableActions, $includeRelationships, 
-                                                                  $folderId, $filter, $maxItems, $skipCount);
-
-        if (PEAR::isError($checkedout))
-        {
-            return array(
-                "status_code" => 1,
-                "message" => "Failed getting list of checked out documents"
-            );
-        }
-
-        // convert to array format for external code
-        $co = array();
-        foreach ($checkedout as $documentProperties)
-        {
-            $co[] = CMISUtil::createObjectPropertiesEntry($documentProperties);;
-        }
-
-        return array(
-            "status_code" => 0,
-            "results" => $co
-        );
-    }
-
-}
-
-/**
- * Handles requests for and actions on Folders and Documents
- */
-class KTObjectService extends KTCMISBase {
-
-    protected $ObjectService;
-
-    public function __construct(&$ktapi = null, $username = null, $password = null)
-    {
-        parent::__construct($ktapi, $username, $password);
-        // instantiate underlying CMIS service
-        $this->ObjectService = new CMISObjectService();
-        $this->setInterface();
-    }
-
-    public function startSession($username, $password)
-    {
-        parent::startSession($username, $password);
-        $this->setInterface();
-        return self::$session;
-    }
-
-    public function setInterface(&$ktapi = null)
-    {
-        parent::setInterface($ktapi);
-        $this->ObjectService->setInterface(self::$ktapi);
-    }
-
-    /**
-     * Gets the properties for the selected object
-     *
-     * @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 = '')
-    {
-        try {
-            $propertyCollection = $this->ObjectService->getProperties($repositoryId, $objectId, $includeAllowableActions,
-                                                                      $includeRelationships);
-        }
-        catch (Exception $e)
-        {
-            return array(
-                "status_code" => 1,
-                "message" => $e->getMessage()
-            );
-        }
-
-        $properties = CMISUtil::createObjectPropertiesEntry($propertyCollection);
-
-        return array(
-			"status_code" => 0,
-			"results" => $properties
-		);
-    }
-
-    /**
-     * 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
-     * @return string $objectId The id of the created folder object
-     */
-    public function createDocument($repositoryId, $typeId, $properties, $folderId = null,
-                            $contentStream = null, $versioningState = null)
-    {
-        $objectId = null;
-
-        try {
-            $objectId = $this->ObjectService->createDocument($repositoryId, $typeId, $properties, $folderId,
-                                                             $contentStream, $versioningState);
-        }
-        catch (Exception $e)
-        {
-            return array(
-                "status_code" => 1,
-                "message" => $e->getMessage()
-            );
-        }
-
-        return array(
-            'status_code' => 0,
-            'results' => $objectId
-        );
-    }
-
-    /**
-     * 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
-     * @return string $objectId The id of the created folder object
-     */
-    public function createFolder($repositoryId, $typeId, $properties, $folderId)
-    {
-        $objectId = null;
-
-        try {
-            $objectId = $this->ObjectService->createFolder($repositoryId, $typeId, $properties, $folderId);
-        }
-        catch (Exception $e)
-        {
-            return array(
-                "status_code" => 1,
-                "message" => $e->getMessage()
-            );
-        }
-
-        return array(
-            'status_code' => 0,
-            'results' => $objectId
-        );
-    }
-    
-    /**
-     * Fetches the content stream data for an object
-     *  
-     * @param string $repositoryId
-     * @param string $objectId
-     * @return string $contentStream (binary or text data)
-     */
-    function getContentStream($repositoryId, $objectId)
-    {
-        try {
-            $contentStream = $this->ObjectService->getContentStream($repositoryId, $objectId);
-        }
-        catch (Exception $e)
-        {
-            return array(
-                "status_code" => 1,
-                "message" => $e->getMessage()
-            );
-        }
-
-        return array(
-            'status_code' => 0,
-            'results' => $contentStream
-        );
-    }
-    
-    /**
-     * 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] 
-     */
-    public function moveObject($repositoryId, $objectId, $changeToken = '', $targetFolderId, $sourceFolderId = null)
-    {
-        try {
-            $this->ObjectService->moveObject($repositoryId, $objectId, $changeToken, $targetFolderId, $sourceFolderId);
-        }
-        catch (Exception $e)
-        {
-            return array(
-                "status_code" => 1,
-                "message" => $e->getMessage()
-            );
-        }
-
-        return array(
-            'status_code' => 0,
-            'results' => $objectId
-        );
-    }
-    
-    /**
-     * Deletes an object from the repository
-     * 
-     * @param string $repositoryId
-     * @param string $objectId
-     * @param string $changeToken [optional]
-     * @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)
-    {
-        try {
-            $this->ObjectService->deleteObject($repositoryId, $objectId, $changeToken);
-        }
-        catch (Exception $e)
-        {
-            return array(
-                "status_code" => 1,
-                "message" => $e->getMessage()
-            );
-        }
-
-        return array(
-            'status_code' => 0,
-            'results' => $objectId
-        );
-    }
-    
-    public function deleteTree($repositoryId, $objectId, $changeToken = null, $unfileNonfolderObject = 'delete', $continueOnFailure = false)
-    {
-        try {
-            $result = $this->ObjectService->deleteTree($repositoryId, $objectId, $changeToken, $unfileNonfolderObject, $continueOnFailure);
-        }
-        catch (Exception $e)
-        {
-            return array(
-                "status_code" => 1,
-                "message" => $e->getMessage()
-            );
-        }
-
-        // check whether there is a list of items which did not delete
-        if (count($result) > 0)
-        {
-            return array(
-                "status_code" => 1,
-                "message" => $result
-            );          
-        }
-        
-        return array(
-            'status_code' => 0,
-            'results' => $objectId
-        );
-    }
-
-    /**
-     * Sets the content stream data for an existing document
-     *
-     * if $overwriteFlag = TRUE, the new content stream is applied whether or not the document has an existing content stream
-     * if $overwriteFlag = FALSE, the new content stream is applied only if the document does not have an existing content stream
-     *
-     * NOTE A Repository MAY automatically create new Document versions as part of this service method.
-     *      Therefore, the documentId output NEED NOT be identical to the documentId input.
-     *
-     * @param string $repositoryId
-     * @param string $documentId
-     * @param boolean $overwriteFlag
-     * @param string $contentStream
-     * @param string $changeToken
-     * @return string $documentId
-     */
-    function setContentStream($repositoryId, $documentId, $overwriteFlag, $contentStream, $changeToken = null)
-    {
-        try {
-            $documentId = $this->ObjectService->setContentStream($repositoryId, $documentId, $overwriteFlag, $contentStream, $changeToken);
-        }
-        catch (Exception $e)
-        {
-            return array(
-                "status_code" => 1,
-                "message" => $e->getMessage()
-            );
-        }
-
-        return array(
-            'status_code' => 0,
-            'results' => $documentId
-        );
-    }
-
-}
-
-/**
- * Handles requests for and actions on versionable objects
- */
-class KTVersioningService extends KTCMISBase {
-
-    protected $VersioningService;
-
-    public function __construct(&$ktapi = null, $username = null, $password = null)
-    {
-        parent::__construct($ktapi, $username, $password);
-        // instantiate underlying CMIS service
-        $this->VersioningService = new CMISVersioningService();
-        $this->setInterface();
-    }
-
-    public function startSession($username, $password)
-    {
-        parent::startSession($username, $password);
-        $this->setInterface();
-        return self::$session;
-    }
-
-    public function setInterface(&$ktapi = null)
-    {
-        parent::setInterface($ktapi);
-        $this->VersioningService->setInterface(self::$ktapi);
-    }
-    
-    /**
-     * 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]
-     * @return array results
-     */
-    // TODO set up delivery of content stream? or is that up to the CMIS client?
-    public function checkOut($repositoryId, $documentId, $changeToken = '')
-    {
-        try {
-            $result = $this->VersioningService->checkOut($repositoryId, $documentId, $changeToken);
-        }
-        catch (Exception $e)
-        {
-            return array(
-                "status_code" => 1,
-                "message" => $e->getMessage()
-            );
-        }
-
-        return array(
-            'status_code' => 0,
-            'results' => (!empty($result) ? $result : 'Document Checked Out')
-        );
-    }
-    
-    /**
-     * 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]
-     */
-    // 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 = '')
-    {
-        try {
-            $result = $this->VersioningService->cancelCheckOut($repositoryId, $documentId, $changeToken);
-        }
-        catch (Exception $e)
-        {
-            return array(
-                "status_code" => 1,
-                "message" => $e->getMessage()
-            );
-        }
-
-        return array(
-            'status_code' => 0,
-            'results' => (!empty($result) ? $result : 'Document Checkout Cancelled')
-        );
-    }
-    
-    /**
-     * Checks in a checked out document
-     * 
-     * @param string $repositoryId
-     * @param string $documentId
-     * @param boolean $major
-     * @param string $changeToken [optional]
-     * @param array $properties [optional]
-     * @param contentStream $contentStream [optional]
-     * @param string $checkinComment [optional]
-     * @return string $documentId
-     */
-    public function checkIn($repositoryId, $documentId, $major, $changeToken = '', $properties = array(), $contentStream = null, $checkinComment = '')
-    {
-        try {
-            $result = $this->VersioningService->checkIn($repositoryId, $documentId, $major, $changeToken, $properties, $contentStream, $checkinComment);
-        }
-        catch (Exception $e)
-        {
-            return array(
-                "status_code" => 1,
-                "message" => $e->getMessage()
-            );
-        }
-
-        return array(
-            'status_code' => 0,
-            'results' => (!empty($result) ? $result : 'Document Checked In Successfully')
-        );
-    }
-
-}
-
-?>
@@ -61,7 +61,7 @@ class CMISObjectService {
         // NOTE The latter method has been adopted for the moment
         catch (Exception $e)
         {
-            throw new ConstraintViolationException('Object is not of base type document. ' . $e->getMessage());
+            throw new ConstraintViolationException('Object base type could not be determined. ' . $e->getMessage());
         }
         if ($typeDefinition['attributes']['baseType'] != 'document')
@@ -103,49 +103,41 @@ class CMISObjectService {
             }
         }
-        if (!$typeAllowed)
-        {
+        if (!$typeAllowed) {
             throw new ConstraintViolationException('Parent folder may not hold objects of this type (' . $typeId . ')');
         }
         // if content stream is required and no content stream is supplied, throw a ConstraintViolationException
-        if (($typeDefinition['attributes']['contentStreamAllowed'] == 'required') && is_null($contentStream))
-        {
+        if (($typeDefinition['attributes']['contentStreamAllowed'] == 'required') && is_null($contentStream)) {
             throw new ConstraintViolationException('This repository requires a content stream for document creation.  '
                                                  . 'Refusing to create an empty document');
         }
-        else if (($typeDefinition['attributes']['contentStreamAllowed'] == 'notAllowed') && !empty($contentStream))
-        {
+        else if (($typeDefinition['attributes']['contentStreamAllowed'] == 'notAllowed') && !empty($contentStream)) {
             throw new StreamNotSupportedException('Content Streams are not supported');
         }
         // if versionable attribute is set to false and versioningState is supplied, throw a ConstraintViolationException
-        if (!$typeDefinition['attributes']['versionable'] && !empty($versioningState))
-        {
+        if (!$typeDefinition['attributes']['versionable'] && !empty($versioningState)) {
             throw new ConstraintViolationException('This repository does not support versioning');
         }
         // TODO deal with $versioningState when supplied
         // set title and name identical if only one submitted
-        if ($properties['title'] == '')
-        {
+        if ($properties['title'] == '') {
             $properties['title'] = $properties['name'];
         }
-        else if ($properties['name'] == '')
-        {
+        else if ($properties['name'] == '') {
             $properties['name'] = $properties['title'];
         }
         // if name is blank throw exception (check type) - using invalidArgument Exception for now
-        if (trim($properties['name']) == '')
-        {
+        if (trim($properties['name']) == '') {
             throw new InvalidArgumentException('Refusing to create an un-named document');
         }
         // TODO also set to Default if a non-supported type is submitted
-        if ($properties['type'] == '')
-        {
+        if ($properties['type'] == '') {
             $properties['type'] = 'Default';
         }
@@ -154,17 +146,7 @@ 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))
         {
-            // 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 = CMISUtil::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_');
+            $tempfilename = CMISUtil::createTemporaryFile($contentStream);
             // metadata
             $metadata = array();
@@ -192,12 +174,10 @@ class CMISObjectService {
                                 );
             }
-            if (!empty($properties['category']))
-            {
+            if (!empty($properties['category'])) {
                 $category = $properties['category'];
             }
-            else
-            {
+            else {
                 $category = 'Miscellaneous';
             }
@@ -231,12 +211,10 @@ class CMISObjectService {
             $KTMime = new KTMime();
             $mimetype = $KTMime->getMimeTypeFromFile($tempfilename);
             preg_match('/^([^\/]*)\/([^\/]*)/', $mimetype, $matches);
-            if (($matches[1] == 'text') || ($matches[1] == 'image') || ($matches[1] == 'audio'))
-            {
+            if (($matches[1] == 'text') || ($matches[1] == 'image') || ($matches[1] == 'audio')) {
                 $mediatype = ucwords($matches[1]);
             }
-            else if (($matches[2] == 'pdf') || ($matches[2] == 'msword'))
-            {
+            else if (($matches[2] == 'pdf') || ($matches[2] == 'msword')) {
                 $mediatype = 'Text';
             }
@@ -262,12 +240,10 @@ class CMISObjectService {
             $response = $this->ktapi->add_document_with_metadata((int)$folderId, $properties['title'], $properties['name'],
                                                                  $properties['type'], $tempfilename, $metadata, $sysdata);
-            if ($response['status_code'] != 0)
-            {
+            if ($response['status_code'] != 0) {
                 throw new StorageException('The repository was unable to create the document.  ' . $response['message']);
             }
-            else
-            {
+            else {
                 $objectId = CMISUtil::encodeObjectId('Document', $response['results']['document_id']);
             }
@@ -314,13 +290,11 @@ class CMISObjectService {
         //      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 is not of base type folder. ' . $e->getMessage());
         }
-        if ($typeDefinition['attributes']['baseType'] != 'folder')
-        {
+        if ($typeDefinition['attributes']['baseType'] != 'folder') {
             throw new ConstraintViolationException('Object is not of base type folder');
         }
@@ -333,20 +307,17 @@ class CMISObjectService {
         // 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))
-        {
+        if (!is_array($allowed) || !in_array($typeId, $allowed)) {
             throw new ConstraintViolationException('Parent folder may not hold objects of this type (' . $typeId . ')');
         }
         // TODO if name is blank! throw another exception (check type) - using invalidArgument Exception for now
-        if (trim($properties['name']) == '')
-        {
+        if (trim($properties['name']) == '') {
             throw new InvalidArgumentException('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)
-        {
+        if ($response['status_code'] != 0) {
             throw new StorageException('The repository was unable to create the folder: ' . $response['message']);
         }
         else
@@ -380,8 +351,7 @@ class CMISObjectService {
         $objectId = CMISUtil::decodeObjectId($objectId, $typeId);
-        if ($typeId == 'Unknown')
-        {
+        if ($typeId == 'Unknown') {
             throw new ObjectNotFoundException('The type of the requested object could not be determined');
         }
@@ -492,8 +462,7 @@ class CMISObjectService {
         // check type id of object against allowed child types for destination folder
         $CMISFolder = new CMISFolderObject($targetFolderId, $this->ktapi);
         $allowed = $CMISFolder->getProperty('AllowedChildObjectTypeIds');
-        if (!is_array($allowed) || !in_array($typeId, $allowed))
-        {
+        if (!is_array($allowed) || !in_array($typeId, $allowed)) {
             throw new ConstraintViolationException('Parent folder may not hold objects of this type (' . $typeId . ')');
         }
@@ -517,8 +486,7 @@ class CMISObjectService {
         }
         // if failed, throw StorageException
-        if ($response['status_code'] != 0)
-        {
+        if ($response['status_code'] != 0) {
             throw new StorageException('The repository was unable to move the object: ' . $response['message']);
         } 
     }
@@ -541,13 +509,15 @@ 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 == 'Folder')
+        {
             $object = $this->ktapi->get_folder_by_id($objectId);
             if (PEAR::isError($object)) {
                 $exists = false;
             }
         }
-        else if ($typeId == 'Document') {
+        else if ($typeId == 'Document')
+        {
             $object = $this->ktapi->get_document_by_id($objectId);
             if (PEAR::isError($object)) {
                 $exists = false;
@@ -743,11 +713,7 @@ class CMISObjectService {
             throw new ContentAlreadyExistsException('Unable to overwrite existing content stream');
         }
-        // NOTE There is a function in CMISUtil to do this 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 it existed when
-        //      I wrote the CMISUtil function)
-        $uploadManager = new KTUploadManager();
-        $tempfilename = $uploadManager->store_base64_file($contentStream, 'cmis_');
+        $tempfilename = CMISUtil::createTemporaryFile($contentStream);
         // 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);
@@ -3,11 +3,12 @@
 require_once(KT_DIR . '/ktapi/ktapi.inc.php');
 require_once(CMIS_DIR . '/exceptions/ConstraintViolationException.inc.php');
 require_once(CMIS_DIR . '/exceptions/StorageException.inc.php');
+require_once(CMIS_DIR . '/exceptions/StreamNotSupportedException.inc.php');
 require_once(CMIS_DIR . '/exceptions/UpdateConflictException.inc.php');
 require_once(CMIS_DIR . '/exceptions/VersioningException.inc.php');
 require_once(CMIS_DIR . '/services/CMISObjectService.inc.php');
 require_once(CMIS_DIR . '/objecttypes/CMISDocumentObject.inc.php');
-//require_once(CMIS_DIR . '/util/CMISUtil.inc.php');
+require_once(CMIS_DIR . '/util/CMISUtil.inc.php');
 class CMISVersioningService {
@@ -182,14 +183,8 @@ class CMISVersioningService {
      * @return string $documentId
      */
     // TODO Exceptions:
-    //        •	ConstraintViolationException - SHALL throw if o	The Document’s Object-Type definition’s versionable attribute is FALSE. 
-    //        •	storageException - MAY throw
-    //        •	streamNotSupportedException -  The Repository SHALL throw this exception if the Object-Type definition specified by the typeId 
-    //                                         parameter’s “contentStreamAllowed” attribute is set to “not allowed” and a contentStream input 
-    //                                         parameter is provided.
-    //        •	updateConflictException - MAY throw
     //        •	versioningException - The repository MAY throw this exception if the object is a non-current Document Version
-    public function checkIn($repositoryId, $documentId, $major, $changeToken = '', $properties = array(), $contentStream = null, $checkinComment = '')
+    public function checkIn($repositoryId, $documentId, $major, $contentStream = null, $changeToken = '', $properties = array(), $checkinComment = '')
     {
         $documentId = CMISUtil::decodeObjectId($documentId, $typeId);
@@ -206,7 +201,35 @@ class CMISVersioningService {
             throw new ConstraintViolationException('This document is not versionable and may not be checked in');
         }
-        return $documentId;
+        $RepositoryService = new CMISRepositoryService();
+        try {
+            $typeDefinition = $RepositoryService->getTypeDefinition($repositoryId, $typeId);
+        }
+        catch (exception $e) {
+            // if we can't get the type definition, then we can't store the content
+            throw new StorageException($e->getMessage());
+        }
+        
+        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) {
+            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,
+                                                   $sig_username, $sig_password);
+                                       
+        // if there was any error in cancelling the checkout
+        if ($response['status_code'] == 1) {
+            throw new RuntimeException('There was an error checking in the document: ' . $response['message']);
+        }
+        
+        return CMISUtil::encodeObjectId(DOCUMENT, $documentId);
     }
 }
@@ -406,30 +406,6 @@ class CMISUtil {
         return (($input === true) ? 'true' : (($input === false) ? 'false' : $input));
     }
-    /**
-     * Creates a temporary file
-     * Cleanup is the responsibility of the calling code
-     *
-     * @param string|binary $content The content to be written to the file.
-     * @param string $uploadDir Optional upload directory.  Will use the KnowledgeTree system tmp directory if not supplied.
-     * @return string The path to the created file (for reference and cleanup.)
-     */
-    static public function createTemporaryFile($content, $encoding = null, $uploadDir = null)
-    {
-        if(is_null($uploadDir))
-        {
-            $oKTConfig =& KTConfig::getSingleton();
-            $uploadDir = $oKTConfig->get('webservice/uploadDirectory');
-        }
-
-        $temp = tempnam($uploadDir, 'myfile');
-        $fp = fopen($temp, 'wb');
-        fwrite($fp, ($encoding == 'base64' ? base64_decode($content) : $content));
-        fclose($fp);
-
-        return $temp;
-    }
-    
     // TODO more robust base64 encoding detection, if possible
     /**
@@ -610,6 +586,33 @@ class CMISUtil {
         return $exists;
     }
+    
+    /**
+     * Creates a temporary file
+     * Cleanup is the responsibility of the calling code
+     *
+     * @param string $contentStream The content to be stored (assumed to be base64)
+     * @return string The path to the created file (for reference and cleanup.)
+     */
+    static public function createTemporaryFile($contentStream)
+    {
+        // 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 = CMISUtil::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;
+    }
 }
+<?php
+/*
+ * $Id: $
+ *
+ * The contents of this file are subject to the KnowledgeTree
+ * Commercial Editions On-Premise License ("License");
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.knowledgetree.com/about/legal/
+ * The terms of this license may change from time to time and the latest
+ * license will be published from time to time at the above Internet address.
+ *
+ * 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 KnowledgeTree Inc.
+ * Portions copyright The Jam Warehouse Software (Pty) Ltd;
+ * All Rights Reserved.
+ *
+ */
+
+require_once(KT_LIB_DIR . "/actions/documentviewlet.inc.php");
+require_once(KT_DIR . '/search2/documentProcessor/documentProcessor.inc.php');
+
+/**
+ * Generates thumbnails of documents using the pdf converter output
+ * Dependent on the pdfConverter
+ */
+class thumbnailGenerator extends BaseProcessor
+{
+    public $order = 3;
+    protected $namespace = 'thumbnails.generator.processor';
+
+    /**
+     * Constructor
+     *
+     * @return thumbnailGenerator
+     */
+    public function thumbnailGenerator()
+    {
+    }
+
+    /**
+     * Gets the document path and calls the generator function
+     *
+     * @return boolean
+     */
+    public function processDocument()
+    {
+        // do the generation
+        $res = $this->generateThumbnail();
+        return $res;
+    }
+
+    /**
+     * The supported mime types for the converter.
+     *
+     * @return array
+     */
+	public function getSupportedMimeTypes()
+	{
+//	    $aAcceptedMimeTypes = array('doc', 'ods', 'odt', 'ott', 'txt', 'rtf', 'sxw', 'stw',
+//            //                                    'html', 'htm',
+//            'xml' , 'pdb', 'psw', 'ods', 'ots', 'sxc',
+//            'stc', 'dif', 'dbf', 'xls', 'xlt', 'slk', 'csv', 'pxl',
+//            'odp', 'otp', 'sxi', 'sti', 'ppt', 'pot', 'sxd', 'odg',
+//            'otg', 'std', 'asc');
+
+        // taken from the original list of accepted types in the pdf generator action
+        $mime_types = array();
+        $mime_types[] = 'text/plain';
+        $mime_types[] = 'text/html';
+        $mime_types[] = 'text/csv';
+        $mime_types[] = 'text/rtf';
+
+        // Office OLE2 - 2003, XP, etc
+        $mime_types[] = 'application/msword';
+        $mime_types[] = 'application/vnd.ms-powerpoint';
+        $mime_types[] = 'application/vnd.ms-excel';
+
+        // Star Office
+        $mime_types[] = 'application/vnd.sun.xml.writer';
+        $mime_types[] = 'application/vnd.sun.xml.writer.template';
+        $mime_types[] = 'application/vnd.sun.xml.calc';
+        $mime_types[] = 'application/vnd.sun.xml.calc.template';
+        $mime_types[] = 'application/vnd.sun.xml.draw';
+        $mime_types[] = 'application/vnd.sun.xml.draw.template';
+        $mime_types[] = 'application/vnd.sun.xml.impress';
+        $mime_types[] = 'application/vnd.sun.xml.impress.template';
+
+        // Open Office
+        $mime_types[] = 'application/vnd.oasis.opendocument.text';
+        $mime_types[] = 'application/vnd.oasis.opendocument.text-template';
+        $mime_types[] = 'application/vnd.oasis.opendocument.graphics';
+        $mime_types[] = 'application/vnd.oasis.opendocument.graphics-template';
+        $mime_types[] = 'application/vnd.oasis.opendocument.presentation';
+        $mime_types[] = 'application/vnd.oasis.opendocument.presentation-template';
+        $mime_types[] = 'application/vnd.oasis.opendocument.spreadsheet';
+        $mime_types[] = 'application/vnd.oasis.opendocument.spreadsheet-template';
+
+        /* OO3
+        // Office 2007
+        $mime_types[] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+    	$mime_types[] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.template';
+    	$mime_types[] = 'application/vnd.openxmlformats-officedocument.presentationml.template';
+    	$mime_types[] = 'application/vnd.openxmlformats-officedocument.presentationml.slideshow';
+    	$mime_types[] = 'application/vnd.openxmlformats-officedocument.presentationml.presentation';
+    	$mime_types[] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+    	$mime_types[] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.template';
+    	*/
+
+        return $mime_types;
+	}
+
+	/**
+	 * Generates the thumbnail from the pdf
+	 *
+	 * @return boolean
+	 */
+	private function generateThumbnail()
+	{
+	    /*
+	       The thumbnail is displayed in the info panel and the document view
+	       The info panel is in the plugin ktcore/documentpreview/
+	           - add a hook in there but build the functionality in this plugin ie keep the plugins separate and don't create dependencies
+	           - if the thumbnail plugin is disabled then maybe display a normal sized info panel
+
+           The document view will display the thumbnail on the right in a document viewlet similar to the workflow viewlet
+               - check out ktcore/KTDocumentViewlets.php
+               - viewlet class is below
+	    */
+
+	    $pdfDir = $default->pdfDirectory;
+        $pdfFile = $pdfDir .'/'. $this->document->iId.'.pdf';
+
+        // if a previous version of the pdf exists - delete it
+        if(!file_exists($pdfFile)){
+            global $default;
+            $default->log->debug('Thumbnail Generator Plugin: PDF file does not exist, cannot generate a thumbnail');
+            return false;
+        }
+
+        // do generation
+        return true;
+    }
+}
+
+
+class ThumbnailViewlet extends KTDocumentViewlet {
+    var $sName = 'thumbnail.viewlets';
+
+    function display_viewlet() {
+        $oKTTemplating =& KTTemplating::getSingleton();
+        $oTemplate =& $oKTTemplating->loadTemplate('thumbnail_viewlet');
+        if (is_null($oTemplate)) return '';
+
+        $oTemplate->setData(array());
+        return $oTemplate->render();
+    }
+}
+
+?>
 \ No newline at end of file
+<?php
+/**
+ * $Id: $
+ *
+ * The contents of this file are subject to the KnowledgeTree
+ * Commercial Editions On-Premise License ("License");
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.knowledgetree.com/about/legal/
+ * The terms of this license may change from time to time and the latest
+ * license will be published from time to time at the above Internet address.
+ *
+ * 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 KnowledgeTree Inc.
+ * Portions copyright The Jam Warehouse Software (Pty) Ltd;
+ * All Rights Reserved.
+ *
+ */
+
+require_once(KT_LIB_DIR . '/plugins/plugin.inc.php');
+require_once(KT_LIB_DIR . '/plugins/pluginregistry.inc.php');
+
+class thumbnailsPlugin extends KTPlugin {
+    var $sNamespace = 'thumbnails.generator.processor.plugin';
+    var $iVersion = 0;
+    var $autoRegister = true;
+
+    function thumbnailsPlugin($sFilename = null) {
+        $res = parent::KTPlugin($sFilename);
+        $this->sFriendlyName = _kt('Thumbnail Generator');
+        return $res;
+    }
+
+    /**
+     * Setup the plugin: add the processor, viewlet action and template location
+     *
+     */
+    function setup() {
+        $plugin_dir = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+        $dir = $plugin_dir . 'thumbnails.php';
+        $this->registerProcessor('thumbnailGenerator', 'thumbnails.generator.processor', $dir);
+        $this->registerAction('documentviewlet', 'ThumbnailViewlet', 'thumbnail.viewlets', $dir);
+
+        require_once(KT_LIB_DIR . '/templating/templating.inc.php');
+        $oTemplating =& KTTemplating::getSingleton();
+        $oTemplating->addLocation('thumbnails', $plugin_dir.'templates', 'thumbnails.generator.processor.plugin');
+    }
+}
+
+$oPluginRegistry =& KTPluginRegistry::getSingleton();
+$oPluginRegistry->registerPlugin('thumbnailsPlugin', 'thumbnails.generator.processor.plugin', __FILE__);
+?>
 \ No newline at end of file
@@ -7,7 +7,7 @@
     Description: Installer steps
 -->
-<install version="3.3">
+<install version="3.7" type="Commercial Edition">
     <steps>
         <step name="Welcome">welcome</step>
         <step name="License Agreement">license</step>
@@ -254,8 +254,8 @@ class InstallUtil {
      */
     public function checkPermission($dir, $create=false)
     {
-        $exist = 'Directory does not exist';
-        $write = 'Directory is not writable';
+        $exist = 'Directory doesn\'t exist';
+        $write = 'Directory not writable';
         $ret = array('class' => 'cross');
         if(!file_exists($dir)){
@@ -105,6 +105,15 @@ class Installer {
 	protected $installOrders = array();
 	/**
+	* List of installation properties
+	*
+	* @author KnowledgeTree Team
+	* @access protected
+	* @var array string
+	*/
+	protected $installProperties = array();
+	
+	/**
 	* Flag if a step object needs confirmation
 	*
 	* @author KnowledgeTree Team
@@ -281,11 +290,7 @@ class Installer {
 	*/
     private function _runStepAction($stepName) {
         $this->stepAction = new stepAction($stepName);
-        $this->stepAction->setSteps($this->getSteps());
-        $this->stepAction->setStepNames($this->getStepNames());
-        $this->stepAction->setDisplayConfirm($this->stepConfirmation);
-        $this->stepAction->setDisplayFirst($this->stepDisplayFirst());
-        $this->stepAction->loadSession($this->session);
+        $this->stepAction->setUpStepAction($this->getSteps(), $this->getStepNames(), $this->getStepConfirmation(), $this->stepDisplayFirst(), $this->getSession(), $this->getInstallProperties());
         return $this->stepAction->doAction();
     }
@@ -367,6 +372,22 @@ class Installer {
     }
 	/**
+	* Set install properties
+	*
+	* @author KnowledgeTree Team
+	* @param none
+	* @access private
+	* @return void
+	*/
+    private function _xmlInstallProperties() {
+    	if(isset($this->simpleXmlObj)) {
+    		$this->installProperties['install_version'] = (string) $this->simpleXmlObj['version'];
+    		$this->installProperties['install_type'] = (string) $this->simpleXmlObj['type'];
+			$this->_loadToSession('installProperties', $this->installProperties);
+    	}
+    }
+    
+	/**
 	* Install steps
 	*
 	* @author KnowledgeTree Team
@@ -456,7 +477,11 @@ class Installer {
     	$this->installOrders = $this->session->get('installOrders');
     	if(!$this->installOrders) {
     		$this->_xmlStepsOrders();
-    	}    	
+    	}
+    	$this->installProperties = $this->session->get('installProperties');
+    	if(!$this->installProperties) {
+    		$this->_xmlInstallProperties();
+    	}
     }
     private function loadNeeded() {
@@ -576,6 +601,42 @@ class Installer {
     }
 	/**
+	* Returns whether or not a confirmation step is needed
+	*
+	* @author KnowledgeTree Team
+	* @param none
+	* @access public
+	* @return boolean
+	*/
+    public function getStepConfirmation() {
+    	return $this->stepConfirmation;
+    }
+    
+	/**
+	* Return install properties
+	*
+	* @author KnowledgeTree Team
+	* @param string
+	* @access public
+	* @return string
+	*/    
+    public function getInstallProperties() {
+    	return $this->installProperties;
+    }
+    
+	/**
+	* Returns session
+	*
+	* @author KnowledgeTree Team
+	* @param none
+	* @access public
+	* @return boolean
+	*/
+    public function getSession() {
+    	return $this->session;
+    }
+    
+	/**
 	* Dump of SESSION 
 	*
 	* @author KnowledgeTree Team
@@ -42,10 +42,70 @@
 class unixOpenOffice extends unixService {
+	// utility
+	public $util;
+	// path to office
+	private $path;
+	// host
+	private $host;
+	// pid running
+	private $pidFile;
+	// port to bind to
+	private $port;
+	// bin folder
+	private $bin;
+	// office executable
+	private $soffice;
+	// office log file
+	private $log;
+	
+	# nohup /home/jarrett/ktdms/openoffice/program/soffice.bin -nofirststartwizard -nologo -headless -accept=socket,host=127.0.0.1,port=8100;urp;StarOffice.ServiceManager &> /home/jarrett/ktdms/var/log/dmsctl.log &
 	public function __construct() {
 		$this->name = "KTOpenOfficeTest";
+		$this->util = new InstallUtil();
 	}
-
+	public function load() {
+		$this->setPort("8100");
+		$this->setHost("localhost");
+		
+	}
+	
+	private function setPort($port = "8100") {
+		$this->port = $port;
+	}
+	
+	private function setHost($host = "localhost") {
+		$this->host = $host;
+	}
+	
+    public function install() {
+    	$status = $this->status();
+    	if($status == '') {
+			return $this->start();
+    	} else {
+    		return $status;
+    	}
+    }
+    
+    public function start() {
+    	return false;
+    	$state = $this->status();
+    	if($state != 'STARTED') {
+	    	$cmd = "";
+	    	$cmd .= "";
+	    	$response = $this->util->pexec($cmd);
+	    	
+	    	return $response;
+    	} elseif ($state == '') {
+    		// Start Service
+    		return true;
+    	} else {
+    		// Service Running Already
+    		return true;
+    	}
+    	
+    	return false;
+    }
 }
 ?>
 \ No newline at end of file
@@ -66,7 +66,7 @@ select {
 	border:1px solid #B7B7B7;
 	left:215px;
 	position:relative;
-	top:25px;
+	top:20px;
 	width:1024px;
 }
@@ -92,9 +92,8 @@ select {
 }
 #content {
-    margin-left: 200px;
+    margin-left: 220px;
     height:515px;
-    
 }
 #content_container {
@@ -110,13 +109,65 @@ select {
 	height: 400px;
 }
+#step_content_dependencies {
+	border: 1px solid rgb(207, 207, 207);
+	padding: 5px;
+	min-height:265px;
+}
+
+#step_content_configuration {
+	border: 1px solid rgb(207, 207, 207);
+	padding: 5px;
+	min-height:290px;
+}
+
+#step_content_registration {
+	border: 1px solid rgb(207, 207, 207);
+	padding: 5px;
+	height:295px;
+}
+
+#step_content_registration_confirm {
+	border: 1px solid rgb(207, 207, 207);
+	padding: 5px;
+	height:400px;
+}
+
+#step_content_install {
+	border: 1px solid rgb(207, 207, 207);
+	padding: 5px;
+	height:290px;
+}
+
+#step_content_database {
+	border: 1px solid rgb(207, 207, 207);
+	padding: 5px;
+	min-height:355px;
+}
+
+#step_content_database_confirm {
+	border: 1px solid rgb(207, 207, 207);
+	padding: 5px;
+	height:375px;
+}
+
+#step_content_complete {
+	border: 1px solid rgb(207, 207, 207);
+	padding: 5px;
+	min-height:355px;
+}
+
+.radio {
+	float:none;
+}
+
 #sidebar {
 	background: rgb(239, 239, 239) none repeat scroll 0% 0%;
-	font-size: 75%;
+	font-size: 90%;
 	color: grey; 
 	font-family: sans-serif; 
 	margin-top: 0px;
-	width: 200px;
+	width: 235px;
 	float: left;
 	padding-top: 20px;
 	padding-bottom: 20px;
@@ -143,6 +194,18 @@ select {
     margin-left: 10px;
 }
+#logo {
+	position:relative;
+	right:760px;
+	top:20px;
+}
+
+#install_details {
+	bottom:30px;
+	position:relative;
+	right:10px;
+}
+
 .menu {
     color: #616161;
     text-align: left;
@@ -217,6 +280,16 @@ select {
     color: red;
 }
+/*
+td.error {
+	width:190px;
+}
+*/
+
+.conf_paths {
+	width:755px;
+}
+
 .errors {
     color: #9F0000;
 }
@@ -228,31 +301,6 @@ select {
     width:120px;
 }
-/*
-#buttons_double input {
-	float: left;
-	margin-top: 10px;
-	margin-left: 5px;
-	font-size: 12px;
-	font-weight: bold;	
-	background-image: url("graphics/dame/kt_gradient.jpg");
-	background-repeat: repeat-x;
-	background-position-y: 0%;
-	border: 1px solid #cecece;
-}
-
-#buttons_single input {
-	float: right;
-	margin-top: 10px;
-	margin-left: 5px;
-	font-size: 12px;
-	font-weight: bold;	
-	background-image: url("graphics/dame/kt_gradient.jpg");
-	background-repeat: repeat-x;
-	background-position-y: 0%;
-	border: 1px solid #cecece;
-}*/
-
 .back {
 	background-image: url("graphics/dame/kt_gradient.jpg");
 	background-repeat:repeat-x;
@@ -275,6 +323,11 @@ input {
 	margin-top:10px;
 }
+.textinput {
+	margin-top:0px;
+	float:left;
+}
+
 .buttons a {
     background: #DDDDDD;
     border: solid 1px #888;
@@ -326,12 +379,16 @@ input {
     height:45px;
 }
+#dbconf {
+	width:755px;
+}
+
 table#dbconf tr td {
 	width:50%;
 }
-input#dname {
-	size:40px;
+table#dbconf tr td input{
+	
 }
 .options {
@@ -343,48 +400,92 @@ input#dname {
 }
 #section {
-	/*border:1px solid;*/
+
 }
-sup {
-	font-size: 11px;
+.php_ext_details table {
+	width:745px;
 }
-refresh {
-	/*
-	style="color: #000000; 
-	font-weight: normal;
-	*/
+.php_ext_details table tr {
+	
 }
-.php_ext_details table {
-	width:800px;
+td.ext_indicator {
+	width:10px;
+}
+
+td.ext_name {
+	width:110p;
+}
+
+td.ext_description {
+	width:360px;
+}
+
+td.ext_error {
+	width:350px;
+}
+
+td.ext_refresh {
+	width:10px;
+}
+
+td.dir_name {
+	width:200px;
+}
+
+td.dir_description {
+	width:200px;
 }
 .php_con_details table {
-	width:800px;
+	width:745px;
+	/*border:1px solid;*/
 }
 .error_message {
 	border:none;
-	background-color:#FFCCCC;
 	color:#A30000;
-/*	width:550px; */
 	padding:0px;
+	color:red;
+	font-size:90%;
+	margin-bottom:0.75em;
+	font-weight:bold;
 }
 .continue_message {
+	background: url("graphics/big-ok.png") no-repeat;
 	border:none;
-	background:transparent url("graphics/big-ok.png") no-repeat scroll 0 50%;
 	width:550px;
 	padding:0px;
+	color:#898989;
+	font-size:90%;
+	margin-bottom:0.75em;
 }
 .license_agreement {
 	overflow: scroll;
 	height: 255px;
-	width:785px;
+	width:765px;
 	height:370px;
 	overflow-x:hidden;
 	border:1px solid #CFCFCF;
+}
+
+.db_adv_options {
+	height:200px;
+	width:720px;
+}
+
+.adv_option {
+	height:65px;
+	width:720px;
+}
+
+#tooltips {
+	background: url("graphics/question.gif") no-repeat;
+	width:16px;
+	height:16px;
+	cursor:pointer;
 }
 \ No newline at end of file
@@ -5,6 +5,7 @@ function wizard() {
 // Does a form check on every new page load
 wizard.prototype.doFormCheck = function() {
 	w.addReadOnly();
+	w.load();
 }
 // Toggle Advance Database options
@@ -134,61 +135,87 @@ wizard.prototype.onSubmitValidate = function(silent) {
 	return true;
 }
+wizard.prototype.pClick = function() {
+	var state = document.getElementById('state');
+	if(state != "undefined") {
+		state.name = 'previous';
+	}
+}
+
+wizard.prototype.nClick = function() {
+	var state = document.getElementById('state');
+	if(state != "undefined") {
+		state.name = 'next';
+	}
+}
+
 // Validate Registration Page
 wizard.prototype.validateRegistration = function() {
-	return true;
+	// See if next or previous is clicked.
+	var state = document.getElementById('state').name;
+	if(state == 'next') {
+		if(w.valRegHelper()) {
+			document.getElementById('sendAll').name = 'Next'; // Force the next step
+			document.getElementById('sendAll').value = 'next';
+			document.getElementById('registration').submit();
+		}
+	} else if(state == 'previous') {
+		document.getElementById('sendAll').name = 'Previous'; // Force the previous step
+		document.getElementById('sendAll').value = 'previous';
+		document.getElementById('registration').submit();
+	}
+}
+
+wizard.prototype.valRegHelper = function() {
 	var first = document.getElementById('first');
 	var last = document.getElementById('last');
 	var email = document.getElementById('email');
-	if(first.value < 2) {
-		
+	if(first.value.length < 2) {
+		document.getElementById("reg_error").innerHTML = "Please enter a First Name";
+		w.focusElement(first);
 		return false;
 	}
-	if(last.value < 2) {
-		
-		
+	if(last.value.length < 2) {
+		document.getElementById("reg_error").innerHTML = "Please enter a Last Name";
+		w.focusElement(last);
+		return false;
 	}
-	if(w.emailCheck(email.value)) {
-		
+	if(!w.emailCheck(email.value)) {
+		document.getElementById("reg_error").innerHTML = "Please enter a valid email address";
+		w.focusElement(email);
+		return false;
 	}
-	return false;
+	return true;
 }
 // Validate Registration Page Courtesy of SmartWebby.com (http://www.smartwebby.com/dhtml/)
-wizard.prototype.emailCheck = function() { 
+wizard.prototype.emailCheck = function(str) { 
 	var at="@";
 	var dot=".";
 	var lat=str.indexOf(at);
 	var lstr=str.length;
 	var ldot=str.indexOf(dot);
 	if (str.indexOf(at)==-1) {
-	//		   alert("Invalid E-mail ID")
 		return false;
 	}
 	if (str.indexOf(at)==-1 || str.indexOf(at)==0 || str.indexOf(at)==lstr) {
-	//		   alert("Invalid E-mail ID")
 		return false;
 	}
 	if (str.indexOf(dot)==-1 || str.indexOf(dot)==0 || str.indexOf(dot)==lstr) {
-	//		    alert("Invalid E-mail ID")
 		return false;
 	}
 	if (str.indexOf(at,(lat+1))!=-1) {
-	//		    alert("Invalid E-mail ID")
 		return false;
 	}
 	if (str.substring(lat-1,lat)==dot || str.substring(lat+1,lat+2)==dot){
-	//		    alert("Invalid E-mail ID")
 		return false;
 	}
 	if (str.indexOf(dot,(lat+2))==-1){
-	//		    alert("Invalid E-mail ID")
 		return false;
 	}
 	if (str.indexOf(" ")!=-1){
-	//		    alert("Invalid E-mail ID")
 		return false;
 	}
 	return true;
@@ -213,4 +240,9 @@ wizard.prototype.addReadOnly = function() {
 //    		w.focusElement(inputs[i]);
 		}
 	}
+}
+
+/* */
+wizard.prototype.load = function() {
+//	$('#tooltips').tooltip();
 }
 \ No newline at end of file
@@ -78,6 +78,15 @@ class stepAction {
     protected $displayFirst = false;
 	/**
+	* List of install properties
+	*
+	* @author KnowledgeTree Team
+	* @access protected
+	* @var boolean
+	*/
+    protected $installProperties = array();
+    
+	/**
 	* Reference to session object
 	*
 	* @author KnowledgeTree Team
@@ -107,6 +116,95 @@ class stepAction {
     }
 	/**
+	* Helper to initialize step actions
+	*
+	* @author KnowledgeTree Team
+	* @param string
+	* @access public
+	* @return string
+	*/
+    public function setUpStepAction($steps, $stepNames, $stepConfirmation, $stepDisplayFirst, $session, $installProperties) {
+        $this->setSteps($steps);
+        $this->setStepNames($stepNames);
+        $this->setDisplayConfirm($stepConfirmation);
+        $this->setDisplayFirst($stepDisplayFirst);
+        $this->loadSession($session);
+        $this->setInstallProperties($installProperties);
+    }
+    
+	/**
+	* Sets steps class names in string format
+	*
+	* @author KnowledgeTree Team
+	* @param array
+	* @access public
+	* @return void
+	*/
+    public function setSteps($stepClassNames) {
+        $this->stepClassNames = $stepClassNames;
+    }
+
+	/**
+	* Sets steps in human readable string format
+	*
+	* @author KnowledgeTree Team
+	* @param array
+	* @access public
+	* @return void
+	*/
+    public function setStepNames($step_names) {
+        $this->step_names = $step_names;
+    }
+
+	/**
+	* Sets confirmation page flag
+	*
+	* @author KnowledgeTree Team
+	* @param boolean
+	* @access public
+	* @return void
+	*/
+    public function setDisplayConfirm($displayConfirm) {
+        $this->displayConfirm = $displayConfirm;
+    }
+
+	/**
+	* Sets confirmation page first flag
+	*
+	* @author KnowledgeTree Team
+	* @param boolean
+	* @access public
+	* @return void
+	*/
+    public function setDisplayFirst($displayFirst) {
+        $this->displayFirst = $displayFirst;
+    }
+    
+	/**
+	* Sets session object
+	*
+	* @author KnowledgeTree Team
+	* @param object Session
+	* @access public
+	* @return void
+	*/
+    public function loadSession($ses) {
+        $this->session = $ses;
+    }
+    
+	/**
+	* Sets install properties
+	*
+	* @author KnowledgeTree Team
+	* @param array
+	* @access public
+	* @return void
+	*/
+    public function setInstallProperties($installProperties) {
+    	$this->installProperties = $installProperties;
+    }
+    
+	/**
 	* Main control to handle the steps actions
 	*
 	* @author KnowledgeTree Team
@@ -181,43 +279,7 @@ class stepAction {
         return $str;
     }
-
-	/**
-	* Sets steps class names in string format
-	*
-	* @author KnowledgeTree Team
-	* @param array
-	* @access public
-	* @return void
-	*/
-    public function setSteps($stepClassNames) {
-        $this->stepClassNames = $stepClassNames;
-    }
-
-	/**
-	* Sets steps in human readable string format
-	*
-	* @author KnowledgeTree Team
-	* @param array
-	* @access public
-	* @return void
-	*/
-    public function setStepNames($step_names) {
-        $this->step_names = $step_names;
-    }
-
-	/**
-	* Returns a message to display at the top of template
-	*
-	* @author KnowledgeTree Team
-	* @param none
-	* @access public
-	* @return string
-	*/
-    public function getTop() {
-        return '<span class="top">'.$this->getCurrentStepName().'</span>';
-    }
-
+    
 	/**
 	* Returns current step name
 	*
@@ -270,10 +332,6 @@ class stepAction {
         return $menu;
     }
-    public function getActions() {
-    	
-    }
-    
 	/**
 	* Returns confirmation page flag
 	*
@@ -283,7 +341,6 @@ class stepAction {
 	* @return boolean
 	*/
     public function displayConfirm() {
-    	// TODO:No other way I can think of doing this
         return $this->displayConfirm;
     }
@@ -300,42 +357,6 @@ class stepAction {
     }
 	/**
-	* Sets confirmation page flag
-	*
-	* @author KnowledgeTree Team
-	* @param boolean
-	* @access public
-	* @return void
-	*/
-    public function setDisplayConfirm($displayConfirm) {
-        $this->displayConfirm = $displayConfirm;
-    }
-
-	/**
-	* Sets confirmation page first flag
-	*
-	* @author KnowledgeTree Team
-	* @param boolean
-	* @access public
-	* @return void
-	*/
-    public function setDisplayFirst($displayFirst) {
-        $this->displayFirst = $displayFirst;
-    }
-    
-	/**
-	* Sets session object
-	*
-	* @author KnowledgeTree Team
-	* @param object Session
-	* @access public
-	* @return void
-	*/
-    public function loadSession($ses) {
-        $this->session = $ses;
-    }
-
-	/**
 	* Returns session object
 	*
 	* @author KnowledgeTree Team
@@ -356,8 +377,7 @@ class stepAction {
 	* @return string
 	*/
     public function paintAction() {
-        $left = $this->getLeftMenu();
-        $top = $this->getTop();
+        
         $step_errors = $this->action->getErrors(); // Get errors
         $step_warnings = $this->action->getWarnings(); // Get warnings
         if($this->displayConfirm()) { // Check if theres a confirm step
@@ -382,11 +402,19 @@ class stepAction {
         }
         $content = $step_tpl->fetch();
 		$tpl = new Template("templates/wizard.tpl");
+        $vars = $this->getVars(); // Get template variables
+        $tpl->set("vars", $vars); // Set template errors
 		$tpl->set('content', $content);
-		$tpl->set('left', $left);
 		echo $tpl->fetch();
 	}
+	public function getVars() {
+		$left = $this->getLeftMenu();
+		$vars['left'] = $left; // Set left menu
+		$vars['install_version'] = $this->installProperties['install_version']; // Set version
+		$vars['install_type'] = $this->installProperties['install_type']; // Set type
+		return $vars;
+	}
     /**
      * Load class to session
      *
@@ -65,14 +65,6 @@ class complete extends Step {
     protected $util = null;
-    /**
-     * List of services to check
-     * 
-     * @access private
-     * @var array
-     */
-    private $_services = array('Lucene', 'Scheduler');
-    
     public function __construct() {
     	$this->temp_variables = array("step_name"=>"complete", "silent"=>$this->silent);
         $this->_dbhandler = new dbUtil();
@@ -361,7 +361,7 @@ class dependencies extends Step
     private function getConfigurations()
     {
         return array(
-            array('name' => 'Safe Mode', 'configuration' => 'safe_mode', 'recommended' => 'ON', 'type' => 'bool'),
+            array('name' => 'Safe Mode', 'configuration' => 'safe_mode', 'recommended' => 'OFF', 'type' => 'bool'),
             array('name' => 'Display Errors', 'configuration' => 'display_errors', 'recommended' => 'OFF', 'type' => 'bool'),
             array('name' => 'Display Startup Errors', 'configuration' => 'display_startup_errors', 'recommended' => 'ON', 'type' => 'bool'),
             array('name' => 'File Uploads', 'configuration' => 'file_uploads', 'recommended' => 'ON', 'type' => 'bool'),
@@ -42,9 +42,6 @@
 class registration extends Step
 {
-	
-	public $temp_variables = array("step_name"=>"registration");
-	
     /**
      * Initialise the registration step
      *
@@ -66,10 +63,6 @@ class registration extends Step
     public function doStep()
     {
         $this->setFormInfo();
-//		die('a');
-//print_r($_POST);
-//print_r($_GET);
-return 'next';
 		if(!$this->inStep("registration")) {
 			return 'landing';
 		}
@@ -98,7 +91,7 @@ return &#39;next&#39;;
         if(isset($_POST['registered']) && $_POST['registered'] == 'yes'){
             return true;
         }
-
+return true;
 	    //$this->postForm($_POST);
 	    //$this->sendToHost($_POST);
@@ -61,6 +61,7 @@ class services extends Step
     protected $runInstall = true;
     private $services = array('Lucene', 'Scheduler', 'OpenOffice');
+//    private $services = array('OpenOffice');
     protected $java;
@@ -68,7 +69,7 @@ class services extends Step
     protected $util;
-    private $javaVersion = '1.7';
+    private $javaVersion = '1.5';
 	/**
 	* Java Installed 
@@ -294,8 +295,10 @@ class services extends Step
 			$service = new $className();
 			$status = $this->serviceStatus($service);
 			if($status != 'STARTED') {
-				$this->temp_variables['services'][] = array('class'=>'cross_orange', 'msg'=>$service->getName()." Could not be added as a Service");
+				$msg = $service->getName()." Could not be added as a Service";
+				$this->temp_variables['services'][] = array('class'=>'cross_orange', 'msg'=>$msg);
 				$this->serviceCheck = 'cross_orange';
+				$this->warnings[] = $msg;
 			} else {
 				if(WINDOWS_OS) {
 					$this->temp_variables['services'][] = array('class'=>'tick', 'msg'=>$service->getName()." has been added as a Service"); }
@@ -356,7 +359,7 @@ class services extends Step
     }
     private function useDetected() {
-    	return $this->detSettings();
+    	return $this->detSettings(true);
     }
     private function specifyJava() {
@@ -387,7 +390,7 @@ class services extends Step
 	* @access private
 	* @return boolean
 	*/
-    private function detSettings() {
+    private function detSettings($attempt) {
     	$javaExecutable = $this->util->javaSpecified();// Retrieve java bin
     	$cmd = "$javaExecutable -version > output/outJV 2>&1 echo $!";
     	$response = $this->util->pexec($cmd);
@@ -398,7 +401,7 @@ class services extends Step
 	    		if($matches[1] < $this->javaVersion) { // Check Version of java
 					$this->javaVersionInCorrect();
 					$this->javaCheck = 'cross';
-					$this->error[] = "Requires Java 1.5+ to be installed";
+					if(!$attempt) $this->error[] = "Requires Java 1.5+ to be installed";
 					return false;
 	    		} else {
 					$this->javaVersionCorrect();
@@ -411,10 +414,12 @@ class services extends Step
     			$this->javaVersionWarning();
     			$this->javaCheck = 'cross_orange';
     			$this->javaExeError = "Java : Incorrect path specified";
-				$this->error[] = "Requires Java 1.5+ to be installed";
+				if(!$attempt) $this->error[] = "Requires Java 1.5+ to be installed";
 				return false;
     		}
     	}
+    	
+    	return false;
     }
     function detPhpSettings() {
-<h1>Installation Completed</h1>
-
-<h2>KnowledgeTree post-configuration checkup</h2>
-
-<p>This allows you to check that your KnowledgeTree configuration is set
-up correctly.  You can run this at any time after configuration to check
-that things are still set up correctly.</p>
-
-<?php
-if($errors || $warnings){
-    echo '<div>'
-       . '<a href="http://wiki.knowledgetree.com/Web_Based_Installer#Post_Install" target="_blank">'
-       . 'Click Here for help on overcoming post install issues</a></div><br/>';
-}
-?>
+<form>
+	<p class="title">Installation Completed</p>
+	
+<!--	<h2>KnowledgeTree post-configuration checkup</h2>-->
-<div>
-    <h3><?php echo "<span class='{$paths_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Paths and Permissions</h3>
-<?php if($silent) { ?>
-	<div id="options" class="onclick" onclick="javascript:{w.toggleClass('paths_check');}">Show Details</div>
-	<div class="paths_check" style="display:none">
-<?php } ?>
-    <table>
-        <tr><?php echo $varDirectory; ?></tr>
-        <tr><?php echo $documentRoot; ?></tr>
-        <tr><?php echo $logDirectory; ?></tr>
-        <tr><?php echo $tmpDirectory; ?></tr>
-        <tr><?php echo $uploadDirectory; ?></tr>
-        <tr><?php echo $config; ?></tr>
-        <tr><?php echo $docLocation; ?></tr>
-    </table>
-<?php if($silent) { ?>
+	<p>This allows you to check that your KnowledgeTree configuration is set
+	up correctly.  You can run this at any time after configuration to check
+	that things are still set up correctly.</p>
+	
+	<?php
+	if($errors || $warnings){
+	    echo '<div>'
+	       . '<a href="http://wiki.knowledgetree.com/Web_Based_Installer#Post_Install" target="_blank">'
+	       . 'Click Here for help on overcoming post install issues</a></div><br/>';
+	}
+	?>
+	<div id="step_content_complete">
+	<div>
+	    <h3><?php echo "<span class='{$paths_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Paths and Permissions</h3>
+	<?php if($silent) { ?>
+		<div id="options" class="onclick" onclick="javascript:{w.toggleClass('paths_check');}">Show Details</div>
+		<div class="paths_check" style="display:none">
+	<?php } ?>
+	    <table>
+	        <tr><?php echo $varDirectory; ?></tr>
+	        <tr><?php echo $documentRoot; ?></tr>
+	        <tr><?php echo $logDirectory; ?></tr>
+	        <tr><?php echo $tmpDirectory; ?></tr>
+	        <tr><?php echo $uploadDirectory; ?></tr>
+	        <tr><?php echo $config; ?></tr>
+	        <tr><?php echo $docLocation; ?></tr>
+	    </table>
+	<?php if($silent) { ?>
+		</div>
+	<?php } ?>
 	</div>
-<?php } ?>
-</div>
-<div>
-    <h3><?php echo "<span class='{$database_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Database connectivity</h3>
-<?php if($silent) { ?>
-	<div id="options" class="onclick" onclick="javascript:{w.toggleClass('database_check');}">Show Details</div>
-	<div class="database_check" style="display:none">
-<?php } ?>
-    <table>
-        <tr><?php echo $dbConnectAdmin; ?></tr>
-        <tr><?php echo $dbConnectUser; ?></tr>
-    </table>
-<?php if($silent) { ?>
+	<div>
+	    <h3><?php echo "<span class='{$database_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Database connectivity</h3>
+	<?php if($silent) { ?>
+		<div id="options" class="onclick" onclick="javascript:{w.toggleClass('database_check');}">Show Details</div>
+		<div class="database_check" style="display:none">
+	<?php } ?>
+	    <table>
+	        <tr><?php echo $dbConnectAdmin; ?></tr>
+	        <tr><?php echo $dbConnectUser; ?></tr>
+	    </table>
+	<?php if($silent) { ?>
+		</div>
+	<?php } ?>
+	    <h3><?php echo "<span class='{$privileges_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Privileges</h3>
+	<?php if($silent) { ?>
+		<div id="options" class="onclick" onclick="javascript:{w.toggleClass('privileges_check');}">Show Details</div>
+		<div class="privileges_check" style="display:none">
+	<?php } ?>
+	    <table>
+	        <tr><?php echo $dbPrivileges; ?></tr>
+	        <tr><?php echo $dbTransaction; ?></tr>
+	    </table>
+	<?php if($silent) { ?>
+		</div>
+	<?php } ?>
 	</div>
-<?php } ?>
-    <h3><?php echo "<span class='{$privileges_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Privileges</h3>
-<?php if($silent) { ?>
-	<div id="options" class="onclick" onclick="javascript:{w.toggleClass('privileges_check');}">Show Details</div>
-	<div class="privileges_check" style="display:none">
-<?php } ?>
-    <table>
-        <tr><?php echo $dbPrivileges; ?></tr>
-        <tr><?php echo $dbTransaction; ?></tr>
-    </table>
-<?php if($silent) { ?>
+	<div>
+	    <h3><?php echo "<span class='{$services_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Services</h3>
+	<?php if($silent) { ?>
+		<div id="options" class="onclick" onclick="javascript:{w.toggleClass('services_check');}">Show Details</div>
+		<div class="services_check" style="display:none">
+	<?php } ?>
+	    <table>
+	        <tr>
+	        	<td><?php echo "<span class='{$LuceneStatus}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Lucene Service</td>
+	        	<?php if ($LuceneStatus != 'tick') { ?>
+	        		<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
+	        	<?php } ?>
+	        </tr> 
+	        <tr>
+	        	<td><?php echo "<span class='{$SchedulerStatus}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Scheduler Service</td>
+	        	<?php if ($SchedulerStatus != 'tick') { ?>
+	        		<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
+	        	<?php } ?>
+	        </tr>
+	    </table>
+	<?php if($silent) { ?>
+		</div>
+	<?php } ?>
 	</div>
-<?php } ?>
-</div>
-<div>
-    <h3><?php echo "<span class='{$services_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Services</h3>
-<?php if($silent) { ?>
-	<div id="options" class="onclick" onclick="javascript:{w.toggleClass('services_check');}">Show Details</div>
-	<div class="services_check" style="display:none">
-<?php } ?>
-    <table>
-        <tr>
-        	<td><?php echo "<span class='{$LuceneStatus}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Lucene Service</td>
-        	<?php if ($LuceneStatus != 'tick') { ?>
-        		<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
-        	<?php } ?>
-        </tr> 
-        <tr>
-        	<td><?php echo "<span class='{$SchedulerStatus}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Scheduler Service</td>
-        	<?php if ($SchedulerStatus != 'tick') { ?>
-        		<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
-        	<?php } ?>
-        </tr>
-    </table>
-<?php if($silent) { ?>
 	</div>
-<?php } ?>
-</div>
-<form>
-	<div class="buttons">
-<!--	    <a href="index.php?step_name=complete&step=previous" class="previous">Previous</a>-->
-<!--	    <a href="">Refresh</a>-->
-	    <a href="../../">Goto Login</a>
-	    <?php
-	        if (INSTALL_TYPE == 'Zend') {
-	            echo '<a href="http://' . $_SERVER['HTTP_HOST'] . '/ZendServer/Index">Zend Server Configuration</a>';
-	        }
-	    ?>
-</div>
+    <a href="../../" class="buttons back" style="width:80px;">Goto Login</a>
+    <?php
+        if (INSTALL_TYPE == 'Zend') {
+        	?>
+            <a href="<?php echo "http://".$_SERVER['HTTP_HOST'].":10081/ZendServer/Index"; ?>" class="back" target="_blank">Zend Server Configuration</a>
+            <?php
+        }
+    ?>
 </form>
 \ No newline at end of file
-<h1>Checking System Configuration</h1>
+<form action="index.php?step_name=configuration" method="post">
+<p class="title">Checking System Configuration</p>
 <p class="description">
 The wizard will review your system to determine whether KnowledgeTree is correctly configured. You&rsquo;ll see whether KnowledgeTree has the correct settings or whether changes are required.
@@ -15,7 +16,7 @@ The wizard will review your system to determine whether KnowledgeTree is correct
 </div>
 <div class="error_message">
 <?php if($errors) { ?>
-	<span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Once you&rsquo;ve fixed these items, return to this wizard and try again.</span><br/>
+	<span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;to address. Once you&rsquo;ve fixed these items, return to this wizard and try again.</span><br/>
 <?php } elseif ($warnings) {
 	?>
 	<span class='cross_orange'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;KnowledgeTree Optional Dependencies not met, but you will be able to continue.</span><br/>
@@ -28,40 +29,47 @@ The wizard will review your system to determine whether KnowledgeTree is correct
 <?php } ?>
 </div>
-<form action="index.php?step_name=configuration" method="post">
+<div id="step_content_configuration">
 <h3>Server Settings</h3>
 <p class="description">
 The settings below have been drawn from the system information. The host and port should reflect the host and port that will be used to access KnowledgeTree. The Root Url is only needed if your installation is in a directory off the main web server root.
 </p>
-<table>
+<table class="dbconf">
     <tr>
-        <td><label for='host'>Host: </label></td>
-        <td><input name='host' id='host' size='60' value='<?php echo $server['host']['value']; ?>' /></td>
+        <td width="150px"><label for='host'>Host: </label></td>
+        <td> <div id="tooltips" title="Location of your web root">&nbsp;</div> </td>
+        <td><input name='host' id='host' size='35' value='<?php echo $server['host']['value']; ?>' /></td>
     </tr>
     <tr>
         <td><label for='port'>Port: </label></td>
-        <td><input name='port' id='port' size='5' value='<?php echo $server['port']['value']; ?>' /></td>
+        <td> <div id="tooltips" title="The port that the web server listens on.">&nbsp;</div> </td>
+        <td><input name='port' id='port' size='5' value='<?php echo $server['port']['value']; ?>' style="float:left;"/></td>
     </tr>
     <tr>
         <td><label for='root_url'>Root URL: </label></td>
-        <td><input name='root_url' id='root_url' size='60' value='<?php echo $server['root_url']['value']; ?>' /></td>
+        <td> <div id="tooltips" title="Relative path to KnowledgeTree Source directory">&nbsp;</div> </td>
+        <td><input name='root_url' id='root_url' size='35' value='<?php echo $server['root_url']['value']; ?>' /></td>
     </tr>
     <tr>
         <td><label for='file_system_root'>Web Root: </label></td>
-        <td><input name='file_system_root' id='file_system_root' size='60' value='<?php echo $server['file_system_root']['value']; ?>' /></td>
+        <td> <div id="tooltips" title="Absolute path to KnowledgeTree Source directory">&nbsp;</div> </td>
+        <td><input name='file_system_root' id='file_system_root' size='35' value='<?php echo $server['file_system_root']['value']; ?>' /></td>
     </tr>
     <tr>
-        <td><label for='yes'>Do you have SSL Enabled?: </label></td>
-        <td>
-            <label for='yes'>Yes: </label><input type='radio' name='ssl_enabled' id='yes' value='yes' <?php echo $server['ssl_enabled']['value'] == 'yes' ? 'CHECKED' : ''; ?> />&nbsp;&nbsp;
-            <label for='no'>No: </label><input type='radio' name='ssl_enabled' id='no' value='no' <?php echo $server['ssl_enabled']['value'] == 'no' ? 'CHECKED' : ''; ?> />
-        </td>
+        <td> <label for='yes'>Do you have SSL Enabled?: </label> </td>
+        <td> <div id="tooltips" title="Whether or not you have SSL installed">&nbsp;</div> </td>
+        <td> 
+        	<label for='yes'>Yes: </label> 
+        	<input class="radio" type='radio' name='ssl_enabled' id='yes' value='yes' <?php echo $server['ssl_enabled']['value'] == 'yes' ? 'CHECKED' : ''; ?> />
+        	<label for='no'>No: </label>
+        	<input class="radio" type='radio' name='ssl_enabled' id='no' value='no' <?php echo $server['ssl_enabled']['value'] == 'no' ? 'CHECKED' : ''; ?> />
+		</td>
     </tr>
 </table>
-<h3><?php echo "<span class='{$paths_perms}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Paths and Permissions</h3>
+<h3><?php echo "<span class='{$paths_perms}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Directory Paths and Permissions</h3>
 <?php if($silent) { ?>
 	<div id="options" class="onclick" onclick="javascript:{w.toggleClass('paths_perms');}">Show Details</div>
 	<div class="paths_perms" style="display:none">
@@ -76,12 +84,17 @@ The following folders must be writable for KnowledgeTree to be able to run. The 
     	<tr>
     		<td> <div class='<?php echo $path['class']; ?>'></div> </td>
     		<td> <label for='<?php echo $path['setting']; ?>'> <?php echo $path['name']; ?>: </label> </td>
-    		<td><input name='<?php echo $path['setting']; ?>' id='<?php echo $path['setting']; ?>' size='60' value='<?php echo $path['path']; ?>' /></td>
+    		<td><input name='<?php echo $path['setting']; ?>' id='<?php echo $path['setting']; ?>' style="float:left;width:290px;" value='<?php echo $path['path']; ?>' /></td>
     		<?php if(isset($path['msg'])) {
     			?>
     			<td class="error"> <?php echo $path['msg']; ?> </td>
     			<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
     			<?php
+    		} else {
+    			?>
+    			<td class="error"> </td>
+    			<td> </td>
+    			<?php
     		}
     		?>
     	</tr>
@@ -92,8 +105,7 @@ The following folders must be writable for KnowledgeTree to be able to run. The 
 <?php if($silent) { ?>
 	</div>
 <?php } ?>
-<div class="buttons">
-    <input type="submit" name="Previous" value="Previous"/>
-    <input type="submit" name="Next" value="Next"/>
-</div>
+	</div>
+    <input type="submit" name="Previous" value="Previous" class="back"/>
+    <input type="submit" name="Next" value="Next" class="input"/>
 </form>
 \ No newline at end of file
-<h1>System Configuration</h1>
-
-<h3>Server Settings</h3>
-
-<table>
-    <tr>
-        <td>Host: </td>
-        <td><?php echo $server['host']['value']; ?></td>
-    </tr>
-    <tr>
-        <td>Port: </td>
-        <td><?php echo $server['port']['value']; ?></td>
-    </tr>
-    <tr>
-        <td>Root Url: </td>
-        <td><?php echo $server['root_url']['value']; ?></td>
-    </tr>
-    <tr>
-        <td>File System Root: </td>
-        <td><?php echo $server['file_system_root']['value']; ?></td>
-    </tr>
-    <tr>
-        <td>SSL Enabled: </td>
-        <td><?php echo $server['ssl_enabled']['value']; ?></td>
-    </tr>
-</table>
-
-<h3>Paths and Permissions</h3>
-
-<table>
-<?php
-    foreach ($paths as $key => $path){
-?>
-	<tr>
-		<td><div class='<?php echo $path['class']; ?>'></div></td>
-		<td><?php echo $path['name']; ?>:</td>
-		<td><?php echo $path['path']; ?></td>
-	</tr>
-<?php
-    }
-?>
-</table>
-
 <form action="index.php?step_name=configuration" method="post">
-
-<div class="buttons">
-    <!--<input type="submit" onclick="history.back();" name="Back" value="Back"/>
-    <input type="submit"  name="Back" value="Back"/>-->
-    <input type="submit"  name="Edit" value="Edit"/>
-    <input type="submit" name="Confirm" value="Confirm"/>
-</div>
+	<p class="title">System Configuration</p>
+	<div class="continue_message">
+	<?php
+		if(!$errors && !$warnings) {
+			?>
+				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;All configuration settings are correctly set. Please click next to continue.
+			<?php
+		}
+	?>
+	</div>
+	<div class="error_message">
+	<?php if($errors) { ?>
+		<span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;to address. Once you&rsquo;ve fixed these items, return to this wizard and try again.</span><br/>
+	<?php } elseif ($warnings) {
+		?>
+		<span class='cross_orange'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;KnowledgeTree Optional Dependencies not met, but you will be able to continue.</span><br/>
+		<?php
+	}?>
+	<?php
+		if($errors || $warnings) {
+			?>
+		    	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://wiki.knowledgetree.com/Web_Based_Installer#System_Configuration" target="_blank">Click here for help on overcoming configuration issues</a>
+	<?php } ?>
+	</div>
+	
+	<div id="step_content_configuration">
+		<h3>Server Settings</h3>
+		<table>
+		    <tr>
+		        <td width="150px">Host: </td>
+		        <td> <div id="tooltips" title="Location of your web root">&nbsp;</div> </td>
+		        <td><?php echo $server['host']['value']; ?></td>
+		    </tr>
+		    <tr>
+		        <td>Port: </td>
+		        <td> <div id="tooltips" title="The port that the web server listens on.">&nbsp;</div> </td>
+		        <td><?php echo $server['port']['value']; ?></td>
+		    </tr>
+		    <tr>
+		        <td>Root Url: </td>
+		        <td> <div id="tooltips" title="Relative path to KnowledgeTree Source directory">&nbsp;</div> </td>
+		        <td><?php echo $server['root_url']['value']; ?></td>
+		    </tr>
+		    <tr>
+		        <td>File System Root: </td>
+		        <td> <div id="tooltips" title="Absolute path to KnowledgeTree Source directory">&nbsp;</div> </td>
+		        <td><?php echo $server['file_system_root']['value']; ?></td>
+		    </tr>
+		    <tr>
+		        <td>SSL Enabled: </td>
+		        <td> <div id="tooltips" title="Whether or not you have SSL installed">&nbsp;</div> </td>
+		        <td><?php echo $server['ssl_enabled']['value']; ?></td>
+		    </tr>
+		</table>
+		
+		<h3>Paths and Permissions</h3>
+		
+		<table class="conf_paths">
+		<?php
+		    foreach ($paths as $key => $path){
+		?>
+			<tr>
+				<td width="10"><div class='<?php echo $path['class']; ?>'></div></td>
+				<td width="22%"><?php echo $path['name']; ?>:</td>
+				<td width="50%"><?php echo $path['path']; ?></td>
+	    		<?php if(isset($path['msg'])) {	?>
+	    			<td class="error" width="27%"> <?php echo $path['msg']; ?> </td>
+	    			<td width="10"><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
+	    		<?php } else { ?>
+	    			<td class="error" width="27%"> </td>
+	    			<td width="10"> </td>
+	    		<?php } ?>
+			</tr>
+		<?php
+		    }
+		?>
+		</table>
+		<br/>
+	</div>
+    <input type="submit"  name="Edit" value="Edit" class="back"/>
+    <input type="submit" name="Confirm" value="Confirm" class="input"/>
 </form>
 \ No newline at end of file
-<h1>Confirming Database Configurations</h1>
+<form id="dbsettings" action="index.php?step_name=<?php echo $step_name; ?>" method="post" onsubmit="w.onSubmitValidate(<?php if ($silent) echo 'true'; else echo 'false'; ?>);return false;">
+<p class="title">Confirming Database Configurations</p>
 <!-- Check For immediate Errors -->
 <span class="error"> <?php if($errors['con']) { echo $errors['con']; } ?> </span>
-<form id="dbsettings" action="index.php?step_name=<?php echo $step_name; ?>" method="post" onsubmit="w.onSubmitValidate(<?php if ($silent) echo 'true'; else echo 'false'; ?>);return false;">
 <!-- Hidden Fields -->
 <input type="hidden" id='ddrop' name="ddrop" <?php echo ($ddrop) ? 'CHECKED' : ''; ?>/>
 <input type="hidden" id="sendAll" name="" value="" />
@@ -11,6 +11,7 @@
 	This step configures the connection to the database server and installs the database. The details for an administrative <br/>
 	user on the database server are required in order to be able to configure and install the installation database.
 	</div>
+	<div id="step_content_database">
 	<table class="dbconf">
 <!--	TODO: Different Databases-->
 	    <tr><td>Your current database type is: </td>
@@ -26,53 +27,50 @@
 		</tr>
 		    <tr>
 		        <td><label for='dname'>Enter a name for the database: </label></td>
-		        <td><input type='text' value="<?php echo $dname?>" id='dname' name='dname' size='40'/></td>
+		        <td><input type='text' value="<?php echo $dname?>" id='dname' name='dname' size='45'/></td>
 		        <td id="error" class="error"><?php if($errors['dname']) echo $errors['dname']; ?></td>
 		    </tr>
 		    <tr>
 		        <td><label for='duname'>Enter Database Administrative username: </label></td>
-		        <td><input type='text' value="<?php echo $duname?>" id='duname' name='duname' size='40' /></td>
+		        <td><input type='text' value="<?php echo $duname?>" id='duname' name='duname' size='45' /></td>
 		        <td id="error" class="error"><?php if($errors['duname']) echo $errors['duname']; ?></td>
 		    </tr>
 		    <tr>
 		        <td><label for='dpassword'>Enter the password for the user: </label></td>
-		        <td><input type='password' value="<?php echo $dpassword?>" id='dpassword' name='dpassword' size='40' /></td>
+		        <td><input type='password' value="<?php echo $dpassword?>" id='dpassword' name='dpassword' size='45' /></td>
 		        <td id="error" class="error"><?php if($errors['dpassword']) echo $errors['dpassword']; ?></td>
 		    </tr>
 	</table>
 	<div id="options" class="onclick" onclick="javascript:{w.toggleClass('adv_options');}">Advanced Options</div>
-
 	<div id="database" class="adv_options" style="display:none;">
 	    <div class="description">
 	        These options are only necessary for some sites. If you're not sure what you should enter here, leave the default settings.
 	    </div>
-	    <p>
-	    <label for='dhost'>Host: </label><br />
-	    <span class="description">The address of the server where the database is located, if different to the current server.</span><br/>
-	    <input type="text" value="<?php echo $dhost?>" id="dhost" name="dhost" size='60'/>
-	    </p>
-
-	    <p>
-	    <label for='dport'>Port: </label><br />
-	    <span class="description">The port on which your database server is listening, if it is a non-standard port please enter the number here.</span><br/>
-	    <input type="text" value="<?php echo $dport?>" id="dport" name="dport" size='10'/>
-	    </p>
-
-	    <p>
-	    <label for='dbbinary'>Socket: </label><br />
-	    <span class="description">The path to the database binary. If it is not on your system path then please enter it here.</span><br/>
-	    <input type="text" value="<?php echo $dbbinary?>" id="dbbinary" name="dbbinary" size='60'/>
-	    </p>
+	    <div class="db_adv_options">
+	    	<div class="adv_option">
+	    		<label for='dhost'>Host: </label><br>
+				<span class="description">The address of the server where the database is located, if different to the current server.</span>
+				<input type="text" value="<?php echo $dhost?>" id="dhost" name="dhost" size='45' class="textinput"/>
+	    	</div>
+	    	<div class="adv_option">
+	    		<label for='dport'>Port: </label><br>
+	    		<span class="description">The port on which your database server is listening, if it is a non-standard port please enter the number here.</span>
+	    		<input type="text" value="<?php echo $dport?>" id="dport" name="dport" size='10' class="textinput"/>
+	    	</div>
+	    	<div class="adv_option">
+	    		<label for='dport'>Socket: </label><br>
+	    		<span class="description">The path to the database binary. If it is not on your system path then please enter it here.</span>	    				<input type="text" value="<?php echo $dbbinary?>" id="dbbinary" name="dbbinary" size='45' class="textinput"/>
+	    	</div>
+	    </div>
+	</div>
 	</div>
-	<div class="buttons">
-	    <input type="submit" name="Previous" value="Previous" />
+	    <input type="submit" class="back" name="Previous" value="Previous" />
 	    <?php if ($silent) { ?>
-	    <input type="submit" name="Next" value="Next" />
+	    <input type="submit" class="input" name="Next" value="Next" />
 	    <?php } else { ?>
-	    <input type="button" name="Next" value="Next" onclick="javascript:{w.showStep(1, 'n');}"/>
+	    <input type="button" class="input" name="Next" value="Next" onclick="javascript:{w.showStep(1, 'n');}"/>
 	    <?php } ?>
-	</div>
 </div>
 <!-- STEP 2 of the database configuration - Admin user password settings -->
@@ -99,10 +97,8 @@ An administrative user is required for creating tables within the database.
 		</tr>
 	</table>
-	<div class="buttons">
-	    <input type="button" name="Previous" value="Previous" onclick="javascript:{w.showStep(2, 'p');}"/>
-	    <input type="button" name="Next" value="Next" onclick="javascript:{w.showStep(2, 'n');}"/>
-	</div>
+	    <input type="button" name="Previous" class="back" value="Previous" onclick="javascript:{w.showStep(2, 'p');}"/>
+	    <input type="button" name="Next" class="input" value="Next" onclick="javascript:{w.showStep(2, 'n');}"/>
 </div>
 <!-- STEP 3 of the database configuration - default user password settings -->
@@ -129,10 +125,7 @@ An second user is required for normal database interaction, the reading and writ
 	        <td id="error_4_3" class="error" style="display:none">Passwords Do Not Match</td>
 		</tr>
 	</table>
-		<div class="buttons">
-	    <input type="button" name="Previous" value="previous" onclick="javascript:{w.showStep(3, 'p');}"/>
-<!--	    <input type="button" name="Next" value="next" onclick="showStep(3, 'n');"/>-->
-		<input type="submit" name="Next" value="next" />
-	</div>
+	    <input type="button" name="Previous" value="previous" onclick="javascript:{w.showStep(3, 'p');}" class="back"/>
+		<input type="submit" name="Next" value="next" class="input"/>
 </div>
 </form>
 \ No newline at end of file
-<h1>Confirming Database Configurations</h1>
-
-<div class="description">
-Please confirm whether KnowledgeTree has correctly determined your database settings before proceeding.
-</div>
-<!--<div id="section">-->
-
 <form action="index.php?step_name=<?php echo $step_name; ?>" method="post">
-<h3><b>Database Settings</b></h3>
-<table width="33%" class="dbconf">
-<?php
-if($dtypes) {
-        $type = '';
-        foreach($dtypes as $k=>$v) {
-            $type = (!$k) ? $v : $type;
-        }
-        ?>
-    <tr>
-        <td>Database type: </td>
-        <td><?php echo $type; ?></td>
-    </tr>
-<?php } ?>
-    <tr>
-        <td>Name: </td>
-        <td><?php echo $dname; ?></td>
-    </tr>
-    <tr>
-        <td>Root Username: </td>
-        <td><?php echo $duname; ?></td>
-    </tr>
-    <tr>
-        <td>Root Password: </td>
-        <td><?php echo $dpassword; ?></td>
-    </tr>
-    <?php if($ddrop) { ?>
-    <tr>
-        <td colspan="2"><b>You are about to drop the database if it exists </b></td>
-    </tr>
-    <?php } ?>
-</table>
-<!--</div>-->
-<h3><b>Advanced Settings</b></h3>
-
-<table width="35%" class="dbconf">
-    <tr>
-        <td>Host: </td>
-        <td><?php echo $dhost; ?></td>
-    </tr>
-    <tr>
-        <td>Port: </td>
-        <td><?php echo $dport; ?></td>
-    </tr>
-    <tr>
-        <td>Mysql Binary: </td>
-        <td><?php echo $dbbinary; ?></td>
-    </tr>
-    <?php if (!$silent) { ?>
-    <tr>
-        <td><b>Table Prefix: </td>
-        <td><?php echo $tprefix; ?></td>
-    </tr>
-<?php } ?>
-</table>
-
-<h3><b>Database Users</b></h3>
-
-<table width="35%" class="dbconf">
-    <?php //if (!$silent) { ?>
-    <tr>
-        <td>DMS Admin Username: </td>
-        <td><?php echo $dmsname; ?></td>
-    </tr>
-    <?php //} ?>
-    <tr>
-        <td>DMS Admin Password: </td>
-        <td><?php echo $dmspassword; ?></td>
-    </tr>
-    <?php //if (!$silent) { ?>
-    <tr>
-        <td>DMS User Username: </td>
-        <td><?php echo $dmsusername; ?></td>
-    </tr>
-    <?php //} ?>
-    <tr>
-        <td>DMS User Password: </td>
-        <td><?php echo $dmsuserpassword; ?></td>
-    </tr>
-</table>
+<p class="title">Confirming Database Configurations</p>
-<div class="buttons">
-    <input type="submit" name="Edit" value="Edit"/>
-    <input type="submit" name="Confirm" value="Confirm"/>
-</div>
+	<div class="description">
+	Please confirm whether KnowledgeTree has correctly determined your database settings before proceeding.
+	</div>
+	<div id="step_content_database_confirm">
+		<h3><b>Database Settings</b></h3>
+		<table class="dbconf">
+		<?php
+		if($dtypes) {
+		        $type = '';
+		        foreach($dtypes as $k=>$v) {
+		            $type = (!$k) ? $v : $type;
+		        }
+		        ?>
+		    <tr>
+		        <td width="160px">Database Type: </td>
+		        <td width="150px"> <div id="tooltips" title="Type of database being used.">&nbsp;</div> </td>
+		        <td><?php echo $type; ?></td>
+		    </tr>
+		<?php } ?>
+		    <tr>
+		        <td>Database Name: </td>
+		        <td> <div id="tooltips" title="Name of the database being created.">&nbsp;</div> </td>
+		        <td><?php echo $dname; ?></td>
+		    </tr>
+		    <tr>
+		        <td>Root Username: </td>
+		        <td> <div id="tooltips" title="Root user name of the database.">&nbsp;</div> </td>
+		        <td><?php echo $duname; ?></td>
+		    </tr>
+		    <tr>
+		        <td>Root Password: </td>
+		        <td> <div id="tooltips" title="Root user password of the database">&nbsp;</div> </td>
+		        <td><?php echo $dpassword; ?></td>
+		    </tr>
+		    <?php if($ddrop) { ?>
+		    <tr>
+		        <td colspan="2"><b>You are about to drop the database if it exists </b></td>
+		    </tr>
+		    <?php } ?>
+		</table>
+		<!--</div>-->
+		<h3><b>Advanced Settings</b></h3>
+		
+		<table class="dbconf">
+		    <tr>
+		        <td width="160px">Host: </td>
+		        <td width="150px"> <div id="tooltips" title="The address of the server where the database is located">&nbsp;</div> </td>
+		        <td><?php echo $dhost; ?></td>
+		    </tr>
+		    <tr>
+		        <td>Port: </td>
+		        <td> <div id="tooltips" title="The port on which your database server is listening">&nbsp;</div> </td>
+		        <td><?php echo $dport; ?></td>
+		    </tr>
+		    <tr>
+		        <td>Mysql Binary: </td>
+		        <td> <div id="tooltips" title="The path to the database binary">&nbsp;</div> </td>
+		        <td><?php echo $dbbinary; ?></td>
+		    </tr>
+		    <?php if (!$silent) { ?>
+		    <tr>
+		        <td><b>Table Prefix: </td>
+		        <td> <div id="tooltips" title="If needed, a prefix to the database name.">&nbsp;</div> </td>
+		        <td><?php echo $tprefix; ?></td>
+		    </tr>
+		<?php } ?>
+		</table>
+		
+		<h3><b>Database Users</b></h3>
+		
+		<table class="dbconf">
+		    <?php //if (!$silent) { ?>
+		    <tr>
+		        <td width="160px">DMS Admin Username: </td>
+		        <td width="150px"> <div id="tooltips" title="Database Administrative User for KnowledgeTree System">&nbsp;</div> </td>
+		        <td><?php echo $dmsname; ?></td>
+		    </tr>
+		    <?php //} ?>
+		    <tr>
+		        <td>DMS Admin Password: </td>
+		        <td> <div id="tooltips" title="Database Administrative User password">&nbsp;</div> </td>
+		        <td><?php echo $dmspassword; ?></td>
+		    </tr>
+		    <?php //if (!$silent) { ?>
+		    <tr>
+		        <td>DMS User Username: </td>
+		        <td> <div id="tooltips" title="Database User for KnowledgeTree System">&nbsp;</div> </td>
+		        <td><?php echo $dmsusername; ?></td>
+		    </tr>
+		    <?php //} ?>
+		    <tr>
+		        <td>DMS User Password: </td>
+		        <td> <div id="tooltips" title="Database User password">&nbsp;</div> </td>
+		        <td><?php echo $dmsuserpassword; ?></td>
+		    </tr>
+		</table>
+	</div>
+    <input type="submit" name="Edit" value="Edit" class="back"/>
+    <input type="submit" name="Confirm" value="Confirm" class="input"/>
 </form>
 \ No newline at end of file
-<h1>Checking PHP Dependencies</h1>
-
-<p class="description">
-The wizard will review your system to determine whether you have the right PHP components in place to run KnowledgeTree. <br/>
-Once the scan is completed, you&rsquo;ll see whether your system has met the requirements or whether there are areas you need to address. 
-</p>
-
-<div class="continue_message">
-<?php
-	if(!$errors && $warnings) {
-		?>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Congratulations! Your system is ready to run KnowledgeTree. Click Next to continue.
-		<?php
-	}
-?>
-</div>
-
-<div class="error_message">
-<?php if($errors) { ?>
-	<span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Once you&rsquo;ve fixed these items, return to this wizard and try again.</span><br/>
-<?php } elseif ($warnings) { ?>
-	<span class='cross_orange'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;KnowledgeTree Optional Dependencies not met, but you will be able to continue.</span><br/>
-<?php } ?>
-
-<?php
-	if($errors || $warnings) {
-		?>
-	    	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://wiki.knowledgetree.com/Web_Based_Installer#PHP_Dependencies" target="_blank">Click here for help on overcoming dependency issues</a>
-<?php } ?>
-</div>
-
-<h3><?php echo "<span class='{$php}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>PHP Version Check</h3>
-<?php if($silent) { ?>
-	<div id="options" class="onclick" onclick="javascript:{w.toggleClass('php_details');}">Show Details</div>
-	<div class="php_details" style="display:none">
-<?php } ?>
-<p class="description">
-Your version of PHP must be between 5.0 and 5.3.2 to run optimally. Versions higher than 5.3.2 are not recommended.
-</p>
-<?php echo "<span class='{$version['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$version['version']}"; ?>
-<?php if($silent) { ?>
-	</div>
-<?php } ?>
-<br />
-<h3><?php echo "<span class='{$php_ext}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>PHP Extensions</h3>
-<?php
-if($silent) { ?>
-	<div id="options" class="onclick" onclick="javascript:{w.toggleClass('php_ext_details');}">Show Details</div>
-	<div class="php_ext_details" style="display:none">
-<?php } ?>
-<p class="description">
-The extensions shown in red below are required for KnowledgeTree to run optimally. Items shown in yellow are optional, but recommended.
-</p>
-<table>
-<?php
-    foreach($extensions as $ext) {
-   	?>
-<!--        $row = '<tr>';-->
-		<tr>
+<form action="index.php?step_name=dependencies" method="post">
+	<p class="title">Checking PHP Dependencies</p>
+	
+	<p class="description">
+	The wizard will review your system to determine whether you have the right PHP components in place to run KnowledgeTree. <br/>
+	Once the scan is completed, you&rsquo;ll see whether your system has met the requirements or whether there are areas you need to address. 
+	</p>
+	
+	<div class="continue_message">
 	<?php
-        switch($ext['available']){
-            case 'yes':
-                $class = 'tick';
-                break;
-            case 'optional':
-                $class = 'cross_orange';
-                break;
-            case 'no':
-            default:
-                $class = 'cross';
-        }
+		if(!$errors && $warnings) {
+			?>
+				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Congratulations! Your system is ready to run KnowledgeTree. Click Next to continue.
+			<?php
+		}
 	?>
-        <td><div class='<?php echo $class; ?>'></div></td>
-        <td><?php echo $ext['name']; ?></td>
-        <?php echo ($ext['available'] != 'yes') ? "<td>{$ext['details']}</td>" : '<td></td>'; ?>
-        <?php echo isset($errors[$ext['extension']]) ? "<td><span class='error'>{$errors[$ext['extension']]}</span></td>" : '<td></td>'; ?>
-    <?php
-    	if ($class == 'orange' || $class == 'cross') {
-    		?>
-    		<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
-    		<?php
-    	}
-    ?>
-        <?php
-    }
-?>
-</table>
-<?php if($silent) { ?>
 	</div>
-<?php } ?>
-<br />
-<h3><?php echo "<span class='{$php_con}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>PHP Configuration</h3>
-<?php
-if($silent) { ?>
-	<div id="options" class="onclick" onclick="javascript:{w.toggleClass('php_con_details');}">Show Details</div>
-	<div class="php_con_details" style="display:none">
-<?php } ?>
-<p class="description">
-The configurations shown in red below are required for KnowledgeTree to run optimally. Items shown in yellow are optional, but recommended.
-</p>
-<table>
-<tr>
-    <th>Setting</th>
-    <th>Recommended value</th>
-    <th>Current value</th>
-</tr>
-<?php
-    foreach($configurations as $config) {
-    	?>
-    	<tr>
-    		<td><?php echo $config['name']; ?></td>
-    		<td><?php echo $config['recommended']; ?></td>
-    		<td class="<?php echo $config['class']; ?>"><?php echo $config['name']; ?></td>
-    <?php
-    	if ($config['class'] == 'orange' || $config['class'] == 'cross') {
-    		?>
-    		<td><a href="javascript:this.location.reload();">Refresh</a></td>
-    		<?php
-    	}
-    ?>
-        </tr>
+	<div class="error_message">
+	<?php if($errors) { ?>
+		<span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;to address. Once you&rsquo;ve fixed these items, return to this wizard and try again.</span><br/>
+	<?php } elseif ($warnings) { ?>
+		<span class='cross_orange'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;KnowledgeTree Optional Dependencies are not met, but you will be able to continue.</span><br/>
+	<?php } ?>
+	
+	<?php
+		if($errors || $warnings) {
+			?>
+		    	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://wiki.knowledgetree.com/Web_Based_Installer#PHP_Dependencies" target="_blank">Click here for help on overcoming dependency issues</a>
+	<?php } ?>
+	</div>
+	<div id="step_content_dependencies">
+		<h3><?php echo "<span class='{$php}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>PHP Version Check</h3>
+		<?php if($silent) { ?>
+			<div id="options" class="onclick" onclick="javascript:{w.toggleClass('php_details');}">Show Details</div>
+			<div class="php_details" style="display:none">
+		<?php } ?>
+		<p class="description">
+		Your version of PHP must be between 5.0 and 5.3.2 to run optimally. Versions higher than 5.3.2 are not recommended.
+		</p>
+		<?php echo "<span class='{$version['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$version['version']}"; ?>
+		<?php if($version['class'] != 'tick') { ?>
+			<a href="javascript:this.location.reload();" class="refresh">Refresh</a>
+		<?php } ?>
+		<?php if($silent) { ?>
+			</div>
+		<?php } ?>
+		<br />
+		<h3><?php echo "<span class='{$php_ext}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>PHP Extensions</h3>
 		<?php
-    }
-?>
-</table>
-<br/>
-B = Bytes, K = Kilobytes, M = Megabytes, G = Gigabytes
-<?php if($silent) { ?>
+		if($silent) { ?>
+			<div id="options" class="onclick" onclick="javascript:{w.toggleClass('php_ext_details');}">Show Details</div>
+			<div class="php_ext_details" style="display:none">
+		<?php } ?>
+		<p class="description">
+			The extensions shown in red below are required for KnowledgeTree to run optimally. <br/>Items shown in yellow are optional, but recommended.
+		</p>
+		<table class="description">
+		<?php
+		    foreach($extensions as $ext) {
+		   	?>
+				<tr>
+			<?php
+		        switch($ext['available']){
+		            case 'yes':
+		                $class = 'tick';
+		                break;
+		            case 'optional':
+		                $class = 'cross_orange';
+		                break;
+		            case 'no':
+		            default:
+		                $class = 'cross';
+		        }
+			?>
+		        <td class="ext_indicator"><div class='<?php echo $class; ?>'></div></td>
+		        <td class="ext_name"><?php echo $ext['name']; ?></td>
+		        <?php echo ($ext['available'] != 'yes') ? "<td class='ext_description'>{$ext['details']}</td>" : '<td></td>'; ?>
+		        <?php echo isset($errors[$ext['extension']]) ? "<td class='ext_error'><span class='error'>{$errors[$ext['extension']]}</span></td>" : '<td></td>'; ?>
+		    <?php
+		    	if ($class == 'orange' || $class == 'cross') {
+		    		?>
+		    		<td class="ext_refresh"><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
+		    		<?php
+		    	}
+		    ?>
+		        <?php
+		    }
+		?>
+		</table>
+		<?php if($silent) { ?>
+			</div>
+		<?php } ?>
+		<br />
+		<h3><?php echo "<span class='{$php_con}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>PHP Configuration</h3>
+		<?php
+		if($silent) { ?>
+			<div id="options" class="onclick" onclick="javascript:{w.toggleClass('php_con_details');}">Show Details</div>
+			<div class="php_con_details" style="display:none">
+		<?php } ?>
+		<p class="description">
+		The configurations shown in red below are required for KnowledgeTree to run optimally. Items shown in yellow are optional, but recommended.
+		</p>
+		<table class="description">
+		<tr>
+		    <th>Setting</th>
+		    <th>Recommended value</th>
+		    <th>Current value</th>
+		</tr>
+		<?php
+		    foreach($configurations as $config) {
+		    	?>
+		    	<tr>
+		    		<td class="dir_name"><?php echo $config['name']; ?></td>
+		    		<td class="dir_description"><?php echo $config['recommended']; ?></td>
+		    		<td class="<?php echo $config['class']; ?>"><?php echo $config['name']; ?></td>
+		    <?php
+		    	if ($config['class'] == 'orange' || $config['class'] == 'cross') {
+		    		?>
+		    		<td class="ext_refresh"><a href="javascript:this.location.reload();">Refresh</a></td>
+		    		<?php
+		    	}
+		    ?>
+		        </tr>
+				<?php
+		    }
+		?>
+		</table>
+		<br/>
+		B = Bytes, K = Kilobytes, M = Megabytes, G = Gigabytes
+		<?php if($silent) { ?>
+			</div>
+		<?php } ?>
 	</div>
-<?php } ?>
-<form action="index.php?step_name=dependencies" method="post">
-<div class="buttons">
-    <input type="submit" name="Previous" value="Back"/>
-    <input type="submit" name="Next" value="Next"/>
-</div>
+    <input type="submit" class="back" name="Previous" value="Back"/>
+    <input type="submit" class="input" name="Next" value="Next"/>
 </form>
 \ No newline at end of file
 <head>
-		<title>KnowledgeTree Installer</title>
-		<script type="text/javascript" src="resources/wizard.js"></script>
-		<link rel="stylesheet" type="text/css" href="resources/wizard.css">
+	<title>KnowledgeTree Installer</title>
+	<script type="text/javascript" src="resources/wizard.js"></script>
+	<link rel="stylesheet" type="text/css" href="resources/wizard.css">
 	</head><body onload="w.doFormCheck();">
 		<div id="outer-wrapper">
 		    <div id="header">
 		        <div class="logo"></div>
 		    </div>
-		
 		    <div id="wrapper">
 		        <div id="container">
 		            <div id="content">
-		                <h1>Welcome to the KnowledgeTree Setup Wizard</h1>
-
-<div style="width: 800px;">
-<?php if(isset($error)) echo '';echo "<div class='error'>".$error."</div>"; ?>
-<?php 
-if(isset($errors)) {
-	if($errors){
-	    echo '<div class="error">';
-	    foreach ($errors as $msg){
-	        echo $msg . "<br />\n";
-	    }
-	    echo '</div>';
-	}
-}
-?>
-</div>
-
-<form action="index.php?step_name=welcome" method="post">
-<div class="buttons">
-</div>
-</form>		            </div>
-		        </div>
-		
+		            	<form action="index.php?step_name=welcome" method="post">
+			                <p class="title">Welcome to the KnowledgeTree Setup Wizard</p>
+							<div style="width: 800px;">
+							<?php if(isset($error)) echo '';echo "<div class='error'>".$error."</div>"; ?>
+							<?php 
+								if(isset($errors)) {
+									if($errors){
+									    echo '<div class="error">';
+									    foreach ($errors as $msg){
+									        echo $msg . "<br />\n";
+									    }
+									    echo '</div>';
+									}
+								}
+							?>
+							</div>
+						</form>
+					</div>
+				</div>
 		        <div id="sidebar">
-		            <div class="menu"><span class="active">Welcome</span><br><span class="inactive">License Agreement</span><br><span class="inactive">PHP Dependencies</span><br><span class="inactive">System Configuration</span><br><span class="inactive">Service Dependencies</span><br><span class="inactive">Database Configuration</span><br><span class="inactive">Registration</span><br><span class="inactive">Install</span><br><span class="inactive">Complete</span><br></div>		        </div>
+		            <div class="menu">
+		            	<span class="active">Welcome</span><br>
+		            	<span class="inactive">License Agreement</span><br>
+		            	<span class="inactive">PHP Dependencies</span><br>
+		            	<span class="inactive">System Configuration</span><br>
+		            	<span class="inactive">Service Dependencies</span><br>
+		            	<span class="inactive">Database Configuration</span><br>
+		            	<span class="inactive">Registration</span><br>
+		            	<span class="inactive">Install</span><br>
+		            	<span class="inactive">Complete</span><br>
+		            </div>
+				</div>
 		        <div class="clearing">&nbsp;</div>
 		    </div>
-		
 		    <div id="footer">
 		        <div class="powered-by"></div>
 		    </div>
-<h1>Welcome to the KnowledgeTree Setup Wizard</h1>
+<p class="title">Welcome to the KnowledgeTree Setup Wizard</p>
 <div style="width: 800px;">
 <?php if(isset($error)) echo $error; ?>
-<h1>Finalizing System Installation</h1>
-
-<p class="description">
-The wizard will now complete the installation and run a final check on the system. 
-</p>
-
 <form action="index.php?step_name=install" method="post">
-    <div class="buttons">
-        <input type="submit" name="Previous" value="Previous"/>
-        <input type="submit" name="Install" value="Install"/>
-    </div>
+	<p class="title">Finalizing System Installation</p>
+
+	<div id="step_content">
+		The wizard will now complete the installation and run a final check on the system. 
+	</div>
+	<input type="submit" name="Previous" value="Previous" class="back"/>
+	<input type="submit" name="Install" value="Install" class="input"/>
 </form>
 \ No newline at end of file
-<form action="index.php?step_name=registration" method="post">
-<h1>Registering KnowledgeTree</h1>
-
-<p>
-Register with KnowledgeTree to receive important product updates. We respect your privacy and will not share your information with third parties. For more information, please refer to our Privacy and Data Retention Policies.
-<a href="index.php?step_name=install">Skip Registration</a>
-</p>
-
-<p class='disclaimer'>
-We will not share your information with 3rd-parties, nor will we send you information not directly related to KnowledgeTree's products
-and services. Please see our <a href="http://www.knowledgetree.com/about/legal" target="_blank">Privacy and Data Retention policies</a> for more information.
-</p>
-
-<p>
-
-<table>
-    <tr>
-        <td><label for='first'>First Name</label></td>
-        <td rowspan='6' width='5%'>&nbsp;</td>
-        <td><input name='submitted[first_name]' id='first' size='37' /></td>
-        <td rowspan='6' width='5%'>&nbsp;</td>
-        <td rowspan='6'>
-            <img src='resources/graphics/dropbox.png' width="100%" height="100%"/>
-        </td>
-    </tr>
-    <tr>
-        <td><label for='last'>Last Name</label></td>
-        <td><input name='submitted[last_name]' id='last' size='37' /></td>
-    </tr>
-    <tr>
-        <td><label for='email'>Email Address</label></td>
-        <td><input name='submitted[email_address]' id='email' size='37' /></td>
-    </tr>
-    <tr>
-        <td><label for='country'>Country</label></td>
-        <td>
-            <select id='country' name='submitted[country]'>
-                <?php
-                    $str = '';
-                    foreach ($countries as $code => $country) {
-                        $str .= "<option name='{$code}' value='{$country}'>{$country}</option>";
-                    }
-
-                    echo $str;
-                ?>
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td><label for='industry'>Industry</label></td>
-        <td>
-            <select id='industry' name='submitted[industry]'>
-                <?php
-                    $str = '';
-                    foreach ($industries as $code => $industry) {
-                        $str .= "<option name='{$code}' value='{$industry}'>{$industry}</option>";
-                    }
-
-                    echo $str;
-                ?>
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td><label for='size'>Organization Size</label></td>
-        <td>
-            <select id='size' name='submitted[organization_size]'>
-                <?php
-                    $str = '';
-                    foreach ($org_size as $code => $size) {
-                        $str .= "<option name='{$code}' value='{$size}'>{$size}</option>";
-                    }
-
-                    echo $str;
-                ?>
-            </select>
-        </td>
-    </tr>
-</table>
-</p>
-
-<input type='hidden' name='form_id' value='webform_client_form_242' />
-<input type='hidden' name='op' value='Submit' />
-
-
-<div class="buttons">
-    <input type="submit" name="Previous" value="Previous"/>
-    <input type="submit" name="Next" value="Register"/>
-</div>
+<form id="registration" action="index.php?step_name=<?php echo $step_name; ?>" method="post" onsubmit="w.validateRegistration();return false;">
+	<p class="title">Registering KnowledgeTree</p>
+	
+	<p class="description">
+	Register with KnowledgeTree to receive important product updates. We respect your privacy and will not share your information with third parties. For more information, please refer to our Privacy and Data Retention Policies.
+	<a href="index.php?step_name=install">Skip Registration</a>
+	</p>
+	<!-- Hidden Fields -->
+	<input type="hidden" id="sendAll" name="" value="" />
+	<input type="hidden" id="state" name="" />
+	<p class='disclaimer'>
+	We will not share your information with 3rd-parties, nor will we send you information not directly related to KnowledgeTree's products
+	and services. Please see our <a href="http://www.knowledgetree.com/about/legal" target="_blank">Privacy and Data Retention policies</a> for more information.
+	</p>
+	<br/>
+	<div id="step_content_registration">
+		<span class="error" id="reg_error"></span>
+		<table>
+		    <tr>
+		        <td><label for='first'>First Name</label></td>
+		        <td rowspan='6' width='5%'>&nbsp;</td>
+		        <td><input name='submitted[first_name]' id='first' size='37' /></td>
+		        <td rowspan='6' width='5%'>&nbsp;</td>
+		        <td rowspan='6'> <img src='resources/graphics/dropbox.png'/> </td>
+		    </tr>
+		    
+		    <tr>
+		        <td><label for='last'>Last Name</label></td>
+		        <td><input name='submitted[last_name]' id='last' size='37' /></td>
+		    </tr>
+		    <tr>
+		        <td><label for='email'>Email Address</label></td>
+		        <td><input name='submitted[email_address]' id='email' size='37' /></td>
+		    </tr>
+		    <tr>
+		        <td><label for='country'>Country</label></td>
+		        <td>
+		            <select id='country' name='submitted[country]'>
+		                <?php
+		                    $str = '';
+		                    foreach ($countries as $code => $country) {
+		                        $str .= "<option name='{$code}' value='{$country}'>{$country}</option>";
+		                    }
+		
+		                    echo $str;
+		                ?>
+		            </select>
+		        </td>
+		    </tr>
+		    <tr>
+		        <td><label for='industry'>Industry</label></td>
+		        <td>
+		            <select id='industry' name='submitted[industry]'>
+		                <?php
+		                    $str = '';
+		                    foreach ($industries as $code => $industry) {
+		                        $str .= "<option name='{$code}' value='{$industry}'>{$industry}</option>";
+		                    }
+		
+		                    echo $str;
+		                ?>
+		            </select>
+		        </td>
+		    </tr>
+		    <tr>
+		        <td><label for='size'>Organization Size</label></td>
+		        <td>
+		            <select id='size' name='submitted[organization_size]'>
+		                <?php
+		                    $str = '';
+		                    foreach ($org_size as $code => $size) {
+		                        $str .= "<option name='{$code}' value='{$size}'>{$size}</option>";
+		                    }
+		
+		                    echo $str;
+		                ?>
+		            </select>
+		        </td>
+		    </tr>
+		</table>
+		
+		<input type='hidden' name='form_id' value='webform_client_form_242' />
+		<input type='hidden' name='op' value='Submit' />
+	</div>
+	
+	<input type="submit" name="Previous" value="Previous" class="back" onclick="w.pClick()"/>
+	<input type="submit" name="Next" value="Register" class="input" onclick="w.nClick()"/>
 </form>
 \ No newline at end of file
-<h1>Thank you for registering</h1>
-
-<p>
-Thank you for signing up. You'll receive an email from us shortly with download instructions for the KnowledgeTree Drop Box software.
-</p>
-
 <form action="index.php?step_name=registration" method="post">
-
-<div class="buttons">
-    <input type="submit" name="Previous" value="Previous"/>
-    <input type="submit" name="Confirm" value="Next"/>
-</div>
+	<p class="title">Thank you for registering</p>
+	<div id="step_content_registration_confirm">
+	Thank you for signing up. You'll receive an email from us shortly with download instructions for the KnowledgeTree Drop Box software.
+	</div>
+	<input type="submit" name="Previous" value="Previous" class="back"/>
+	<input type="submit" name="Confirm" value="Next" class="input"/>
 </form>
 \ No newline at end of file
 <form action="index.php?step_name=services" method="post">
-<h1>Checking Service Dependencies</h1>
-
-<p class="description">
-The wizard will review your system to determine whether you can run KnowledgeTree background services. <br/>Once the scan is completed, you&rsquo;ll see whether your system has met the requirements or whether there are areas you need to address. 
-</p>
-
-<div class="continue_message">
-<?php
-	if(!$errors && !$warnings) {
+	<p class="title">Checking Service Dependencies</p>
+	
+	<p class="description">
+	The wizard will review your system to determine whether you can run KnowledgeTree background services. <br/>Once the scan is completed, you&rsquo;ll see whether your system has met the requirements or whether there are areas you need to address. 
+	</p>
+	
+	<div class="continue_message">
+	<?php
+		if(!$errors && !$warnings) {
+			?>
+				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;All service dependencies are met. Please click next to continue.
+			<?php
+		}
+	?>
+	</div>
+	<div class="error_message">
+	<?php if($errors) { ?>
+		<span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;to address. Once you&rsquo;ve fixed these items, return to this wizard and try again.</span><br/>
+	<?php } elseif ($warnings) {
 		?>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;All service dependencies are met. Please click next to continue.
+		<span class='cross_orange'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;KnowledgeTree Optional Dependencies not met, but you will be able to continue.</span><br/>
 		<?php
-	}
-?>
-</div>
-<div class="error_message">
-<?php if($errors) { ?>
-	<span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Once you&rsquo;ve fixed these items, return to this wizard and try again.</span><br/>
-<?php } elseif ($warnings) {
-	?>
-	<span class='cross_orange'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;KnowledgeTree Optional Dependencies not met, but you will be able to continue.</span><br/>
+	}?>
 	<?php
-}?>
-<?php
-	if($errors || $warnings) {
-		?>
-	    	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://wiki.knowledgetree.com/Web_Based_Installer#Service_Dependencies" target="_blank">Click here for help on overcoming dependency issues</a>
-<?php } ?>
-</div>
-
-<?php if(!$alreadyInstalled) { ?>
-	<?php if($javaExeError != '') { ?>
-		Specify the location of your Java executable
-		&nbsp;&nbsp;&nbsp;
-		<input name='java' id='port' size='25' value='<?php echo $java['location']; ?>'/>
-		&nbsp;&nbsp;&nbsp;
-		<?php if($javaExeError != true) { ?><span class="error"><?php echo $javaExeError; ?></span><?php } ?>
+		if($errors || $warnings) {
+			?>
+		    	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://wiki.knowledgetree.com/Web_Based_Installer#Service_Dependencies" target="_blank">Click here for help on overcoming service issues</a>
 	<?php } ?>
-	<?php if($phpExeError != '') { ?>
-		<br />
-		Specify the location of your PHP executable
-		<br />
-		<?php if($php['location'] == '') { ?>
-			<input name='php' id='port' size='25' value='<?php echo $php['location']; ?>'/>
+	</div>
+	<div id="step_content_configuration" style="width:755px;">
+		<?php if(!$alreadyInstalled) { ?>
+			<?php if($javaExeError != '') { ?>
+				Specify the location of your Java executable
+				&nbsp;&nbsp;&nbsp;
+				<input name='java' id='port' size='25' value='<?php echo $java['location']; ?>' style="float:none;"/>
+				&nbsp;&nbsp;&nbsp;
+				<?php if($javaExeError != true) { ?><span class="error"><?php echo $javaExeError; ?></span><?php } ?>
+			<?php } ?>
+			<?php if($phpExeError != '') { ?>
+				<br />
+				Specify the location of your PHP executable
+				<br />
+				<?php if($php['location'] == '') { ?>
+					<input name='php' id='port' size='25' value='<?php echo $php['location']; ?>'/>
+				<?php } else { ?>
+					<input type="hidden" name='php' id='port' size='25' value='<?php echo $php['location']; ?>'/>
+				<?php } ?>
+				&nbsp;&nbsp;&nbsp;
+				<?php if($phpExeError != true) { ?><span class="error"><?php echo $phpExeError; ?></span><?php } ?>
+			<?php } ?>
+			<?php if($javaExeError != '' || $phpExeError != '') { ?>
+				<input type="submit" name="Refresh" value="Submit" style="float:none;"/>
+			<?php } ?>
+			<h3><?php echo "<span class='{$javaCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Java Check</h3>
+			<?php if($silent) { ?>
+				<div id="options" class="onclick" onclick="javascript:{w.toggleClass('java_details');}">Show Details</div>
+				<div class="java_details" style="display:none">
+			<?php } ?>
+			<p class="description">
+			The Java version must be higher than 1.5.
+			</p>
+			<table>
+				<tr>
+					<td> <span class='<?php echo $step_vars['java']['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
+					<td style="width:645px;"> <?php echo $step_vars['java']['found']; ?> </td>
+					<?php 
+					if ($step_vars['java']['class'] != 'tick') {
+					?>
+						<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
+					<?php
+					} else { ?>
+						<td> </td>
+					<?php } ?>
+				</tr>
+				<tr>
+					<td> <span class='<?php echo $step_vars['version']['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
+					<td> <?php echo $step_vars['version']['found']; ?> </td>
+					<?php if ($step_vars['version']['class'] != 'tick') {
+						?>
+							<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
+						<?php
+					}
+					?>			
+				</tr>
+			</table>
+			<?php if($silent) { ?>
+				</div>
+			<?php } ?>
+			<?php if (!$disableExtension) { ?>
+				<h3><?php echo "<span class='{$javaExtCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Java Extensions</h3>
+				<?php if($silent) { ?>
+					<div id="options" class="onclick" onclick="javascript:{w.toggleClass('java_ext_details');}">Show Details</div>
+					<div class="java_ext_details" style="display:none">
+				<?php } ?>
+				<p class="description">
+				A PHP Java Bridge is required for KnowledgeTree to perform at an optimal level.
+				</p>
+				<table>
+					<tr>
+						<td> <span class='<?php echo $step_vars['extensions']['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
+						<td style="width:645px;"> <?php echo $step_vars['extensions']['found']; ?> </td>
+						<?php if ($step_vars['extensions']['class'] != 'tick') {
+							?>
+								<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
+							<?php
+						}
+						?>
+					</tr>
+				</table>
+				<?php //echo "<span class='{$step_vars['extensions']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['extensions']['found']}"; ?>
+		<!--		<br />-->
+				<?php if($silent) { ?>
+					</div>
+				<?php } ?>
+			<?php } ?>
 		<?php } else { ?>
-			<input type="hidden" name='php' id='port' size='25' value='<?php echo $php['location']; ?>'/>
+			<p class="description">
+			All services are already installed.
+			</p>
 		<?php } ?>
-		&nbsp;&nbsp;&nbsp;
-		<?php if($phpExeError != true) { ?><span class="error"><?php echo $phpExeError; ?></span><?php } ?>
-	<?php } ?>
-	<?php if($javaExeError != '' || $phpExeError != '') { ?>
-		<input type="submit" name="Refresh" value="Submit"/>
-	<?php } ?>
-	<h3><?php echo "<span class='{$javaCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Java Check</h3>
-	<?php if($silent) { ?>
-		<div id="options" class="onclick" onclick="javascript:{w.toggleClass('java_details');}">Show Details</div>
-		<div class="java_details" style="display:none">
-	<?php } ?>
-	<p class="description">
-	The Java version must be higher than 1.5.
-	</p>
-	<table>
-		<tr>
-			<td> <span class='<?php echo $step_vars['java']['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
-			<td> <?php echo $step_vars['java']['found']; ?> </td>
-			<?php if ($step_vars['java']['class'] != 'tick') {
-				?>
-					<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
-				<?php
-			}
-			?>
-		</tr>
-		<tr>
-			<td> <span class='<?php echo $step_vars['version']['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
-			<td> <?php echo $step_vars['version']['found']; ?> </td>
-			<?php if ($step_vars['version']['class'] != 'tick') {
-				?>
-					<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
-				<?php
-			}
-			?>			
-		</tr>
-	</table>
-	<?php if($silent) { ?>
-		</div>
-	<?php } ?>
-	<?php if (!$disableExtension) { ?>
-		<h3><?php echo "<span class='{$javaExtCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Java Extensions</h3>
+		<h3><?php echo "<span class='{$serviceCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Services Check</h3>
 		<?php if($silent) { ?>
-			<div id="options" class="onclick" onclick="javascript:{w.toggleClass('java_ext_details');}">Show Details</div>
-			<div class="java_ext_details" style="display:none">
+			<div id="options" class="onclick" onclick="javascript:{w.toggleClass('service_details');}">Show Details</div>
+			<div class="service_details" style="display:none">
 		<?php } ?>
 		<p class="description">
-		A PHP Java Bridge is required for KnowledgeTree to perform at an optimal level.
+		Preload Services if posibble.
 		</p>
 		<table>
-			<tr>
-				<td> <span class='<?php echo $step_vars['extensions']['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
-				<td> <?php echo $step_vars['extensions']['found']; ?> </td>
-				<?php if ($step_vars['extensions']['class'] != 'tick') {
-					?>
-						<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
-					<?php
-				}
-				?>
-			</tr>
+		<?php
+		if($step_vars) {
+			if(isset($step_vars['services'])) {
+			    foreach ($step_vars['services'] as $ser){
+			    	?>
+			    	<tr>
+			    		<td> <span class='<?php echo $ser['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
+			    		<td style="width:645px;"> <?php echo $ser['msg']; ?> </td>
+			    		<?php if ($ser['class'] != 'tick') {
+			    			?>
+			    			<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
+			    			<?php
+			    		} ?>
+			    	</tr>
+			    	<?php
+			    }
+			}
+		}
+		?>
 		</table>
-		<?php //echo "<span class='{$step_vars['extensions']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['extensions']['found']}"; ?>
-<!--		<br />-->
 		<?php if($silent) { ?>
 			</div>
 		<?php } ?>
-	<?php } ?>
-<?php } else { ?>
-	<p class="description">
-	All services are already installed.
-	</p>
-<?php } ?>
-<h3><?php echo "<span class='{$serviceCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Services Check</h3>
-<?php if($silent) { ?>
-	<div id="options" class="onclick" onclick="javascript:{w.toggleClass('service_details');}">Show Details</div>
-	<div class="service_details" style="display:none">
-<?php } ?>
-<p class="description">
-Preload Services if posibble.
-</p>
-<table>
-<?php
-if($step_vars) {
-	if(isset($step_vars['services'])) {
-	    foreach ($step_vars['services'] as $ser){
-	    	?>
-	    	<tr>
-	    		<td> <span class='<?php echo $ser['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> </td>
-	    		<td> <?php echo $ser['msg']; ?> </td>
-	    		<?php if ($ser['class'] != 'tick') {
-	    			?>
-	    			<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
-	    			<?php
-	    		} ?>
-	    	</tr>
-	    	<?php
-	    }
-	}
-}
-?>
-</table>
-<?php if($silent) { ?>
 	</div>
-<?php } ?>
-<div class="buttons">
-    <input type="submit" name="Previous" value="Back"/>
-    <input type="submit" name="Next" value="Next"/>
-</div>
+    <input type="submit" class="back" name="Previous" value="Back"/>
+    <input type="submit" class="input" name="Next" value="Next"/>
 </form>
 \ No newline at end of file
 <form action="index.php?step_name=welcome" method="post">
-<p class="title">Welcome to KnowledgeTree</p>
-
-<div id="step_content">
-<p>
-This wizard will lead you through the steps needed to install and configure KnowledgeTree on your server.
-</p>
-</div>
-
-<!--<div class="buttons" id="buttons_single">-->
-    <input class="next" type="submit" name="Next" value="Next"/>
-<!--</div>-->
+	<p class="title">Welcome to KnowledgeTree</p>
+	<div id="step_content">
+		<p> This wizard will lead you through the steps needed to install and configure KnowledgeTree on your server. </p>
+	</div>
+	<input class="next" type="submit" name="Next" value="Next"/>
 </form>
 \ No newline at end of file
@@ -2,22 +2,24 @@
 <html>
 	<head>
 		<title>KnowledgeTree Installer</title>
-<!--		<script type="text/javascript" src="resources/jquery-tooltip/lib/jquery.js"></script>-->
-<!--		<script type="text/javascript" src="resources/jquery-tooltip/lib/jquery.bgiframe.js"></script>-->
-<!--		<script type="text/javascript" src=".resources/jquery-tooltip/lib/jquery.dimensions.js"></script>-->
-<!--		<script type="text/javascript" src="resources/jquery-tooltip/lib/jquery.tooltip.js"></script>-->
+		<script type="text/javascript" src="resources/jquery-tooltip/lib/jquery.js"></script>
 		<script type="text/javascript" src="resources/wizard.js" ></script>
 		<link rel="stylesheet" type="text/css" href="resources/wizard.css" />
 	</head>
 	<body onload="w.doFormCheck();">
 		<div id="outer-wrapper">
-		    <div id="header"></div>
-		    
+		    <div id="header">
+		    <div id="logo"><img src="resources/graphics/dame/installer-header_logo.png"/></div>
+		    <div id="install_details">
+				<span style="font-size:120%;"> <?php echo $vars['install_version']; ?> </span><br>
+				<span style="font-size:80%;"><?php echo $vars['install_type']; ?></span>
+				</div>
+		    </div>
 		    <div id="wrapper">
 		        <div id="container">
 		        	<div id="sidebar">
-		            	<?php echo $left; ?>
+		            	<?php echo $vars['left']; ?>
 		        	</div>
 		            <div id="content">
 		            	<div id="content_container">
@@ -3,7 +3,10 @@
 // TODO use CMISUtil::encodeObjectId to create testing ids, as we may change how the encoding works in future
 require_once (KT_DIR . '/tests/test.php');
-require_once (KT_LIB_DIR . '/api/ktcmis/ktcmis.inc.php');
+require_once (KT_LIB_DIR . '/api/ktcmis/ktNavigationService.inc.php');
+require_once (KT_LIB_DIR . '/api/ktcmis/ktObjectService.inc.php');
+require_once (KT_LIB_DIR . '/api/ktcmis/ktRepositoryService.inc.php');
+require_once (KT_LIB_DIR . '/api/ktcmis/ktVersioningService.inc.php');
 // username and password for authentication
 // must be set correctly for all of the tests to pass in all circumstances
@@ -63,7 +66,7 @@ class CMISTestCase extends KTUnitTestCase {
     }
     // Repository service functions
-    function tedstRepositoryService()
+    function testRepositoryService()
     {
         $RepositoryService = new KTRepositoryService();
@@ -180,7 +183,7 @@ class CMISTestCase extends KTUnitTestCase {
     }
     // Navigation service functions
-    function tedstNavigationService()
+    function testNavigationService()
     {
         $NavigationService = new KTNavigationService($this->ktapi);
@@ -302,7 +305,7 @@ class CMISTestCase extends KTUnitTestCase {
     // Object Services
-    function tedstObjectService()
+    function testObjectService()
     {
         $ObjectService = new KTObjectService($this->ktapi);
 //        $ObjectService->startSession(KT_TEST_USER, KT_TEST_PASS);
@@ -526,7 +529,7 @@ class CMISTestCase extends KTUnitTestCase {
         $response = $NavigationService->getCheckedOutDocs($repositoryId, false, false);
         $this->assertEqual($response['status_code'], 0);
         $this->assertNotNull($response['results']);
-        $this->assertTrue(in_array($documentId, $response['results']));
+        $this->assertTrue($this->findInPropertiesArray('ObjectId', $documentId, $response['results']));
         // now let's cancel the checkout so that we can delete later during cleanup :)
         $response = $VersioningService->cancelCheckOut($repositoryId, $pwcId);
@@ -537,7 +540,46 @@ class CMISTestCase extends KTUnitTestCase {
         // tear down the folder/doc tree structure with which we were testing
         $this->cleanupFolderDocStructure();
     }
+    
+    /**
+     * Searches a CMIS properties array for a specific value
+     * 
+     * @param string $key The CMIS property key to look for
+     * @param string $needle The value to check
+     * @param array $haystack The CMIS properties array
+     * @param int $propeLevel -1 or positive value -> -1 = not yet found | positive = found
+     * @return boolean
+     */
+    function findInPropertiesArray($key, $needle, $haystack, $propLevel = null)
+    {
+        $found = false;
+        
+        if (empty($propLevel)) $propLevel = -1;
+        foreach($haystack as $elKey => $elValue)
+        {
+            if (($propLevel == -1) && ((string)$elKey != 'properties')) {
+                $found = $this->findInPropertiesArray($key, $needle, $elValue, $propLevel);
+                if ($found) break;
+            }
+            else if ((string)$elKey == 'properties') {
+                $propLevel = 1;
+            }
+            
+            // now check through actual properties array
+            $properties = $elValue;
+            foreach($properties as $propKey => $property)
+            {
+                if (($propKey == $key) && ($property['value'] == $needle)) {
+                    $found = true;
+                    break;
+                }
+            }
+        }
+        
+        return $found;
+    }
+    
     /**
      * Helper function to create a document
      */
@@ -30,6 +30,7 @@ i.	Other (Content-less document, Folder, Relationship, Type, etc) – best effor
 When POSTing an Atom Document, the atom fields take precedence over the CMIS property field for writeable properties.  For example, atom:title will overwrite cmis:name
  */
+// load all available CMIS services
 include_once CMIS_ATOM_LIB_FOLDER . 'RepositoryService.inc.php';
 include_once CMIS_ATOM_LIB_FOLDER . 'NavigationService.inc.php';
 include_once CMIS_ATOM_LIB_FOLDER . 'ObjectService.inc.php';
@@ -101,7 +102,7 @@ class KT_cmis_atom_service_folder extends KT_cmis_atom_service {
             $feed = KT_cmis_atom_service_helper::getObjectFeed($this, $ObjectService, $repositoryId, $folderId);
         }
-        //Expose the responseFeed
+        // Expose the responseFeed
         $this->responseFeed = $feed;
     }
@@ -140,7 +141,7 @@ class KT_cmis_atom_service_folder extends KT_cmis_atom_service {
             $objectId = $this->params[2];
         }
-        $cmisObjectProperties = KT_cmis_atom_service_helper::getCmisProperties($this->parsedXMLContent['@children']['cmis:object']);
+        $cmisObjectProperties = KT_cmis_atom_service_helper::getCmisProperties($this->parsedXMLContent['@children']);
         // check for existing object id as property of submitted object data
         if (!empty($cmisObjectProperties['ObjectId']))
@@ -159,7 +160,7 @@ class KT_cmis_atom_service_folder extends KT_cmis_atom_service {
             CMISUtil::decodeObjectId($objectId, $typeId);
         }
-        // now check for content stream
+        // check for content stream
         $content = KT_cmis_atom_service_helper::getAtomValues($this->parsedXMLContent['@children'], 'content');        
         // TODO this will possibly need to change somewhat once Relationship Objects come into play.
@@ -207,7 +208,7 @@ class KT_cmis_atom_service_folder extends KT_cmis_atom_service {
             $feed = KT_cmis_atom_service_helper::getErrorFeed($this, self::STATUS_SERVER_ERROR, $error);
         }
-        //Expose the responseFeed
+        // Expose the responseFeed
         $this->responseFeed = $feed;
     }
@@ -236,7 +237,7 @@ class KT_cmis_atom_service_folder extends KT_cmis_atom_service {
         if (PEAR::isError($response))
         {
             $feed = KT_cmis_atom_service_helper::getErrorFeed($this, self::STATUS_SERVER_ERROR, $response->getMessage());
-           //Expose the responseFeed
+            // Expose the responseFeed
             $this->responseFeed = $feed;
             return null;
         }
@@ -349,7 +350,7 @@ class KT_cmis_atom_service_types extends KT_cmis_atom_service {
         $type = ((empty($this->params[0])) ? 'all' : $this->params[0]);
         $feed = KT_cmis_atom_service_helper::getTypeFeed($type, $types);
-        //Expose the responseFeed
+        // Expose the responseFeed
         $this->responseFeed = $feed;
     }
@@ -385,7 +386,7 @@ class KT_cmis_atom_service_type extends KT_cmis_atom_service {
             $feed = $this->getTypeChildrenFeed($this->params[1]);
         }
-        //Expose the responseFeed
+        // Expose the responseFeed
         $this->responseFeed=$feed;
     }
@@ -494,7 +495,7 @@ class KT_cmis_atom_service_checkedout extends KT_cmis_atom_service {
 //        $entry = null;
 //        $feed->newField('cmis:hasMoreItems', 'false', $entry, true);
-        //Expose the responseFeed
+        // Expose the responseFeed
         $this->responseFeed = $feed;
     }
@@ -513,7 +514,7 @@ class KT_cmis_atom_service_checkedout extends KT_cmis_atom_service {
         if (empty($cmisObjectProperties['ObjectId']))
         {
             $feed = KT_cmis_atom_service_helper::getErrorFeed($this, self::STATUS_SERVER_ERROR, 'No object was specified for checkout');
-            //Expose the responseFeed
+            // Expose the responseFeed
             $this->responseFeed = $feed;
             return null;
         }
@@ -523,7 +524,7 @@ class KT_cmis_atom_service_checkedout extends KT_cmis_atom_service {
         if (PEAR::isError($response))
         {
             $feed = KT_cmis_atom_service_helper::getErrorFeed($this, self::STATUS_SERVER_ERROR, 'No object was specified for checkout');
-            //Expose the responseFeed
+            // Expose the responseFeed
             $this->responseFeed = $feed;
             return null;
         }
@@ -531,7 +532,7 @@ class KT_cmis_atom_service_checkedout extends KT_cmis_atom_service {
         $this->setStatus(self::STATUS_CREATED);
         $feed = KT_cmis_atom_service_helper::getObjectFeed($this, $ObjectService, $repositoryId, $cmisObjectProperties['ObjectId'], 'POST');
-        //Expose the responseFeed
+        // Expose the responseFeed
         $this->responseFeed = $feed;
     }
@@ -559,13 +560,13 @@ class KT_cmis_atom_service_document extends KT_cmis_atom_service {
         // this depends on $this->params[1]
         if (!empty($this->params[1]))
         {
-            $this->getContentStream($ObjectService, $repositoryId);
+            KT_cmis_atom_service_helper::downloadContentStream($this, $ObjectService, $repositoryId);
             return null;
         }
         $feed = KT_cmis_atom_service_helper::getObjectFeed($this, $ObjectService, $repositoryId, $this->params[0]);
-        //Expose the responseFeed
+        // Expose the responseFeed
         $this->responseFeed = $feed;
     }
@@ -594,7 +595,7 @@ class KT_cmis_atom_service_document extends KT_cmis_atom_service {
         if (PEAR::isError($response))
         {
             $feed = KT_cmis_atom_service_helper::getErrorFeed($this, self::STATUS_SERVER_ERROR, $response->getMessage());
-            //Expose the responseFeed
+            // Expose the responseFeed
             $this->responseFeed = $feed;
             return null;
         }
@@ -603,46 +604,6 @@ class KT_cmis_atom_service_document extends KT_cmis_atom_service {
         $this->setStatus(self::STATUS_NO_CONTENT);        
     }
-    private function getContentStream(&$ObjectService, $repositoryId)
-    {
-        $response = $ObjectService->getProperties($repositoryId, $this->params[0], false, false);
-        if (PEAR::isError($response)) {
-            $feed = KT_cmis_atom_service_helper::getErrorFeed($this, KT_cmis_atom_service::STATUS_SERVER_ERROR, $response->getMessage());
-            $this->responseFeed = $feed;
-            return null;
-        }
-        
-        // TODO also check If-Modified-Since?
-//        $this->headers['If-Modified-Since'] => 2009-07-24 17:16:54
-
-        $this->contentDownload = true;
-        $eTag = md5($response['properties']['LastModificationDate']['value'] . $response['properties']['ContentStreamLength']['value']);
-        
-        if ($this->headers['If-None-Match'] == $eTag)
-        {
-            $this->setStatus(self::STATUS_NOT_MODIFIED);
-            $this->contentDownload = false;
-            return null;
-        }
-        
-        $contentStream = $ObjectService->getContentStream($repositoryId, $this->params[0]);
-        
-        // headers specific to output
-        $this->setEtag($eTag);
-        $this->setHeader('Last-Modified', $response['properties']['LastModificationDate']['value']);
-
-        if (!empty($response['properties']['ContentStreamMimeType']['value'])) {
-    		$this->setHeader('Content-type', $response['properties']['ContentStreamMimeType']['value'] . ';charset=utf-8');
-        }
-        else {
-    		$this->setHeader('Content-type', 'text/plain;charset=utf-8');
-        }
-        
-        $this->setHeader('Content-Disposition', 'attachment;filename="' . $response['properties']['ContentStreamFilename']['value'] . '"');
-		$this->setHeader('Content-Length', $response['properties']['ContentStreamLength']['value']);
-        $this->output = $contentStream;
-    }
-    
 }
 class KT_cmis_atom_service_pwc extends KT_cmis_atom_service {
@@ -665,13 +626,13 @@ class KT_cmis_atom_service_pwc extends KT_cmis_atom_service {
         // this depends on $this->params[1]
         if (!empty($this->params[1]))
         {
-            $this->getContentStream($ObjectService, $repositoryId);
+            KT_cmis_atom_service_helper::downloadContentStream($this, $ObjectService, $repositoryId);
             return null;
         }
         $feed = KT_cmis_atom_service_helper::getObjectFeed($this, $ObjectService, $repositoryId, $this->params[0]);
-        //Expose the responseFeed
+        // Expose the responseFeed
         $this->responseFeed = $feed;
     }
@@ -696,7 +657,7 @@ class KT_cmis_atom_service_pwc extends KT_cmis_atom_service {
         if (PEAR::isError($response))
         {
             $feed = KT_cmis_atom_service_helper::getErrorFeed($this, self::STATUS_SERVER_ERROR, $response->getMessage());
-           //Expose the responseFeed
+           // Expose the responseFeed
             $this->responseFeed = $feed;
             return null;
         }
@@ -707,25 +668,58 @@ class KT_cmis_atom_service_pwc extends KT_cmis_atom_service {
     public function PUT_action()
     {
-        // call the checkin function
         $RepositoryService = new RepositoryService();
         $VersioningService = new VersioningService(KT_cmis_atom_service_helper::getKt());
         $repositories = $RepositoryService->getRepositories();
         $repositoryId = $repositories[0]['repositoryId'];
-        $response = $VersioningService->checkIn($repositoryId, $this->params[0]);
+        // check for content stream
+        // NOTE this is a hack!  will not work with CMISSpaces at least, probably not with any client except RestTest and similar
+        //      where we can manually modify the input
+        // first we try for an atom content tag
+        $content = KT_cmis_atom_service_helper::getAtomValues($this->parsedXMLContent['@children'], 'content');
+        if (!empty($content)) {
+            $contentStream = $content;
+        }
+        // not found? try for a regular content tag
+        else {
+            $content = KT_cmis_atom_service_helper::findTag('content', $this->parsedXMLContent['@children'], null, false); 
+            $contentStream = $content['@value'];
+        }
+        
+        // if we haven't found it now, the real hack begins - retrieve the EXISTING content and submit this as the contentStream
+        // this is needed because KnowledgeTree will not accept a checkin without a content stream but CMISSpaces (and possibly 
+        // other CMIS clients are the same, does not send a content stream on checkin nor does it offer the user a method to choose one)
+        // NOTE that if the content is INTENDED to be empty this and all the above checks will FAIL!
+        // FIXME this is horrible, terrible, ugly and bad!
+        if (empty($contentStream))
+        {
+            $ObjectService = new ObjectService(KT_cmis_atom_service_helper::getKt());
+            $contentStream = base64_encode(KT_cmis_atom_service_helper::getContentStream($this, $ObjectService, $repositoryId));
+        }
+        
+        // and if we don't have it by now, we give up...but leave the error to be generated by the underlying KnowledgeTree code
+        
+        // checkin function call
+        // TODO dynamically detect version change type - leaving this for now as the CMIS clients tested do not appear to 
+        //      offer the choice to the user - perhaps it will turn out that this will come from somewhere else but for now
+        //      we assume minor version updates only
+        $major = false;
+        $response = $VersioningService->checkIn($repositoryId, $this->params[0], $major, $contentStream);
         if (PEAR::isError($response))
         {
             $feed = KT_cmis_atom_service_helper::getErrorFeed($this, self::STATUS_SERVER_ERROR, $response->getMessage());
-           //Expose the responseFeed
+            // Expose the responseFeed
             $this->responseFeed = $feed;
             return null;
         }
-        $this->setStatus(self::STATUS_NO_CONTENT);
-        $this->responseFeed = null;
+        $feed = KT_cmis_atom_service_helper::getObjectFeed($this, $ObjectService, $repositoryId, $this->params[0]);
+
+        // Expose the responseFeed
+        $this->responseFeed = $feed;
     }
 }
@@ -418,7 +418,7 @@ class KT_cmis_atom_service_helper {
         while($start < $numFolders)
         {
             $name = $path[$numQ-$numFolders+$start];
-            // hack to fix drupal url encoding issue
+            // fix for possible url encoding issue
             $name = str_replace('%2520', '%20', $name);
             $folderName = urldecode($name);
@@ -494,6 +494,71 @@ class KT_cmis_atom_service_helper {
         return date('Y-m-d H:i:s', $time);
     }
+    /**
+     * Fetches the document content stream for internal use
+     * 
+     * @param object $ObjectService
+     * @param string $repositoryId
+     * @return null | string $contentStream
+     */
+    static public function getContentStream(&$service, &$ObjectService, $repositoryId)
+    {
+        $response = $ObjectService->getProperties($repositoryId, $service->params[0], false, false);
+        if (PEAR::isError($response)) {
+            return null;
+        }
+        
+        $contentStream = $ObjectService->getContentStream($repositoryId, $service->params[0]);
+        
+        return $contentStream;
+    }
+    /**
+     * Fetches and prepares the document content stream for download/viewing
+     * 
+     * @param object $ObjectService
+     * @param string $repositoryId
+     * @return null | nothing
+     */
+    static public function downloadContentStream(&$service, &$ObjectService, $repositoryId)
+    {
+        $response = $ObjectService->getProperties($repositoryId, $service->params[0], false, false);
+        if (PEAR::isError($response)) {
+            $feed = KT_cmis_atom_service_helper::getErrorFeed($service, KT_cmis_atom_service::STATUS_SERVER_ERROR, $response->getMessage());
+            $service->responseFeed = $feed;
+            return null;
+        }
+        
+        // TODO also check If-Modified-Since?
+//        $service->headers['If-Modified-Since'] => 2009-07-24 17:16:54
+
+        $service->setContentDownload(true);
+        $eTag = md5($response['properties']['LastModificationDate']['value'] . $response['properties']['ContentStreamLength']['value']);
+        
+        if ($service->headers['If-None-Match'] == $eTag)
+        {
+            $service->setStatus(KT_cmis_atom_service::STATUS_NOT_MODIFIED);
+            $service->setContentDownload(false);
+            return null;
+        }
+        
+        $contentStream = $ObjectService->getContentStream($repositoryId, $service->params[0]);
+        
+        // headers specific to output
+        $service->setEtag($eTag);
+        $service->setHeader('Last-Modified', $response['properties']['LastModificationDate']['value']);
+
+        if (!empty($response['properties']['ContentStreamMimeType']['value'])) {
+    		$service->setHeader('Content-type', $response['properties']['ContentStreamMimeType']['value'] . ';charset=utf-8');
+        }
+        else {
+    		$service->setHeader('Content-type', 'text/plain;charset=utf-8');
+        }
+        
+        $service->setHeader('Content-Disposition', 'attachment;filename="' . $response['properties']['ContentStreamFilename']['value'] . '"');
+		$service->setHeader('Content-Length', $response['properties']['ContentStreamLength']['value']);
+        $service->setOutput($contentStream);
+    }
+    
     //TODO: Add key information to be able to find the same tag in the original struct (MarkH)
     static public function findTag($tagName=NULL,$xml=array(),$tagArray=NULL,$deep=false){
         $tagArray=is_array($tagArray)?$tagArray:array();
@@ -147,7 +147,7 @@ class KT_atom_service{
 		header("HTTP/1.1 ".$status);
 	}
-	protected function setEtag($etagValue=NULL){
+	public function setEtag($etagValue=NULL){
 		if($etagValue)header('ETag: '.$etagValue);
 	}
@@ -8,7 +8,12 @@ class KT_cmis_atom_service extends KT_atom_service {
     protected $serviceType = null;
     protected $contentDownload = false;
-        
+    
+    public function setContentDownload($contentDownload)
+    {
+        $this->contentDownload = $contentDownload;
+    }
+    
     public public function isContentDownload()
     {
         return $this->contentDownload;
@@ -19,6 +24,11 @@ class KT_cmis_atom_service extends KT_atom_service {
         return $this->status == self::STATUS_NOT_MODIFIED;
     }
+    public function setoutput($output)
+    {
+        $this->output = $output;
+    }
+    
     public function getOutput()
     {
         return $this->output;
@@ -29,7 +39,7 @@ class KT_cmis_atom_service extends KT_atom_service {
         return $this->serviceType;
     }
-    protected function setHeader($header = null, $value = null)
+    public function setHeader($header = null, $value = null)
     {
 		if ($header) header($header . ': ' . $value);
 	}
 <?php
-require_once KT_LIB_DIR . '/api/ktcmis/ktcmis.inc.php';
+require_once KT_LIB_DIR . '/api/ktcmis/ktNavigationService.inc.php';
 /**
  * CMIS Service class which hooks into the KnowledgeTree interface
 <?php
-require_once KT_LIB_DIR . '/api/ktcmis/ktcmis.inc.php';
+require_once KT_LIB_DIR . '/api/ktcmis/ktObjectService.inc.php';
 /**
  * CMIS Service class which hooks into the KnowledgeTree interface
@@ -5,7 +5,7 @@
  * for processing of CMIS queries and responses via atompub/webservices
  */
-require_once KT_LIB_DIR . '/api/ktcmis/ktcmis.inc.php';
+require_once KT_LIB_DIR . '/api/ktcmis/ktRepositoryService.inc.php';
 class RepositoryService extends KTRepositoryService {
 <?php
-require_once KT_LIB_DIR . '/api/ktcmis/ktcmis.inc.php';
+require_once KT_LIB_DIR . '/api/ktcmis/ktVersioningService.inc.php';
 /**
  * CMIS Service class which hooks into the KnowledgeTree interface
@@ -85,9 +85,9 @@ class VersioningService extends KTVersioningService {
      * @param string $checkinComment [optional]
      * @return string $documentId
      */
-    public function checkIn($repositoryId, $documentId, $major, $changeToken = '', $properties = array(), $contentStream = null, $checkinComment = '')
+    public function checkIn($repositoryId, $documentId, $major, $contentStream = null, $changeToken = '', $properties = array(), $checkinComment = '')
     {
-        $result = parent::checkIn($repositoryId, $documentId, $major, $changeToken, $properties, $contentStream, $checkinComment);
+        $result = parent::checkIn($repositoryId, $documentId, $major, $contentStream, $changeToken, $properties, $checkinComment);
         if ($result['status_code'] == 0) {
             return $result['results'];