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

Kevin G Fourie
2 parents d72bc3ae 7bbaa40a
Showing 35 changed files with 1371 additions and 951 deletions
.gitignore
bin/diagtools/ReportTemplate.html
bin/diagtools/winDiag.php
ktwebservice/1-20090903194035
ktwebservice/KTDownloadManager.inc.php
ktwebservice/KTUploadManager.inc.php
ktwebservice/download.php
ktwebservice/upload.php
setup/wizard/installUtil.php
setup/wizard/lib/services/unixLucene.php
setup/wizard/lib/services/unixOpenOffice.php
setup/wizard/lib/services/unixScheduler.php
setup/wizard/output/outJV
setup/wizard/resources/wizard.css
setup/wizard/resources/wizard.js
setup/wizard/step.php
setup/wizard/steps/configuration.php
setup/wizard/steps/database.php
setup/wizard/steps/registration.php
setup/wizard/steps/services.php
@@ -8,3 +8,6 @@ bin/luceneserver/lucene.pid
 dummy.php
 var/*
 plugins/commercial
+clienttools/Karoo
+clienttools/Office
+.gitmodules
 \ No newline at end of file
+<table width="500" border="0" align="center" cellpadding="0" cellspacing="0" style="border:1px solid #000066; background-color:#DADADE"><tr><td style="font-family:Arial, Helvetica, sans-serif; font-size:14px; font-weight:bold; padding:10px; border-bottom: 1px solid #666666">[heading]</td></tr><tr><td style="font-size:12px; background-color:#FFFFFF; padding:10px 5px 20px 5px;"><pre>[content]</pre></td></tr></table>
 \ No newline at end of file
+<?php
+/*
+	$template=file_get_contents('ReportTemplate.html');
+
+	$rep=array();
+	$rep['running processes']=shell_exec('tasklist');
+	$rep['services']=shell_exec('sc query');
+	$rep['system path']=shell_exec('path');
+	$rep['environment variables']=shell_exec('set');
+	
+	$report=array();
+		
+	foreach ($rep as $test=>$results){
+		$test=ucwords($test);
+		$report[]=str_replace(array('[heading]','[content]'),array($test,$results),$template);
+	}
+	
+	$report=join('',$report);
+	
+	echo $report;
+*/
+?>
 \ No newline at end of file
+<?xml version="1.0"?>
+<Document xmlns="http://www.evolus.vn/Namespace/Pencil"><Properties/><Pages><Page><Properties><Property name="name">Acorn Layout</Property><Property name="id">1247050268296_4354</Property><Property name="width">1024</Property><Property name="height">768</Property><Property name="dimBackground">false</Property></Properties><Content><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.Common:RoundedRect" transform="matrix(1, 0, 0, 1, 0, 0)" p:locked="true"><p:metadata><p:property name="box"><![CDATA[1030,770]]></p:property><p:property name="withBlur"><![CDATA[false]]></p:property><p:property name="radius"><![CDATA[7,0]]></p:property><p:property name="textPadding"><![CDATA[0,10]]></p:property><p:property name="fillColor"><![CDATA[#336699FF]]></p:property><p:property name="strokeColor"><![CDATA[#000000FF]]></p:property><p:property name="strokeStyle"><![CDATA[0|]]></p:property><p:property name="textContent"><![CDATA[]]></p:property><p:property name="textFont"><![CDATA[Arial|normal|normal|12px|none]]></p:property><p:property name="textColor"><![CDATA[#FFFFFFFF]]></p:property><p:property name="textAlign"><![CDATA[1,1]]></p:property></p:metadata>
+
+            <defs>
+                <rect width="1030" height="770" rx="7" ry="7" x="0" y="0" style="stroke-width: 0pt; fill: rgb(51, 102, 153); fill-opacity: 1; stroke: rgb(0, 0, 0); stroke-opacity: 1;" p:name="rrRect" id="rrRect11247050298197" transform="translate(0)"/>
+                <filter height="1.2558399" y="-0.12792" width="1.06396" x="-0.03198" p:name="shadingFilter" id="shadingFilter11247050298197">
+                    <feGaussianBlur stdDeviation="1" in="SourceAlpha"/>
+                </filter>
+            </defs>
+            <use xlink:href="#rrRect11247050298197" xmlns:xlink="http://www.w3.org/1999/xlink" transform="translate(2, 2)" p:filter="url(#shadingFilter11247050298197)" style="opacity: 0.5; visibility: hidden;" p:heavy="true" p:name="bgCopy" id="bgCopy11247050298197"/>
+            <use xlink:href="#rrRect11247050298197" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+            <foreignObject x="10" y="385" width="1010" height="0" p:name="text" id="text11247050298197" style="font-family: Arial; font-size: 12px; font-weight: normal; font-style: normal; text-decoration: none; fill: rgb(255, 255, 255); fill-opacity: 1; color: rgb(255, 255, 255); opacity: 1; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml"/></foreignObject><path id="text11247050298197_underline" style="fill: none; stroke-width: 1px; visibility: hidden;"/>
+        </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.Common:RoundedRect" transform="matrix(1, 0, 0, 1, 13, 92)"><p:metadata><p:property name="box"><![CDATA[210,550]]></p:property><p:property name="withBlur"><![CDATA[false]]></p:property><p:property name="radius"><![CDATA[7,0]]></p:property><p:property name="textPadding"><![CDATA[0,10]]></p:property><p:property name="fillColor"><![CDATA[#FFFFFFFF]]></p:property><p:property name="strokeColor"><![CDATA[#000000FF]]></p:property><p:property name="strokeStyle"><![CDATA[0|]]></p:property><p:property name="textContent"><![CDATA[]]></p:property><p:property name="textFont"><![CDATA[Arial|normal|normal|12px|none]]></p:property><p:property name="textColor"><![CDATA[#FFFFFFFF]]></p:property><p:property name="textAlign"><![CDATA[1,1]]></p:property></p:metadata>
+
+            <defs>
+                <rect width="210" height="550" rx="7" ry="7" x="0" y="0" style="stroke-width: 0pt; fill: rgb(255, 255, 255); fill-opacity: 1; stroke: rgb(0, 0, 0); stroke-opacity: 1;" p:name="rrRect" id="rrRect21247050338773" transform="translate(0)"/>
+                <filter height="1.2558399" y="-0.12792" width="1.06396" x="-0.03198" p:name="shadingFilter" id="shadingFilter21247050338773">
+                    <feGaussianBlur stdDeviation="1" in="SourceAlpha"/>
+                </filter>
+            </defs>
+            <use xlink:href="#rrRect21247050338773" xmlns:xlink="http://www.w3.org/1999/xlink" transform="translate(2, 2)" p:filter="url(#shadingFilter21247050338773)" style="opacity: 0.5; visibility: hidden;" p:heavy="true" p:name="bgCopy" id="bgCopy21247050338773"/>
+            <use xlink:href="#rrRect21247050338773" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+            <foreignObject x="10" y="275" width="190" height="0" p:name="text" id="text21247050338773" style="font-family: Arial; font-size: 12px; font-weight: normal; font-style: normal; text-decoration: none; fill: rgb(255, 255, 255); fill-opacity: 1; color: rgb(255, 255, 255); opacity: 1; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml"/></foreignObject><path id="text21247050338773_underline" style="fill: none; stroke-width: 1px; visibility: hidden;"/>
+        </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.Common:RoundedRect" transform="matrix(1, 0, 0, 1, 235, 90)"><p:metadata><p:property name="box"><![CDATA[560,550]]></p:property><p:property name="withBlur"><![CDATA[false]]></p:property><p:property name="radius"><![CDATA[7,0]]></p:property><p:property name="textPadding"><![CDATA[0,10]]></p:property><p:property name="fillColor"><![CDATA[#FFFFFFFF]]></p:property><p:property name="strokeColor"><![CDATA[#000000FF]]></p:property><p:property name="strokeStyle"><![CDATA[0|]]></p:property><p:property name="textContent"><![CDATA[]]></p:property><p:property name="textFont"><![CDATA[Arial|normal|normal|12px|none]]></p:property><p:property name="textColor"><![CDATA[#FFFFFFFF]]></p:property><p:property name="textAlign"><![CDATA[1,1]]></p:property></p:metadata>
+
+            <defs>
+                <rect width="560" height="550" rx="7" ry="7" x="0" y="0" style="stroke-width: 0pt; fill: rgb(255, 255, 255); fill-opacity: 1; stroke: rgb(0, 0, 0); stroke-opacity: 1;" p:name="rrRect" id="rrRect31247050400981" transform="translate(0)"/>
+                <filter height="1.2558399" y="-0.12792" width="1.06396" x="-0.03198" p:name="shadingFilter" id="shadingFilter31247050400981">
+                    <feGaussianBlur stdDeviation="1" in="SourceAlpha"/>
+                </filter>
+            </defs>
+            <use xlink:href="#rrRect31247050400981" xmlns:xlink="http://www.w3.org/1999/xlink" transform="translate(2, 2)" p:filter="url(#shadingFilter31247050400981)" style="opacity: 0.5; visibility: hidden;" p:heavy="true" p:name="bgCopy" id="bgCopy31247050400981"/>
+            <use xlink:href="#rrRect31247050400981" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+            <foreignObject x="10" y="275" width="540" height="0" p:name="text" id="text31247050400981" style="font-family: Arial; font-size: 12px; font-weight: normal; font-style: normal; text-decoration: none; fill: rgb(255, 255, 255); fill-opacity: 1; color: rgb(255, 255, 255); opacity: 1; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml"/></foreignObject><path id="text31247050400981_underline" style="fill: none; stroke-width: 1px; visibility: hidden;"/>
+        </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.Common:RoundedRect" transform="matrix(1, 0, 0, 1, 803, 92)"><p:metadata><p:property name="box"><![CDATA[210,550]]></p:property><p:property name="withBlur"><![CDATA[false]]></p:property><p:property name="radius"><![CDATA[7,0]]></p:property><p:property name="textPadding"><![CDATA[0,10]]></p:property><p:property name="fillColor"><![CDATA[#FFFFFFFF]]></p:property><p:property name="strokeColor"><![CDATA[#000000FF]]></p:property><p:property name="strokeStyle"><![CDATA[0|]]></p:property><p:property name="textContent"><![CDATA[]]></p:property><p:property name="textFont"><![CDATA[Arial|normal|normal|12px|none]]></p:property><p:property name="textColor"><![CDATA[#FFFFFFFF]]></p:property><p:property name="textAlign"><![CDATA[1,1]]></p:property></p:metadata>
+
+            <defs>
+                <rect width="210" height="550" rx="7" ry="7" x="0" y="0" style="stroke-width: 0pt; fill: rgb(255, 255, 255); fill-opacity: 1; stroke: rgb(0, 0, 0); stroke-opacity: 1;" p:name="rrRect" id="rrRect21247050338773133" transform="translate(0)"/>
+                <filter height="1.2558399" y="-0.12792" width="1.06396" x="-0.03198" p:name="shadingFilter" id="shadingFilter21247050338773133">
+                    <feGaussianBlur stdDeviation="1" in="SourceAlpha"/>
+                </filter>
+            </defs>
+            <use xlink:href="#rrRect21247050338773133" xmlns:xlink="http://www.w3.org/1999/xlink" transform="translate(2, 2)" p:filter="url(#shadingFilter21247050338773133)" style="opacity: 0.5; visibility: hidden;" p:heavy="true" p:name="bgCopy" id="bgCopy21247050338773133"/>
+            <use xlink:href="#rrRect21247050338773133" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+            <foreignObject x="10" y="275" width="190" height="0" p:name="text" id="text21247050338773133" style="font-family: Arial; font-size: 12px; font-weight: normal; font-style: normal; text-decoration: none; fill: rgb(255, 255, 255); fill-opacity: 1; color: rgb(255, 255, 255); opacity: 1; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml"/></foreignObject><path id="text21247050338773_underline133" style="fill: none; stroke-width: 1px; visibility: hidden;"/>
+        </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.Common:RoundedRect" transform="matrix(1, 0, 0, 1, 15, 8)"><p:metadata><p:property name="box"><![CDATA[995,72]]></p:property><p:property name="withBlur"><![CDATA[false]]></p:property><p:property name="radius"><![CDATA[7,0]]></p:property><p:property name="textPadding"><![CDATA[0,10]]></p:property><p:property name="fillColor"><![CDATA[#FFFFFFFF]]></p:property><p:property name="strokeColor"><![CDATA[#000000FF]]></p:property><p:property name="strokeStyle"><![CDATA[0|]]></p:property><p:property name="textContent"><![CDATA[]]></p:property><p:property name="textFont"><![CDATA[Arial|normal|normal|12px|none]]></p:property><p:property name="textColor"><![CDATA[#FFFFFFFF]]></p:property><p:property name="textAlign"><![CDATA[1,1]]></p:property></p:metadata>
+
+            <defs>
+                <rect width="995" height="72" rx="7" ry="7" x="0" y="0" style="stroke-width: 0pt; fill: rgb(255, 255, 255); fill-opacity: 1; stroke: rgb(0, 0, 0); stroke-opacity: 1;" p:name="rrRect" id="rrRect21247050338773112" transform="translate(0)"/>
+                <filter height="1.2558399" y="-0.12792" width="1.06396" x="-0.03198" p:name="shadingFilter" id="shadingFilter21247050338773112">
+                    <feGaussianBlur stdDeviation="1" in="SourceAlpha"/>
+                </filter>
+            </defs>
+            <use xlink:href="#rrRect21247050338773112" xmlns:xlink="http://www.w3.org/1999/xlink" transform="translate(2, 2)" p:filter="url(#shadingFilter21247050338773112)" style="opacity: 0.5; visibility: hidden;" p:heavy="true" p:name="bgCopy" id="bgCopy21247050338773112"/>
+            <use xlink:href="#rrRect21247050338773112" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+            <foreignObject x="10" y="36" width="975" height="0" p:name="text" id="text21247050338773112" style="font-family: Arial; font-size: 12px; font-weight: normal; font-style: normal; text-decoration: none; fill: rgb(255, 255, 255); fill-opacity: 1; color: rgb(255, 255, 255); opacity: 1; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml"/></foreignObject><path id="text21247050338773112_underline" style="fill: none; stroke-width: 1px; visibility: hidden;"/><path id="text21247050338773_underline112" style="fill: none; stroke-width: 1px; visibility: hidden;"/>
+        </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.Common:RoundedRect" transform="matrix(1, 0, 0, 1, 15, 655)"><p:metadata><p:property name="box"><![CDATA[995,72]]></p:property><p:property name="withBlur"><![CDATA[false]]></p:property><p:property name="radius"><![CDATA[7,0]]></p:property><p:property name="textPadding"><![CDATA[0,10]]></p:property><p:property name="fillColor"><![CDATA[#FFFFFFFF]]></p:property><p:property name="strokeColor"><![CDATA[#000000FF]]></p:property><p:property name="strokeStyle"><![CDATA[0|]]></p:property><p:property name="textContent"><![CDATA[]]></p:property><p:property name="textFont"><![CDATA[Arial|normal|normal|12px|none]]></p:property><p:property name="textColor"><![CDATA[#FFFFFFFF]]></p:property><p:property name="textAlign"><![CDATA[1,1]]></p:property></p:metadata>
+
+            <defs>
+                <rect width="995" height="72" rx="7" ry="7" x="0" y="0" style="stroke-width: 0pt; fill: rgb(255, 255, 255); fill-opacity: 1; stroke: rgb(0, 0, 0); stroke-opacity: 1;" p:name="rrRect" id="rrRect2124705033877311249" transform="translate(0)"/>
+                <filter height="1.2558399" y="-0.12792" width="1.06396" x="-0.03198" p:name="shadingFilter" id="shadingFilter2124705033877311249">
+                    <feGaussianBlur stdDeviation="1" in="SourceAlpha"/>
+                </filter>
+            </defs>
+            <use xlink:href="#rrRect2124705033877311249" xmlns:xlink="http://www.w3.org/1999/xlink" transform="translate(2, 2)" p:filter="url(#shadingFilter2124705033877311249)" style="opacity: 0.5; visibility: hidden;" p:heavy="true" p:name="bgCopy" id="bgCopy2124705033877311249"/>
+            <use xlink:href="#rrRect2124705033877311249" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+            <foreignObject x="10" y="36" width="975" height="0" p:name="text" id="text2124705033877311249" style="font-family: Arial; font-size: 12px; font-weight: normal; font-style: normal; text-decoration: none; fill: rgb(255, 255, 255); fill-opacity: 1; color: rgb(255, 255, 255); opacity: 1; text-align: center;"><div xmlns="http://www.w3.org/1999/xhtml"/></foreignObject><path id="text21247050338773112_underline49" style="fill: none; stroke-width: 1px; visibility: hidden;"/><path id="text21247050338773_underline11249" style="fill: none; stroke-width: 1px; visibility: hidden;"/>
+        </g></Content></Page></Pages></Document>
 \ No newline at end of file
@@ -60,10 +60,8 @@ class KTDownloadManager
 		$this->age = $config->get('webservice/downloadExpiry',5);
  
 		$protocol = $config->get('KnowledgeTree/sslEnabled')?'https':'http';
-		$server = KTUtil::getServerName(TRUE);
-		$url = $config->get('webservice/downloadUrl');
  
-		$this->download_url = $protocol . '://' . $server . $url;
+		$this->download_url = $protocol . '://' . $_SERVER['HTTP_HOST'] . $config->get('webservice/downloadUrl');
 		$this->random=$config->get('webservice/randomKeyText','jhsdf8q1jkjpoiudfs7sd3ds1');
 	}
  
@@ -110,7 +110,6 @@ class KTUploadManager
 		return ($tempdir == $this->temp_dir);
 		*/
     }
-    
 	function store_base64_file($base64, $prefix= 'sa_')
 	{
 		$tempfilename = $this->get_temp_filename($prefix);
@@ -134,36 +133,6 @@ class KTUploadManager
  
 		return $tempfilename;
 	}
-    
-    /**
-     * 
-     * @param string $content file content NOT base64 encoded (may be string, may be binary)
-     * @param string $prefix [optional]
-     * @return $tempfilename the name of the temporary file created
-     */
-    function store_file($content, $prefix= 'sa_')
-	{
-		$tempfilename = $this->get_temp_filename($prefix);
-		if (!is_writable($tempfilename))
-		{
-			return new PEAR_Error("Cannot write to file: $tempfilename");
-		}
-
-		if (!$this->is_valid_temporary_file($tempfilename))
-		{
-			return new PEAR_Error("Invalid temporary file: $tempfilename. There is a problem with the temporary storage path: $this->temp_dir.");
-		}
-
-		$fp=fopen($tempfilename, 'wb');
-		if ($fp === false)
-		{
-			return new PEAR_Error("Cannot write content to temporary file: $tempfilename.");
-		}
-		fwrite($fp, $content);
-		fclose($fp);
-
-		return $tempfilename;
-	}
  
 	/**
 	 * This tells the manager to manage a file that has been uploaded.
@@ -77,7 +77,7 @@ $response = $download_manager-&gt;download($document_id, $hash, null, $apptype);
 if (PEAR::isError($response))
 {
 	$msg = urlencode($response->getMessage());
-	print "status_code=4&msg=$msg";
+	print "status_code=4&msg=$msg:".$_GET["u"].":".$_GET["d"].":".$_GET["code"].":".$_GET["apptype"].":";
 	exit;
 }
  
@@ -117,6 +117,7 @@ foreach($_FILES as $key =&gt;$file)
 	$tempfile=$file['tmp_name'];
  
 	$error=$file['error'];
+    $extra = $filename.'-'.$tempfile.'-'.$error;
 	if ($error == UPLOAD_ERR_OK)
 	{
 		$result = $upload_manager->uploaded($filename, $tempfile, $action);
@@ -145,7 +146,7 @@ if ($failed)
 }
 else
 {
-	respond(0, '', $added);
+	respond(0, 'It worked'.$extra, $added);
 }
  
 function respond($code, $msg, $uploads=array())
@@ -280,6 +280,7 @@ class InstallUtil {
  
         if(is_writable($dir)){
             $ret['class'] = 'tick';
+            
             return $ret;
         }
  
@@ -357,6 +358,14 @@ class InstallUtil {
     	return true;
     }
  
+    /**
+     * Attempt using the php-java bridge
+     *
+	 * @author KnowledgeTree Team
+     * @access public
+     * @param none
+     * @return boolean
+     */
     public function javaBridge() {
 		try {
     		$javaSystem = new Java('java.lang.System');
@@ -365,8 +374,16 @@ class InstallUtil {
 		}
 		return true;
     }
-		
-    function tryJava1() {
+	
+    /**
+     * Attempt java detection
+     *
+	 * @author KnowledgeTree Team
+     * @access public
+     * @param none
+     * @return boolean
+     */
+    public function tryJava1() {
     	$response = $this->pexec("java -version"); // Java Runtime Check
     	if(empty($response['out'])) {
     		return false;
@@ -375,7 +392,15 @@ class InstallUtil {
     	return 'java';
     }
  
-    function tryJava2() {
+    /**
+     * Attempt java detection
+     *
+	 * @author KnowledgeTree Team
+     * @access public
+     * @param none
+     * @return boolean
+     */
+    public function tryJava2() {
     	$response = $this->pexec("java"); // Java Runtime Check
     	if(empty($response['out'])) {
     		return false;
@@ -384,7 +409,15 @@ class InstallUtil {
     	return 'java';
     }
  
-    function tryJava3() {
+    /**
+     * Attempt java detection
+     *
+	 * @author KnowledgeTree Team
+     * @access public
+     * @param none
+     * @return boolean
+     */
+    public function tryJava3() {
     	$response = $this->pexec("whereis java"); // Java Runtime Check
     	if(empty($response['out'])) {
     		return false;
@@ -454,7 +487,7 @@ class InstallUtil {
     			$response = $this->tryJava3();
     		}
     	}
-		
+//		return false;
     	return $response;
     }
  
@@ -468,7 +501,16 @@ class InstallUtil {
 	*/
     function getPhp() {
 		$cmd = "whereis php";
-		$response = $this->pexec($cmd);
+		$res = $this->getPhpHelper($cmd);
+		if($res != '') {
+			return $res;
+		}
+		$cmd = "which php";
+		return $this->getPhpHelper($cmd);
+    }
+    
+    function getPhpHelper($cmd) {
+    	$response = $this->pexec($cmd);
 		if(is_array($response['out'])) {
 			if (isset($response['out'][0])) {
 				$broke = explode(' ', $response['out'][0]);
@@ -481,7 +523,7 @@ class InstallUtil {
 			}
 		}
  
-		return '';
+		return '';    	
     }
  
     function getOpenOffice() {
@@ -180,6 +180,7 @@ class unixLucene extends unixService {
  
     public function start() {
     	$state = $this->status();
+    	return ;
     	if($state != 'STARTED') {
 	    	$cmd = "cd ".$this->getLuceneDir()."; ";
 	    	$cmd .= "nohup java -jar ".$this->getLuceneSource()." > ".SYS_LOG_DIR."lucene.log 2>&1 & echo $!";
@@ -125,6 +125,7 @@ class unixOpenOffice extends unixService {
  
     public function start() {
     	$state = $this->status();
+    	return ;
     	if($state != 'STARTED') {
 			$cmd = "nohup {$this->getBin()} ".$this->getOption()." > ".SYS_LOG_DIR."{$this->getLog()} 2>&1 & echo $!";
 	    	$response = $this->util->pexec($cmd);
@@ -150,6 +150,7 @@ class unixScheduler extends unixService {
 	function start() {
 		// TODO : Write sh on the fly? Not sure the reasoning here
 		$source = $this->getSchedulerSourceLoc();
+		return ;
 		if($source) { // Source
 			$cmd = "nohup ".$source." > ".SYS_LOG_DIR."scheduler.log 2>&1 & echo $!";
 	    	$response = $this->util->pexec($cmd);
-java version "1.6.0_14"
-Java(TM) SE Runtime Environment (build 1.6.0_14-b08)
-Java HotSpot(TM) Client VM (build 14.0-b16, mixed mode, sharing)
@@ -299,6 +299,11 @@ select {
 	margin-top:10px;
 }
  
+.textinput {
+	margin-top:0px;
+	float:left;
+}
+
 .step input {
 	background-image: url("graphics/dame/kt_gradient.jpg");
 	background-repeat:repeat-x;
@@ -326,11 +331,6 @@ select {
 	margin-top:10px;
 }
  
-.textinput {
-	margin-top:0px;
-	float:left;
-}
-
 .buttons a {
     background: #DDDDDD;
     border: solid 1px #888;
@@ -528,4 +528,12 @@ td.dir_description {
 .description_click {
     line-height:150%;
     font-size:90%;
+}
+
+.specify {
+    background: #DDDDDD;
+    border: solid 1px #888;
+    padding: 2px 8px 2px 5px;
+    text-decoration: none;
+    color: #EC7725;
 }
 \ No newline at end of file
@@ -5,18 +5,20 @@ function wizard() {
 // Does a form check on every new page load
 wizard.prototype.doFormCheck = function() {
 	w.addReadOnly();
-	w.load();
+	w.preload();
 }
  
 // Toggle Advance Database options
-wizard.prototype.toggleClass = function(el, option) {
-	var el = document.getElementsByClassName(el); //adv_options|php_details|php_ext_details|php_con_details
+wizard.prototype.toggleClass = function(ele, option) {
+	var el = document.getElementsByClassName(ele); //adv_options|php_details|php_ext_details|php_con_details
 	if(el[0].style.display == 'none') {
 	    el[0].style.display = 'block';
-	    document.getElementById(option).innerHTML = "Hide Details";
+	    if(document.getElementById(option).innerHTML != '&nbsp;&nbsp;Advanced Options')
+	    	document.getElementById(option).innerHTML = "Hide Details";
 	} else {
 	    el[0].style.display = 'none';
-	    document.getElementById(option).innerHTML = "Show Details";
+	    if(document.getElementById(option).innerHTML != '&nbsp;&nbsp;Advanced Options')
+	    	document.getElementById(option).innerHTML = "Show Details";
 	}
 }
  
@@ -51,8 +53,9 @@ wizard.prototype.toggleElement = function(el) {
 		j = p-1;
 	}
 	el = document.getElementsByClassName("step"+j);
-	el[0].style.display = 'block';
-	
+	if(el != 'undefined') {
+		el[0].style.display = 'block';
+	}
 	return true;
 }
  
@@ -170,17 +173,26 @@ wizard.prototype.valRegHelper = function() {
 	var first = document.getElementById('first');
 	var last = document.getElementById('last');
 	var email = document.getElementById('email');
-	
-	if(first.value.length < 2) {
+	if(first.value.length < 1) {
 		document.getElementById("reg_error").innerHTML = "Please enter a First Name";
 		w.focusElement(first);
 		return false;
 	}
-	if(last.value.length < 2) {
+	if(!w.nameCheck(first.value)) {
+		document.getElementById("reg_error").innerHTML = "Please enter a valid First Name";
+		w.focusElement(first);
+		return false;
+	}
+	if(last.value.length < 1) {
 		document.getElementById("reg_error").innerHTML = "Please enter a Last Name";
 		w.focusElement(last);
 		return false;
 	}
+	if(!w.nameCheck(last.value)) {
+		document.getElementById("reg_error").innerHTML = "Please enter a valid Last Name";
+		w.focusElement(last);
+		return false;
+	}
 	if(!w.emailCheck(email.value)) {
 		document.getElementById("reg_error").innerHTML = "Please enter a valid email address";
 		w.focusElement(email);
@@ -190,8 +202,18 @@ wizard.prototype.valRegHelper = function() {
 	return true;
 }
  
+wizard.prototype.nameCheck = function(str) {
+	var nameRegxp = /^([a-zA-Z]+)$/;
+	if(str.match(nameRegxp)) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
 // Validate Registration Page Courtesy of SmartWebby.com (http://www.smartwebby.com/dhtml/)
 wizard.prototype.emailCheck = function(str) { 
+	str = w.trim(str);
 	var at="@";
 	var dot=".";
 	var lat=str.indexOf(at);
@@ -221,6 +243,20 @@ wizard.prototype.emailCheck = function(str) {
 	return true;
 }
  
+wizard.prototype.trim = function (str, chars) {
+	return w.ltrim(w.rtrim(str, chars), chars);
+}
+ 
+wizard.prototype.ltrim = function (str, chars) {
+	chars = chars || "\\s";
+	return str.replace(new RegExp("^[" + chars + "]+", "g"), "");
+}
+ 
+wizard.prototype.rtrim = function (str, chars) {
+	chars = chars || "\\s";
+	return str.replace(new RegExp("[" + chars + "]+$", "g"), "");
+}
+
 // Disable DnD on element
 // Element has to have a readOnly status set to readonly
 wizard.prototype.disableDnd = function(el_id) {
@@ -243,6 +279,6 @@ wizard.prototype.addReadOnly = function() {
 }
  
 /* */
-wizard.prototype.load = function() {
+wizard.prototype.preload = function() {
 //	$('#tooltips').tooltip();
 }
 \ No newline at end of file
@@ -168,7 +168,7 @@ class Step
 	* @return void
 	*/
     public function loadDefaults() {
-//        return '';
+		
     }
  
 	/**
@@ -47,17 +47,73 @@ class configuration extends Step
 	*
 	* @author KnowledgeTree Team
 	* @access private
-	* @var array
-	*/	
+	* @var object
+	*/
     private $_dbhandler = null;
+    
+	/**
+	* Database host
+	*
+	* @author KnowledgeTree Team
+	* @access private
+	* @var string
+	*/
     private $host;
+    
+	/**
+	* Database port
+	*
+	* @author KnowledgeTree Team
+	* @access private
+	* @var string
+	*/
     private $port;
+    
+	/**
+	* Relative path to knowledge tree directory
+	*
+	* @author KnowledgeTree Team
+	* @access private
+	* @var string
+	*/
     private $root_url;
+    
+	/**
+	* Absolute path to knowledge tree directory
+	*
+	* @author KnowledgeTree Team
+	* @access private
+	* @var string
+	*/
     private $file_system_root;
+    
+	/**
+	* Whether or not ssl is enabled
+	*
+	* @author KnowledgeTree Team
+	* @access private
+	* @var string
+	*/
     private $ssl_enabled;
+    
+	/**
+	* Whether or not the step is complete
+	*
+	* @author KnowledgeTree Team
+	* @access private
+	* @var string
+	*/
     private $done;
-	public $temp_variables = array("step_name"=>"configuration");
+	
+	/**
+	* Flag to store class information in session
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @var array
+	*/
 	public $displayFirst = true;
+	
 	/**
 	* Flag to store class information in session
 	*
@@ -66,6 +122,7 @@ class configuration extends Step
 	* @var array
 	*/
     protected $storeInSession = true;
+    
 	/**
 	* Flag if step needs to be installed
 	*
@@ -84,7 +141,26 @@ class configuration extends Step
 	*/
     protected $silent = false;
  
+	/**
+	* Flag if step needs to run silently
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @var array
+	*/
+    protected $error = array();
+    
+	/**
+	* List of paths
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @var array
+	*/
+    protected $paths = array();
+    
     protected $util = null;
+    
     /**
      * Class constructor
      *
@@ -99,21 +175,6 @@ class configuration extends Step
         $this->done = true;
     }
  
-    /**
-     * Set the variables from those stored in the session.
-     * Used for stepping back to the step from a future step.
-     *
-	 * @author KnowledgeTree Team
-     * @access private
-     */
-	private function setDetails() {
-		$conf = $this->getDataFromSession("configuration");
-		if($conf) {
-			$this->temp_variables['server'] = $conf['server'];
-			$this->temp_variables['paths'] = $conf['paths'];
-		}
-	}
-
 	/**
 	 * Control function for position within the step
 	 *
@@ -123,6 +184,7 @@ class configuration extends Step
 	 */
     public function doStep() {
     	if(!$this->inStep("configuration")) {
+    		$this->setDetails();
     		$this->doRun();
     		return 'landing';
     	}
@@ -133,26 +195,51 @@ class configuration extends Step
             }
             return 'error';
         } else if($this->previous()) {
-//        	$this->setDetails();
             return 'previous';
         } else if($this->confirm()) {
+        	$this->setDetails();
         	if($this->doRun()) {
             	return 'next';
         	}
         	return 'error';
         } else if($this->edit()) {
-        	//$this->setDetails();
-        	if($this->doRun()) {
-        		
+        	$this->setDetails();
+			if($this->doRun(true)) {
+        		return 'landing';
+        	} else {
+        		return 'error';
         	}
-//        	die;
-        	return 'landing';
         }
  
         $this->doRun();
         return 'landing';
     }
-
+#/var/www/installers/knowledgetree/config/config.ini
+    /**
+     * Set the variables from those stored in the session.
+     * Used for stepping back to the step from a future step.
+     *
+	 * @author KnowledgeTree Team
+     * @access private
+     * @param none
+	 * @return void
+     */
+	private function setDetails() {
+		$conf = $this->getDataFromSession("configuration");
+		if($conf) {
+			$this->temp_variables['server'] = $conf['server'];
+			$this->temp_variables['paths'] = $conf['paths'];
+		}
+	}
+	
+	/**
+	 * Default Template settings
+	 * 
+	 * @author KnowledgeTree Team
+     * @access public
+     * @param none
+	 * @return void
+	 */
     public function loadTemplateDefaults() {
     	$this->temp_variables['paths_perms'] = 'tick';
     }
@@ -164,13 +251,13 @@ class configuration extends Step
      * @access public
      * @return boolean True to continue | False if errors occurred
      */
-    public function doRun()
+    public function doRun($edit = false)
     {
         $server = $this->getServerInfo();
-        $this->temp_variables['server'] = $server;
+        if(!$edit) $this->temp_variables['server'] = $server;
  
         $paths = $this->getPathInfo($server['file_system_root']['value']);
-        $this->temp_variables['paths'] = $paths;
+        if(!$edit) $this->temp_variables['paths'] = $paths;
  
         // Running user
         // Logging
@@ -338,7 +425,11 @@ class configuration extends Step
      */
     private function getPathInfo($fileSystemRoot)
     {
-        $dirs = $this->getDirectories();
+        if(isset($this->temp_variables['paths'])) {
+        	$dirs = $this->temp_variables['paths']; // Pull from temp
+        } else {
+        	$dirs = $this->getDirectories(); // Get detected
+        }
         $varDirectory = $fileSystemRoot . DS . 'var';
         foreach ($dirs as $key => $dir){
             $path = (isset($_POST[$dir['setting']])) ? $_POST[$dir['setting']] : $dir['path'];
@@ -348,14 +439,16 @@ class configuration extends Step
             }
 			if(WINDOWS_OS)
             	$path = preg_replace('/\//', '\\',$path);
-
             	$dirs[$key]['path'] = $path;
             $class = $this->util->checkPermission($path, $dir['create']);
-            
 			if($class['class'] != 'tick') {
 				$this->temp_variables['paths_perms'] = $class['class'];
 				$this->done = false;
-				$this->error[] = "path error";
+				$this->error[] = "Path error";
+			}
+			if(isset($class['msg'])) {
+				$this->done = false;
+				$this->error[] = $class['msg'];
 			}
             $dirs[$key] = array_merge($dirs[$key], $class);
         }
@@ -381,8 +474,24 @@ class configuration extends Step
                 array('name' => 'Temporary Directory', 'setting' => 'tmpDirectory', 'path' => '${varDirectory}/tmp', 'create' => true),
                 array('name' => 'Uploads Directory', 'setting' => 'uploadDirectory', 'path' => '${varDirectory}/uploads', 'create' => true),
                 array('name' => 'Executables Directory', 'setting' => 'binDirectory', 'path' => '${fileSystemRoot}/bin', 'create' => false),
-                array('name' => 'Configuration File', 'setting' => '', 'path' => '${fileSystemRoot}/config/config.ini', 'create' => false),
+                array('name' => 'Configuration File', 'setting' => 'configFile', 'path' => '${fileSystemRoot}/config/config.ini', 'create' => false),
                 );
     }
+    
+    private function setFromPost() {
+    	$this->paths = array(
+                array('name' => 'Var Directory', 'setting' => 'varDirectory', 'path' => $_POST['varDirectory'], 'create' => false),
+                array('name' => 'Document Directory', 'setting' => 'documentRoot', 'path' => $_POST['documentRoot'], 'create' => true),
+                array('name' => 'Log Directory', 'setting' => 'logDirectory', 'path' => $_POST['logDirectory'], 'create' => true),
+                array('name' => 'Temporary Directory', 'setting' => 'tmpDirectory', 'path' => $_POST['tmpDirectory'], 'create' => true),
+                array('name' => 'Uploads Directory', 'setting' => 'uploadDirectory', 'path' => $_POST['uploadDirectory'], 'create' => true),
+                array('name' => 'Executables Directory', 'setting' => 'binDirectory', 'path' => $_POST['binDirectory'], 'create' => false),
+                array('name' => 'Configuration File', 'setting' => 'configFile', 'path' => $_POST['configFile'], 'create' => false),
+    	);
+    }
+    
+    public function getFromPost() {
+    	return $this->paths;
+    }
 }
 ?>
 \ No newline at end of file
@@ -196,15 +196,6 @@ class database extends Step
     private $ddrop = false;
  
 	/**
-	* List of variables needed
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @var array
-	*/
-    public $temp_variables = array("step_name"=>"database");
-    
-	/**
 	* List of errors encountered
 	*
 	* @author KnowledgeTree Team
@@ -315,6 +306,8 @@ class database extends Step
 			return 'next';
         } else if($this->edit()) {
             $this->setDataFromSession("database"); // Set Session Information, since its an edit
+            $this->temp_variables['state'] = 'edit';
+            
             return 'landing';
         }
     }
@@ -469,6 +462,11 @@ class database extends Step
 	* @return void
 	*/
    private function setDetails() {
+   		if($this->edit()) {
+   			$this->temp_variables['state'] = 'edit';
+   		} else {
+   			$this->temp_variables['state'] = '';
+   		}
    		$this->temp_variables['dtype'] = $this->getPostSafe('dtype');
         $this->temp_variables['dtypes'] = array("0"=>"mysql"); // TODO:multiple databases;
         $this->temp_variables['dhost'] = $this->getPostSafe('dhost');
@@ -42,6 +42,15 @@
  
 class registration extends Step
 {
+	/**
+	* Flag to store class information in session
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @var array
+	*/
+    public $storeInSession = true;
+    
     /**
      * Initialise the registration step
      *
@@ -63,7 +72,9 @@ class registration extends Step
     public function doStep()
     {
         $this->setFormInfo();
+        $this->loadFromSession();
 		if(!$this->inStep("registration")) {
+			$this->loadFromSession();
 			return 'landing';
 		}
 		if($this->next()) {
@@ -71,14 +82,48 @@ class registration extends Step
 		        return 'confirm';
 	        return 'error';
 		} else if($this->previous()) {
+
 		    return 'previous';
 		}else if($this->confirm()) {
  
 		    return 'next';
 		}
+		
 		return 'landing';
     }
  
+    public function loadFromSession() {
+    	$reg = $this->getDataFromSession('registration');
+        $this->temp_variables['first_name'] = $this->getPostSafe($reg['first_name']);
+    	$this->temp_variables['last_name'] = $this->getPostSafe($reg['last_name']);
+    	$this->temp_variables['email_address'] = $this->getPostSafe($reg['email_address']);
+    	$this->temp_variables['sel_country'] = $this->getPostSafe($reg['sel_country']);
+    	$this->temp_variables['sel_industry'] = $this->getPostSafe($reg['sel_industry']);
+    	$this->temp_variables['sel_organization_size'] = $this->getPostSafe($reg['sel_organization_size']);
+    }
+    
+	/**
+	* Safer way to return post data
+	*
+	* @author KnowledgeTree Team
+	* @params SimpleXmlObject $simplexml
+	* @access public
+	* @return void
+	*/
+    public function getPostSafe($key) {
+    	$value = isset($key) ? $key : "";
+    	return $value;
+    }
+    
+    public function setInSession() {
+        $this->temp_variables['first_name'] = $_POST['submitted']['first_name'];
+    	$this->temp_variables['last_name'] = $_POST['submitted']['last_name'];
+    	$this->temp_variables['email_address'] = $_POST['submitted']['email_address'];
+    	$this->temp_variables['sel_country'] = $_POST['submitted']['country'];
+    	$this->temp_variables['sel_industry'] = $_POST['submitted']['industry'];
+    	$this->temp_variables['sel_organization_size'] = $_POST['submitted']['organization_size'];
+    }
+    
     /**
      * Execute the step action to register the user. If the user has already registered then the step will return.
      *
@@ -91,13 +136,14 @@ class registration extends Step
         if(isset($_POST['registered']) && $_POST['registered'] == 'yes'){
             return true;
         }
-return true;
+		$this->setInSession();
+		return true;
 	    //$this->postForm($_POST);
 	    //$this->sendToHost($_POST);
  
 	    // Post the form using curl
         $this->curlForm($_POST);
-
+		
         // Prevent the form being reposted.
         $_POST['registered'] = 'yes';
 	    return true;
@@ -500,5 +546,17 @@ return true;
         $this->temp_variables['industries'] = $industries;
         $this->temp_variables['org_size'] = $sizes;
     }
+    
+    /**
+     * Return whether or not to store a step information in session
+     * 
+     * @author KnowledgeTree Team
+     * @param none
+     * @access public
+     * @return boolean
+     */
+    public function storeInSession() {
+    	return $this->storeInSession;
+    }
 }
 ?>
 \ No newline at end of file
@@ -123,6 +123,9 @@ class services extends Step
 	* @var mixed
 	*/
     private $javaCheck = 'cross';
+
+    
+    public $providedJava = false;
  
 	/**
 	* Flag if services are already Installed
@@ -215,7 +218,7 @@ class services extends Step
     private $disableExtension = false;
  
 	/**
-	* Holds path error, if java is specified
+	* Flag, if java is specified and an error has been encountered
 	*
 	* @author KnowledgeTree Team
 	* @access public
@@ -224,6 +227,15 @@ class services extends Step
     private $javaExeError = '';
  
 	/**
+	* Holds path error, if java is specified
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @var mixed
+	*/
+    private $javaExeMessage = '';
+    
+	/**
 	* Holds path error, if php is specified
 	*
 	* @author KnowledgeTree Team
@@ -257,16 +269,21 @@ class services extends Step
     		$this->doRun();
     		return 'landing';
     	}
-        // Check dependencies
-        $passed = $this->doRun();
         if($this->next()) {
-            if($passed)
+	        // Check dependencies
+	        $passed = $this->doRun();
+	        $serv = $this->getDataFromSession("services");
+//	        var_dump($conf);
+//	        die;
+            if($passed || $serv['providedJava'])
                 return 'next';
             else
                 return 'error';
         } else if($this->previous()) {
             return 'previous';
         }
+        
+        $passed = $this->doRun();
         return 'landing';
     }
  
@@ -406,14 +423,17 @@ class services extends Step
 		$this->setJava(); // Check if java has been auto detected
     	if($this->util->javaSpecified()) {
     		$this->disableExtension = true; // Disable the use of the php bridge extension
-    		return $this->detSettings(); // AutoDetect java settings
+    		if($this->detSettings(true)) { // AutoDetect java settings
+    			return true;
+    		} else {
+    			$this->specifyJava(); // Ask for settings
+    		}
     	} else {
     		$auto = $this->useBridge(); // Use Bridge to get java settings
     		if($auto) {
 				return $auto;
     		} else {
-    			// Check if auto detected java works
-    			$auto = $this->useDetected();
+    			$auto = $this->useDetected(); // Check if auto detected java works
     			if($auto) {
     				$this->disableExtension = true; // Disable the use of the php bridge extension
     				return $auto;
@@ -434,7 +454,7 @@ class services extends Step
 	* @return boolean
 	*/
     private function useDetected() {
-    	return $this->detSettings(true);
+    	return $this->detSettings();
     }
  
     private function specifyJava() {
@@ -480,24 +500,34 @@ class services extends Step
 	    		if($matches[1] < $this->javaVersion) { // Check Version of java
 					$this->javaVersionInCorrect();
 					$this->javaCheck = 'cross';
-					if(!$attempt) $this->error[] = "Requires Java 1.5+ to be installed";
+					$this->error[] = "Requires Java 1.5+ to be installed";
+					
 					return false;
 	    		} else {
 					$this->javaVersionCorrect();
 					$this->javaInstalled();
 					$this->javaCheck = 'tick';
+					$this->providedJava = true;
  
 					return true;
 	    		}
     		} else {
     			$this->javaVersionWarning();
     			$this->javaCheck = 'cross_orange';
-    			$this->javaExeError = "Java : Incorrect path specified";
-				if(!$attempt) $this->error[] = "Requires Java 1.5+ to be installed";
+    			if($attempt) {
+	    			$this->javaExeMessage = "Incorrect java path specified";
+	    			$this->javaExeError = true;
+	    			$this->error[] = "Requires Java 1.5+ to be installed";
+    			}
+				
+				
 				return false;
     		}
     	}
  
+		$this->javaVersionInCorrect();
+		$this->javaCheck = 'cross';
+		$this->error[] = "Requires Java 1.5+ to be installed";
     	return false;
     }
  
@@ -875,6 +905,7 @@ class services extends Step
     	$this->temp_variables['luceneInstalled'] = $this->luceneInstalled;
     	$this->temp_variables['schedulerInstalled'] = $this->schedulerInstalled;
 		$this->temp_variables['javaExeError'] = $this->javaExeError;
+		$this->temp_variables['javaExeMessage'] = $this->javaExeMessage;
 		$this->temp_variables['javaCheck'] = $this->javaCheck;
 		$this->temp_variables['javaExtCheck'] = $this->javaExtCheck;
 		// TODO : PHP detection
@@ -882,6 +913,8 @@ class services extends Step
 		$this->temp_variables['phpExeError'] = '';//$this->phpExeError;
 		$this->temp_variables['serviceCheck'] = $this->serviceCheck;
 		$this->temp_variables['disableExtension'] = $this->disableExtension;
+		// TODO: Java checks are gettign intense
+		$this->temp_variables['providedJava'] = $this->providedJava;
     }
  
     private function setPhp() {
@@ -17,7 +17,7 @@
 	<!--Warning and Error Messages-->
 	<?php if($errors) { ?>
 		<span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-		<span class='error_message'>Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. Once you&rsquo;ve fixed these items, return to this wizard and try again.</span>
+		<span class='error_message'>Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. </span>
 		<br/>
 	<?php } elseif ($warnings) {
 		?>
@@ -84,7 +84,7 @@
 	</p>
 	<table>
 	<?php
-		if($errors && $warnings) {
+		if($errors || $warnings) {
 			$width = "290px";
 		} else {
 			$width = "520px";
@@ -98,7 +98,7 @@
 	    		<?php if(isset($path['msg'])) {
 	    			?>
 	    			<td class="error"> <?php echo $path['msg']; ?> </td>
-	    			<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
+<!--	    			<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>-->
 	    			<?php
 	    		} else {
 	    			?>
@@ -11,7 +11,7 @@
 <!--Warning and Error Messages-->
 	<?php if($errors) { ?>
 		<span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-		<span class='error_message'>Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. Once you&rsquo;ve fixed these items, return to this wizard and try again.</span>
+		<span class='error_message'>Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address.</span>
 		<br/>
 	<?php } elseif ($warnings) {
 		?>
@@ -12,37 +12,44 @@
 	user on the database server are required in order to be able to configure and install the installation database.
 	</div>
 	<div id="step_content_database" class="step">
+	
 	<table class="dbconf">
+	<?php
+		$input_size = '45';
+		$align = 'left';
+	?>
 <!--	TODO: Different Databases-->
+<?php if($state != 'edit') { ?>
 	    <tr><td>Your current database type is: </td>
 		<?php if($dtypes) {
 		        foreach($dtypes as $k=>$v) {
 		    ?><td>
 		    	&nbsp;
-		    	<?php echo ucwords($v);?>
+		    	<?php echo ucwords($v)." (Currently the only supported database.)";?>
 		    	<input type="hidden" name="dtype" value="<?php echo $v; ?>" <?php if(!$k)echo 'checked="checked"'; ?>/>
 		    	</td>
 		<?php }
 		}
 		?>
 		</tr>
+<?php } ?>
 		    <tr>
 		        <td><label for='dname'>Enter a name for the database: </label></td>
-		        <td><input type='text' value="<?php echo $dname?>" id='dname' name='dname' size='45'/></td>
+		        <td><input type='text' value="<?php echo $dname?>" id='dname' name='dname' size='<?php echo $input_size; ?>' style="float:left"/></td>
 		        <td id="error" class="error"><?php if($errors['dname']) echo $errors['dname']; ?></td>
 		    </tr>
 		    <tr>
 		        <td><label for='duname'>Enter Database Administrative username: </label></td>
-		        <td><input type='text' value="<?php echo $duname?>" id='duname' name='duname' size='45' /></td>
+		        <td><input type='text' value="<?php echo $duname?>" id='duname' name='duname' size='<?php echo $input_size; ?>' style="float:left"/></td>
 		        <td id="error" class="error"><?php if($errors['duname']) echo $errors['duname']; ?></td>
 		    </tr>
 		    <tr>
 		        <td><label for='dpassword'>Enter the password for the user: </label></td>
-		        <td><input type='password' value="<?php echo $dpassword?>" id='dpassword' name='dpassword' size='45' /></td>
+		        <td><input type='password' value="<?php echo $dpassword?>" id='dpassword' name='dpassword' size='<?php echo $input_size; ?>' style="float:left"/></td>
 		        <td id="error" class="error"><?php if($errors['dpassword']) echo $errors['dpassword']; ?></td>
 		    </tr>
 	</table>
-
+<br/><br/>
 	<div id="option3" class="onclick" onclick="javascript:{w.toggleClass('adv_options', 'option3');}">&nbsp;&nbsp;Advanced Options</div>
 	<div id="database" class="adv_options" style="display:none;">
 	    <div class="description">
@@ -52,7 +59,7 @@
 	    	<tr>
 	    		<td width="10px"> <label for='dhost'>Host: </label> </td>
 	    		<td width="205px"> <div id="tooltips" title="The address of the server where the database is located, if different to the current server">&nbsp;</div> </td>
-	    		<td width="10px"> <input type="text" value="<?php echo $dhost?>" id="dhost" name="dhost" size='45' class="textinput"/> </td>
+	    		<td width="10px"> <input type="text" value="<?php echo $dhost?>" id="dhost" name="dhost" size='<?php echo $input_size; ?>' class="textinput"/> </td>
 	    	</tr>
 	    	<tr>
 	    		<td> <label for='dport'>Port: </label> </td>
@@ -62,7 +69,7 @@
 	    	<tr>
 	    		<td> <label for='dbbinary'>Socket: </label> </td>
 	    		<td> <div id="tooltips" title="The path to the database binary. If it is not on your system path then please enter it here">&nbsp;</div> </td>
-	    		<td> <input type="text" value="<?php echo $dbbinary?>" id="dbbinary" name="dbbinary" size='45' class="textinput"/> </td>
+	    		<td> <input type="text" value="<?php echo $dbbinary?>" id="dbbinary" name="dbbinary" size='<?php echo $input_size; ?>' class="textinput"/> </td>
 	    	</tr>
 	    </table>
 	</div>
@@ -2,7 +2,7 @@
 <p class="title">Confirming Database Configurations</p>
  
 	<div class="description">
-	Please confirm whether KnowledgeTree has correctly determined your database settings before proceeding.
+	Please 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>
 	<div id="step_content_database_confirm" class="step">
 		<h3><b>Database Settings</b></h3>
@@ -17,7 +17,7 @@
 		    <tr>
 		        <td width="153px">Database Type: </td>
 		        <td width="15px"> <div id="tooltips" title="Type of database being used.">&nbsp;</div> </td>
-		        <td><?php echo $type; ?></td>
+		        <td><?php echo $type." (Currently the only supported database.)"; ?></td>
 		    </tr>
 		<?php } ?>
 		    <tr>
@@ -69,7 +69,7 @@
 		<?php } ?>
 		</table>
  
-		<h3><b>Database Users</b></h3>
+		<h3><b>Database Users (System Generated)</b></h3>
  
 		<table class="dbconf">
 		    <?php //if (!$silent) { ?>
@@ -17,7 +17,7 @@
 <!--Warning and Error Messages-->
 	<?php if($errors) { ?>
 		<span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-		<span class='error_message'>Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. Once you&rsquo;ve fixed these items, return to this wizard and try again.</span>
+		<span class='error_message'>Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. </span>
 		<br/>
 	<?php } elseif ($warnings) { ?>
 			<span class='cross_orange'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
 <form id="registration" action="index.php?step_name=<?php echo $step_name; ?>" method="post" onsubmit="w.validateRegistration();return false;">
 	<p class="title">Registering KnowledgeTree</p>
-	
+	<?php
+		//echo $sel_country;
+	?>
 	<p class="description">
-	Register with KnowledgeTree to receive important product updates. <b>We respect your privacy and will not share your information with third parties. For more information, please refer to our Privacy and Data Retention Policies.</b>
+	Register with KnowledgeTree to receive important product updates.
 	<a href="index.php?step_name=install">Skip Registration</a>
 	</p>
 	<!-- Hidden Fields -->
@@ -20,18 +22,18 @@
 		    <tr>
 		        <td><label for='first'>First Name</label></td>
 		        <td rowspan='6' width='5%'>&nbsp;</td>
-		        <td><input name='submitted[first_name]' id='first' size='<?php echo $input_width; ?>' style="float:left;"/></td>
+		        <td><input value="<?php echo $first_name; ?>" name='submitted[first_name]' id='first' size='<?php echo $input_width; ?>' style="float:left;"/></td>
 		        <td rowspan='6' width='5%'>&nbsp;</td>
 		        <td rowspan='6'> <img src='resources/graphics/dropbox.png' /> </td>
 		    </tr>
  
 		    <tr>
 		        <td><label for='last'>Last Name</label></td>
-		        <td><input name='submitted[last_name]' id='last' size='<?php echo $input_width; ?>' style="float:left;"/></td>
+		        <td><input value="<?php echo $last_name; ?>" name='submitted[last_name]' id='last' size='<?php echo $input_width; ?>' style="float:left;"/></td>
 		    </tr>
 		    <tr>
 		        <td><label for='email'>Email Address</label></td>
-		        <td><input name='submitted[email_address]' id='email' size='<?php echo $input_width; ?>' style="float:left;"/></td>
+		        <td><input value="<?php echo $email_address; ?>" name='submitted[email_address]' id='email' size='<?php echo $input_width; ?>' style="float:left;"/></td>
 		    </tr>
 		    <tr>
 		        <td><label for='country'>Country</label></td>
@@ -40,7 +42,12 @@
 		                <?php
 		                    $str = '';
 		                    foreach ($countries as $code => $country) {
-		                        $str .= "<option name='{$code}' value='{$country}'>{$country}</option>";
+		                    	if ($sel_country == $country) {
+		                    		$str .= "<option name='{$code}' value='{$country}' selected='selected'>{$country}</option>";
+		                    	} else {
+		                    		$str .= "<option name='{$code}' value='{$country}'>{$country}</option>";
+		                    	}
+		                        
 		                    }
  
 		                    echo $str;
@@ -55,7 +62,11 @@
 		                <?php
 		                    $str = '';
 		                    foreach ($industries as $code => $industry) {
-		                        $str .= "<option name='{$code}' value='{$industry}'>{$industry}</option>";
+		                    	if ($sel_industry == $industry) {
+		                    		$str .= "<option name='{$code}' value='{$industry}' selected='selected'>{$industry}</option>";
+		                    	} else {
+		                        	$str .= "<option name='{$code}' value='{$industry}'>{$industry}</option>";
+		                    	}
 		                    }
  
 		                    echo $str;
@@ -70,7 +81,11 @@
 		                <?php
 		                    $str = '';
 		                    foreach ($org_size as $code => $size) {
-		                        $str .= "<option name='{$code}' value='{$size}'>{$size}</option>";
+	                    		if ($sel_organization_size == $size) {
+	                    			$str .= "<option name='{$code}' value='{$size}' selected='selected'>{$size}</option>";
+	                    		} else {
+		                        	$str .= "<option name='{$code}' value='{$size}'>{$size}</option>";
+	                    		}
 		                    }
  
 		                    echo $str;
-<form action="index.php?step_name=services" method="post">
+<form action="index.php?step_name=services" method="post" id="services">
+	<?php //if($javaExeError != '' || $phpExeError != '') { 
+		//var_dump($javaExeError);
+		//if($errors) $top = "185px"; elseif ($warnings) $top = "185px"; else $top = "168px";
+		?>
+<!--		<input type="submit" name="Next" value="Submit" id="inner_button" style="top:<?php //echo $top; ?>"/>-->
+	<?php //} ?>
 	<p class="title">Checking Service Dependencies</p>
  
 	<p class="description">
@@ -17,7 +23,7 @@
 <!--Warning and Error Messages-->
 	<?php if($errors) { ?>
 		<span class='cross'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-		<span class='error_message'>Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address. Once you&rsquo;ve fixed these items, return to this wizard and try again.</span>
+		<span class='error_message'>Your system is not quite ready to run KnowledgeTree. See the list below to determine which areas you need to address.</span>
 		<br/>
 	<?php } elseif ($warnings) {
 		?>
@@ -28,18 +34,22 @@
 	}?>
 	<?php
 		if($errors || $warnings) {
+//			var_dump($errors);
 			?>
 		    	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://wiki.knowledgetree.com/Web_Based_Installer#Service_Dependencies" target="_blank">Click here for help on overcoming service issues</a>
 	<?php } ?>
 <!--Content-->
 	<div id="step_content_configuration" style="width:755px;" class="step">
 		<?php if(!$alreadyInstalled) { ?>
-			<?php if($javaExeError != '') { ?>
+			<?php //var_dump($javaExeError); ?>
+			<?php if($javaExeError) { ?>
 				Specify the location of your Java executable
 				&nbsp;&nbsp;&nbsp;
 				<input name='java' id='port' size='25' value='<?php echo $java['location']; ?>' style="float:none;"/>
 				&nbsp;&nbsp;&nbsp;
-				<?php if($javaExeError != true) { ?><span class="error"><?php echo $javaExeError; ?></span><?php } ?>
+				<a href="javascript:{document.getElementById('services').submit();}" class="specify">Submit</a>
+				<br/>
+				<?php if($javaExeError != '') { ?><span class="error"><?php echo $javaExeMessage; ?></span><?php } ?>
 			<?php } ?>
 			<?php if($phpExeError != '') { ?>
 				<br />
@@ -53,9 +63,6 @@
 				&nbsp;&nbsp;&nbsp;
 				<?php if($phpExeError != true) { ?><span class="error"><?php echo $phpExeError; ?></span><?php } ?>
 			<?php } ?>
-			<?php if($javaExeError != '' || $phpExeError != '') { ?>
-<!--				<input type="submit" name="Refresh" value="Submit" style="float:none;background-image:url('a');font-size:10pt;font-weight:normal;border:none;"/>-->
-			<?php } ?>
 			<h3><?php echo "<span class='{$javaCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Java Check</h3>
 			<?php if($silent) { ?>
 				<div id="option4" class="onclick" onclick="javascript:{w.toggleClass('java_details', 'option4');}">Show Details</div>
@@ -7,12 +7,19 @@ class ajaxHandler{
 	public $request=NULL;
 	public $kt=NULL;
 	public $authenticator=NULL;
+	public $noAuthRequireList=array();
  
-	public function __construct(&$ret=NULL,&$kt){
+	public function __construct(&$ret=NULL,&$kt,$noAuthRequests=''){
 		// set a local copy of the json request wrapper
+		$noAuthRequests=is_array($noAuthRequests)?$noAuthRequests:split(',',(string)$noAuthRequests);
+		$this->registerNoAuthRequest($noAuthRequests);
 		$this->req=new jsonWrapper(isset($_GET['request'])?$_GET['request']:(isset($_POST['request'])?$_POST['request']:''));
-		$this->auth=$this->req->jsonArray['auth'];
-		$this->request=$this->req->jsonArray['request'];
+		$this->auth=$this->structArray('user,pass,passhash,appType,session,token,version',$this->req->jsonArray['auth']);
+		$this->request=$this->structArray('service,function,parameters',$this->req->jsonArray['request']);
+
+		$add_params=array_merge($_GET,$_POST);
+		unset($add_params['request'],$add_params['datasource']);
+		$this->request['parameters']=array_merge($this->request['parameters'],$add_params);
  
  
 		// set the response object
@@ -22,6 +29,7 @@ class ajaxHandler{
 			$this->ret=new jsonResponseObject();
 		}
 		$this->ret->setRequest($this->req->jsonArray);
+		$this->ret->setTitle($this->request['service'].'::'.$this->request['function']);
  
 		if(get_class($kt)=='KTAPI'){
 			$this->kt=&$kt;
@@ -41,21 +49,32 @@ class ajaxHandler{
  
 		if(!$this->verifySession()){
 			$this->doLogin();
-			if(!$this->isAuthenticated())return $this->render();
+			$isAuthRequired=$this->isNoAuthRequiredRequest();
+			$isAuthenticated=$this->isAuthenticated();
+			if(!$isAuthRequired && !$isAuthenticated)return $this->render();
 		}
  
 		$this->dispatch();
  
 		return $this->render();
 	}
+	
+	private function structArray($structString=NULL,$arr=NULL){
+		$struct=array_flip(split(',',(string)$structString));
+		return array_merge($struct,is_array($arr)?$arr:array());
+	}
  
 	public function dispatch(){
 		$request=$this->request;
-		$this->loadService($request['service']);
-		$service=new $request['service']($this->ret,$this->kt,$this->request,$this->auth);
-		$this->ret->setTitle($request['service'].'::'.$request['function']);
+		if($request['auth']){
+			$service=$this->authenticator;
+		}else{
+			$this->loadService($request['service']);
+			$service=new $request['service']($this->ret,$this->kt,$this->request,$this->auth);
+		}
+		$this->ret->setdebug('dispatch_request','The service class loaded');
 		if(method_exists($service,$request['function'])){
-			//$this->ret->setDebug('got here');
+			$this->ret->setdebug('dispatch_execution','The service method was found. Executing');
 			$service->$request['function']($request['parameters']);
 		}else{
 			$this->ret->addError("Service {$request['service']} does not contain the method: {$request['function']}");
@@ -97,7 +116,7 @@ class ajaxHandler{
 	}
  
 	protected function isAuthenticated(){
-		return true;
+		return $this->authenticator->pickup_session();
 	}
  
 	protected function doLogin(){
@@ -113,6 +132,26 @@ class ajaxHandler{
 		echo $this->ret->getJson();
 		return true;
 	}
+	
+	public function registerNoAuthRequest($requestString=''){
+		if($requestString){
+			if(is_array($requestString)){
+				foreach ($requestString as $rString){
+					$rString=strtolower((string)$rString);
+					$this->noAuthRequireList[$rString]=$rString;
+				}
+			}else{
+				$requestString=strtolower((string)$requestString);
+				$this->noAuthRequireList[$requestString]=(string)$requestString;
+			}
+		}
+	}
+	
+	public function isNoAuthRequiredRequest(){
+		$req=$this->request;
+		$reqString=strtolower("{$req['service']}.{$req['function']}");
+		return in_array($reqString,$this->noAuthRequireList);
+	}
  
 }
 ?>
 \ No newline at end of file
@@ -41,6 +41,17 @@ class client_service{
 		return $var;
 	}
  
+	protected function checkPearError($obj,$errMsg,$debug=NULL,$response=NULL){
+		if (PEAR::isError($obj)){
+			if($response===NULL)$response=array('status_code' => 1);
+			$this->addError($errMsg);
+			if((isset($debug) || $debug==NULL) && $debug!=='')$this->addDebug('',$debug!==NULL?$debug:$obj);
+    		$this->setResponse($response);
+    		return false;
+    	}
+    	return true;	
+	}
+	
 }
  
 ?>
 \ No newline at end of file
@@ -38,12 +38,23 @@ $old_error_handler=set_error_handler(&#39;error_handler&#39;,E_ERROR);
 //Interpret the Json Object that was passed
 include_once('jsonWrapper.php');
 include_once('ajaxhandler.php');
+include_once('serviceHelper.php');
 include_once('client_service.php');
  
 //Instantiate base classes
 $KT = new KTAPI();
 $RET=new jsonResponseObject();
-$handler=new ajaxHandler($RET,$KT);
+if($_GET['datasource'])$RET->isDataSource=true;
+
+$noAuthRequests=array(
+	'auth.ping',
+	'auth.japiLogin',
+	'kt.get_all_client_policies',
+	'kt.get_languages',
+	'kt.switchlang'
+);
+
+$handler=new ajaxHandler($RET,$KT,$noAuthRequests);
  
  
  
@@ -12,6 +12,7 @@ class jsonResponseObject{
 	protected $request=array();
 	protected $debug=array();
 	public $additional=array();
+	public $isDataSource=false;
  
 	public $response=array(
 		'requestName'		=>'',
@@ -60,7 +61,7 @@ class jsonResponseObject{
  
 	public function getJson(){
 		$response=array_merge(array(
-			'title'		=>$this->title,
+			'requestName'		=>$this->title,
 			'errors'	=>array(
 				'hadErrors'		=>(count($this->errors)>0?1:0),
 				'errors'		=>$this->errors
@@ -71,7 +72,11 @@ class jsonResponseObject{
 			'debug'		=>$this->debug,
 		),$this->additional);
  
-		$response=json_encode($response);
+		if($this->isDataSource){
+			$response=json_encode($response['data']);
+		}else{
+			$response=json_encode($response);
+		}
 		return $response;
 	}
 }
+<?php
+class serviceHelper{
+	public function __construct(){
+		throw new Exception('ServiceHelper is only to be used statically');
+	}
+	
+	function bool2str($bool){
+		//TODO: Test this sometime.. a lot shorter - doesn't cater for string though.. but if string then result already correct
+		//return ((bool)$bool)?'true':false;
+		
+		if (is_bool($bool))
+		{
+			return $bool ? 'true' : 'false';
+		}
+		if (is_numeric($bool))
+		{
+			return ($bool+0) ? 'true' : 'false';
+		}
+		// assume str
+		return (strtolower($bool) == 'true') ? 'true' : 'false';
+	}
+	
+	/**
+	 * Return human readable sizes
+	 *
+	 * @param integer $size	The size you want to convert to human readable
+	 * @return string
+	 */
+	function fsize_desc($size){
+		$i=0; 
+		$iec = array("B", "Kb", "Mb", "Gb", "Tb");
+		while (($size/1024)>1) {
+			$size=$size/1024;
+			$i++;
+		}
+		return substr($size,0,strpos($size,'.')+3).$iec[$i];
+	}
+	
+
+	/**
+	 * Display byte sizes in human readable representations
+	 *
+	 * @param integer	$size		Size to represent
+	 * @param string	$max		Maximum representational unit (eg B,KB,MB)
+	 * @param string	$system		Selecting the system of representation (si,bi&c1 defined)
+	 * @param string	$retstring	Format for the return string.
+	 * @return String
+	 */
+	function size_readable($size, $max = null, $system = 'c1', $retstring = '%01.1f %s'){
+	    // Pick units
+	    $systems['si']['prefix'] = array('B', 'K', 'MB', 'GB', 'TB', 'PB');
+	    $systems['si']['size']   = 1000;
+	    $systems['bi']['prefix'] = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB');
+	    $systems['bi']['size']   = 1024;
+	    $systems['c1']['prefix'] = array('B', 'KB', 'MB', 'GB', 'TB', 'PB');
+	    $systems['c1']['size']   = 1024;
+	    $sys = isset($systems[$system]) ? $systems[$system] : $systems['si'];
+	
+	    // Max unit to display
+	    $depth = count($sys['prefix']) - 1;
+	    if ($max && false !== $d = array_search($max, $sys['prefix'])) {
+	        $depth = $d;
+	    }
+	
+	    // Loop
+	    $i = 0;
+	    while ($size >= $sys['size'] && $i < $depth) {
+	        $size /= $sys['size'];
+	        $i++;
+	    }
+	
+	    return sprintf(($sys['prefix'][$i]=='B'?'%01d %s':$retstring), $size, $sys['prefix'][$i]);
+	}	
+}
+?>
 \ No newline at end of file
@@ -23,7 +23,9 @@ class auth extends client_service {
             require_once(KT_DIR .  '/plugins/wintools/baobabkeyutil.inc.php');
  
             if (!BaobabKeyUtil::checkIfLicensed(true)) {
-                return array('authenticated'=> false, 'message'=> 'license_expired');
+                $this->setResponse(array('authenticated'=> false, 'message'=> 'license_expired'));
+                $this->addError('Licence Expired');
+                return false;
             }
         }
  
@@ -38,21 +40,34 @@ class auth extends client_service {
 		        if(!PEAR::isError($session)){
 		        	$this->Response->setStatus('session_id',$session->get_session());
 		        }else{
-		        	$this->Response->setDebug('failed login',print_r($session,true));
-		        	throw new Exception('Unknown Login Error');
+					$this->setResponse(array('authenticated'=> false, 'message'=> 'Invalid username and/or password.'));
+		        	$this->addDebug('failed login',print_r($session,true));
+		        	$this->addError('Unknown Login Error');
 		        	return false;
 		        }
 			}else{
-				throw new Exception('Incorrect Credentials');
+				$this->addError('Incorrect Credentials');
+				//throw new Exception('Incorrect Credentials');
 				return false;
 			}
         }else{
-        	throw new Exception('Unrecognized User');
+        	$this->addError('Incorrect Credentials');
+        	//throw new Exception('Unrecognized User');
         	return false;
         }
         return true;
 	}
  
+	public function japiLogin(){
+		global $default;
+       	$user=$this->KT->get_user_object_by_username($this->AuthInfo['user']);
+		$ret=array(
+			'fullName'			=>PEAR::isError($user)?'':$user->getName()
+		);
+		$this->setResponse($ret);
+		return true;
+	}
+	
 	public function pickup_session(){
 		$params=$this->AuthInfo;
 		$app_type=$params['appType'];
@@ -67,6 +82,40 @@ class auth extends client_service {
        	$this->Response->setStatus('session_id',$session->get_session());
         return true;
 	}
+
+
+	public function ping(){
+		global $default;
+       	$user=$this->KT->get_user_object_by_username($this->AuthInfo['user']);
+		$ret=array(
+			'response'			=>'pong',
+			'loginLocation'		=> '/index.html',
+			'currentversion'	=>$default->systemVersion,
+			'requiredversion'	=>$default->systemVersion,
+			'versionok'			=>true,
+			'fullName'			=>PEAR::isError($user)?'':$user->getName()
+		);
+		$this->setResponse($ret);
+		return true;
+	}
+
+    function logout($params){
+		$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);
+		
+		if (PEAR::isError($session)){
+            return false;
+        }
+	
+    	$session->logout();
+    	$this->setResponse(array('logout'=>true));
+    	return true;
+    }
+
 }
  
 ?>
 \ No newline at end of file
 <?php
 class kt extends client_service  {
+		
  
+	
 /**
  * Get Supported (?) Languages
  *
  * returns array containing languages, count, & defaultlanguage
  *
  */
-	function get_languages(){
+	function get_languages($passthru=false){
 		global $default;
 	    $oReg =& KTi18nregistry::getSingleton();
-		$aRegisteredLangs = $oReg->geti18nLanguages('knowledgeTree');
-		$aLanguageNames = $oReg->getLanguages('knowledgeTree');
-		$languages = array();
+		$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]
+				$languages[]=array(
+					'isoCode'=>$sLang,
+					'language'=>$aLanguageNames[$sLang]
 				);
 			}
 		}
-
-		$this->setResponse(array('languages' => $languages, 'count' => count($languages), 'defaultLanguage' => $default->defaultLanguage));
+		$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';
+		$params['folderId']='1';
 		$this->get_folder_detail($params);
 	}
  
  
 	function get_folder_detail($params)	{
-		$kt = &$this->KT;
+		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']);
+		$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;
+			return false;
 		}
  
-		$detail = $folder->get_detail();
-		if (PEAR::isError($detail))
-		{
-			$this->response= "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';
+		$class='folder';
  
-		$permissions = $detail['permissions'];
-		$perms = '';
-		//default write permissions to false
-		$canWrite = false;
+		$permissions=$detail['permissions'];
+		$perms='';
+		$canWrite=false;
  
-		//iterate through the permissions and convert to human-readable
-		for ($j = 0; $j < strlen($permissions); $j++)
-		{
-		    switch (strtoupper($permissions{$j}))
-			{
+		for ($j=0; $j < strlen($permissions); $j++){
+		    switch (strtoupper($permissions{$j})){
 				case 'W':
-					$canWrite = true;
+					$canWrite=true;
 					$perms .= $this->xlate('write, ');
 				break;
 				case 'R':
@@ -80,227 +83,195 @@ class kt extends client_service  {
 			}
 		}
  
-		//now chop off trailing ', ' if any
-		if (strlen($perms) > 2)
-		{
-			$perms = substr($perms, 0, strlen($perms)-2);
+		if (strlen($perms) > 2){
+			$perms=substr($perms, 0, strlen($perms)-2);
 		}
  
-		//permissions
 		$qtip .= $this->xlate('Permissions:') . " {$perms}<br>";
-
-		//comment
 		$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' => $params['control'] . $params['node'],
-			'filename' => $detail['folder_name'],
-			'cls' => 'folder',
-			'leaf' => false,
-			'document_type' => '',
-			'item_type' => 'F',
-			'permissions' => $permissions,
+		$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']));
+		$params['control']='F_';
+		$params['node']=substr($params['node'], strlen($params['control']));
  
-		$folder = &$kt->get_folder_by_id($params['node']);
-		if (PEAR::isError($folder)){
-			$this->addError("[error 1] Folder Not Found: {$params['control']}{$params['node']}");
-			return false;
-		}
+		$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');
+    	$types=(isset($params['types']) ? $params['types'] : 'DF');
+		$listing=$folder->get_listing(1, $types);
+        $result=$this->_processListing($listing, 'folderContents', $params);
  
-		$listing = $folder->get_listing(1, $types);
+        $this->setResponse($result);
+        return true;
+	}
  
-        $result = $this->_processListing($listing, 'folderContents', $params);
  
-		$this->setResponse($result);
+    /**
+     * 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)){
+			$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);
+		
+		$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)
-		{
-			$filename = $item['filename'];
-			$itemType = $item['item_type'];
-
-			$includeMe = true;
-
-			//build up tooltip
-			$qtip = '';
-
-			//default write permissions to false
-			$canWrite = false;
-			//default immutable to false
-			$immutable = false;
-
-			//first do permissions since they are applicable to both folders and docs
-			$permissions = $item['permissions'];
-			$perms = '';
-
-			//iterate through the permissions and convert to human-readable
-			for ($j = 0; $j < strlen($permissions); $j++)
-			{
-			    switch (strtoupper($permissions{$j}))
-				{
+        $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']);
+			}
+			
+			$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;
+						$canWrite=true;
 						$perms .= $this->xlate('write, ');
-					break;
+						break;
 					case 'R':
 						$perms .= $this->xlate('read, ');
-					break;
+						break;
 					case 'A':
 						$perms .= $this->xlate('add folder, ');
-					break;
-				//	default:
-				//		$perms .= strtoupper($permissions{$j});
-				//	break;
+						break;
 				}
 			}
  
-			//now chop off trailing ', ' if any
-			if (strlen($perms) > 2)
-			{
-				$perms = substr($perms, 0, strlen($perms)-2);
+			if(strlen($perms) > 2){
+				$perms=substr($perms, 0, strlen($perms)-2);
 			}
  
-			//folders
-			if ($itemType == 'F')
-			{
+			if($itemType=='F'){
 				$qtip .= $this->xlate('Folder name').": {$filename}<br>";
-				$class = 'folder';
-
-				//permissions
+				$class='folder';
 				$qtip .= $this->xlate('Permissions:') . " {$perms}<br>";
-
-				//comment
 				$qtip .= $canWrite ? $this->xlate('You may add content to this folder') : $this->xlate('You may not add content to this folder');
 			}
  
 			//documents
-			else
-			{
-				$qtip = '';
-
-				//get file extension so can determine mimetype
-				$extpos = strrpos($filename, '.') ;
-
-				if ($extpos === false)
-				{
-					$class = 'file-unknown';
+			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
-				{
-					$ext = substr($filename, $extpos); // Get Extension including the dot
-					$class = 'file-' . substr($filename, $extpos +1); // Get Extension without the dot
-				}
-
-				// Convert list to array
-				$extensions = explode(',', $arr['extensions']);
-
-				//don't include results which don't have the correct file extensions
-				if(!in_array(strtolower($ext), $extensions))
-				{
-					$includeMe = false;
-				}
-				else
-				{
-					//filename
+				
+				$extensions=explode(',', $arr['extensions']);
+				if(!in_array(strtolower($ext), $extensions)){
+					$includeMe=false;
+				}else{
 					$qtip .= $this->xlate('Filename') . ": {$filename}<br>";
-
-					//size
-					$qtip .= $this->xlate('File Size') . ": " . fsize_desc($item['filesize']) . "<br>";
-
-					//last modified
+					$qtip .= $this->xlate('File Size') . ": " . serviceHelper::fsize_desc($item['filesize']) . "<br>";
 					$qtip .= $this->xlate('Modified') . ": {$item['modified_date']}<br>";
-
-					//owner
 					$qtip .= $this->xlate('Owner') . ": {$item['created_by']}<br>";
-
-					//version
 					$qtip .= $this->xlate('Version') . ": {$item['version']}<br>";
-
-					//immutability
-					if (bool2str(strtolower($item['is_immutable'])) == 'true')
-					{
-						$canWrite = false;
-						$immutable = true;
+					if (serviceHelper::bool2str(strtolower($item['is_immutable']))=='true'){
+						$canWrite=false;
+						$immutable=true;
 					}
-
-					//status, i.e. checked out or not, or immutable
-					if ($immutable)
-					{
+					
+					if($immutable){
 						$qtip .= $this->xlate('Status: Immutable') . '<br>';
-					}
-					else if (strtolower($item['checked_out_by']) != 'n/a' && ($item['checked_out_by'] != ''))
-					{
+					}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
-					{
+					}else{
 						$qtip .= $this->xlate('Status: Available') . '<br>';
 					}
-
-					//permissions
 					$qtip .= $this->xlate('Permissions:') . " {$perms}<br>";
  
-					//immutable
-					if($immutable)
-					{
+					if($immutable){
 						$qtip .= $this->xlate('This document is not editable');
-					}
-					else if ($canWrite)
-					{
+					}else if ($canWrite){
 						$qtip .= $this->xlate('You may edit this document');
-					}
-					else
-					{
+					}else{
 						$qtip .= $this->xlate('This document is not editable');
 					}
 				}
 			}//end of if for files
-			if($includeMe)
-			{
-				$result[] = $this->$methodToIncludeItem($item, $class, $qtip);
+			if($includeMe){
+				$result[]=$this->$methodToIncludeItem($item, $class, $qtip);
 			}
 		}
-
 		return $result;
     }
  
  
  
  
-    private function _processItemInclusion_folderContents($item, $class, $qtip)
-    {
+    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'],
+                '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
             );
     }
@@ -309,128 +280,155 @@ class kt extends client_service  {
     private function _processItemInclusion_search($item, $class, $qtip)
     {
         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'],
-                'relevance' => $item['relevance'],
+                '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'],
+                'relevance'=>$item['relevance'],
                 'qtip'=> $qtip
             );
     }
  
+    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'],
+				'content_id'=>$item['content_id'],
+				'filesize'=>$item['filesize'],
+				'modified'=>$item['modified_date'],
+				'checked_out_by'=>$item['checked_out_by']
+            );
+    }
+    
  
-
 	public function get_metadata($params) {
+    	$kt=&$this->KT;
  
-    	$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'];
+    	$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'];
+	    	$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 {
+    	}else{
     		if(isset($params['document_type'])) {
-    			$document_type = $params['document_type'];
-    		} else {
-    			$document_type = 'Default';
+    			$document_type=$params['document_type'];
+    		}else{
+    			$document_type='Default';
     		}
-    		$detail = $kt->get_document_type_metadata($document_type);
-    		$title = "";
+    		$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");
+		$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']);
+			$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'])));
+			$items[]=array("name"=>"__document_extension", "index"=>0, "value"=>strtolower($fileParts['extension']), "control_type"=>"lookup", "selection"=>explode(',', str_replace('.', '', $params['extensions'])));
 		}
  
-		$document_types = $this->get_documenttypes($params);
-		$json_document_types = array();
+		$document_types=$this->get_documenttypes($params);
+		$json_document_types=array();
 		foreach($document_types['items'] as $val) {
-			$json_document_types[] = $val['name'];
+			$json_document_types[]=$val['name'];
 		}
-		$items[] = array("name" => "__document_type", "index" => 0, "value" => $document_type, "control_type" => "lookup", "selection" => $json_document_types);
+		$items[]=array("name"=>"__document_type", "index"=>0, "value"=>$document_type, "control_type"=>"lookup", "selection"=>$json_document_types);
  
  
 		for($i=0;$i<count($detail);$i++) {
  
 			for($j=0;$j<count($detail[$i]['fields']);$j++)
 			{
-				$items[] = array(
-				'fieldset' => $detail[$i]['fieldset'],
-				'name' => $detail[$i]['fields'][$j]['name'],
+				$items[]=array(
+				'fieldset'=>$detail[$i]['fieldset'],
+				'name'=>$detail[$i]['fields'][$j]['name'],
  
                 // Change for value. If blank value is set to 1, change value to ''
                 // Overcomes issue of n/a
-				'value' => ($document_id > 0 ? ($detail[$i]['fields'][$j]['blankvalue'] == '1' ? '' : $detail[$i]['fields'][$j]['value']) : ''),
-
-				'description' => $detail[$i]['fields'][$j]['description'],
-				'control_type' => $detail[$i]['fields'][$j]['control_type'],
-				'selection' => $detail[$i]['fields'][$j]['selection'],
-				'required' => $detail[$i]['fields'][$j]['required'],
-				'blankvalue' => $detail[$i]['fields'][$j]['blankvalue'],
-				'index' => $index
+				'value'=>($document_id > 0 ? ($detail[$i]['fields'][$j]['blankvalue']=='1' ? '' : $detail[$i]['fields'][$j]['value']) : ''),
+
+				'description'=>$detail[$i]['fields'][$j]['description'],
+				'control_type'=>$detail[$i]['fields'][$j]['control_type'],
+				'selection'=>$detail[$i]['fields'][$j]['selection'],
+				'required'=>$detail[$i]['fields'][$j]['required'],
+				'blankvalue'=>$detail[$i]['fields'][$j]['blankvalue'],
+				'index'=>$index
 				);
 				$index++;
 			}
 		}
  
  
-		$this->setResponse(array('id' => $title, 'items' => $items, 'count' => count($items)));
-
+		$this->setResponse(array('id'=>$title, 'items'=>$items, 'count'=>count($items)));
  
+		return true;
 	}
  
  
 	public function get_documenttypes($params) {
  
-    	$kt = &$this->KT;
+    	$kt=&$this->KT;
  
-    	$detail = $kt->get_documenttypes();
-		$result = array();
-		$items = array();
+    	$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]
+				$items[]=array(
+					'name'=>$detail[$i]
 				);
 			}
 		}
-		$this->setResponse(array('items' => $items, 'count' => count($items)));
+		$this->setResponse(array('items'=>$items, 'count'=>count($items)));
 	}
  
 	function update_document_type($params) {
-		$kt = &$this->KT;
-		$document_id = (int)$params['document_id'];
+		$kt=&$this->KT;
+		$document_id=(int)$params['document_id'];
     	if($document_id > 0) {
-	    	$document = $kt->get_document_by_id($document_id);
+	    	$document=$kt->get_document_by_id($document_id);
 	    	$document->change_document_type($params['document_type']);
-	    	$this->setResponse(array('status_code' => 0));
+	    	$this->setResponse(array('status_code'=>0));
 	    	return true;
  
     	}else{
     		$this->addError("Invalid document Id : {$document_id}");
-	    	$this->setResponse(array('status_code' => 1));
+	    	$this->setResponse(array('status_code'=>1));
     		return false;
     	}
  
@@ -447,35 +445,38 @@ class kt extends client_service  {
     	$session_id=$params['session_id'];
  
  
-    	$document = &$kt->get_document_by_id($params['document_id']);
-        $docname = $document->document->getFileName();
+    	$document=&$kt->get_document_by_id($params['document_id']);
      //   $docname='test.txt';
 		if (PEAR::isError($document))
     	{
-    		$response['message'] = $document->getMessage();
-    		$this->debug("download_document - cannot get $document_id - "  . $document->getMessage(), $session_id);
+    		$response['message']=$document->getMessage();
+    		$this->addDebug("download_document - cannot get $document_id - "  . $document->getMessage(), $session_id);
  
-    		$this->setResponse(new SOAP_Value('$this->response=',"{urn:$this->namespace}kt_response", $response));
+//    		$this->setResponse(new SOAP_Value('$this->response=',"{urn:$this->namespace}kt_response", $response));
+    		$this->setResponse($response);
     		return;
     	}
-
-    	$result = $document->download();
+        $docname=$document->document->getFileName();
+    	$result=$document->download();
 		if (PEAR::isError($result))
     	{
-    		$response['message'] = $result->getMessage();
-			$this->setResponse(array('status_code' => 1, 'message' => $result->getMessage()));
+    		$response['message']=$result->getMessage();
+			$this->setResponse(array('status_code'=>1, 'message'=>$result->getMessage()));
 			return;
     	}
  
-    	$session = &$kt->get_session();
-    	$download_manager = new KTDownloadManager();
+    	$session=&$kt->get_session();
+    	$download_manager=new KTDownloadManager();
     	$download_manager->set_session($session->session);
     	$download_manager->cleanup();
-    	$url = $download_manager->allow_download($document);
-
-    	$response['status_code'] = 0;
-		$response['message'] = $url;
-        $response['filename'] = $docname;
+    	$url=$download_manager->allow_download($document);
+    	//http://ktair.dev?code=750f7a09d40a3d855f2897f417baf0bbb9a1f615&d=16&u=evm2pdkkhfagon47eh2b9slqj6
+    	$url=split('\?',$url);
+    	$url=$url[0].'/ktwebservice/download.php?'.$url[1];
+
+    	$response['status_code']=0;
+		$response['message']=$url;
+        $response['filename']=$docname;
     	$this->setResponse($response);
     }
  
@@ -490,35 +491,35 @@ class kt extends client_service  {
 	 *
 	 */
 	function checkout_document($params){
-    	$responseType = 'kt_response';
+    	$responseType='kt_response';
 		$kt=&$this->KT;
  
-    	$document = &$kt->get_document_by_id($params['document_id']);
+    	$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()));
+			$this->setResponse(array('status_code'=>1, 'message'=>$document->getMessage()));
 			return;
     	}
  
-    	$result = $document->checkout($params['reason']);
+    	$result=$document->checkout($params['reason']);
 		if (PEAR::isError($result))
     	{
     		$this->addError($result->getMessage());
-    		$this->setResponse(array('status_code' => 1, 'message' => $result->getMessage()));
+    		$this->setResponse(array('status_code'=>1, 'message'=>$result->getMessage()));
     		return;
     	}
  
-		$url = '';
+		$url='';
     	if ($params['download'])
     	{
-	    	$download_manager = new KTDownloadManager();
+	    	$download_manager=new KTDownloadManager();
     		$download_manager->set_session($params['session_id']);
     		$download_manager->cleanup();
-    		$url = $download_manager->allow_download($document);
+    		$url=$download_manager->allow_download($document);
     	}
  
-    	$this->setResponse(array('status_code' => 0, 'message' => $url));
+    	$this->setResponse(array('status_code'=>0, 'message'=>$url));
     }
  
  
@@ -533,43 +534,43 @@ 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'];
-		$application = $this->AuthInfo['appType'];
+    	$session_id=$this->AuthInfo['session'];
+		$document_id=$params['document_id'];
+		$filename=$params['filename'];
+		$reason=$params['reason'];
+		$tempfilename=$params['tempfilename'];
+		$application=$this->AuthInfo['appType'];
  
     	$this->addDebug('Checkin',"checkin_document('$session_id',$document_id,'$filename','$reason','$tempfilename', '$application')");
-    	$kt = &$this->KT;
+    	$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();
+    	$upload_manager=new KTUploadManager();
     	if (!$upload_manager->is_valid_temporary_file($tempfilename))
     	{
-			$this->setResponse(array('status_code' => 12));
+			$this->setResponse(array('status_code'=>12));
 			return;
     	}
  
-    	$document = &$kt->get_document_by_id($document_id);
+    	$document=&$kt->get_document_by_id($document_id);
 		if (PEAR::isError($document))
 		{
-			$this->setResponse(array('status_code' => 13));
+			$this->setResponse(array('status_code'=>13));
 		}
  
 		// checkin
-		$result = $document->checkin($filename, $reason, $tempfilename, false);
+		$result=$document->checkin($filename, $reason, $tempfilename, false);
 		if (PEAR::isError($result))
 		{
-			$this->setResponse(array('status_code' => 14));
+			$this->setResponse(array('status_code'=>14));
 		}
  
     	// get status after checkin
 		//$this->response= $this->get_document_detail($session_id, $document_id);
-		$detail = $document->get_detail();
-    	$detail['status_code'] = 0;
-		$detail['message'] = '';
+		$detail=$document->get_detail();
+    	$detail['status_code']=0;
+		$detail['message']='';
  
     	$this->setResponse($detail);
     }
@@ -581,686 +582,540 @@ class kt extends client_service  {
      * @param unknown_type $arr
      */
 	function add_document_with_metadata($arr){
-    	$session_id = $arr['session_id'];
+    	$session_id=$arr['session_id'];
     	//error_reporting(E_ALL);
-		$metadata = array();
-		$packed = @json_decode($arr['metadata']);
+		$metadata=array();
+		$packed=@json_decode($arr['metadata']);
  
 		$this->debug('Entered add_document_with_metadata');
  
-		foreach($packed as $key => $val) {
+		foreach($packed as $key=>$val) {
 			if(!is_array($metadata[$val->fieldset])) {
-				$metadata[$val->fieldset]['fieldset'] = $val->fieldset;
-				$metadata[$val->fieldset]['fields'] = array();
+				$metadata[$val->fieldset]['fieldset']=$val->fieldset;
+				$metadata[$val->fieldset]['fields']=array();
 			}
-			$metadata[$val->fieldset]['fields'][] = array(
-				'name' => $val->name,
-				'value' => $val->value
+			$metadata[$val->fieldset]['fields'][]=array(
+				'name'=>$val->name,
+				'value'=>$val->value
 			);
 		}
  
-    	$add_result = $this->add_document($arr['session_id'], $arr['folder_id'], $arr['title'], $arr['filename'], $arr['documenttype'], $arr['tempfilename'], $arr['application']);
+    	$add_result=$this->add_document($arr['session_id'], $arr['folder_id'], $arr['title'], $arr['filename'], $arr['documenttype'], $arr['tempfilename'], $arr['application']);
 		$this->debug('$this->response= from add_document');
  
-		$status_code = $add_result['status_code'];
+		$status_code=$add_result['status_code'];
 		if ($status_code != 0)
 		{
 			$this->response= $add_result;
 		}
-		$document_id = $add_result['document_id'];
-		$content_id = $add_result['content_id'];
+		$document_id=$add_result['document_id'];
+		$content_id=$add_result['content_id'];
  
-		$update_result = $this->update_document_metadata($arr['session_id'], $document_id, $metadata, $arr['application'], array());
+		$update_result=$this->update_document_metadata($arr['session_id'], $document_id, $metadata, $arr['application'], array());
 		$this->debug('$this->response= from update_document_metadata');
-		$status_code = $update_result['status_code'];
+		$status_code=$update_result['status_code'];
 		if ($status_code != 0)
 		{
 			$this->delete_document($arr['session_id'], $document_id, 'Rollback because metadata could not be added', $arr['application']);
 			$this->response= $update_result;
 		}
  
-		$kt = &$this->KT;
+		$kt=&$this->KT;
     	if (is_array($kt))
     	{
-    		$this->response= array('status_code' => 1);
+    		$this->response= array('status_code'=>1);
     	}
  
-    	$document = $kt->get_document_by_id($document_id);
-    	$result = $document->removeUpdateNotification();
+    	$document=$kt->get_document_by_id($document_id);
+    	$result=$document->removeUpdateNotification();
     	if (PEAR::isError($result))
 		{
 			// not much we can do, maybe just log!
 		}
  
  
-		$result = $document->mergeWithLastMetadataVersion();
+		$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, 'content_id' => $content_id);
+		$this->response= array('status_code'=>0, 'document_id'=>$document_id, 'content_id'=>$content_id);
     }
  
-}
-
-
-/*
-
-
-
  
-
-
-
-
-
-
-
-
-	function debug($str) {
-		$this->response= true;
-		if(!is_resource($this->dfp)) {
-			$this->dfp = fopen("./debug.log", "a+");
+	function get_all_client_policies(){
+		$config=KTConfig::getSingleton();
+		$this->addDebug('KTConfig Singleton',$config);
+		
+		$policies=array('allowRememberPassword', 'captureReasonsCheckin', 'captureReasonsCheckout');
+		
+		$returnPolicies=array();
+		
+		foreach ($policies as $policy_name)
+		{
+			$policyInfo=array(
+						'name'=>$policy_name,
+						'value'=>serviceHelper::bool2str($config->get('addInPolicies/'.$policy_name)),
+						'type'=>'boolean'
+					);
+			
+			$returnPolicies[$policy_name] =$policyInfo;
 		}
-		fwrite($this->dfp, strftime("[DEBUG %Y-%m-%d %H:%M:%S] ").$str."\r\n");
+		
+		$languages=$this->get_languages(true);
+		
+		$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);
+		return true;
+	}
+	
+	public function switchlang($params){
+		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;
  
-    function add_document_params($params)
-    {
-        $session_id = $params['session_id'];
-        $folder_id = $params['folder_id'];
-        $title = $params['title'];
-        $filename = $params['filename'];
-        $documenttype = $params['documenttype'];
-        $tempfilename = $params['tempfilename'];
-        $application = $params['application'];
-
-    	$this->debug('Entered add_document');
-    	$kt = &$this->get$this->xlateapi($session_id, $application);
-    	if (is_array($kt))
-    	{
-    		$this->response= array('status_code' => 1);
-    	}
-    	$this->debug("Got \$kt");
-
-    	$upload_manager = new KTUploadManager();
-    	if (!$upload_manager->is_valid_temporary_file($tempfilename))
-    	{
-			$this->response= array('status_code' => 1);
+    	$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->debug('Exited is_valid_temporary file');
+    	$this->addDebug('','Exited is_valid_temporary file');
  
-    	$folder = &$kt->get_folder_by_id($folder_id);
-		if (PEAR::isError($folder))
-		{
-    		$this->response= array('status_code' => 1);
+    	$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->debug('Exited get_folder_by_id');
+		$this->addDebug('','Exited get_folder_by_id');
  
-    	$document = &$folder->add_document($title, $filename, $documenttype, $tempfilename);
-		if (PEAR::isError($document))
-		{
-			$this->response= array('status_code' => 1);
+    	$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->debug('Exited folder add_document');
+		$this->addDebug('','Exited folder add_document');
  
-    	$detail = $document->get_detail();
-    	$detail['status_code'] = 0;
-		$detail['message'] = '';
-
-    	$this->response= $detail;
+    	$detail=$document->get_detail();
+    	$detail['status_code']=0;
+		$detail['message']='';
  
+    	$this->setResponse($detail);
    }
+	
+    function delete_document($session_id, $document_id, $reason, $application){
+    	$kt=&$this->KT;
  
-
-   function add_document($session_id, $folder_id,  $title, $filename, $documenttype, $tempfilename, $application)
-    {
-    	$this->debug('Entered add_document');
-    	$kt = &$this->get$this->xlateapi($session_id, $application);
-    	if (is_array($kt))
-    	{
-    		$this->response= array('status_code' => 1);
+    	$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;
     	}
-    	$this->debug("Got \$kt");
  
-    	$upload_manager = new KTUploadManager();
-    	if (!$upload_manager->is_valid_temporary_file($tempfilename))
-    	{
-			$this->response= array('status_code' => 1);
+    	$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->debug('Exited is_valid_temporary file');
-
-    	$folder = &$kt->get_folder_by_id($folder_id);
-		if (PEAR::isError($folder))
-		{
-    		$this->response= array('status_code' => 1);
-		}
-
-		$this->debug('Exited get_folder_by_id');
-
-    	$document = &$folder->add_document($title, $filename, $documenttype, $tempfilename);
-		if (PEAR::isError($document))
-		{
-			$this->response= array('status_code' => 1);
-		}
-
-		$this->debug('Exited folder add_document');
-
-    	$detail = $document->get_detail();
-    	$detail['status_code'] = 0;
-		$detail['message'] = '';
-
-    	$this->response= $detail;
+    	$this->setResponse(array('status_code'=>0));
+    	return true;
     }
  
  
  
-    function delete_document($session_id, $document_id, $reason, $application)
-    {
-    	$kt = &$this->get$this->xlateapi($session_id, $application );
-    	if (is_array($kt))
-    	{
-    		$this->response= array('status_code' => 1);
-    	}
-
-
-    	$document = &$kt->get_document_by_id($document_id);
-		if (PEAR::isError($document))
-    	{
-    		$this->response= array('status_code' => 1);
-    	}
-
-    	$result = $document->delete($reason);
-		if (PEAR::isError($result))
-    	{
-    		$this->response= array('status_code' => 1);
-    	}
-    	$response['status_code'] = 0;
-
-    	$this->response= $response;
-
-    }
-
-	function update_document_metadata($session_id, $document_id, $metadata, $application, $sysdata=null)
-	{
-		$this->debug('entered update_document_metadata');
-    	$kt = &$this->get$this->xlateapi($session_id, $application );
-    	$responseType = 'kt_response';
-    	if ($this->version >= 2)
-    	{
-    		$responseType = 'kt_document_detail';
-    	}
+	private function update_document_metadata($session_id, $document_id, $metadata, $application, $sysdata=null){
+		$this->addDebug('','entered update_document_metadata');
+    	$kt=&$this->KT;
+   		$responseType='kt_document_detail';
  
-    	if (is_array($kt))
-    	{
-    		$this->response= array('status_code' => 1, 'kterror'=>$kt);
+    	$document=&$kt->get_document_by_id($document_id);
+		if (PEAR::isError($document)){
+    		return array('status_code'=>1, 'error'=>'Error getting document');
     	}
  
-    	$document = &$kt->get_document_by_id($document_id);
-		if (PEAR::isError($document))
-    	{
-    		$this->response= array('status_code' => 1, 'error'=>'Error getting document');
-    	}
-
-    	$result = $document->update_metadata($metadata);
-    	if (PEAR::isError($result))
-    	{
-    		$this->response= array('status_code' => 1, 'error'=>'Error updating metadata');
+    	$result=$document->update_metadata($metadata);
+    	if (PEAR::isError($result)){
+    		return array('status_code'=>1, 'error'=>'Error updating metadata');
     	}
  
-    	if ($this->version >= 2)
-    	{
-    		$result = $document->update_sysdata($sysdata);
-    		if (PEAR::isError($result))
-    		{
-   	 			$this->response= array('status_code' => 1, 'error'=>'Error update_sysdata');
-    		}
-       	}
-    	$response['status_code'] = 0;
-
-    	$this->response= array('status_code' => 0);
-	}
-
-
-	function get_client_policy($arr)
-	{
-		$policy_name = $arr['policy_name'];
-
-		$config = KTConfig::getSingleton();
-
-		$policy = array(
-						'name' => $policy_name,
-						'value' => bool2str($config->get($policy_name)),
-						'type' => 'boolean'
-					);
-
-		$response['policy'] = $policy;
-		$response['message'] = 'Knowledgetree client policies retrieval succeeded.';
-		$response['status_code'] = 0;
+		$result=$document->update_sysdata($sysdata);
+		if (PEAR::isError($result)){
+	 			return array('status_code'=>1, 'error'=>'Error update_sysdata');
+		}
  
-		$this->response= $response;
+		return array('status_code'=>0);
 	}
  
-	function get_all_client_policies()
-	{
-		$config = KTConfig::getSingleton();
-
-		$policies = array('allowRememberPassword', 'captureReasonsCheckin', 'captureReasonsCheckout');
+	function get_client_policy($arr){
+		$policy_name=$arr['policy_name'];
  
-		$$this->response=Policies = array();
+		$config=KTConfig::getSingleton();
  
-		foreach ($policies as $policy_name)
-		{
-			$policyInfo = array(
-						'name' => $policy_name,
-						'value' => bool2str($config->get('addInPolicies/'.$policy_name)),
-						'type' => 'boolean'
+		$policy=array(
+						'name'=>$policy_name,
+						'value'=>serviceHelper::bool2str($config->get($policy_name)),
+						'type'=>'boolean'
 					);
  
-			$this->response=Policies[$policy_name]  = $policyInfo;
-		}
-
-		$languages = $this->get_languages();
-
-		$metadata = array('totalProperty'=>'resultsCounter', 'root'=>'languages', 'fields'=>array('isoCode', 'language'));
-
-		$finalArray = array();
-		$finalArray['metaData'] = $metadata;
-		$finalArray['policies'] = $$this->response=Policies;
-		$finalArray['languages'] = $languages['languages'];
-		$finalArray['defaultLanguage'] = $languages['defaultLanguage'];
-		$finalArray['resultsCounter'] = $languages['count'];
+		$response['policy']=$policy;
+		$response['message']='Knowledgetree client policies retrieval succeeded.';
+		$response['status_code']=0;
  
-
-		$this->response= $finalArray;
+		$this->setResponse($response);
+		return true;
 	}
  
-	function search($arr)
-	{
-		$kt = &$this->get$this->xlateapi($arr['session_id'], $arr['application']);
  
-		if (is_array($kt))
-		{
-			$this->response= $kt;
-		}
+	function search($arr){
+		$kt=&$this->KT;
  
-		$listing = processSearchExpression("(GeneralText contains \"".$arr['query']."\")");
+		$listing=processSearchExpression("(GeneralText contains \"".$arr['query']."\")");
  
-		$result = ListController::_processListing($listing, 'search', $arr);
+		$result=ListController::_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,
+			$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);
+		}else{
+			$result=array_slice($result, 0, 200);
 		}
  
-		$this->response= $result;
+		$this->setResponse($result);
+		return true;
 	}
  
-	public function update_metadata($arr)
-    {
-    	$session_id = $arr['session_id'];
-		$metadata = array();
-		$packed = @json_decode($arr['metadata']);
  
-		$this->debug('Entered add_document_with_metadata');
+	public function update_metadata($arr){
+		$metadata=array();
+		$packed=@json_decode($arr['metadata']);
  
-		$special = array();
+		$this->addDebug('','Entered add_document_with_metadata');
  
-		foreach($packed as $key => $val) {
-			if(substr($val->name,0,2) != '__') {
+		$special=array();
  
+		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]['fieldset']=$val->fieldset;
+					$metadata[$val->fieldset]['fields']=array();
 				}
-				$metadata[$val->fieldset]['fields'][] = array(
-				'name' => $val->name,
-				'value' => $val->value
+				$metadata[$val->fieldset]['fields'][]=array(
+					'name'=>$val->name,
+					'value'=>$val->value
 				);
-			} else {
-				$special[$val->name] = $val->value;
+			}else{
+				$special[$val->name]=$val->value;
 			}
 		}
  
-		$document_id = $arr['document_id'];
+		$document_id=$arr['document_id'];
  
-		$update_result = $this->update_document_metadata($arr['session_id'], $document_id, $metadata, $arr['application'], array());
-		$this->debug('$this->response= from update_document_metadata');
-		$status_code = $update_result['status_code'];
-		if ($status_code != 0)
-		{
-			$this->response= $update_result;
+		$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);
 		}
  
-		$kt = &$this->get$this->xlateapi($arr['session_id']);
-    	if (is_array($kt))
-    	{
-    		$this->response= $kt;
-    	}
+		$kt=&$this->KT;
  
     	if(!empty($special)) {
-
     		if($document_id > 0) {
-	    		$document = $kt->get_document_by_id($document_id);
+	    		$document=$kt->get_document_by_id($document_id);
  
 	    		if(isset($special['__title'])) {
 	    			$this->debug("Renaming to {$special['__title']}");
-	    			$res = $document->rename($special['__title']);
+	    			$res=$document->rename($special['__title']);
 	    		}
     		}
     	}
  
-		$this->response= array('status_code' => 0, 'document_id' => $document_id);
+		$this->setResponse(array('status_code'=>0, 'document_id'=>$document_id));
     }
  
- 	function check_document_title($arr)
-	{
-
-    	$kt = &$this->get$this->xlateapi($arr['session_id'], $arr['application'] );
-
  
-    	if (is_array($kt))
-    	{
-    		$this->response= array('status_code' => 1);
-    	}
  
-    	$folder = $kt->get_folder_by_id($arr['folder_id']);
+ 	function check_document_title($arr){
+    	$kt=&$this->KT;
  
+    	$folder=$kt->get_folder_by_id($arr['folder_id']);
     	if(PEAR::isError($folder)) {
-    		$this->response= array('status_code' => 1, 'reason' => 'No such folder');
+    		$this->setResponse(array('status_code'=>1, 'reason'=>'No such folder'));
+    		return false;    		
     	}
  
-    	$doc = $folder->get_document_by_name($arr['title']);
-
+    	$doc=$folder->get_document_by_name($arr['title']);
     	if(PEAR::isError($doc)) {
-    		$this->response= array('status_code' => 1, 'reason' => 'No document with that title '.$arr['title']);
+    		$this->setResponse(array('status_code'=>1, 'reason'=>'No document with that title '.$arr['title']));
+    		return false;
     	}
  
-    	$this->response= array('status_code' => 0);
+    	$this->setResponse(array('status_code'=>0));
+    	return true;
 	}
  
  
-	//$session_id, $document_id, $reason
-	function cancel_checkout($params)
-    {
-    	//$this->debug("undo_document_checkout({$params['session_id']}, {$params['document_id']}, {$params['reason']})");
-
-    	$kt = &$this->get$this->xlateapi($params['session_id'], $params['application'] );
-    	if (is_array($kt))
-    	{
-    		$this->response= array('status_code' => 1);
-    	}
+	function cancel_checkout($params){
+    	$kt=&$this->KT;
  
-    	$document = &$kt->get_document_by_id($params['document_id']);
-		if (PEAR::isError($document))
-    	{
-    		$this->response= array('status_code' => 1, 'message' => $document->getMessage());
+    	$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->response= array('status_code' => 1, 'message' => $result->getMessage());
+    	$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->response= $response;
+    	$response['status_code']=0;
+    	$this->setResponse($response);
     }
  
-	function get_users_groups($params)
-	{
-		$kt = &$this->get$this->xlateapi($params['session_id'],$params['application'] );
-    	if (is_array($kt))
-    	{
-    		$this->response= array('status_code' => 1);
-    	}
-
-		$query = $params['query'];
-		//$start = $params['start'];
-		//$page = $params['page'];
  
-		$results = KTAPI_User::getList('name LIKE "%'.$query.'%" AND id>0');
-
-		$$this->response=Array = array();
-
-		if (count($results) > 0) {
-			foreach ($results as $user)
-			{
-				$$this->response=Array[] = array('emailid'=>'u_'.$user->getId(), 'name'=> $user->getName(), 'to'=>preg_replace('/('.$query.')/i', '<b>${0}</b>', $user->getName()));
+	public function get_users_groups($params){
+		$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()));
 			}
 		}
-
-		$groups = KTAPI_Group::getList('name LIKE "%'.$query.'%"');
-
-		if (count($groups) > 0) {
-			foreach ($groups as $group)
-			{
-				$$this->response=Array[] = 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'=>$$this->response=Array, 'metaData'=>array('count'=>count($finalArray), 'root'=>'emails', fields=>array('name', 'to', 'emailid')));
-
-		$this->response= $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->get$this->xlateapi($params['session_id'], $params['application'] );
-    	if (is_array($kt))
-    	{
-    		$this->response= array('status_code' => 1);
-    	}
-
-
-		$message = $params['message'];
-		$list = $params['users'];
-
-
-		$recipientsList = array();
-
-		$list = explode(',', $list);
-
-		foreach ($list as $recipient)
-		{
-			if (trim($recipient) != '') { // check that value is present
-
+    
+	
+	function send_email($params){
+		$kt=&$this->KT;
+		
+		$message=$params['message'];
+		$list=$params['users'];
+		$list=explode(',', $list);
+		
+		$recipientsList=array();
+		
+		foreach ($list as $recipient){
+			if (trim($recipient) != ''){ // check that value is present
 				// if @ sign is present, signifies email address
-				if(strpos($recipient, '@') === false) {
-					// Not email
-					$recipient = trim($recipient);
-
-					switch (substr($recipient, 0, 2))
-					{
+				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;
+							$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);
-
+							$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->response= array('status'=>'norecipients');
-		} else {
+		
+		$document=$kt->get_document_by_id($params['document']);
+		if (count($recipientsList)==0) {
+			$this->setResponse(array('status'=>'norecipients'));
+			return false;
+		}else{
 			$document->email($recipientsList, $message, TRUE); // true to attach document
-			$this->response= array('status'=>'documentemailed');
+			$this->setResponse(array('status'=>'documentemailed'));
 		}
-
-
+		return true;
 	}
  
  
-	function is_latest_version($params)
-	{
+	function is_latest_version($params){
 		$kt=&$this->KT;
-
-
-    	if (is_array($kt))
-    	{
-    		$this->response= $kt;
-    	}
-
-		$documentId = $params['document_id'];
-		$contentId = $params['content_id'];
-
-		$result = $kt->is_latest_version($documentId, $contentId);
-
-		$this->response= $result;
-
+		
+		$documentId=$params['document_id'];
+		$contentId=$params['content_id'];
+		
+		$result=$kt->is_latest_version($documentId, $contentId);
+		
+		$this->setResponse($result);
+		return true;
 	}
-
-	function check_permission($params)
-	{
+	
+	function check_permission($params){
 		$kt=&$this->KT;
-
-
-    	if (is_array($kt))
-    	{
-    		$this->response= $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()) {
+		
+		$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->response= array('status_code'=>0, 'permissions'=>$permissions);
-		//$this->response= $permissions;
+		
+		$this->setResponse(array('status_code'=>0, 'permissions'=>$permissions));
+		return true;
 	}
  
+    function copydocument($params){
+        $kt=&$this->KT;
  
-    function renamefolder($params)
-    {
-        $kt = &$this->get$this->xlateapi($params['session_id'], $params['application'] );
-    	if (is_array($kt))
-    	{
-    		$this->response= array('status_code' => 1);
-    	}
-
-        $response = $kt->rename_folder($params['currentfolderid'], $params['newname']);
-
-        if ($response['status_code'] == 0) {
-            $this->response= array('status_code' => 0, 'status'=>'folderupdated', 'icon'=>'success', 'title'=>$this->xlate('Folder Renamed'), 'message'=>$this->xlate('Folder has been successfully renamed'));
-        } else {
-            $this->response= array('status_code' => 1, 'status'=>'error', 'icon'=>'failure', 'title'=>$this->xlate('Unable to rename folder'), 'message'=>$this->xlate('Unable to rename folder')); //$response['message']
+        $response=$kt->copy_document($params['documentid'], $params['destfolderid']);
+        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 addfolder($params)
-    {
-        $kt = &$this->get$this->xlateapi($params['session_id'], $params['application'] );
-        if (is_array($kt))
-        {
-            $this->response= array('status_code' => 1);
-        }
-
-
-        $response = $kt->create_folder($params['currentfolderid'], $params['newname']);
+    function movedocument($params){
+        $kt=$this->KT;
  
-        if ($response['status_code'] == 0) {
-            $this->response= array('status_code' => 0, 'status'=>'folderupdated', 'icon'=>'success', 'title'=>$this->xlate('Folder Created'), 'message'=>$this->xlate('Folder has been successfully created'), 'id' =>$response['results']['id']); //$params['newname']);//
-        } else {
-            $this->response= array('status_code' => 1, 'status'=>'error', 'icon'=>'failure', 'title'=>$this->xlate('Unable to create folder'), 'message'=>$this->xlate('Unable to create folder')); //$response['message']
+        $response=$kt->move_document($params['documentid'], $params['destfolderid']);
+        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 deletefolder($params)
-    {
-        $kt = &$this->get$this->xlateapi($params['session_id'], $params['application'] );
-        if (is_array($kt))
-        {
-            $this->response= array('status_code' => 1);
+    
+    function copyfolder($params){
+        $kt=&$this->KT;
+
+        $response=$kt->copy_folder($params['sourcefolderid'], $params['destfolderid']);
+        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;
         }
+        
+    }
  
-        $response = $kt->delete_folder($params['folderid'], 'Deleted from office addin');
+    function movefolder($params){
+        $kt=&$this->KT;
  
-        if ($response['status_code'] == 0) {
-            $this->response= array('status_code' => 0, 'status'=>'folderdeleted', 'icon'=>'success', 'title'=>$this->xlate('Folder Deleted'), 'message'=>$this->xlate('Folder has been successfully deleted'));
-        } else {
-            $this->response= array('status_code' => 1, 'status'=>'error', 'icon'=>'failure', 'title'=>$this->xlate('Unable to delete folder'), 'message'=>$this->xlate('Unable to delete folder')); //$response['message']
+        $response=$kt->move_folder($params['sourcefolderid'], $params['destfolderid']);
+        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 candeletefolder($arr)
-    {
-        $kt = &$this->get$this->xlateapi($arr['session_id'], $arr['application']);
-
-        if (is_array($kt))
-        {
-            $this->response= $kt;
+    
+    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;
         }
+    }
  
-
-        $folder = &$kt->get_folder_by_id($arr['folderid']);
-        if (PEAR::isError($folder))
-        {
-            $response = 'error';
-
-            $this->response= 'error 1';
+    function addfolder($params)    {
+        $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'], 'Deleted from office addin');
+        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;
         }
-
-
-        $listing = $folder->get_listing(1, 'DF');
-
-        if (count($listing) == 0) {
-            $this->response= array('status_code' => 0, 'candelete'=>TRUE);
-        } else {
-            $this->response= array('status_code' => 0, 'candelete'=>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;
         }
     }
-
-*/
+}
 ?>
 \ No newline at end of file
 <?php
 class server extends client_service {
 		public function status(){
-
+			$this->setResponse(array('online'=>true));
 		}
  
 		public function ping(){