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

Megan Watson
2 parents 1ed9ca49 495c099e
Showing 27 changed files with 1211 additions and 1299 deletions
ktapi/KTAPIDocument.inc.php
plugins/ktcore/KTBulkActions.php
plugins/ktcore/admin/workflowsv2.php
plugins/multiselect/templates/ktcore/search2/adv_query_builder.smarty
setup/migrate/steps/migrateComplete.php
setup/migrate/steps/migrateDatabase.php
setup/migrate/steps/migrateServices.php
setup/migrate/templates/database.tpl
setup/migrate/templates/wizard.tpl
setup/upgrade/steps/upgradeComplete.php
setup/upgrade/templates/complete.tpl
setup/upgrade/templates/wizard.tpl
setup/wizard/resources/css/wizard.css
setup/wizard/steps/complete.php
setup/wizard/steps/configuration.php
setup/wizard/steps/database.php
setup/wizard/steps/services.php
setup/wizard/templates/database.tpl
setup/wizard/templates/database_confirm.tpl
setup/wizard/templates/wizard.tpl
@@ -2225,6 +2225,7 @@ class KTAPI_Document extends KTAPI_FolderItem
         	$version['user'] = $username;
         	$version['metadata_version'] = $document->getMetadataVersion();
         	$version['content_version'] = $document->getVersion();
+			$version['datetime'] = $document->getVersionCreated();
         	if ($wsversion >= 2)
         	{
         		$version['metadata_version'] = (int) $version['metadata_version'];
@@ -259,16 +259,9 @@ class KTBulkDeleteAction extends KTBulkAction {
         return parent::do_performaction();
     }
  
-     /*
+     /**
       * Bulk delete
-      * Author      :   Jarrett Jordaan
-      * Modified    :   28/04/09
-      *
       * @params     :   KTDocumentUtil/KTFolderUtil $oEntity
-      *
-      * Description :   Since its a bulk operation, the delete function needs to
-      *                 know that. Added extra boolean param to the delete
-      *                 function.
       */
     function perform_action($oEntity) {
         $sReason = $this->res['reason'];
@@ -526,16 +519,10 @@ class KTBulkMoveAction extends KTBulkAction {
         return parent::do_performaction();
     }
  
-     /*
+     /**
       * Bulk move
-      * Author      :   Jarrett Jordaan
-      * Modified    :   28/04/09
-      *
       * @params     :   KTDocumentUtil/KTFolderUtil $oEntity
       *
-      * Description :   Since its a bulk operation, the move function needs to
-      *                 know that. Added extra boolean param to the move
-      *                 function.
       */
     function perform_action($oEntity) {
         if(is_a($oEntity, 'Document')) {
@@ -771,16 +758,10 @@ class KTBulkCopyAction extends KTBulkAction {
         return parent::do_performaction();
     }
  
-     /*
+     /**
       * Bulk copy
-      * Author      :   Jarrett Jordaan
-      * Modified    :   28/04/09
-      *
       * @params     :   KTDocumentUtil/KTFolderUtil $oEntity
-      *
-      * Description :   Since its a bulk operation, the copy function needs to
-      *                 know that. Added extra boolean param to the copy
-      *                 function.
+	  *
       */
     function perform_action($oEntity) {
         if(is_a($oEntity, 'Document')) {
@@ -1029,16 +1010,10 @@ class KTBulkArchiveAction extends KTBulkAction {
         return parent::do_performaction();
     }
  
-     /*
+     /**
       * Bulk archive
-      * Author      :   Jarrett Jordaan
-      * Modified    :   28/04/09
-      *
       * @params     :   KTDocumentUtil/KTFolderUtil $oEntity
       *
-      * Description :   Since its a bulk operation, the archive function needs
-      *                 to know that. Added extra boolean param to the archive
-      *                 function.
       */
     function perform_action($oEntity) {
         if(is_a($oEntity, 'Document')) {
@@ -1216,16 +1191,10 @@ class KTBrowseBulkExportAction extends KTBulkAction {
         return $str;
     }
  
-     /*
+     /**
       * Bulk export
-      * Author      :   Jarrett Jordaan
-      * Modified    :   28/04/09
-      *
       * @params     :   KTDocumentUtil/KTFolderUtil $oEntity
       *
-      * Description :   Since its a bulk operation, the export function needs
-      *                 to know that. Added extra boolean param to the export
-      *                 function.
       */
     function perform_action($oEntity) {
 // TODO find a way to do bulk email
@@ -1489,16 +1458,10 @@ class KTBrowseBulkCheckoutAction extends KTBulkAction {
         return $result;
     }
  
-     /*
+     /**
       * Bulk checkout
-      * Author      :   Jarrett Jordaan
-      * Modified    :   28/04/09
-      *
       * @params     :   KTDocumentUtil/KTFolderUtil $oEntity
       *
-      * Description :   Since its a bulk operation, the checkout function needs
-      *                 to know that. Added extra boolean param to the checkout
-      *                 function.
       */
     function perform_action($oEntity) {
         // checkout document
@@ -2365,8 +2365,7 @@ class KTWorkflowAdminV2 extends KTAdminDispatcher {
  
     	if (!empty($sFilter)) {
     	    $allowed = array();
-            // Modified Jarrett Jordaan Only notify enabled users
-    	    $q = sprintf('name like "%%%s%%" AND disabled = 0', DBUtil::escapeSimple($sFilter));
+    	    $q = sprintf('name like "%%%s%%" AND disabled = 0', DBUtil::escapeSimple($sFilter)); // notify enabled users
     	    $aUsers = User::getList($q);
     	    $q = sprintf('name like "%%%s%%"', DBUtil::escapeSimple($sFilter));
         	$aGroups = Group::getList($q);
@@ -519,8 +519,6 @@ function addFieldTypeSelection(groupid, fid, type, options)
 		default:
 			html += 'unknown: ' + type;
 	}
-    // Jarrett Jordaan
-    // Closing tags added
     html += "</nobr></td>";
  
 	return {html: html, init: callback};
@@ -164,7 +164,6 @@ class migrateComplete extends Step {
 			if($state == "STARTED" || $state == "RUNNING")
 				$running = true;
     	} else {
-    		//TODO : Read fomr my.cnf file
     		$mysqlPid = "/var/run/mysqld/mysqld.sock";
     		if(file_exists($mysqlPid))
     			$running = true;
@@ -155,31 +155,20 @@ class migrateDatabase extends Step
 				unlink($sqlFile);
 			}
 		}
-		$noFile = true;
 		// Handle failed dump
 		if(WINDOWS_OS) {
 			// Could be permissions, check error code.
-			if(!$noFile) {
-				$sqlFile = "C:\\kt-backup-$date.sql"; // Use tmp instead due to permissions
-			}
+			$sqlFile = "C:\\kt-backup-$date.sql"; // Use tmp instead due to permissions
 		} else {
-			if(!$noFile) {
-				$sqlFile = "/tmp/kt-backup-$date.sql"; // Use tmp instead due to permissions
-			}
+			$sqlFile = "/tmp/kt-backup-$date.sql"; // Use tmp instead due to permissions
 		}
 		$cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.$dbName.' > '.$sqlFile;
-		if($noFile) {
-			$this->error[]['error'] = "The KnowledgeTree Setup Wizard was unable to connect to your KnowledgeTree 3.6.1 database.";
-			$this->error[]['msg'] = "Ensure that your KnowledgeTree Mysql service is running.";
-			$this->error[]['cmd'] = "Click <b>Next</b> after resolving the above errors.";
-			$this->temp_variables['manual_export'] = "";
-		} else {
-	    	$this->error[]['error'] = "Could not export database:";
-	    	$this->error[]['msg'] = "Execute the following command in a $termOrBash.";
-	    	$this->error[]['cmd'] = $cmd;
-	    	$this->temp_variables['manual_export'] = $sqlFile;
-		}
-
+		$this->error[]['error'] = "The KnowledgeTree Setup Wizard was unable to connect to your KnowledgeTree 3.6.1 database.";
+		$this->error[]['msg'] = "Ensure that your KnowledgeTree Mysql service is running.";
+		$this->error[]['cmd'] = "Click <b>Next</b> after resolving the above errors.";
+		$this->temp_variables['dumpLocation'] = $sqlFile;
+		$this->temp_variables['manual_export'] = $sqlFile;
+		$this->error[]['manual'] = $cmd;
 		return false;
     }
  
@@ -274,7 +263,7 @@ class migrateDatabase extends Step
         return $this->error;
     }
  
-    private function storeSilent() {
+    public function storeSilent() {
     	// TODO
     	$_SESSION['migrate']['database']['dumpLocation'] = $this->sqlDumpFile;
     	$this->temp_variables['dumpLocation'] = $this->sqlDumpFile;
@@ -398,7 +398,7 @@ class migrateServices extends Step
 	* @access private
 	* @return void
     */
-    private function storeSilent() {
+    public function storeSilent() {
     	$this->temp_variables['alreadyUninstalled'] = $this->alreadyUninstalled;
     	$this->temp_variables['serviceCheck'] = $this->serviceCheck;
     	$this->temp_variables['msg'] = "Turn off KnowledgeTree Mysql Instance.";
@@ -118,6 +118,16 @@
 	<?php } ?>
 </p>
 <br/>
+<p class="description">
+	Manually perform a KnowledgeTree 3.6.1 database export
+</p>
+<p class="disclaimer">
+<?php
+if(isset($error['manual'])) {
+					echo $error['manual'];
+				}
+?>
+</p>
 <?php
 	}
 	?>
@@ -21,7 +21,7 @@
 		<div id="outer-wrapper" align="left">
 		    <div id="header">
 			    <div id="logo"><?php echo $html->image('dame/installer-header_logo.png'); ?> </div>
-			    <div id="install_details">
+			    <div id="version_details">
 					<span style="font-size:120%;"> <?php if (isset($vars['migrate_version'])) echo $vars['migrate_version']; ?> </span>
 					<span style="font-size:120%;"> <?php if (isset($vars['migrate_version'])) echo $vars['migrate_type']; ?></span>
 				</div>
@@ -88,7 +88,7 @@ class upgradeComplete extends Step {
      * Set all silent mode varibles
      *
      */
-    protected function storeSilent() {
+    public function storeSilent() {
     	$v = $this->getDataFromSession('upgradeProperties');
     	$this->temp_variables['sysVersion'] = $this->util->readVersion();
     	$this->temp_variables['migrateCheck'] = $this->migrateCheck;
@@ -31,11 +31,15 @@
 			<br/>
 			[START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [services]
 			<br/>
-			Right-Click and run [Install Services] as administrator
+			Right-Click and run [Install Services] as administrator, if applicable, or
+			<br/>
+			Click [Install Services]
 			<br/>
 			[START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [services]
 			<br/>
-			Right-Click and run [Start Services] as administrator
+			Right-Click and run [Start Services] as administrator, if applicable, or
+			<br/>
+			Click [Start Services]
 			<br/>
 			<br/>
 			<b>Alternatively:</b>
@@ -21,7 +21,7 @@
 		<div id="outer-wrapper" align="left">
 		    <div id="header">
 		    <div id="logo"><?php echo $html->image('dame/installer-header_logo.png'); ?></div>
-		    <div id="upgrade_details">
+		    <div id="version_details">
 				<span style="font-size:120%;"> <?php echo $vars['upgrade_version']; ?> </span>
 				<span style="font-size:120%;"> <?php echo $vars['upgrade_type']; ?> </span>
 				</div>
 * { margin: 0; padding: 0; }
-
 body {
 	background-attachment:scroll;
 	background-color:transparent;
@@ -70,7 +69,7 @@ select {
 #outer-wrapper {
 	border:1px solid #B7B7B7;
 	margin-top:20px;
-	/*width:1024px;*/width:964px;
+	width:964px;
 }
  
 #header {
@@ -87,12 +86,12 @@ select {
 #container {
 	background: white url("../graphics/left.png") repeat-y left;
 	overflow:auto;
-	/*min-height:630px;height:410px;*/min-height:500px;
+	min-height:500px;
 }
  
 #content {
     margin-left: 220px;
-    /*height:515px;*/height:500px;
+    height:500px;
 }
  
 #content_container {
@@ -105,19 +104,19 @@ select {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
 	overflow: auto;
-	/*min-height: 400px;*/min-height: 300px;
+	min-height: 300px;
 }
  
 #step_content_dependencies {
 	border: 1px solid rgb(207, 207, 207);
-	/*padding: 5px;*/padding: 12px;
-	/*min-height:270px;*/min-height:170px;
+	padding: 12px;
+	/min-height:170px;
 }
  
 #step_content_configuration {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
-	/*min-height:320px;*//*height:330px*/min-height:130px;
+	min-height:130px;
 }
  
 #step_content_services {
@@ -129,25 +128,25 @@ select {
 #step_content_registration {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
-	/*min-height:320px;*/min-height:100px;
+	min-height:100px;
 }
  
 #step_content_registration_confirm {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
-	/*min-height:400px;*/min-height:300px;
+	min-height:300px;
 }
  
 #step_content_install {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
-	/*min-height:400px;*/min-height:150px;
+	min-height:150px;
 }
  
 #step_content_database {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
-	/*min-height:365px;*/min-height:240px;
+	min-height:240px;
 }
  
 #step_content_database_confirm {
@@ -164,7 +163,7 @@ select {
  
 .license_agreement {
 	overflow: scroll;
-	/*height:370px;*/height:270px;
+	height:270px;
 	overflow-x:hidden;
 	border:1px solid #CFCFCF;
 }
@@ -204,11 +203,11 @@ select {
  
 #logo {
 	position:relative;
-	/*right:760px;*/right:75%;
-	/*top:20px;*/top:25%;
+	right:75%;
+	top:25%;
 }
  
-#install_details {
+#version_details {
 	bottom:20px;
 	position:relative;
 	right:10px;
@@ -282,7 +281,7 @@ select {
 }
  
 .conf_paths {
-	/*width:755px;*/width:100%;
+	width:100%;
 }
  
 .errors {
@@ -320,7 +319,6 @@ select {
 	font-size:13px;
 	font-weight:bold;
 	margin-left:5px;
-	/*margin-top:10px;*/
 }
  
 .step .radio {
@@ -368,7 +366,9 @@ select {
 .onclick {
      cursor: pointer;
      color: #EC7725;
-     /*width: 150px;*//*width:350px;top:12px;position:relative;*/width:350px;padding-top:12px;position:static;
+     width:350px;
+     padding-top:12px;
+     position:static;
 }
  
 .description {
@@ -415,18 +415,10 @@ table#dbconf tr td input{
 	padding: 5px 8px;
 }
  
-/*#section {
-
-}*/
-
 .php_ext_details table {
-	width:745px;
+	width:645px;
 }
  
-/*.php_ext_details table tr {
-
-}*/
-
 td.ext_indicator {
 	width:10px;
 }
@@ -456,7 +448,7 @@ td.dir_description {
 }
  
 .php_con_details table {
-	/*width:745px;*/width:675px;
+	width:675px;
 }
  
 .error_message {
@@ -515,12 +507,6 @@ td.dir_description {
 	font-size:12pt;
 }
  
-.demo {
-	/*left:75px;
-	position:relative;
-	width:600px*/
-}
-
 .text_message {
  
 }
@@ -540,7 +526,7 @@ td.dir_description {
  
 #loading {
 	bottom:250px;
-	/*left:500px;*/left:400px;
+	left:400px;
 	position:relative;
 	height:0px;
 	width:0px;
@@ -563,15 +549,15 @@ td.dir_description {
 }
  
 .dependency_details {
-	/*top:12px;*/padding-top:12px;
-	/*position:relative;*/position:static;
+	padding-top:12px;
+	position:static;
 	width:650px;
 }
  
 .dependencies {
-	/*position:relative;*/position:static;
+	position:static;
 	right:30%;
-	/*width:880px;*/width:650px;
+	width:650px;
 }
  
 .registration_template {
@@ -583,7 +569,7 @@ td.dir_description {
 }
  
 .description_complete {
-	/*position:relative;*/position:static;
+	position:static;
 	right:35%;
 	width:100%;
 }
@@ -603,14 +589,6 @@ td.dir_description {
 	font-family:sans-serif;
 }
  
-.twitter {
-
-}
-
-.facebook {
-
-}
-
 .connect {
 	float:none;
 	padding-bottom:0;
@@ -169,7 +169,6 @@ class complete extends Step {
         $this->util->dbUtilities->load($dbconf['dhost'], $dbconf['dport'], $dbconf['dmsusername'], $dbconf['dmsuserpassword'], $dbconf['dname']);
         $loaded = $this->util->dbUtilities->getDatabaseLink();
         // if we can log in to the database, check access
-        // TODO check write access?
         if ($loaded)
         {
             $this->temp_variables['dbConnectUser'] .= sprintf($html, 'tick', '', 'Database connectivity successful (user: ' . $dbconf['dmsusername'] . ')');
@@ -257,7 +256,7 @@ class complete extends Step {
      * Set all silent mode varibles
      *
      */
-    private function storeSilent() {
+    public function storeSilent() {
     	$this->temp_variables['services_check'] = $this->services_check;
     	$this->temp_variables['paths_check'] = $this->paths_check;
     	$this->temp_variables['privileges_check'] = $this->privileges_check;
@@ -703,17 +703,17 @@ class configuration extends Step
      */
 	public function getContentPath() {
     	$configPath = realpath('../../../config/config-path');
-        if($configPath == '')
+        if(!file_exists($configPath))
          	$configPath = realpath('../../config/config-path');
-        if(!$configPath) return false;
+        if(!file_exists($configPath)) return false;
         return $configPath;
 	}
  
 	public function getCachePath() {
     	$cachePath = realpath('../../../config/cache-path');
-        if($cachePath == '')
+        if(!file_exists($cachePath))
          	$cachePath = realpath('../../config/cache-path');
-        if(!$cachePath) return false;
+        if(!file_exists($cachePath)) return false;
         return $cachePath;
 	}
 }
@@ -150,22 +150,13 @@ class database extends Step
 	private $dmsuserpassword = '';
  
 	/**
-	* Location of database binaries.
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var string
-	*/
-    private $mysqlDir; // TODO:multiple databases
-    
-	/**
 	* Name of database binary.
 	*
 	* @author KnowledgeTree Team
 	* @access private
 	* @var string
 	*/
-    private $dbbinary = ''; // TODO:multiple databases
+    private $dbbinary = '';
  
 	/**
 	* Database table prefix
@@ -230,7 +221,7 @@ class database extends Step
 	*/
     protected $silent = true;
  
-    private $salt = 'installers';
+    //protected $salt = 'installers';
  
 	/**
 	* Main control of database setup
@@ -284,7 +275,8 @@ class database extends Step
             $this->setPostConfig(); // Set any posted variables
 			return 'next';
         } else if($this->edit()) {
-            $this->setDataFromSession("database"); // Set Session Information, since its an edit
+            if($this->setDataFromSession("database")) // Set Session Information, since its an edit
+            	$this->setDetails(); // Set any posted variables
             $this->temp_variables['state'] = 'edit';
  
             return 'landing';
@@ -363,8 +355,8 @@ class database extends Step
 	* @return boolean
 	*/
     private function setErrorsFromSession() {
-        if(isset($_SESSION[$this->salt]['database']['errors'])) {
-            $this->error[] = $_SESSION[$this->salt]['database']['errors'];
+        if(isset($_SESSION['installers']['database']['errors'])) {
+            $this->error[] = $_SESSION['installers']['database']['errors'];
  
             return true;
         }
@@ -382,7 +374,7 @@ class database extends Step
 	*/
     public function setPostConfig() {
     	$this->dtype = $this->getPostSafe("dtype");
-    	$this->dtypes = array("0"=>"mysql"); // TODO:multiple databases
+    	$this->dtypes = array("0"=>"mysql");
         $this->dhost = $this->getPostSafe("dhost");
         $this->dport = $this->getPostSafe("dport");
         $this->dname = $this->getPostSafe("dname");
@@ -408,7 +400,7 @@ class database extends Step
     public function loadDefaults($simplexml) {
         if($simplexml) {
         	$this->temp_variables['dtype'] = "";
-            $this->temp_variables['dtypes'] = array("0"=>"mysql"); // TODO:multiple databases
+            $this->temp_variables['dtypes'] = array("0"=>"mysql");
             $this->temp_variables['dname'] = (string) $simplexml->dname;
             $this->temp_variables['duname'] = (string) $simplexml->duname;
             $this->temp_variables['dhost'] = (string) $simplexml->dhost;
@@ -416,8 +408,8 @@ class database extends Step
             $this->temp_variables['dpassword'] = '';
             $this->temp_variables['dmsname'] = (string) $simplexml->dmsadminuser;
             $this->temp_variables['dmsusername'] = (string) $simplexml->dmsuser;
-            $this->temp_variables['dmspassword'] = (string) $simplexml->dmsaupass;
-            $this->temp_variables['dmsuserpassword'] = (string) $simplexml->dmsupass;
+            $this->temp_variables['dmspassword'] = substr(md5(rand()), 0, 9);
+            $this->temp_variables['dmsuserpassword'] = substr(md5(rand()), 0, 9);
             if(WINDOWS_OS) {
             	$this->temp_variables['dbbinary'] = 'mysql.exe';
             } else {
@@ -445,7 +437,7 @@ class database extends Step
    			$this->temp_variables['state'] = '';
    		}
    		$this->temp_variables['dtype'] = $this->getPostSafe('dtype');
-        $this->temp_variables['dtypes'] = array("0"=>"mysql"); // TODO:multiple databases;
+        $this->temp_variables['dtypes'] = array("0"=>"mysql");
         $this->temp_variables['dhost'] = $this->getPostSafe('dhost');
         $this->temp_variables['dport'] = $this->getPostSafe('dport');
         $this->temp_variables['dname'] = $this->getPostSafe('dname');
@@ -771,16 +763,34 @@ class database extends Step
         $dbMigrate = $this->util->getDataFromPackage('migrate', 'database');
         $sqlFile = $dbMigrate['dumpLocation'];
     	$this->parse_mysql_dump($sqlFile);
-    	$dropPluginHelper = "TRUNCATE plugin_helper;"; // Remove plugin helper table
-    	$this->util->dbUtilities->query($dropPluginHelper);
+		$this->prepDatabase();
+
+    	return true;
+    }
+    
+    private function prepDatabase() {
+		$this->truncatePluginHelper();
+		$this->truncateActiveSessions();
 		$this->addServerPort();
-    	$updateExternalBinaries = 'UPDATE config_settings c SET c.value = "default" where c.group_name = "externalBinary";'; // Remove references to old paths
-    	$this->util->dbUtilities->query($updateExternalBinaries);
+		$this->updateConfigSettings();
     	$this->reBuildPaths();
 		$this->writeBinaries(); // Rebuild some of the binaries
-		$this->util->getSystemIdentifier(); // ensure a guid was generated and is stored
-
-    	return true;
+		$this->util->getSystemIdentifier(); // ensure a guid was generated and is stored    	
+    }
+    
+    private function truncateActiveSessions() {
+    	$dropActiveSessions = "TRUNCATE active_sessions;"; // Remove plugin helper table
+    	$this->util->dbUtilities->query($dropActiveSessions);
+    }
+    
+    private function truncatePluginHelper() {
+    	$dropPluginHelper = "TRUNCATE plugin_helper;"; // Remove plugin helper table
+    	$this->util->dbUtilities->query($dropPluginHelper);    	
+    }
+    
+    private function updateConfigSettings() {
+    	$updateExternalBinaries = 'UPDATE config_settings c SET c.value = "default" where c.group_name = "externalBinary";'; // Remove references to old paths
+    	$this->util->dbUtilities->query($updateExternalBinaries);    	
     }
  
     private function reBuildPaths() {
@@ -876,7 +886,7 @@ class database extends Step
     private function closeMysql() {
         try {
             $this->util->dbUtilities->close();
-        } catch (Exeption $e) {
+        } catch (Exception $e) {
             $this->error['con'] = "Could not close: " . $e;
         }
     }
@@ -245,8 +245,7 @@ class services extends Step
 			$this->serviceCheck = 'tick';
 		}
 		$this->storeSilent(); // Store info needed for silent mode
-		if(!empty($errors))
-			return false;
+		
 		return true;
     }
  
@@ -21,7 +21,6 @@
 		$input_size = '45';
 		$align = 'left';
 	?>
-<!--	TODO: Different Databases-->
 <?php if($state != 'edit') { ?>
 	    <tr><td>Your current database type is: </td>
 		<?php if($dtypes) {
@@ -86,7 +85,6 @@
 	    <input type="button" name="Next" value="Next" onclick="javascript:{w.showStep(1, 'n');}" class="button_next"/>
 	    <?php } ?>
 </div>
-
 <!-- STEP 2 of the database configuration - Admin user password settings -->
 <div id="database" class="step2" style="display:none;">
 <div class="description">
@@ -114,7 +112,6 @@ An administrative user is required for creating tables within the database.
 	    <input type="button" name="Previous" value="Previous" onclick="javascript:{w.showStep(2, 'p');}" class="button_previous"/>
 	    <input type="button" name="Next" value="Next" onclick="javascript:{w.showStep(2, 'n');}" class="button_next"/>
 </div>
-
 <!-- STEP 3 of the database configuration - default user password settings -->
 <div id="database" class="step3" style="display:none;">
 <div class="description">
 <form id="services_database_registration" action="index.php?step_name=<?php echo $step_name; ?>" method="post">
 <p class="title">Confirming Database Configurations</p>
-
 	<div class="description">
 	Confirm whether KnowledgeTree has correctly determined your database settings before proceeding. Print this page for future use. <a href="javascript:window.print()">Click to Print This Page</a>
 	</div>
@@ -41,9 +40,7 @@
 		    </tr>
 		    <?php } ?>
 		</table>
-		<!--</div>-->
 		<h3><b>Advanced Settings</b></h3>
-		
 		<table class="dbconf">
 		    <tr>
 		        <td width="153px">Host: </td>
@@ -68,29 +65,23 @@
 		    </tr>
 		<?php } ?>
 		</table>
-		
 		<h3><b>Database Users (System Generated)</b></h3>
-		
 		<table class="dbconf">
-		    <?php //if (!$silent) { ?>
 		    <tr>
 		        <td width="153px">DMS Admin Username: </td>
 		        <td width="15px"> <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>
@@ -20,7 +20,7 @@
 		<div id="outer-wrapper" align="left">
 		    <div id="header">
 			    <div id="logo"><?php echo $html->image('dame/installer-header_logo.png'); ?> </div>
-			    <div id="install_details">
+			    <div id="version_details">
 					<span style="font-size:120%;"> <?php echo $vars['install_version']; ?> </span>
 					<span style="font-size:120%;"><?php echo $vars['install_type']; ?></span>
 				</div>
@@ -45,7 +45,6 @@
 		        </div>
 		        <div class="clearing">&nbsp;</div>
 		    </div>
-
 		    <div id="footer">
 		    	<?php echo $html->image('dame/powered-by-kt.png', array("height"=>"23px", "width"=>"105px", "style"=>"padding: 5px;")); ?>
 		    </div>
@@ -472,8 +472,6 @@ function addFieldTypeSelection(groupid, fid, type, options)
 		default:
 			html += 'unknown: ' + type;
 	}
-    // Jarrett Jordaan
-    // Closing tags added
     html += "</nobr></td>";
  
 	return {html: html, init: callback};
@@ -44,6 +44,18 @@ class client_service{
 		return $var;
 	}
  
+	protected function logTrace($location=NULL,$message=NULL){
+		Clienttools_Syslog::logTrace($this->AuthInfo['user'],'SERVICE - '.$location,$message);
+	}
+	
+	protected function logError($location=NULL,$detail=NULL,$err=NULL){
+		Clienttools_Syslog::logError($this->AuthInfo['user'],'SERVICE - '.$location,$detail,$err);
+	}
+	
+	protected function logInfo($location=NULL,$message=NULL,$debugData=NULL){
+		Clienttools_Syslog::logInfo($this->AuthInfo['user'],'SERVICE - '.$location,$message,$debugData);
+	}
+	
 	protected function checkPearError($obj,$errMsg,$debug=NULL,$response=NULL){
 		if (PEAR::isError($obj)){
 			if($response===NULL)$response=array('status_code' => 1);
@@ -7,14 +7,22 @@ class Clienttools_Syslog{
 	private static $errorLogTemplate='[date] | [time] | ERROR | [session] | [user] | [location] | [error_detail] | ([error])';
  
  
+	/**
+	 * Parse an array into a string template
+	 * @param $template		The template string - array keys in square brackets : [date] | [time] | ERROR | [session] | [user] | [location] | [error_detail] | ([error])
+	 * @param $data			The associative array to parse into template. Keys will replace [keys] in template string.
+	 * @return string		The parsed template string
+	 */
 	private static function parseTemplate($template=NULL,$data=NULL){
 		$ret=null;
 		if(is_array($data)){
 			$txs=array_keys($data);
+			foreach($txs as $idx=>$val){
+				$txs[$idx]='['.$val.']';
+			}
 			$txd=array_values($data);
 			$ret=str_replace($txs,$txd,$template);
 		};
-//		echo print_r(Array('s'=>$txs,'d'=>$txd),true)."\n\n\n\n\n\n";
 		return $ret;
 	}
  
@@ -29,8 +37,12 @@ class Clienttools_Syslog{
 	}
  
  
+	/**
+	 * Write a line to the log file.
+	 * @param $line
+	 * @return void
+	 */
 	private static function writeLogLine($line=NULL){
-//		echo('LOGFILE: '.realpath(self::getLogFile()));
 		if($line){
 			$fp=fopen(self::getLogFile(),'a');
 			fwrite($fp,$line."\n");
@@ -43,7 +55,6 @@ class Clienttools_Syslog{
 	 * @return boolean
 	 */
 	private static function doErrorLogging(){
-//		$GLOBALS['default']['debugLevel'];		//Another less secure way of finding the configured debugLevel
 		return KTConfig::getSingleton()->get('explorerCPSettings/debugLevel')=='error' || self::doDebugLogging();
 	}
  
@@ -55,45 +66,80 @@ class Clienttools_Syslog{
 		return KTConfig::getSingleton()->get('explorerCPSettings/debugLevel')=='debug';
 	}
  
+	/**
+	 * Store a line in the log file.. the message and a json string containing the data information will be stored
+	 * @param $user			The logged in user
+	 * @param $location		Information about the location from whence the function was called
+	 * @param $message		The descriptive message explaining the debug data that follows
+	 * @param $data			The debug data - this will be converted to a json string.
+	 * @return void
+	 */
 	public static function logInfo($user,$location,$message,$data){
-		$entry=self::parseTemplate(self::$debugLogTemplate,array(
-			'date'	=>date('Y-m-d'),
-			'time'	=>date('h:i:s'),
-			'user'	=>$user,
-			'session'=>session_id(),
-			'location'=>$location,
-			'debug_message'=>$message,
-			'debug_data'=>json_encode($data)
-		));
-		
-		self::writeLogLine($entry);
+		if(self::doDebugLogging()){
+			list($usec, $sec) = explode(" ", microtime());
+			$usec=ceil($usec*1000);
+			$entry=self::parseTemplate(self::$debugLogTemplate,array(
+				'date'	=>date('Y-m-d'),
+				'time'	=>date('h:i:s').':'.$usec,
+				'user'	=>$user,
+				'session'=>session_id(),
+				'location'=>$location,
+				'debug_message'=>$message,
+				'debug_data'=>json_encode($data)
+			));
+			
+			self::writeLogLine($entry);
+		}
 	}
  
+	/**
+	 * Store a line in the log file.. A simple string to indicate a point in the software
+	 * @param $user			The logged in user
+	 * @param $location		Information about the location from whence the function was called
+	 * @param $message		A string indicating a point reached in the software
+	 * @return void
+	 */
 	public static function logTrace($user,$location,$message){
-		$entry=self::parseTemplate(self::$traceLogTemplate,array(
-			'date'	=>date('Y-m-d'),
-			'time'	=>date('h:i:s'),
-			'user'	=>$user,
-			'session'=>session_id(),
-			'location'=>$location,
-			'trace_message'=>$message,
-		));
-		
-		self::writeLogLine($entry);
+		if(self::doDebugLogging()){
+			list($usec, $sec) = explode(" ", microtime());
+			$usec=ceil($usec*1000);
+			$entry=self::parseTemplate(self::$traceLogTemplate,array(
+				'date'	=>date('Y-m-d'),
+				'time'	=>date('h:i:s').':'.$usec,
+				'user'	=>$user,
+				'session'=>session_id(),
+				'location'=>$location,
+				'trace_message'=>$message,
+			));
+			
+			self::writeLogLine($entry);
+		}
 	}
  
+	/**
+	 * Store a line in the log file.. An Error log
+	 * @param $user			The logged in user
+	 * @param $location		Information about the location from whence the function was called
+	 * @param $detail		A string providing information as to the context of the encountered error
+	 * @param $err			The exception object - this will be serialized
+	 * @return void
+	 */
 	public static function logError($user=NULL,$location=NULL,$detail=NULL,$err=NULL){
-		$entry=self::parseTemplate(self::$errorLogTemplate,array(
-			'date'	=>date('Y-m-d'),
-			'time'	=>date('h:i:s'),
-			'user'	=>$user,
-			'session'=>session_id(),
-			'location'=>$location,
-			'error_detail'=>json_encode($detail),
-			'error'=>json_encode($err),
-		));
-		
-		self::writeLogLine($entry);
+		if(self::doErrorLogging()){
+			list($usec, $sec) = explode(" ", microtime());
+			$usec=ceil($usec*1000);
+			$entry=self::parseTemplate(self::$errorLogTemplate,array(
+				'date'	=>date('Y-m-d'),
+				'time'	=>date('h:i:s').':'.$usec,
+				'user'	=>$user,
+				'session'=>session_id(),
+				'location'=>$location,
+				'error_detail'=>json_encode($detail),
+				'error'=>json_encode($err),
+			));
+			
+			self::writeLogLine($entry);
+		}
  
 	}
 }
@@ -3,6 +3,7 @@
 class auth extends client_service {
  
 	public function login(){
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
 		$params=$this->AuthInfo;
  
 		$username=$params['user'];
@@ -71,6 +72,7 @@ class auth extends client_service {
 	}
  
 	public function japiLogin(){
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
 		global $default;
  
        	$user=$this->KT->get_user_object_by_username($this->AuthInfo['user']);
@@ -82,6 +84,7 @@ class auth extends client_service {
 	}
  
 	public function pickup_session(){
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
 		$params=$this->AuthInfo;
 		$app_type=$params['appType'];
 		$session_id=$params['session'];
@@ -98,6 +101,7 @@ class auth extends client_service {
  
  
 	public function ping(){
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
 		global $default;
        	$user=$this->KT->get_user_object_by_username($this->AuthInfo['user']);
        	$versions=$this->handler->getServerVersions();
@@ -120,12 +124,19 @@ class auth extends client_service {
 	}
  
     function logout($params){
+    	$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
 		$params=$this->AuthInfo;
 		$app_type=$params['appType'];
 		$session_id=$params['session'];
 		$ip=$_SERVER['REMOTE_ADDR'];
  
-		$session = $this->KT->get_active_session($session_id, $ip, $app_type);
+		$session=$this->KT->get_session();
+		$this->logInfo((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Logout Session Object (From KT)',$session);
+		
+		if(get_class($session)!='KTAPI_UserSession'){
+			$session = $this->KT->get_active_session($session_id, $ip, $app_type);
+		}
+		$this->logInfo((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Logout Session Object (To Logout)',$session);
  
 		if (PEAR::isError($session)){
             return false;
 <?php
-class kt extends client_service  {
-		
-
+class kt extends client_service {
  
-/**
- * Get Supported (?) Languages
- *
- * returns array containing languages, count, & defaultlanguage
- *
- */
-	function get_languages($passthru=false){
+	/**
+	 * Get Supported (?) Languages
+	 *
+	 * returns array containing languages, count, & defaultlanguage
+	 *
+	 */
+	function get_languages($passthru = false) {
+		$this->logTrace ((__METHOD__.'('.__FILE__.' '.__LINE__.')'), 'Enter Function' );
 		global $default;
-	    $oReg =& KTi18nregistry::getSingleton();
-		$aRegisteredLangs=$oReg->geti18nLanguages('knowledgeTree');
-		$aLanguageNames=$oReg->getLanguages('knowledgeTree');
-		$languages=array();
-
-		if(!empty($aRegisteredLangs)){
-			foreach (array_keys($aRegisteredLangs) as $sLang){
-				$languages[]=array(
-					'isoCode'=>$sLang,
-					'language'=>$aLanguageNames[$sLang]
-				);
+		$oReg = & KTi18nregistry::getSingleton ();
+		$aRegisteredLangs = $oReg->geti18nLanguages ( 'knowledgeTree' );
+		$aLanguageNames = $oReg->getLanguages ( 'knowledgeTree' );
+		$languages = array ();
+		
+		if (! empty ( $aRegisteredLangs )) {
+			foreach ( array_keys ( $aRegisteredLangs ) as $sLang ) {
+				$languages [] = array ('isoCode' => $sLang, 'language' => $aLanguageNames [$sLang] );
 			}
 		}
-		$response=array('languages'=>$languages, 'count'=>count($languages), 'defaultLanguage'=>$default->defaultLanguage);
-		if(is_bool($passthru))if($passthru)return $response;
-		$this->setResponse($response);
+		$response = array ('languages' => $languages, 'count' => count ( $languages ), 'defaultLanguage' => $default->defaultLanguage );
+		if (is_bool ( $passthru ))
+			if ($passthru)
+				return $response;
+		$this->setResponse ( $response );
 	}
-
-
-	function get_rootfolder_detail($params){
-		$params['folderId']='1';
-		$this->get_folder_detail($params);
+	
+	function get_rootfolder_detail($params) {
+		$this->logTrace ((__METHOD__.'('.__FILE__.' '.__LINE__.')'), 'Enter Function' );
+		$params ['folderId'] = '1';
+		$this->get_folder_detail ( $params );
 	}
-
-
-	function get_folder_detail($params)	{
-		if(isset($params['node'])&&!isset($params['folderId'])){
-			$params['node']=split('_',$params['node']);
-			$params['folderId']=$params['node'][1];
+	
+	function get_folder_detail($params) {
+		$this->logTrace ((__METHOD__.'('.__FILE__.' '.__LINE__.')'), 'Enter Function' );
+		if (isset ( $params ['node'] ) && ! isset ( $params ['folderId'] )) {
+			$params ['node'] = split ( '_', $params ['node'] );
+			$params ['folderId'] = $params ['node'] [1];
 		}
-		$kt=&$this->KT;
-
-		$folder=&$kt->get_folder_by_id($params['folderId']);
-		if (PEAR::isError($folder))
-		{
-			$this->setError("Could not get folder by Id:  {$params['folderId']}");
-			$this->setDebug('FolderError',array('kt'=>$kt,'folder'=>$folder));
+		$kt = &$this->KT;
+		
+		$folder = &$kt->get_folder_by_id ( $params ['folderId'] );
+		if (PEAR::isError ( $folder )) {
+			$this->setError ( "Could not get folder by Id:  {$params['folderId']}" );
+			$this->setDebug ( 'FolderError', array ('kt' => $kt, 'folder' => $folder ) );
 			return false;
 		}
-
-		$detail=$folder->get_detail();
-		if (PEAR::isError($detail)){
-			$this->setResponse("detail error {$params['node']}");
+		
+		$detail = $folder->get_detail ();
+		if (PEAR::isError ( $detail )) {
+			$this->setResponse ( "detail error {$params['node']}" );
 			return false;
 		}
-
-		if(strtolower($detail['folder_name'])=='root folder'){
-			$detail['folder_name']='KnowledgeTree';
+		
+		if (strtolower ( $detail ['folder_name'] ) == 'root folder') {
+			$detail ['folder_name'] = 'KnowledgeTree';
 		}
-
-		$qtip .= $this->xlate('Folder name').": {$detail['folder_name']}<br>";
-		$class='folder';
-
-		$permissions=$detail['permissions'];
-		$perms='';
-		$canWrite=false;
-
-		for ($j=0; $j < strlen($permissions); $j++){
-		    switch (strtoupper($permissions{$j})){
-				case 'W':
-					$canWrite=true;
-					$perms .= $this->xlate('write, ');
-				break;
-				case 'R':
-					$perms .= $this->xlate('read, ');
-				break;
-				case 'A':
-					$perms .= $this->xlate('add folder, ');
-				break;
+		
+		$qtip .= $this->xlate ( 'Folder name' ) . ": {$detail['folder_name']}<br>";
+		$class = 'folder';
+		
+		$permissions = $detail ['permissions'];
+		$perms = '';
+		$canWrite = false;
+		
+		for($j = 0; $j < strlen ( $permissions ); $j ++) {
+			switch (strtoupper ( $permissions {$j} )) {
+				case 'W' :
+					$canWrite = true;
+					$perms .= $this->xlate ( 'write, ' );
+					break;
+				case 'R' :
+					$perms .= $this->xlate ( 'read, ' );
+					break;
+				case 'A' :
+					$perms .= $this->xlate ( 'add folder, ' );
+					break;
 			}
 		}
-
-		if (strlen($perms) > 2){
-			$perms=substr($perms, 0, strlen($perms)-2);
+		
+		if (strlen ( $perms ) > 2) {
+			$perms = substr ( $perms, 0, strlen ( $perms ) - 2 );
 		}
-
-		$qtip .= $this->xlate('Permissions:') . " {$perms}<br>";
-		$qtip .= $canWrite ? $this->xlate('You may add content to this folder') : $this->xlate('You may not add content to this folder');
-
-		$result[]=array(
-			'text'=>$detail['folder_name'],
-			'id'=>'F_'. $params['folderId'],
-			'filename'=>$detail['folder_name'],
-			'cls'=>'folder',
-			'leaf'=>false,
-			'document_type'=>'',
-			'item_type'=>'F',
-			'permissions'=>$permissions,
-			'qtip'=> $qtip
-		);
-
-		$this->setResponse($result);
+		
+		$qtip .= $this->xlate ( 'Permissions:' ) . " {$perms}<br>";
+		$qtip .= $canWrite ? $this->xlate ( 'You may add content to this folder' ) : $this->xlate ( 'You may not add content to this folder' );
+		
+		$result [] = array ('text' => $detail ['folder_name'], 'id' => 'F_' . $params ['folderId'], 'filename' => $detail ['folder_name'], 'cls' => 'folder', 'leaf' => false, 'document_type' => '', 'item_type' => 'F', 'permissions' => $permissions, 'qtip' => $qtip );
+		
+		$this->setResponse ( $result );
 		return true;
 	}
-
-
-	function get_folder_contents($params){
-		$kt=&$this->KT;
-
-		$params['control']='F_';
-		$params['node']=substr($params['node'], strlen($params['control']));
-
-		$folder=&$kt->get_folder_by_id($params['node']);
-    	if(!$this->checkPearError($folder,"[error 1] Folder Not Found: {$params['control']}{$params['node']}",'',array()))return false;
-
-    	$types=(isset($params['types']) ? $params['types'] : 'DF');
-		$listing=$folder->get_listing(1, $types);
-        $result=$this->_processListing($listing, 'folderContents', $params);
-
-        $this->setResponse($result);
-        return true;
+	
+	function get_folder_contents($params) {
+		$this->logTrace ((__METHOD__.'('.__FILE__.' '.__LINE__.')'), 'Enter Function' );
+		$kt = &$this->KT;
+		
+		$params ['control'] = 'F_';
+		$params ['node'] = substr ( $params ['node'], strlen ( $params ['control'] ) );
+		
+		$folder = &$kt->get_folder_by_id ( $params ['node'] );
+		if (! $this->checkPearError ( $folder, "[error 1] Folder Not Found: {$params['control']}{$params['node']}", '', array () ))
+			return false;
+		
+		$types = (isset ( $params ['types'] ) ? $params ['types'] : 'DF');
+		$listing = $folder->get_listing ( 1, $types );
+		$result = $this->_processListing ( $listing, 'folderContents', $params );
+		
+		$this->setResponse ( $result );
+		return true;
 	}
-
-
-    /**
-     * Returns the contents of a folder formatted for a grid view.
-     *
-     * @param array $arr
-     * @return array
-     */
-	function get_folder_contents_for_grid($arr)
-	{		
-		$kt=&$this->KT;
-		
-		$arr['control']='F_';
-		$arr['node']=substr($arr['node'], strlen($arr['control']));
-		
-		$folder=&$kt->get_folder_by_id($arr['node']);
-		if (PEAR::isError($folder)){
-			echo '<pre>'.print_r($arr,true).'</pre>';
-			$this->addError('Folder Not found');
+	
+	/**
+	 * Returns the contents of a folder formatted for a grid view.
+	 *
+	 * @param array $arr
+	 * @return array
+	 */
+	function get_folder_contents_for_grid($arr) {
+		$this->logTrace ((__METHOD__.'('.__FILE__.' '.__LINE__.')'), 'Enter Function' );
+		$kt = &$this->KT;
+		
+		$arr ['control'] = 'F_';
+		$arr ['node'] = substr ( $arr ['node'], strlen ( $arr ['control'] ) );
+		
+		$folder = &$kt->get_folder_by_id ( $arr ['node'] );
+		if (PEAR::isError ( $folder )) {
+			echo '<pre>' . print_r ( $arr, true ) . '</pre>';
+			$this->addError ( 'Folder Not found' );
 			return false;
 		}
-        
-		$types=(isset($arr['types']) ? $arr['types'] : 'DF');
  
-		$listing=$folder->get_listing(1, $types);
-        
-        $result=$this->_processListing($listing, 'grid', $arr);
+		$types = (isset ( $arr ['types'] ) ? $arr ['types'] : 'DF');
  
-		$this->setResponse(array('totalCount'=>count($listing), 'items'=>$result));
+		$listing = $folder->get_listing ( 1, $types );
+		
+		$result = $this->_processListing ( $listing, 'grid', $arr );
+		
+		$this->setResponse ( array ('totalCount' => count ( $listing ), 'items' => $result ) );
  
 		return true;
 	}
-
-	
  
-    private function _processListing($listing, $type, $arr){
-        $result=array();
-        $methodToIncludeItem='_processItemInclusion_'.$type;
-
-		foreach($listing as $item){
+	private function _processListing($listing, $type, $arr) {
+		$this->logTrace ((__METHOD__.'('.__FILE__.' '.__LINE__.')'), 'Enter Function' );
+		$result = array ();
+		$methodToIncludeItem = '_processItemInclusion_' . $type;
+		
+		foreach ( $listing as $item ) {
 			/* Trying to fix folder sizes */
-			if($item['filesize']<=0){
-				$item['filesize']='';
-			}else{
-				$item['filesize']=serviceHelper::size_readable($item['filesize']);
+			if ($item ['filesize'] <= 0) {
+				$item ['filesize'] = '';
+			} else {
+				$item ['filesize'] = serviceHelper::size_readable ( $item ['filesize'] );
 			}
  
-			$filename=$item['filename'];
-			$itemType=$item['item_type'];
-
-			$includeMe=true;
-			$qtip='';
-			$canWrite=false;
-			$immutable=false;
-			$permissions=$item['permissions'];
-			$perms='';
-
-			for ($j=0; $j < strlen($permissions); $j++){
-			    switch (strtoupper($permissions{$j})){
-					case 'W':
-						$canWrite=true;
-						$perms .= $this->xlate('write, ');
+			$filename = $item ['filename'];
+			$itemType = $item ['item_type'];
+			
+			$includeMe = true;
+			$qtip = '';
+			$canWrite = false;
+			$immutable = false;
+			$permissions = $item ['permissions'];
+			$perms = '';
+			
+			for($j = 0; $j < strlen ( $permissions ); $j ++) {
+				switch (strtoupper ( $permissions {$j} )) {
+					case 'W' :
+						$canWrite = true;
+						$perms .= $this->xlate ( 'write, ' );
 						break;
-					case 'R':
-						$perms .= $this->xlate('read, ');
+					case 'R' :
+						$perms .= $this->xlate ( 'read, ' );
 						break;
-					case 'A':
-						$perms .= $this->xlate('add folder, ');
+					case 'A' :
+						$perms .= $this->xlate ( 'add folder, ' );
 						break;
 				}
 			}
-
-			if(strlen($perms) > 2){
-				$perms=substr($perms, 0, strlen($perms)-2);
-			}
-
-			if($itemType=='F'){
-				$qtip .= $this->xlate('Folder name').": {$filename}<br>";
-				$class='folder';
-				$qtip .= $this->xlate('Permissions:') . " {$perms}<br>";
-				$qtip .= $canWrite ? $this->xlate('You may add content to this folder') : $this->xlate('You may not add content to this folder');
+			
+			if (strlen ( $perms ) > 2) {
+				$perms = substr ( $perms, 0, strlen ( $perms ) - 2 );
 			}
+			
+			if ($itemType == 'F') {
+				$qtip .= $this->xlate ( 'Folder name' ) . ": {$filename}<br>";
+				$class = 'folder';
+				$qtip .= $this->xlate ( 'Permissions:' ) . " {$perms}<br>";
+				$qtip .= $canWrite ? $this->xlate ( 'You may add content to this folder' ) : $this->xlate ( 'You may not add content to this folder' );
+			} 
  
 			//documents
-			else{
-				$qtip='';
-				$extpos=strrpos($filename, '.') ;
-
-				if($extpos === false){
-					$class='file-unknown';
-				}else{
-					$ext=substr($filename, $extpos); // Get Extension including the dot
-					$class='file-' . substr($filename, $extpos +1); // Get Extension without the dot
+			else {
+				$qtip = '';
+				$extpos = strrpos ( $filename, '.' );
+				
+				if ($extpos === false) {
+					$class = 'file-unknown';
+				} else {
+					$ext = substr ( $filename, $extpos ); // Get Extension including the dot
+					$class = 'file-' . substr ( $filename, $extpos + 1 ); // Get Extension without the dot
 				}
  
-				$extensions=explode(',', $arr['extensions']);
-				if(!in_array(strtolower($ext), $extensions) && !in_array('*',$extensions)){
-					$includeMe=false;
-				}else{
-					$qtip .= $this->xlate('Filename') . ": {$filename}<br>";
-					$qtip .= $this->xlate('File Size') . ": " . serviceHelper::fsize_desc($item['filesize']) . "<br>";
-					$qtip .= $this->xlate('Modified') . ": {$item['modified_date']}<br>";
-					$qtip .= $this->xlate('Owner') . ": {$item['created_by']}<br>";
-					$qtip .= $this->xlate('Version') . ": {$item['version']}<br>";
-					if (serviceHelper::bool2str(strtolower($item['is_immutable']))=='true'){
-						$canWrite=false;
-						$immutable=true;
+				$extensions = explode ( ',', $arr ['extensions'] );
+				if (! in_array ( strtolower ( $ext ), $extensions ) && ! in_array ( '*', $extensions )) {
+					$includeMe = false;
+				} else {
+					$qtip .= $this->xlate ( 'Filename' ) . ": {$filename}<br>";
+					$qtip .= $this->xlate ( 'File Size' ) . ": " . serviceHelper::fsize_desc ( $item ['filesize'] ) . "<br>";
+					$qtip .= $this->xlate ( 'Modified' ) . ": {$item['modified_date']}<br>";
+					$qtip .= $this->xlate ( 'Owner' ) . ": {$item['created_by']}<br>";
+					$qtip .= $this->xlate ( 'Version' ) . ": {$item['version']}<br>";
+					if (serviceHelper::bool2str ( strtolower ( $item ['is_immutable'] ) ) == 'true') {
+						$canWrite = false;
+						$immutable = true;
 					}
  
-					if($immutable){
-						$qtip .= $this->xlate('Status: Immutable') . '<br>';
-					}else if (strtolower($item['checked_out_by']) != 'n/a' && ($item['checked_out_by'] != '')){
-						$qtip .= $this->xlate('Status: Checked out by') . " {$item['checked_out_by']}<br>";
-					}else{
-						$qtip .= $this->xlate('Status: Available') . '<br>';
+					if ($immutable) {
+						$qtip .= $this->xlate ( 'Status: Immutable' ) . '<br>';
+					} else if (strtolower ( $item ['checked_out_by'] ) != 'n/a' && ($item ['checked_out_by'] != '')) {
+						$qtip .= $this->xlate ( 'Status: Checked out by' ) . " {$item['checked_out_by']}<br>";
+					} else {
+						$qtip .= $this->xlate ( 'Status: Available' ) . '<br>';
 					}
-					$qtip .= $this->xlate('Permissions:') . " {$perms}<br>";
-
-					if($immutable){
-						$qtip .= $this->xlate('This document is not editable');
-					}else if ($canWrite){
-						$qtip .= $this->xlate('You may edit this document');
-					}else{
-						$qtip .= $this->xlate('This document is not editable');
+					$qtip .= $this->xlate ( 'Permissions:' ) . " {$perms}<br>";
+					
+					if ($immutable) {
+						$qtip .= $this->xlate ( 'This document is not editable' );
+					} else if ($canWrite) {
+						$qtip .= $this->xlate ( 'You may edit this document' );
+					} else {
+						$qtip .= $this->xlate ( 'This document is not editable' );
 					}
 				}
-			}//end of if for files
-			if($includeMe){
-				$result[]=$this->$methodToIncludeItem($item, $class, $qtip);
+			} //end of if for files
+			if ($includeMe) {
+				$result [] = $this->$methodToIncludeItem ( $item, $class, $qtip );
 			}
 		}
 		return $result;
-    }
-
-
-
-
-    private function _processItemInclusion_folderContents($item, $class, $qtip){
-        return array (
-                'text'=>htmlspecialchars($item['title']),
-                'originaltext'=>$item['title'],
-                'id'=>($item['item_type']=='F' ? $item['item_type']."_" : "").$item['id'],
-                'filename'=>$item['filename'],
-                'cls'=>$class,
-                'leaf'=>($item['item_type']=='D'),
-                'document_type'=>$item['document_type'],
-                'item_type'=>$item['item_type'],
-                'permissions'=>$item['permissions'],
-				'content_id'=>$item['content_id'],
-				'checked_out_by'=>$item['checked_out_by'],
-                'qtip'=> $qtip
-            );
-    }
-
-
-    private function _processItemInclusion_search($item, $class, $qtip)
-    {
-		if ($item['filesize']=='n/a') {
-			$item['filesize']=-1;
-		}
-        return array (
-                'text'=>htmlspecialchars($item['title']),
-                'originaltext'=>$item['title'],
-                'id'=>$item['document_id'],
-                'filename'=>$item['filename'],
-                'cls'=>$class,
-                'leaf'=>true,
-                'document_type'=>$item['document_type'],
-                'item_type'=>'D',
-                'permissions'=>$item['permissions'],
-				'content_id'=>$item['content_id'],
-				'filesize'=>$item['filesize'],
-				'modified'=>$item['modified_date'],
-				'created_date'=>$item['created_date'],
-				'checked_out_by'=>$item['checked_out_by'],
-                'relevance'=>$item['relevance'],
-                'qtip'=> $qtip,
-				'version'=>$item['version']
-            );
-    }
+	}
+	
+	private function _processItemInclusion_folderContents($item, $class, $qtip) {
+		$this->logTrace ((__METHOD__.'('.__FILE__.' '.__LINE__.')'), 'Enter Function' );
+		return array ('text' => htmlspecialchars ( $item ['title'] ), 'originaltext' => $item ['title'], 'id' => ($item ['item_type'] == 'F' ? $item ['item_type'] . "_" : "") . $item ['id'], 'filename' => $item ['filename'], 'cls' => $class, 'leaf' => ($item ['item_type'] == 'D'), 'document_type' => $item ['document_type'], 'item_type' => $item ['item_type'], 'permissions' => $item ['permissions'], 'content_id' => $item ['content_id'], 'checked_out_by' => $item ['checked_out_by'], 'qtip' => $qtip );
+	}
+	
+	private function _processItemInclusion_search($item, $class, $qtip) {
+		$this->logTrace ((__METHOD__.'('.__FILE__.' '.__LINE__.')'), 'Enter Function' );
+		if ($item ['filesize'] == 'n/a') {
+			$item ['filesize'] = - 1;
+		}
+		return array ('text' => htmlspecialchars ( $item ['title'] ), 'originaltext' => $item ['title'], 'id' => $item ['document_id'], 'filename' => $item ['filename'], 'cls' => $class, 'leaf' => true, 'document_type' => $item ['document_type'], 'item_type' => 'D', 'permissions' => $item ['permissions'], 'content_id' => $item ['content_id'], 'filesize' => $item ['filesize'], 'modified' => $item ['modified_date'], 'created_date' => $item ['created_date'], 'checked_out_by' => $item ['checked_out_by'], 'relevance' => $item ['relevance'], 'qtip' => $qtip, 'version' => $item ['version'] );
+	}
+	
+	private function _processItemInclusion_grid($item, $class, $qtip) {
+		$this->logTrace ((__METHOD__.'('.__FILE__.' '.__LINE__.')'), 'Enter Function' );
+		//var_dump($item);
+		
  
-    private function _processItemInclusion_grid($item, $class, $qtip)
-    {
-        //var_dump($item);
-		
-		if ($item['filesize']=='n/a') {
-			$item['filesize']=-1;
-		}
-		
-		return array (
-                'text'=>htmlspecialchars($item['title']),
-                'originaltext'=>$item['title'],
-                'id'=>$item['id'],
-                'filename'=>$item['filename'],
-                'cls'=>$class,
-				'owner'=>$item['created_by'],
-                'document_type'=>$item['document_type'],
-                'item_type'=>$item['item_type'],
-                'permissions'=>$item['permissions'],
-				'created_date'=>$item['created_date'],
-				'content_id'=>$item['content_id'],
-				'filesize'=>$item['filesize'],
-				'modified'=>$item['modified_date'],
-				'checked_out_by'=>$item['checked_out_by'],
-				'version'=>$item['version']
-            );
-    }
-    
-    
+		if ($item ['filesize'] == 'n/a') {
+			$item ['filesize'] = - 1;
+		}
+		
+		return array ('text' => htmlspecialchars ( $item ['title'] ), 'originaltext' => $item ['title'], 'id' => $item ['id'], 'filename' => $item ['filename'], 'cls' => $class, 'owner' => $item ['created_by'], 'document_type' => $item ['document_type'], 'item_type' => $item ['item_type'], 'permissions' => $item ['permissions'], 'created_date' => $item ['created_date'], 'content_id' => $item ['content_id'], 'filesize' => $item ['filesize'], 'modified' => $item ['modified_date'], 'checked_out_by' => $item ['checked_out_by'], 'version' => $item ['version'] );
+	}
+	
 	public function get_metadata($params) {
-    	$kt=&$this->KT;
-
-    	if (substr($params['document_id'], 0, 2)=='D_') {
-			$params['document_id']=substr($params['document_id'], 2);
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$kt = &$this->KT;
+		
+		if (substr ( $params ['document_id'], 0, 2 ) == 'D_') {
+			$params ['document_id'] = substr ( $params ['document_id'], 2 );
 		}
-
-    	$document_id=(int)$params['document_id'];
-    	if($document_id > 0) {
-	    	$document=$kt->get_document_by_id($params['document_id']);
-	    	$detail=$document->get_metadata();
-	    	$document_detail=$document->get_detail();
-	    	$title=$document_detail['title'];
-	    	$document_type=$document_detail['document_type'];
-
-    	}else{
-    		if(isset($params['document_type'])) {
-    			$document_type=$params['document_type'];
-    		}else{
-    			$document_type='Default';
-    		}
-    		$detail=$kt->get_document_type_metadata($document_type);
-    		$title="";
-    	}
-
-		$result=array();
-		$items=array();
-		$index=0;
-		$items[]=array("name"=>"__title", "index"=>0, "value"=>$title, "control_type"=>"string");
-
-
+		
+		$document_id = ( int ) $params ['document_id'];
+		if ($document_id > 0) {
+			$document = $kt->get_document_by_id ( $params ['document_id'] );
+			$detail = $document->get_metadata ();
+			$document_detail = $document->get_detail ();
+			$title = $document_detail ['title'];
+			$document_type = $document_detail ['document_type'];
+		
+		} else {
+			if (isset ( $params ['document_type'] )) {
+				$document_type = $params ['document_type'];
+			} else {
+				$document_type = 'Default';
+			}
+			$detail = $kt->get_document_type_metadata ( $document_type );
+			$title = "";
+		}
+		
+		$result = array ();
+		$items = array ();
+		$index = 0;
+		$items [] = array ("name" => "__title", "index" => 0, "value" => $title, "control_type" => "string" );
+		
 		// Commented out for timebeing - will be used by 'Save in Format'
+		
  
-		if (isset($params['extensions'])) {
-
-			$fileParts=pathinfo($document_detail['filename']);
-
-			$items[]=array("name"=>"__document_extension", "index"=>0, "value"=>strtolower($fileParts['extension']), "control_type"=>"lookup", "selection"=>explode(',', str_replace('.', '', $params['extensions'])));
+		if (isset ( $params ['extensions'] )) {
+			
+			$fileParts = pathinfo ( $document_detail ['filename'] );
+			
+			$items [] = array ("name" => "__document_extension", "index" => 0, "value" => strtolower ( $fileParts ['extension'] ), "control_type" => "lookup", "selection" => explode ( ',', str_replace ( '.', '', $params ['extensions'] ) ) );
 		}
+		
+		$document_types = $kt->get_documenttypes ( $params );
+		$items [] = array ("name" => "__document_type", "index" => 0, "value" => $document_type, "control_type" => "lookup", "selection" => $document_types );
+		
+		foreach ( $detail as $fieldset ) {
+			foreach ( $fieldset ['fields'] as $field ) {
+				
+				$prepArray = array ('fieldset' => $fieldset ['fieldset'], 'name' => $field ['name'], 
  
-		$document_types=$kt->get_documenttypes($params);
-		$items[]=array("name"=>"__document_type", "index"=>0, "value"=>$document_type, "control_type"=>"lookup", "selection"=>$document_types);
-
-		foreach ($detail as $fieldset) {
-			foreach ($fieldset['fields'] as $field)	{
+				// Change for value. If blank value is set to 1, change value to ''
+				// Overcomes issue of n/a
+				'value' => ($document_id > 0 ? ($field ['blankvalue'] == '1' ? '' : $field ['value']) : ''), 
  
-				$prepArray = array(
-                    'fieldset' => $fieldset['fieldset'],
-                    'name' => $field['name'],
-                    
-                    // Change for value. If blank value is set to 1, change value to ''
-                    // Overcomes issue of n/a
-                    'value' => ($document_id > 0 ? ($field['blankvalue'] == '1' ? '' : $field['value']) : ''),
-                    
-                    'description' => $field['description'],
-                    'control_type' => $field['control_type'],
-                    'selection' => $field['selection'],
-                    'required' => $field['required'],
-                    'blankvalue' => $field['blankvalue'],
-                    'index' => $index
-                );
-                
-                // Small Adjustment for multiselect to real type
-                if ($field['control_type'] == 'multiselect') {
-                    $prepArray['control_type'] = $field['options']['type'];
-                }
-		
-                
-				if (isset($field['options']['ishtml'])) {
-					$prepArray['ishtml'] = $field['options']['ishtml'];
+				'description' => $field ['description'], 'control_type' => $field ['control_type'], 'selection' => $field ['selection'], 'required' => $field ['required'], 'blankvalue' => $field ['blankvalue'], 'index' => $index );
+				
+				// Small Adjustment for multiselect to real type
+				if ($field ['control_type'] == 'multiselect') {
+					$prepArray ['control_type'] = $field ['options'] ['type'];
+				}
+				
+				if (isset ( $field ['options'] ['ishtml'] )) {
+					$prepArray ['ishtml'] = $field ['options'] ['ishtml'];
 				} else {
-					$prepArray['ishtml'] = '0';
+					$prepArray ['ishtml'] = '0';
 				}
  
-				if (isset($field['options']['maxlength'])) {
-					$prepArray['maxlength'] = $field['options']['maxlength'];
+				if (isset ( $field ['options'] ['maxlength'] )) {
+					$prepArray ['maxlength'] = $field ['options'] ['maxlength'];
 				} else {
-					$prepArray['maxlength'] = '-1';
+					$prepArray ['maxlength'] = '-1';
 				}
-                
-                $items[] = $prepArray;
-                $index++;
-            }
-        }
-
-
-
-		$this->setResponse(array('id'=>$title, 'items'=>$items, 'count'=>count($items)));
-
+				
+				$items [] = $prepArray;
+				$index ++;
+			}
+		}
+		
+		$this->setResponse ( array ('id' => $title, 'items' => $items, 'count' => count ( $items ) ) );
+		
 		return true;
 	}
-
-
+	
 	public function get_documenttypes($params) {
-
-    	$kt=&$this->KT;
-
-    	$detail=$kt->get_documenttypes();
-		$result=array();
-		$items=array();
-		for($i=0;$i<count($detail);$i++) {
-			if(strtolower(substr($detail[$i], -5)) != 'email')
-			{
-				$items[]=array(
-					'name'=>$detail[$i]
-				);
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		
+		$kt = &$this->KT;
+		
+		$detail = $kt->get_documenttypes ();
+		$result = array ();
+		$items = array ();
+		for($i = 0; $i < count ( $detail ); $i ++) {
+			if (strtolower ( substr ( $detail [$i], - 5 ) ) != 'email') {
+				$items [] = array ('name' => $detail [$i] );
 			}
 		}
-		$this->setResponse(array('items'=>$items, 'count'=>count($items)));
+		$this->setResponse ( array ('items' => $items, 'count' => count ( $items ) ) );
 		return true;
 	}
-
+	
 	function update_document_type($params) {
-		$kt=&$this->KT;
-		$document_id=(int)$params['document_id'];
-    	if($document_id > 0) {
-	    	$document=$kt->get_document_by_id($document_id);
-	    	$document->change_document_type($params['document_type']);
-	    	$this->setResponse(array('status_code'=>0));
-	    	return true;
-
-    	}else{
-    		$this->addError("Invalid document Id : {$document_id}");
-	    	$this->setResponse(array('status_code'=>1));
-    		return false;
-    	}
-
+		$kt = &$this->KT;
+		$document_id = ( int ) $params ['document_id'];
+		if ($document_id > 0) {
+			$document = $kt->get_document_by_id ( $document_id );
+			$document->change_document_type ( $params ['document_type'] );
+			$this->setResponse ( array ('status_code' => 0 ) );
+			return true;
+		
+		} else {
+			$this->addError ( "Invalid document Id : {$document_id}" );
+			$this->setResponse ( array ('status_code' => 1 ) );
+			return false;
+		}
+	
 	}
-
+	
 	/**
 	 * Get a url for downloading the specified document
 	 * Parameters:
@@ -470,91 +393,86 @@ class kt extends client_service  {
 	 *
 	 * @param unknown_type $params
 	 */
-	function download_document($params,$returnResult=false) {
-
-    	$kt=&$this->KT;
-    	$params['session_id']=$params['session_id']?$params['session_id']:$this->AuthInfo['session'];
-    	$params['app_type']=$params['app_type']?$params['app_type']:$this->AuthInfo['appType'];
-    	$params['app_type']='air';
-    	$multipart=isset($params['multipart'])?(bool)$params['multipart']:false;
-    	$multipart=false;
-    	
-    	$this->Response->addDebug('download_document Parameters',$params);
-    	
-    	
-    	$session_id=$params['session_id'];
-
-
-    	$document=&$kt->get_document_by_id($params['document_id']);
-     //   $docname='test.txt';
-		if (PEAR::isError($document))
-    	{
-    		$response['message']=$document->getMessage();
-    		$this->addDebug("download_document - cannot get $document_id - "  . $document->getMessage(), $document);
-
-//    		$this->setResponse(new SOAP_Value('$this->response=',"{urn:$this->namespace}kt_response", $response));
-    		$this->setResponse($response);
-    		return;
-    	}
-        $docname=$document->document->getFileName();
-    	$result=$document->download();
-		if (PEAR::isError($result))
-    	{
-    		$response['message']=$result->getMessage();
-			$this->setResponse(array('status_code'=>1, 'message'=>$result->getMessage()));
+	function download_document($params, $returnResult = false){
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		
+		$kt = &$this->KT;
+		$params ['session_id'] = $params ['session_id'] ? $params ['session_id'] : $this->AuthInfo ['session'];
+		$params ['app_type'] = $params ['app_type'] ? $params ['app_type'] : $this->AuthInfo ['appType'];
+		$params ['app_type'] = 'air';
+		$multipart = isset ( $params ['multipart'] ) ? ( bool ) $params ['multipart'] : false;
+		$multipart = false;
+		
+		$this->Response->addDebug ( 'download_document Parameters', $params );
+		
+		$session_id = $params ['session_id'];
+		
+		$document = &$kt->get_document_by_id ( $params ['document_id'] );
+		//   $docname='test.txt';
+		if (PEAR::isError ( $document )) {
+			$response ['message'] = $document->getMessage ();
+			$this->addDebug ( "download_document - cannot get $document_id - " . $document->getMessage (), $document );
+			
+			//    		$this->setResponse(new SOAP_Value('$this->response=',"{urn:$this->namespace}kt_response", $response));
+			$this->setResponse ( $response );
 			return;
-    	}
-
-    	$session=&$kt->get_session();
-    	$download_manager=new KTDownloadManager();
-    	$download_manager->set_session($session->session);
-    	$download_manager->cleanup();
-    	$url=$download_manager->allow_download($document,NULL,$multipart);
-    	//http://ktair.dev?code=750f7a09d40a3d855f2897f417baf0bbb9a1f615&d=16&u=evm2pdkkhfagon47eh2b9slqj6
-    	/*
+		}
+		$docname = $document->document->getFileName ();
+		$result = $document->download ();
+		if (PEAR::isError ( $result )) {
+			$response ['message'] = $result->getMessage ();
+			$this->setResponse ( array ('status_code' => 1, 'message' => $result->getMessage () ) );
+			return;
+		}
+		
+		$session = &$kt->get_session ();
+		$download_manager = new KTDownloadManager ( );
+		$download_manager->set_session ( $session->session );
+		$download_manager->cleanup ();
+		$url = $download_manager->allow_download ( $document, NULL, $multipart );
+		//http://ktair.dev?code=750f7a09d40a3d855f2897f417baf0bbb9a1f615&d=16&u=evm2pdkkhfagon47eh2b9slqj6
+		/*
     	$this->addDebug('url before split',$url);
     	$url=split('\?',$url);
     	$this->addDebug('url after split',$url);
     	$url=$url[0].'/ktwebservice/download.php?'.$url[1];
     	$this->addDebug('url after recombo',$url);
     	*/
-
-    	$response['status_code']=0;
-		$response['message']=$url.'&apptype='.$params['app_type'];
-        $response['filename']=$docname;
-        
-        $this->addDebug('effective params',$params);
-        
-        if($returnResult){
-        	return $response;	
-        }else{
-    		$this->setResponse($response);
-        }
-    }
-    
-    /**
-     * Get download URLS for multiple documents
-     * params contains:
-     * 		app_type
-     * 		documents = array of doc_id
-     *
-     * @param unknown_type $params
-     */
-    public function download_multiple_documents($params){
-    	$response=array();
-    	foreach($params['documents'] as $docId){
-    		$ret=$this->download_document(array('document_id'=>$docId,'app_type'=>$params['app_type'],'multipart'=>$params['multipart']),true);
-    		$this->Response->addDebug('Trying to create Download Link for '.$docId,$ret);
-    		$rec=array(
-    			'filename'	=>$ret['filename'],
-    			'url'		=>$ret['message'],
-    			'succeeded'	=>$ret['status_code']==0?true:false
-    		);
-    		if(is_array($ret))$response[$docId]=$rec;
-    	}
-    	$this->setResponse($response);
-    }
-    
+		
+		$response ['status_code'] = 0;
+		$response ['message'] = $url . '&apptype=' . $params ['app_type'];
+		$response ['filename'] = $docname;
+		
+		$this->addDebug ( 'effective params', $params );
+		
+		if ($returnResult) {
+			return $response;
+		} else {
+			$this->setResponse ( $response );
+		}
+	}
+	
+	/**
+	 * Get download URLS for multiple documents
+	 * params contains:
+	 * 		app_type
+	 * 		documents = array of doc_id
+	 *
+	 * @param unknown_type $params
+	 */
+	public function download_multiple_documents($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$response = array ();
+		foreach ( $params ['documents'] as $docId ) {
+			$ret = $this->download_document ( array ('document_id' => $docId, 'app_type' => $params ['app_type'], 'multipart' => $params ['multipart'] ), true );
+			$this->Response->addDebug ( 'Trying to create Download Link for ' . $docId, $ret );
+			$rec = array ('filename' => $ret ['filename'], 'url' => $ret ['message'], 'succeeded' => $ret ['status_code'] == 0 ? true : false );
+			if (is_array ( $ret ))
+				$response [$docId] = $rec;
+		}
+		$this->setResponse ( $response );
+	}
+	
 	/**
 	 * Checkout a Document
 	 * params contains:
@@ -564,39 +482,36 @@ class kt extends client_service  {
 	 * @param array $params
 	 *
 	 */
-	function checkout_document($params){
-    	$responseType='kt_response';
-		$kt=&$this->KT;
-
-    	$document=&$kt->get_document_by_id($params['document_id']);
-		if (PEAR::isError($document))
-    	{
-			$this->addError("checkout_document - cannot get documentid {$params['document_id']} - "  . $document->getMessage());
-			$this->setResponse(array('status_code'=>1, 'message'=>$document->getMessage()));
+	function checkout_document($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$responseType = 'kt_response';
+		$kt = &$this->KT;
+		
+		$document = &$kt->get_document_by_id ( $params ['document_id'] );
+		if (PEAR::isError ( $document )) {
+			$this->addError ( "checkout_document - cannot get documentid {$params['document_id']} - " . $document->getMessage () );
+			$this->setResponse ( array ('status_code' => 1, 'message' => $document->getMessage () ) );
 			return;
-    	}
-
-    	$result=$document->checkout($params['reason']);
-		if (PEAR::isError($result))
-    	{
-    		$this->addError($result->getMessage());
-    		$this->setResponse(array('status_code'=>1, 'message'=>$result->getMessage()));
-    		return;
-    	}
-
-		$url='';
-    	if ($params['download'])
-    	{
-	    	$download_manager=new KTDownloadManager();
-    		$download_manager->set_session($params['session_id']);
-    		$download_manager->cleanup();
-    		$url=$download_manager->allow_download($document);
-    	}
-
-    	$this->setResponse(array('status_code'=>0, 'message'=>$url));
-    }
-
-
+		}
+		
+		$result = $document->checkout ( $params ['reason'] );
+		if (PEAR::isError ( $result )) {
+			$this->addError ( $result->getMessage () );
+			$this->setResponse ( array ('status_code' => 1, 'message' => $result->getMessage () ) );
+			return;
+		}
+		
+		$url = '';
+		if ($params ['download']) {
+			$download_manager = new KTDownloadManager ( );
+			$download_manager->set_session ( $params ['session_id'] );
+			$download_manager->cleanup ();
+			$url = $download_manager->allow_download ( $document );
+		}
+		
+		$this->setResponse ( array ('status_code' => 0, 'message' => $url ) );
+	}
+	
 	/**
 	 * Checkin Document //TODO: Find out how upload works
 	 * params contains:
@@ -607,706 +522,692 @@ class kt extends client_service  {
 	 *
 	 * @param array $params
 	 */
-    function checkin_document($params){
-    	$session_id=$this->AuthInfo['session'];
-		$document_id=$params['document_id'];
-		$filename=$params['filename'];
-		$reason=$params['reason'];
-		$tempfilename=$params['tempfilename'];
-		$major_update=$params['major_update'];
-		$application=$this->AuthInfo['appType'];
-
-    	$this->addDebug('Checkin',"checkin_document('$session_id',$document_id,'$filename','$reason','$tempfilename', '$application', $major_update)");
-    	$kt=&$this->KT;
-
-    	// we need to add some security to ensure that people don't frig the checkin process to access restricted files.
+	function checkin_document($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$session_id = $this->AuthInfo ['session'];
+		$document_id = $params ['document_id'];
+		$filename = $params ['filename'];
+		$reason = $params ['reason'];
+		$tempfilename = $params ['tempfilename'];
+		$major_update = $params ['major_update'];
+		$application = $this->AuthInfo ['appType'];
+		
+		$this->addDebug ( 'Checkin', "checkin_document('$session_id',$document_id,'$filename','$reason','$tempfilename', '$application', $major_update)" );
+		$kt = &$this->KT;
+		
+		// we need to add some security to ensure that people don't frig the checkin process to access restricted files.
 		// possibly should change 'tempfilename' to be a hash or id of some sort if this is troublesome.
-    	$upload_manager=new KTUploadManager();
-    	if (!$upload_manager->is_valid_temporary_file($tempfilename))
-    	{
-			$this->setResponse(array('status_code'=>12));
+		$upload_manager = new KTUploadManager ( );
+		if (! $upload_manager->is_valid_temporary_file ( $tempfilename )) {
+			$this->setResponse ( array ('status_code' => 12 ) );
 			return;
-    	}
-
-    	$document=&$kt->get_document_by_id($document_id);
-		if (PEAR::isError($document))
-		{
-			$this->setResponse(array('status_code'=>13));
 		}
-
+		
+		$document = &$kt->get_document_by_id ( $document_id );
+		if (PEAR::isError ( $document )) {
+			$this->setResponse ( array ('status_code' => 13 ) );
+		}
+		
 		// checkin
-		$result=$document->checkin($filename, $reason, $tempfilename, $major_update);
-		if (PEAR::isError($result))
-		{
-			$this->setResponse(array('status_code'=>14));
+		$result = $document->checkin ( $filename, $reason, $tempfilename, $major_update );
+		if (PEAR::isError ( $result )) {
+			$this->setResponse ( array ('status_code' => 14 ) );
 		}
-
-    	// get status after checkin
+		
+		// get status after checkin
 		//$this->response= $this->get_document_detail($session_id, $document_id);
-		$detail=$document->get_detail();
-    	$detail['status_code']=0;
-		$detail['message']='';
-
-    	$this->setResponse($detail);
-    }
-    
-    
-    /**
-     * Upload a document
-     *
-     * @param unknown_type $arr
-     */
-	function add_document_with_metadata($arr){
-    	$session_id=$arr['session_id'];
-    	//error_reporting(E_ALL);
-		$metadata=array();
-		$packed=$arr['metadata'];
-
-		foreach($meta as $item){
-			$fieldSet=$item['fieldset'];
-			unset($item['fieldset']);
-			$metadata[$fieldSet]['fieldset']=$fieldSet;
-			$metadata[$fieldSet]['fields'][]=$item;
-		}		
-
-    	$kt=&$this->KT;
-
-    	$upload_manager=new KTUploadManager();
-    	if (!$upload_manager->is_valid_temporary_file($arr['tempfilename'])) 	{
-    		$this->addError('Temporary File Not Valid');
-			$this->setResponse(array('status_code'=>1, 'message'=>'Temporary File Not Valid'));
+		$detail = $document->get_detail ();
+		$detail ['status_code'] = 0;
+		$detail ['message'] = '';
+		
+		$this->setResponse ( $detail );
+	}
+	
+	/**
+	 * Upload a document
+	 *
+	 * @param unknown_type $arr
+	 */
+	function add_document_with_metadata($arr) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$session_id = $arr ['session_id'];
+		//error_reporting(E_ALL);
+		$metadata = array ();
+		$packed = $arr ['metadata'];
+		
+		foreach ( $meta as $item ) {
+			$fieldSet = $item ['fieldset'];
+			unset ( $item ['fieldset'] );
+			$metadata [$fieldSet] ['fieldset'] = $fieldSet;
+			$metadata [$fieldSet] ['fields'] [] = $item;
+		}
+		
+		$kt = &$this->KT;
+		
+		$upload_manager = new KTUploadManager ( );
+		if (! $upload_manager->is_valid_temporary_file ( $arr ['tempfilename'] )) {
+			$this->addError ( 'Temporary File Not Valid' );
+			$this->setResponse ( array ('status_code' => 1, 'message' => 'Temporary File Not Valid' ) );
 			return false;
-    	}
-    	$this->addDebug('','Exited is_valid_temporary file');
-
-    	$folder=&$kt->get_folder_by_id($arr['folder_id']);
-		if (PEAR::isError($folder)){
-			$this->addError('Could not find Folder '.$arr['folder_id']);
-    		$this->setResponse(array('status_code'=>1, 'message'=>'Could not find Folder '.$arr['folder_id']));
-    		return false;
 		}
+		$this->addDebug ( '', 'Exited is_valid_temporary file' );
  
-    	$document=&$folder->add_document($arr['title'], $arr['filename'], $arr['documenttype'], $arr['tempfilename']);
-		if (PEAR::isError($document)){
-			$this->addError("Could not add Document [title:{$title},filename:{$filename},documenttype:{$documenttype},tempfilename:{$tempfilename}]");
-    		$this->setResponse(array('status_code'=>1, 'message'=>'Could not add Document'));
-    		return false;
+		$folder = &$kt->get_folder_by_id ( $arr ['folder_id'] );
+		if (PEAR::isError ( $folder )) {
+			$this->addError ( 'Could not find Folder ' . $arr ['folder_id'] );
+			$this->setResponse ( array ('status_code' => 1, 'message' => 'Could not find Folder ' . $arr ['folder_id'] ) );
+			return false;
 		}
-
-  
-		$document_id=$document->get_documentid();
-
-		$update_result=$this->update_document_metadata($arr['session_id'], $document_id, $metadata, $arr['application'], array());
-
-		$status_code=$update_result['status_code'];
-		if ($status_code != 0)
-		{
-			$this->delete_document(array('session_id' => $arr['session_id'], 'document_id' => $document_id, 'reason' => 'Rollback because metadata could not be added', 'application' => $arr['application']));
-			$this->response= $update_result;
+		
+		$document = &$folder->add_document ( $arr ['title'], $arr ['filename'], $arr ['documenttype'], $arr ['tempfilename'] );
+		if (PEAR::isError ( $document )) {
+			$this->addError ( "Could not add Document [title:{$title},filename:{$filename},documenttype:{$documenttype},tempfilename:{$tempfilename}]" );
+			$this->setResponse ( array ('status_code' => 1, 'message' => 'Could not add Document' ) );
+			return false;
 		}
-
-
-		$result=$document->mergeWithLastMetadataVersion();
-		if (PEAR::isError($result))
-		{
+		
+		$document_id = $document->get_documentid ();
+		
+		$update_result = $this->update_document_metadata ( $arr ['session_id'], $document_id, $metadata, $arr ['application'], array () );
+		
+		$status_code = $update_result ['status_code'];
+		if ($status_code != 0) {
+			$this->delete_document ( array ('session_id' => $arr ['session_id'], 'document_id' => $document_id, 'reason' => 'Rollback because metadata could not be added', 'application' => $arr ['application'] ) );
+			$this->response = $update_result;
+		}
+		
+		$result = $document->mergeWithLastMetadataVersion ();
+		if (PEAR::isError ( $result )) {
 			// not much we can do, maybe just log!
 		}
-
-		$this->response= array('status_code'=>0, 'document_id'=>$document_id);
-    }
+		
+		$this->response = array ('status_code' => 0, 'document_id' => $document_id );
+	}
  
-	function create_empty_upload_file($params){
-		$config=KTConfig::getSingleton();
-		$this->addDebug('KTConfig Singleton',$config);
-		$uploadFolder=$config->get('webservice/uploadDirectory');
+	function create_empty_upload_file($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$config = KTConfig::getSingleton ();
+		$this->addDebug ( 'KTConfig Singleton', $config );
+		$uploadFolder = $config->get ( 'webservice/uploadDirectory' );
  
-		$result = array();
+		$result = array ();
  
-		if ($file = fopen($uploadFolder."/".$params['filename'], 'w')) {
-			fclose($file);
-			$result['status_code'] = '0';
-			$result['filename'] = $uploadFolder."/".$params['filename'];
+		if ($file = fopen ( $uploadFolder . "/" . $params ['filename'], 'w' )) {
+			fclose ( $file );
+			$result ['status_code'] = '0';
+			$result ['filename'] = $uploadFolder . "/" . $params ['filename'];
 		} else {
-			$result['status_code'] = '1';
-			$result['filename'] = $uploadFolder."/".$params['filename'];
+			$result ['status_code'] = '1';
+			$result ['filename'] = $uploadFolder . "/" . $params ['filename'];
 		}
-		$this->setResponse($result);
+		$this->setResponse ( $result );
 		return true;
 	}
-
-    function get_all_client_policies(){
-		$config=KTConfig::getSingleton();
-		$this->addDebug('KTConfig Singleton',$config);
+	
+	function get_all_client_policies() {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$config = KTConfig::getSingleton ();
+		$this->addDebug ( 'KTConfig Singleton', $config );
  
-		$policies=array('allowRememberPassword', 'captureReasonsCheckin', 'captureReasonsCheckout');
+		$policies = array ('allowRememberPassword', 'captureReasonsCheckin', 'captureReasonsCheckout' );
  
-		$returnPolicies=array();
+		$returnPolicies = array ();
  
-		foreach ($policies as $policy_name)
-		{
-			$policyInfo=array(
-						'name'=>$policy_name,
-						'value'=>serviceHelper::bool2str($config->get('addInPolicies/'.$policy_name)),
-						'type'=>'boolean'
-					);
+		foreach ( $policies as $policy_name ) {
+			$policyInfo = array ('name' => $policy_name, 'value' => serviceHelper::bool2str ( $config->get ( 'addInPolicies/' . $policy_name ) ), 'type' => 'boolean' );
  
-			$returnPolicies[$policy_name] =$policyInfo;
+			$returnPolicies [$policy_name] = $policyInfo;
 		}
  
-		$languages=$this->get_languages(true);
-		
-		$metadata=array('totalProperty'=>'resultsCounter', 'root'=>'languages', 'fields'=>array('isoCode', 'language'));
+		$languages = $this->get_languages ( true );
  
-		$finalArray=array();
-		$finalArray['metaData']=$metadata;
-		$finalArray['policies']=$returnPolicies;
-		$finalArray['languages']=$languages['languages'];
-		$finalArray['defaultLanguage']=$languages['defaultLanguage'];
-		$finalArray['resultsCounter']=$languages['count'];
+		$metadata = array ('totalProperty' => 'resultsCounter', 'root' => 'languages', 'fields' => array ('isoCode', 'language' ) );
  
+		$finalArray = array ();
+		$finalArray ['metaData'] = $metadata;
+		$finalArray ['policies'] = $returnPolicies;
+		$finalArray ['languages'] = $languages ['languages'];
+		$finalArray ['defaultLanguage'] = $languages ['defaultLanguage'];
+		$finalArray ['resultsCounter'] = $languages ['count'];
  
-		$this->setResponse($finalArray);
+		$this->setResponse ( $finalArray );
 		return true;
 	}
-
-    function get_all_explorer_policies(){
-		$config=KTConfig::getSingleton();
-		$this->addDebug('KTConfig Singleton',$config);
+	
+	function get_all_explorer_policies() {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$config = KTConfig::getSingleton ();
+		$this->addDebug ( 'KTConfig Singleton', $config );
  
-		$policies=array('allowRememberPassword', 'explorerMetadataCapture', 'officeMetadataCapture', 'captureReasonsCheckin', 'captureReasonsCheckout', 'captureReasonsDelete', 'captureReasonsCancelCheckout', 'captureReasonsCopyInKT', 'captureReasonsMoveInKT');
+		$policies = array ('allowRememberPassword', 'explorerMetadataCapture', 'officeMetadataCapture', 'captureReasonsCheckin', 'captureReasonsCheckout', 'captureReasonsDelete', 'captureReasonsCancelCheckout', 'captureReasonsCopyInKT', 'captureReasonsMoveInKT' );
  
-		$returnPolicies=array();
-		$test = $config->get('clientToolPolicies/allowRememberPassword');
+		$returnPolicies = array ();
+		$test = $config->get ( 'clientToolPolicies/allowRememberPassword' );
 		global $default;
-		$default->log->error('I am here-'.$test);
-		foreach ($policies as $policy_name)
-		{
-			$policyInfo=array(
-						'name'=>$policy_name,
-						'value'=>serviceHelper::bool2str($config->get('clientToolPolicies/'.$policy_name)),
-						'type'=>'boolean'
-					);
+		$default->log->error ( 'I am here-' . $test );
+		foreach ( $policies as $policy_name ) {
+			$policyInfo = array ('name' => $policy_name, 'value' => serviceHelper::bool2str ( $config->get ( 'clientToolPolicies/' . $policy_name ) ), 'type' => 'boolean' );
  
-			$returnPolicies[$policy_name] =$policyInfo;
+			$returnPolicies [$policy_name] = $policyInfo;
 		}
  
-		$languages=$this->get_languages(true);
-		
-		$metadata=array('totalProperty'=>'resultsCounter', 'root'=>'languages', 'fields'=>array('isoCode', 'language'));
+		$languages = $this->get_languages ( true );
  
-		$finalArray=array();
-		$finalArray['metaData']=$metadata;
-		$finalArray['policies']=$returnPolicies;
-		$finalArray['languages']=$languages['languages'];
-		$finalArray['defaultLanguage']=$languages['defaultLanguage'];
-		$finalArray['resultsCounter']=$languages['count'];
+		$metadata = array ('totalProperty' => 'resultsCounter', 'root' => 'languages', 'fields' => array ('isoCode', 'language' ) );
  
+		$finalArray = array ();
+		$finalArray ['metaData'] = $metadata;
+		$finalArray ['policies'] = $returnPolicies;
+		$finalArray ['languages'] = $languages ['languages'];
+		$finalArray ['defaultLanguage'] = $languages ['defaultLanguage'];
+		$finalArray ['resultsCounter'] = $languages ['count'];
  
-		$this->setResponse($finalArray);
+		$this->setResponse ( $finalArray );
 		return true;
 	}
  
-	public function switchlang($params){
-		setcookie("kt_language", $params['lang'], 2147483647, '/');
+	public function switchlang($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		setcookie ( "kt_language", $params ['lang'], 2147483647, '/' );
 	}
-
-
-    function add_document_params($params){
-        $folder_id=$params['folder_id'];
-        $title=$params['title'];
-        $filename=$params['filename'];
-        $documenttype=$params['documenttype'];
-        $tempfilename=$params['tempfilename'];
-        $application=$params['application'];
-
-    	$this->addDebug('','Entered add_document');
-    	$kt=&$this->KT;
-
-    	$upload_manager=new KTUploadManager();
-    	if (!$upload_manager->is_valid_temporary_file($tempfilename)) 	{
-    		$this->addError('Temporary File Not Valid');
-			$this->setResponse(array('status_code'=>1));
+	
+	function add_document_params($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$folder_id = $params ['folder_id'];
+		$title = $params ['title'];
+		$filename = $params ['filename'];
+		$documenttype = $params ['documenttype'];
+		$tempfilename = $params ['tempfilename'];
+		$application = $params ['application'];
+		
+		$this->addDebug ( '', 'Entered add_document' );
+		$kt = &$this->KT;
+		
+		$upload_manager = new KTUploadManager ( );
+		if (! $upload_manager->is_valid_temporary_file ( $tempfilename )) {
+			$this->addError ( 'Temporary File Not Valid' );
+			$this->setResponse ( array ('status_code' => 1 ) );
 			return false;
-    	}
-    	$this->addDebug('','Exited is_valid_temporary file');
-
-    	$folder=&$kt->get_folder_by_id($folder_id);
-		if (PEAR::isError($folder)){
-			$this->addError('Could not find Folder '.$folder_id);
-    		$this->setResponse(array('status_code'=>1));
-    		return false;
 		}
-
-		$this->addDebug('','Exited get_folder_by_id');
-
-    	$document=&$folder->add_document($title, $filename, $documenttype, $tempfilename);
-		if (PEAR::isError($document)){
-			$this->addError("Could add Document [title:{$title},filename:{$filename},documenttype:{$documenttype},tempfilename:{$tempfilename}]");
-    		$this->setResponse(array('status_code'=>1));
-    		return false;
+		$this->addDebug ( '', 'Exited is_valid_temporary file' );
+		
+		$folder = &$kt->get_folder_by_id ( $folder_id );
+		if (PEAR::isError ( $folder )) {
+			$this->addError ( 'Could not find Folder ' . $folder_id );
+			$this->setResponse ( array ('status_code' => 1 ) );
+			return false;
 		}
-
-		$this->addDebug('','Exited folder add_document');
-
-    	$detail=$document->get_detail();
-    	$detail['status_code']=0;
-		$detail['message']='';
-
-    	$this->setResponse($detail);
-   }
+		
+		$this->addDebug ( '', 'Exited get_folder_by_id' );
+		
+		$document = &$folder->add_document ( $title, $filename, $documenttype, $tempfilename );
+		if (PEAR::isError ( $document )) {
+			$this->addError ( "Could add Document [title:{$title},filename:{$filename},documenttype:{$documenttype},tempfilename:{$tempfilename}]" );
+			$this->setResponse ( array ('status_code' => 1 ) );
+			return false;
+		}
+		
+		$this->addDebug ( '', 'Exited folder add_document' );
+		
+		$detail = $document->get_detail ();
+		$detail ['status_code'] = 0;
+		$detail ['message'] = '';
+		
+		$this->setResponse ( $detail );
+	}
  
-    function delete_document($params){
-		$session_id = $params['session_id'];
-		$document_id = $params['document_id'];
-		$reason = $params['reason'];
-		$application = $params['application'];
+	function delete_document($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$session_id = $params ['session_id'];
+		$document_id = $params ['document_id'];
+		$reason = $params ['reason'];
+		$application = $params ['application'];
  
-    	$kt=&$this->KT;
-
-    	$document=&$kt->get_document_by_id($document_id);
-		if (PEAR::isError($document)){
-			$this->addError("Invalid document {$document_id}");
-    		$this->setResponse(array('status_code'=>1));
-    		return false;
-    	}
-
-    	$result=$document->delete($reason);
-		if (PEAR::isError($result))	{
-			$this->addError("Could not delete document {$document_id}");
-    		$this->setResponse(array('status_code'=>1));
-    		return false;
-    	}
-    	$this->setResponse(array('status_code'=>0));
-    	return true;
-    }
-
-
-
-	private function update_document_metadata($session_id, $document_id, $metadata, $application, $sysdata=null){
-		$this->addDebug('update_document_metadata','entered update_document_metadata');
-    	$kt=&$this->KT;
-   		$responseType='kt_document_detail';
-
-    	$document=&$kt->get_document_by_id($document_id);
-		if (PEAR::isError($document)){
-    		return array('status_code'=>1, 'error'=>'Error getting document');
-    	}
-
-    	$result=$document->update_metadata($metadata);
-    	if (PEAR::isError($result)){
-    		return array('status_code'=>1, 'error'=>'Error updating metadata');
-    	}
-
-		$result=$document->update_sysdata($sysdata);
-		if (PEAR::isError($result)){
-	 			return array('status_code'=>1, 'error'=>'Error update_sysdata');
+		$kt = &$this->KT;
+		
+		$document = &$kt->get_document_by_id ( $document_id );
+		if (PEAR::isError ( $document )) {
+			$this->addError ( "Invalid document {$document_id}" );
+			$this->setResponse ( array ('status_code' => 1 ) );
+			return false;
 		}
-
-		return array('status_code'=>0);
+		
+		$result = $document->delete ( $reason );
+		if (PEAR::isError ( $result )) {
+			$this->addError ( "Could not delete document {$document_id}" );
+			$this->setResponse ( array ('status_code' => 1 ) );
+			return false;
+		}
+		$this->setResponse ( array ('status_code' => 0 ) );
+		return true;
 	}
-
-	function get_client_policy($arr){
-		$policy_name=$arr['policy_name'];
-
-		$config=KTConfig::getSingleton();
-
-		$policy=array(
-						'name'=>$policy_name,
-						'value'=>serviceHelper::bool2str($config->get($policy_name)),
-						'type'=>'boolean'
-					);
-
-		$response['policy']=$policy;
-		$response['message']='Knowledgetree client policies retrieval succeeded.';
-		$response['status_code']=0;
-
-		$this->setResponse($response);
+	
+	private function update_document_metadata($session_id, $document_id, $metadata, $application, $sysdata = null) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$this->addDebug ( 'update_document_metadata', 'entered update_document_metadata' );
+		$kt = &$this->KT;
+		$responseType = 'kt_document_detail';
+		
+		$document = &$kt->get_document_by_id ( $document_id );
+		if (PEAR::isError ( $document )) {
+			return array ('status_code' => 1, 'error' => 'Error getting document' );
+		}
+		
+		$result = $document->update_metadata ( $metadata );
+		if (PEAR::isError ( $result )) {
+			return array ('status_code' => 1, 'error' => 'Error updating metadata' );
+		}
+		
+		$result = $document->update_sysdata ( $sysdata );
+		if (PEAR::isError ( $result )) {
+			return array ('status_code' => 1, 'error' => 'Error update_sysdata' );
+		}
+		
+		return array ('status_code' => 0 );
+	}
+	
+	function get_client_policy($arr) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$policy_name = $arr ['policy_name'];
+		
+		$config = KTConfig::getSingleton ();
+		
+		$policy = array ('name' => $policy_name, 'value' => serviceHelper::bool2str ( $config->get ( $policy_name ) ), 'type' => 'boolean' );
+		
+		$response ['policy'] = $policy;
+		$response ['message'] = 'Knowledgetree client policies retrieval succeeded.';
+		$response ['status_code'] = 0;
+		
+		$this->setResponse ( $response );
 		return true;
 	}
-
-
-	function search($arr){
-		$kt=&$this->KT;
-
-		$listing=processSearchExpression("(GeneralText contains \"".$arr['query']."\")");
-
-		$result=$this->_processListing($listing, 'search', $arr);
-
-		if(!count($result)) {
-			$result[]=array(
-				'text'=>$this->xlate("No results found"),
-				'id'=>($listing[$i]['item_type']=='F' ? $listing[$i]['item_type']."_" : "").$listing[$i]['id'],
-				'leaf'=>true,
-				'relevance'=>0,
-				'qtip'=> $this->xlate("Please retry your search")
-			);
-		}else{
-			$result=array_slice($result, 0, 200);
+	
+	function search($arr) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$kt = &$this->KT;
+		
+		$listing = processSearchExpression ( "(GeneralText contains \"" . $arr ['query'] . "\")" );
+		
+		$result = $this->_processListing ( $listing, 'search', $arr );
+		
+		if (! count ( $result )) {
+			$result [] = array ('text' => $this->xlate ( "No results found" ), 'id' => ($listing [$i] ['item_type'] == 'F' ? $listing [$i] ['item_type'] . "_" : "") . $listing [$i] ['id'], 'leaf' => true, 'relevance' => 0, 'qtip' => $this->xlate ( "Please retry your search" ) );
+		} else {
+			$result = array_slice ( $result, 0, 200 );
 		}
-
+		
 		//$this->setResponse($result);
-		$this->setResponse(array('totalCount'=>count($listing), 'items'=>$result));
-
+		$this->setResponse ( array ('totalCount' => count ( $listing ), 'items' => $result ) );
+		
 		return true;
 	}
-
-
-	public function update_metadata($arr){
-		$metadata=array();
-		$meta=$arr['metadata'];
-
-		$this->addDebug('','Entered add_document_with_metadata');
-		$this->addDebug('metadata received',$meta);
-
-		$special=array();
-//		foreach($apacked as $packed){
-//			foreach($packed as $key=>$val) {
-//				if(substr($val->name,0,2) != '__') {
-//					if(!is_array($metadata[$val->fieldset])) {
-//						$metadata[$val->fieldset]['fieldset']=$val->fieldset;
-//						$metadata[$val->fieldset]['fields']=array();
-//					}
-//					$metadata[$val->fieldset]['fields'][]=array(
-//						'name'=>$val->name,
-//						'value'=>$val->value
-//					);
-//				}else{
-//					$special[$val->name]=$val->value;
-//				}
-//			}
-//		}
+	
+	public function update_metadata($arr) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$metadata = array ();
+		$meta = $arr ['metadata'];
+		
+		$this->addDebug ( '', 'Entered add_document_with_metadata' );
+		$this->addDebug ( 'metadata received', $meta );
+		
+		$special = array ();
+		//		foreach($apacked as $packed){
+		//			foreach($packed as $key=>$val) {
+		//				if(substr($val->name,0,2) != '__') {
+		//					if(!is_array($metadata[$val->fieldset])) {
+		//						$metadata[$val->fieldset]['fieldset']=$val->fieldset;
+		//						$metadata[$val->fieldset]['fields']=array();
+		//					}
+		//					$metadata[$val->fieldset]['fields'][]=array(
+		//						'name'=>$val->name,
+		//						'value'=>$val->value
+		//					);
+		//				}else{
+		//					$special[$val->name]=$val->value;
+		//				}
+		//			}
+		//		}
+		
  
 		/**
  
 Fatal error:  Cannot unset string offsets in on line 981
 		 */
+		
+		//		foreach($meta as $item){
+		//			$isSpecial=substr($item['name'],0,2)=='__';
+		//			if($isSpecial){
+		//				$special[$item['name']]=$item['value'];
+		//			}else{
+		//				$fieldSet=$item['fieldset'];
+		//				unset($item['fieldset']);
+		//				$metadata[$fieldSet]['fieldset']=$fieldSet;
+		//				$metadata[$fieldSet]['fields'][]=$item;
+		//			}		
+		//		}
+		
  
-//		foreach($meta as $item){
-//			$isSpecial=substr($item['name'],0,2)=='__';
-//			if($isSpecial){
-//				$special[$item['name']]=$item['value'];
-//			}else{
-//				$fieldSet=$item['fieldset'];
-//				unset($item['fieldset']);
-//				$metadata[$fieldSet]['fieldset']=$fieldSet;
-//				$metadata[$fieldSet]['fields'][]=$item;
-//			}		
-//		}
-		
-		$metadata=array();
-		$special=array();
-		
-		foreach($meta as $item){
-			if(substr($item['name'],0,2)=='__'){
-				$special[$item['name']]=$item['value'];
-			}else{
-				$metadata[$item['fieldset']]['fieldset']=$item['fieldset'];
-				$metadata[$item['fieldset']]['fields'][]=array('name'=>$item['name'],'value'=>$item['value']);
+		$metadata = array ();
+		$special = array ();
+		
+		foreach ( $meta as $item ) {
+			if (substr ( $item ['name'], 0, 2 ) == '__') {
+				$special [$item ['name']] = $item ['value'];
+			} else {
+				$metadata [$item ['fieldset']] ['fieldset'] = $item ['fieldset'];
+				$metadata [$item ['fieldset']] ['fields'] [] = array ('name' => $item ['name'], 'value' => $item ['value'] );
 			}
 		}
  
+		$this->addDebug ( 'after processing', array ('metadata' => $metadata, 'special' => $special ) );
  
+		$document_id = $arr ['document_id'];
  
-		$this->addDebug('after processing',array('metadata'=>$metadata,'special'=>$special));
+		$update_result = $this->update_document_metadata ( $arr ['session_id'], $document_id, $metadata, $arr ['application'], array () );
+		$this->addDebug ( '', '$this->response= from update_document_metadata' );
  
-		$document_id=$arr['document_id'];
-
-		$update_result=$this->update_document_metadata($arr['session_id'], $document_id, $metadata, $arr['application'], array());
-		$this->addDebug('','$this->response= from update_document_metadata');
-
-		$status_code=$update_result['status_code'];
-		if ($status_code != 0){
-			$this->setResponse($update_result);
+		$status_code = $update_result ['status_code'];
+		if ($status_code != 0) {
+			$this->setResponse ( $update_result );
 		}
-
-		$kt=&$this->KT;
-
-    	if(!empty($special)) {
-    		if($document_id > 0) {
-	    		$document=$kt->get_document_by_id($document_id);
-
-	    		if(isset($special['__title'])) {
-	    			$this->addDebug("Renaming to {$special['__title']}");
-	    			$res=$document->rename($special['__title']);
-	    		}
-    		}
-    	}
-
-		$this->setResponse(array('status_code'=>0, 'document_id'=>$document_id));
-    }
-
-
-
- 	function check_document_title($arr){
-    	$kt=&$this->KT;
-
-    	$folder=$kt->get_folder_by_id($arr['folder_id']);
-    	if(PEAR::isError($folder)) {
-    		$this->setResponse(array('status_code'=>1, 'reason'=>'No such folder'));
-    		return false;    		
-    	}
-
-    	$doc=$folder->get_document_by_name($arr['title']);
-    	if(PEAR::isError($doc)) {
-    		$this->setResponse(array('status_code'=>1, 'reason'=>'No document with that title '.$arr['title']));
-    		return false;
-    	}
-
-    	$this->setResponse(array('status_code'=>0));
-    	return true;
+		
+		$kt = &$this->KT;
+		
+		if (! empty ( $special )) {
+			if ($document_id > 0) {
+				$document = $kt->get_document_by_id ( $document_id );
+				
+				if (isset ( $special ['__title'] )) {
+					$this->addDebug ( "Renaming to {$special['__title']}" );
+					$res = $document->rename ( $special ['__title'] );
+				}
+			}
+		}
+		
+		$this->setResponse ( array ('status_code' => 0, 'document_id' => $document_id ) );
 	}
-
-
-	function cancel_checkout($params){
-    	$kt=&$this->KT;
-
-    	$document=&$kt->get_document_by_id($params['document_id']);
-		if (PEAR::isError($document)){
-    		$this->setResponse(array('status_code'=>1, 'message'=>$document->getMessage()));
-    		return false;
-    	}
-
-    	$result=$document->undo_checkout($params['reason']);
-		if (PEAR::isError($result)){
-			$this->setResponse(array('status_code'=>1, 'message'=>$result->getMessage()));
+	
+	function check_document_title($arr) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$kt = &$this->KT;
+		
+		$folder = $kt->get_folder_by_id ( $arr ['folder_id'] );
+		if (PEAR::isError ( $folder )) {
+			$this->setResponse ( array ('status_code' => 1, 'reason' => 'No such folder' ) );
 			return false;
-    	}
-    	$response['status_code']=0;
-    	$this->setResponse($response);
-    }
-
-	function get_transaction_history($params){
-    	$kt=&$this->KT;
-
-    	$document=&$kt->get_document_by_id($params['document_id']);
-		if (PEAR::isError($document)){
-    		$this->setResponse(array('status_code'=>1, 'message'=>$document->getMessage()));
-    		return false;
-    	}
-
-    	$versions=$document->get_version_history();
-		$transactions=$document->get_transaction_history();
-    	$response['status_code']=0;
-		$response['transactions'] = $transactions;
-		$response['versions'] = $versions;
-    	$this->setResponse($response);
-    }
+		}
+		
+		$doc = $folder->get_document_by_name ( $arr ['title'] );
+		if (PEAR::isError ( $doc )) {
+			$this->setResponse ( array ('status_code' => 1, 'reason' => 'No document with that title ' . $arr ['title'] ) );
+			return false;
+		}
+		
+		$this->setResponse ( array ('status_code' => 0 ) );
+		return true;
+	}
  
+	function cancel_checkout($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$kt = &$this->KT;
+		
+		$document = &$kt->get_document_by_id ( $params ['document_id'] );
+		if (PEAR::isError ( $document )) {
+			$this->setResponse ( array ('status_code' => 1, 'message' => $document->getMessage () ) );
+			return false;
+		}
+		
+		$result = $document->undo_checkout ( $params ['reason'] );
+		if (PEAR::isError ( $result )) {
+			$this->setResponse ( array ('status_code' => 1, 'message' => $result->getMessage () ) );
+			return false;
+		}
+		$response ['status_code'] = 0;
+		$this->setResponse ( $response );
+	}
  
-
-	public function get_users_groups($params){
-		$kt=&$this->KT;
-		$query=$params['query'];
+	function get_transaction_history($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$kt = &$this->KT;
+		
+		$document = &$kt->get_document_by_id ( $params ['document_id'] );
+		if (PEAR::isError ( $document )) {
+			$this->setResponse ( array ('status_code' => 1, 'message' => $document->getMessage () ) );
+			return false;
+		}
+		
+		$versions = $document->get_version_history ();
+		$transactions = $document->get_transaction_history ();
+		$response ['status_code'] = 0;
+		$response ['transactions'] = $transactions;
+		$response ['versions'] = $versions;
+		$this->setResponse ( $response );
+	}
+	
+	public function get_users_groups($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$kt = &$this->KT;
+		$query = $params ['query'];
 		//$start=$params['start'];
 		//$page=$params['page'];
+		
  
-		$results=KTAPI_User::getList('name LIKE "%'.$query.'%" AND id>0');
-		$returnArray=array();
-		if (count($results) > 0){
-			foreach ($results as $user){
-				$returnArray[]=array('emailid'=>'u_'.$user->getId(), 'name'=> $user->getName(), 'to'=>preg_replace('/('.$query.')/i', '<b>${0}</b>', $user->getName()));
+		$results = KTAPI_User::getList ( 'name LIKE "%' . $query . '%" AND id>0' );
+		$returnArray = array ();
+		if (count ( $results ) > 0) {
+			foreach ( $results as $user ) {
+				$returnArray [] = array ('emailid' => 'u_' . $user->getId (), 'name' => $user->getName (), 'to' => preg_replace ( '/(' . $query . ')/i', '<b>${0}</b>', $user->getName () ) );
 			}
 		}
  
-		$groups=KTAPI_Group::getList('name LIKE "%'.$query.'%"');
-		if (count($groups) > 0){
-			foreach ($groups as $group){
-				$returnArray[]=array('emailid'=>'g_'.$group->getId(), 'name'=> $group->getName(), 'to'=>preg_replace('/('.$query.')/i', '<b>${0}</b>', $group->getName()));
+		$groups = KTAPI_Group::getList ( 'name LIKE "%' . $query . '%"' );
+		if (count ( $groups ) > 0) {
+			foreach ( $groups as $group ) {
+				$returnArray [] = array ('emailid' => 'g_' . $group->getId (), 'name' => $group->getName (), 'to' => preg_replace ( '/(' . $query . ')/i', '<b>${0}</b>', $group->getName () ) );
 			}
 		}
  
-		$sendArray=array ('emails'=>$returnArray, 'metaData'=>array('count'=>count($finalArray), 'root'=>'emails', fields=>array('name', 'to', 'emailid')));
-		$this->setResponse($sendArray);
+		$sendArray = array ('emails' => $returnArray, 'metaData' => array ('count' => count ( $finalArray ), 'root' => 'emails', fields => array ('name', 'to', 'emailid' ) ) );
+		$this->setResponse ( $sendArray );
 		return true;
 	}
-    
  
-	function send_email($params){
-		$kt=&$this->KT;
+	function send_email($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$kt = &$this->KT;
  
-		$message=$params['message'];
-		$list=$params['users'];
-		$list=explode(',', $list);
+		$message = $params ['message'];
+		$list = $params ['users'];
+		$list = explode ( ',', $list );
  
-		$recipientsList=array();
+		$recipientsList = array ();
  
-		foreach ($list as $recipient){
-			if (trim($recipient) != ''){ // check that value is present
+		foreach ( $list as $recipient ) {
+			if (trim ( $recipient ) != '') { // check that value is present
 				// if @ sign is present, signifies email address
-				if(strpos($recipient, '@') === false) { 
-					$recipient=trim($recipient);
-					switch (substr($recipient, 0, 2)){
-						case 'u_':
-							$id=substr($recipient, 2);
-							$user=KTAPI_User::getById($id);
-							if ($user != null){
-								$recipientsList[]=$user;
+				if (strpos ( $recipient, '@' ) === false) {
+					$recipient = trim ( $recipient );
+					switch (substr ( $recipient, 0, 2 )) {
+						case 'u_' :
+							$id = substr ( $recipient, 2 );
+							$user = KTAPI_User::getById ( $id );
+							if ($user != null) {
+								$recipientsList [] = $user;
 							}
 							break;
-						case 'g_':
-							$id=substr($recipient, 2);
-							$group=KTAPI_Group::getById($id);
+						case 'g_' :
+							$id = substr ( $recipient, 2 );
+							$group = KTAPI_Group::getById ( $id );
 							if ($group != null) {
-								$recipientsList[]=$group;
+								$recipientsList [] = $group;
 							}
 							break;
 					}
-				}else{ // Email - just add to list
-					$recipientsList[]=trim($recipient);
+				} else { // Email - just add to list
+					$recipientsList [] = trim ( $recipient );
 				}
 			}
 		}
  
-		$document=$kt->get_document_by_id($params['document']);
-		if (count($recipientsList)==0) {
-			$this->setResponse(array('status'=>'norecipients'));
+		$document = $kt->get_document_by_id ( $params ['document'] );
+		if (count ( $recipientsList ) == 0) {
+			$this->setResponse ( array ('status' => 'norecipients' ) );
 			return false;
-		}else{
-			$result = $document->email($recipientsList, $message, TRUE); // true to attach document
-			if (PEAR::isError($result)) {
-                $this->setResponse(array('status'=>$result->getMessage()));;
-                return false;
-            }
-			$this->setResponse(array('status'=>'documentemailed'));
+		} else {
+			$result = $document->email ( $recipientsList, $message, TRUE ); // true to attach document
+			if (PEAR::isError ( $result )) {
+				$this->setResponse ( array ('status' => $result->getMessage () ) );
+				;
+				return false;
+			}
+			$this->setResponse ( array ('status' => 'documentemailed' ) );
 		}
 		return true;
 	}
-
-
-	function is_latest_version($params){
-		$kt=&$this->KT;
+	
+	function is_latest_version($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$kt = &$this->KT;
  
-		$documentId=$params['document_id'];
-		$contentId=$params['content_id'];
+		$documentId = $params ['document_id'];
+		$contentId = $params ['content_id'];
  
-		$result=$kt->is_latest_version($documentId, $contentId);
+		$result = $kt->is_latest_version ( $documentId, $contentId );
  
-		$this->setResponse($result);
+		$this->setResponse ( $result );
 		return true;
 	}
  
-	function check_permission($params){
-		$kt=&$this->KT;
-		
-		$user=$kt->get_user();
-		$document=$kt->get_document_by_id($params['document_id']);
-		$folder=&$kt->get_folder_by_id($document->ktapi_folder->folderid);
-		$folderDetail=$folder->get_detail();
-		$permissions=$folderDetail['permissions'];
-		if ($user->getId()==$document->document->getCheckedOutUserID()){
+	function check_permission($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$kt = &$this->KT;
+		
+		$user = $kt->get_user ();
+		$document = $kt->get_document_by_id ( $params ['document_id'] );
+		$folder = &$kt->get_folder_by_id ( $document->ktapi_folder->folderid );
+		$folderDetail = $folder->get_detail ();
+		$permissions = $folderDetail ['permissions'];
+		if ($user->getId () == $document->document->getCheckedOutUserID ()) {
 			$permissions .= 'E';
 		}
  
-		$this->setResponse(array('status_code'=>0, 'permissions'=>$permissions));
+		$this->setResponse ( array ('status_code' => 0, 'permissions' => $permissions ) );
 		return true;
 	}
-
-    function copydocument($params){
-        $kt=&$this->KT;
-
-        $response=$kt->copy_document($params['documentid'], $params['destfolderid'], $params['reason']);
-        if ($response['status_code']==0) {
-            $this->setResponse(array('status_code'=>0, 'status'=>'itemupdated', 'icon'=>'success', 'title'=>$this->xlate('Document Copied'), 'message'=>$this->xlate('Document has been successfully copied')));
-            return true;
-        }else{
-            $this->setResponse(array('status_code'=>1, 'status'=>'error', 'icon'=>'failure', 'title'=>$this->xlate('Unable to copy document'), 'message'=>$this->xlate('Unable to copy document')));
-            return false;
-        }
-    }
-
-    function movedocument($params){
-        $kt=$this->KT;
-
-        $response=$kt->move_document($params['documentid'], $params['destfolderid'], $params['reason']);
-        if ($response['status_code']==0) {
-            $this->setResponse(array('status_code'=>0, 'status'=>'itemupdated', 'icon'=>'success', 'title'=>$this->xlate('Document Moved'), 'message'=>$this->xlate('Document has been successfully moved')));
-            return true;
-        }else{
-            $this->setResponse(array('status_code'=>1, 'status'=>'error', 'icon'=>'failure', 'title'=>$this->xlate('Unable to move document'), 'message'=>$this->xlate('Unable to move document'))); 
-            return false;
-        }
-        
-    }
-    
-    function copyfolder($params){
-        $kt=&$this->KT;
-
-        $response=$kt->copy_folder($params['sourcefolderid'], $params['destfolderid'], $params['reason']);
-        if ($response['status_code']==0) {
-            $this->setResponse(array('status_code'=>0, 'status'=>'itemupdated', 'icon'=>'success', 'title'=>$this->xlate('Folder Copied'), 'message'=>$this->xlate('Folder has been successfully copied')));
-            return true;
-        }else{
-            $this->setResponse(array('status_code'=>1, 'status'=>'error', 'icon'=>'failure', 'title'=>$this->xlate('Unable to copy folder'), 'message'=>$this->xlate('Unable to copy folder')));
-            return false;
-        }
-        
-    }
-
-    function movefolder($params){
-        $kt=&$this->KT;
-
-        $response=$kt->move_folder($params['sourcefolderid'], $params['destfolderid'], $params['reason']);
-        if ($response['status_code']==0) {
-            $this->setResponse(array('status_code'=>0, 'status'=>'itemupdated', 'icon'=>'success', 'title'=>$this->xlate('Folder Moved'), 'message'=>$this->xlate('Folder has been successfully moved')));
-            return true;
-        }else{
-            $this->setResponse(array('status_code'=>1, 'status'=>'error', 'icon'=>'failure', 'title'=>$this->xlate('Unable to move folder'), 'message'=>$this->xlate('Unable to move folder')));
-            return false;
-        }
-    }
-
-    
-    function renamefolder($params){
-        $kt=&$this->KT;
-        
-        $response=$kt->rename_folder($params['currentfolderid'], $params['newname']);
-        if ($response['status_code']==0) {
-            $this->setResponse(array('status_code'=>0, 'status'=>'folderupdated', 'icon'=>'success', 'title'=>$this->xlate('Folder Renamed'), 'message'=>$this->xlate('Folder has been successfully renamed')));
-            return true;
-        }else{
-            $this->setResponse(array('status_code'=>1, 'status'=>'error', 'icon'=>'failure', 'title'=>$this->xlate('Unable to rename folder'), 'message'=>$this->xlate('Unable to rename folder')));
-            return false;
-        }
-    }
-
-    function addfolder($params)    {
-        $kt=&$this->KT;
-        $this->addDebug('parameters',$params);
-        $response=$kt->create_folder($params['currentfolderid'], $params['newname']);
-		$this->setResponse($response);
+	
+	function copydocument($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$kt = &$this->KT;
+		
+		$response = $kt->copy_document ( $params ['documentid'], $params ['destfolderid'], $params ['reason'] );
+		if ($response ['status_code'] == 0) {
+			$this->setResponse ( array ('status_code' => 0, 'status' => 'itemupdated', 'icon' => 'success', 'title' => $this->xlate ( 'Document Copied' ), 'message' => $this->xlate ( 'Document has been successfully copied' ) ) );
+			return true;
+		} else {
+			$this->setResponse ( array ('status_code' => 1, 'status' => 'error', 'icon' => 'failure', 'title' => $this->xlate ( 'Unable to copy document' ), 'message' => $this->xlate ( 'Unable to copy document' ) ) );
+			return false;
+		}
+	}
+	
+	function movedocument($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$kt = $this->KT;
+		
+		$response = $kt->move_document ( $params ['documentid'], $params ['destfolderid'], $params ['reason'] );
+		if ($response ['status_code'] == 0) {
+			$this->setResponse ( array ('status_code' => 0, 'status' => 'itemupdated', 'icon' => 'success', 'title' => $this->xlate ( 'Document Moved' ), 'message' => $this->xlate ( 'Document has been successfully moved' ) ) );
+			return true;
+		} else {
+			$this->setResponse ( array ('status_code' => 1, 'status' => 'error', 'icon' => 'failure', 'title' => $this->xlate ( 'Unable to move document' ), 'message' => $this->xlate ( 'Unable to move document' ) ) );
+			return false;
+		}
+	
+	}
+	
+	function copyfolder($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$kt = &$this->KT;
+		
+		$response = $kt->copy_folder ( $params ['sourcefolderid'], $params ['destfolderid'], $params ['reason'] );
+		if ($response ['status_code'] == 0) {
+			$this->setResponse ( array ('status_code' => 0, 'status' => 'itemupdated', 'icon' => 'success', 'title' => $this->xlate ( 'Folder Copied' ), 'message' => $this->xlate ( 'Folder has been successfully copied' ) ) );
+			return true;
+		} else {
+			$this->setResponse ( array ('status_code' => 1, 'status' => 'error', 'icon' => 'failure', 'title' => $this->xlate ( 'Unable to copy folder' ), 'message' => $this->xlate ( 'Unable to copy folder' ) ) );
+			return false;
+		}
+	
+	}
+	
+	function movefolder($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$kt = &$this->KT;
+		
+		$response = $kt->move_folder ( $params ['sourcefolderid'], $params ['destfolderid'], $params ['reason'] );
+		if ($response ['status_code'] == 0) {
+			$this->setResponse ( array ('status_code' => 0, 'status' => 'itemupdated', 'icon' => 'success', 'title' => $this->xlate ( 'Folder Moved' ), 'message' => $this->xlate ( 'Folder has been successfully moved' ) ) );
+			return true;
+		} else {
+			$this->setResponse ( array ('status_code' => 1, 'status' => 'error', 'icon' => 'failure', 'title' => $this->xlate ( 'Unable to move folder' ), 'message' => $this->xlate ( 'Unable to move folder' ) ) );
+			return false;
+		}
+	}
+	
+	function renamefolder($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$kt = &$this->KT;
+		
+		$response = $kt->rename_folder ( $params ['currentfolderid'], $params ['newname'] );
+		if ($response ['status_code'] == 0) {
+			$this->setResponse ( array ('status_code' => 0, 'status' => 'folderupdated', 'icon' => 'success', 'title' => $this->xlate ( 'Folder Renamed' ), 'message' => $this->xlate ( 'Folder has been successfully renamed' ) ) );
+			return true;
+		} else {
+			$this->setResponse ( array ('status_code' => 1, 'status' => 'error', 'icon' => 'failure', 'title' => $this->xlate ( 'Unable to rename folder' ), 'message' => $this->xlate ( 'Unable to rename folder' ) ) );
+			return false;
+		}
+	}
+	
+	function addfolder($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$kt = &$this->KT;
+		$this->addDebug ( 'parameters', $params );
+		$response = $kt->create_folder ( $params ['currentfolderid'], $params ['newname'] );
+		$this->setResponse ( $response );
 		return true;
-    }
-    
-    function deletefolder($params){
-        $kt=&$this->KT;
-
-        $response=$kt->delete_folder($params['folderid'], $params['reason']);
-        if ($response['status_code']==0) {
-            $this->setResponse(array('status_code'=>0, 'status'=>'folderdeleted', 'icon'=>'success', 'title'=>$this->xlate('Folder Deleted'), 'message'=>$this->xlate('Folder has been successfully deleted')));
-            return true;
-        }else{
-            $this->setResponse(array('status_code'=>1, 'status'=>'error', 'icon'=>'failure', 'title'=>$this->xlate('Unable to delete folder'), 'message'=>$this->xlate('Unable to delete folder'))); 
-            return false;
-        }
-    }
-    
-    function candeletefolder($arr){
-        $kt=&$this->KT;
-        
-        $folder=&$kt->get_folder_by_id($arr['folderid']);
-        if (PEAR::isError($folder)){
-            $this->setResponse('error 1');
-            return false;
-        }
-        
-        $listing=$folder->get_listing(1, 'DF');
-        if (count($listing)==0) {
-            $this->setResponse(array('status_code'=>0, 'candelete'=>TRUE));
-            return true;
-        }else{
-            $this->setResponse(array('status_code'=>0, 'candelete'=>FALSE));
-            return true;
-        }
-    }
+	}
+	
+	function deletefolder($params) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$kt = &$this->KT;
+		
+		$response = $kt->delete_folder ( $params ['folderid'], $params ['reason'] );
+		if ($response ['status_code'] == 0) {
+			$this->setResponse ( array ('status_code' => 0, 'status' => 'folderdeleted', 'icon' => 'success', 'title' => $this->xlate ( 'Folder Deleted' ), 'message' => $this->xlate ( 'Folder has been successfully deleted' ) ) );
+			return true;
+		} else {
+			$this->setResponse ( array ('status_code' => 1, 'status' => 'error', 'icon' => 'failure', 'title' => $this->xlate ( 'Unable to delete folder' ), 'message' => $this->xlate ( 'Unable to delete folder' ) ) );
+			return false;
+		}
+	}
+	
+	function candeletefolder($arr) {
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
+		$kt = &$this->KT;
+		
+		$folder = &$kt->get_folder_by_id ( $arr ['folderid'] );
+		if (PEAR::isError ( $folder )) {
+			$this->setResponse ( 'error 1' );
+			return false;
+		}
+		
+		$listing = $folder->get_listing ( 1, 'DF' );
+		if (count ( $listing ) == 0) {
+			$this->setResponse ( array ('status_code' => 0, 'candelete' => TRUE ) );
+			return true;
+		} else {
+			$this->setResponse ( array ('status_code' => 0, 'candelete' => FALSE ) );
+			return true;
+		}
+	}
 }
 ?>
 \ No newline at end of file
 <?php
 class server extends client_service {
 		public function status(){
+			$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
 			$this->setResponse(array('online'=>true));
 		}
  
 		public function ping(){
+			$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
 			$this->addResponse('pong',time());
 		}
  
 		public function getToken(){
+			$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
  
 		}
  
 		public function phpInfo(){
+			$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
 			ob_start();
 			phpinfo();
 			$this->addResponse('phpinfo',ob_get_clean());
 <?php
 class system extends client_service{
 	public function checkVersion(){
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
 		global $default;
        	$user=$this->KT->get_user_object_by_username($this->AuthInfo['user']);
        	$versions=$this->handler->getServerVersions();
@@ -19,11 +20,14 @@ class system extends client_service{
  
 		);
 		$this->setResponse($ret);
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Exit Function');
 		return true;
 	}
  
 	public function jsondecode($params){
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
 		$this->setResponse(@json_decode(trim($params['code'])));
+		$this->logTrace((__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Exit Function');
 	}
 }