diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php
index 31a546af88..0e0d7c9965 100644
--- a/phpgwapi/inc/class.egw_framework.inc.php
+++ b/phpgwapi/inc/class.egw_framework.inc.php
@@ -655,13 +655,15 @@ abstract class egw_framework
 
 		if ($GLOBALS['egw_info']['flags']['include_xajax'])
 		{
-			require_once(EGW_SERVER_ROOT.'/phpgwapi/inc/xajax.inc.php');
-
-			$xajax = new xajax(egw::link('/xajax.php'), 'xajax_', translation::charset());
-			$xajax->waitCursorOff();
-			$xajax->registerFunction("doXMLHTTP");
-
-			$java_script .= $xajax->getJavascript($GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/js/');
+			require_once(EGW_API_INC.'/xajax/xajax_core/xajax.inc.php');
+			
+			$xajax = new xajax();
+			$xajax->configure('requestURI', egw::link('/xajax.php'));
+			$xajax->configure('javascript URI',$GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/inc/xajax');
+ 			$xajax->configure('waitCursor',false);
+ 			$xajax->register(XAJAX_FUNCTION,'doXMLHTTP');
+ 			
+ 			$java_script .= $xajax->getJavascript();
 		}
 
 		/* this flag is for all javascript code that has to be put before other jscode.
diff --git a/phpgwapi/inc/xajax/xajax_core/xajaxResponse.inc.php b/phpgwapi/inc/xajax/xajax_core/xajaxResponse.inc.php
index 483b5d1c98..60baeadcfa 100644
--- a/phpgwapi/inc/xajax/xajax_core/xajaxResponse.inc.php
+++ b/phpgwapi/inc/xajax/xajax_core/xajaxResponse.inc.php
@@ -39,6 +39,33 @@
 */
 class xajaxResponse
 {
+	/**
+	 * Adding all legacy functions to ease the transition
+	 */
+	function outputEntitiesOn()		{ $this->setOutputEntities(true); }
+	function outputEntitiesOff()	{ $this->setOutputEntities(false); }
+	function addConfirmCommands()	{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'confirmCommands'), $temp); }
+	function addAssign()			{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'assign'), $temp); }
+	function addAppend()			{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'append'), $temp); }
+	function addPrepend()			{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'prepend'), $temp); }
+	function addReplace()			{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'replace'), $temp); }
+	function addClear()				{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'clear'), $temp); }
+	function addAlert()				{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'alert'), $temp); }
+	function addRedirect()			{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'redirect'), $temp); }
+	function addScript()			{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'script'), $temp); }
+	function addScriptCall()		{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'call'), $temp); }
+	function addRemove()			{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'remove'), $temp); }
+	function addCreate()			{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'create'), $temp); }
+	function addInsert()			{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'insert'), $temp); }
+	function addInsertAfter()		{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'insertAfter'), $temp); }
+	function addCreateInput()		{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'createInput'), $temp); }
+	function addInsertInput()		{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'insertInput'), $temp); }
+	function addInsertInputAfter()	{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'insertInputAfter'), $temp); }
+	function addRemoveHandler()		{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'removeHandler'), $temp); }
+	function addIncludeScript()		{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'includeScript'), $temp); }
+	function addIncludeCSS()		{ $temp=func_get_args(); return call_user_func_array(array(&$this, 'includeCSS'), $temp); }
+	function &getXML()				{ return $this; }
+	
 	/**#@+
 	 * @access protected
 	 */
diff --git a/phpgwapi/js/xajax_js/xajax.js b/phpgwapi/js/xajax_js/xajax.js
deleted file mode 100644
index 0dca8f5200..0000000000
--- a/phpgwapi/js/xajax_js/xajax.js
+++ /dev/null
@@ -1,172 +0,0 @@
-/* xajax Javascript library :: version 0.2.4 */
-Array.prototype.containsValue=function(valueToCheck){for(var i=0;i<this.length;i++){if(this[i]==valueToCheck)return true;}
-return false;}
-function Xajax(){this.DebugMessage=function(text){if(text.length > 1000)text=text.substr(0,1000)+"...\n[long response]\n...";try{if(this.debugWindow==undefined||this.debugWindow.closed==true){this.debugWindow=window.open('about:blank','xajax-debug','width=800,height=600,scrollbars=1,resizable,status');this.debugWindow.document.write('<html><head><title>Xajax debug output</title></head><body><h2>Xajax debug output</h2><div id="debugTag"></div></body></html>');}
-text=text.replace(/&/g,"&amp;")
-text=text.replace(/</g,"&lt;")
-text=text.replace(/>/g,"&gt;")
-debugTag=this.debugWindow.document.getElementById('debugTag');debugTag.innerHTML=('<b>'+(new Date()).toString()+'</b>: '+text+'<hr/>')+debugTag.innerHTML;}catch(e){alert("Xajax Debug:\n "+text);}
-};this.workId='xajaxWork'+new Date().getTime();this.depth=0;this.responseErrorsForAlert=["400","401","402","403","404","500","501","502","503"];this.getRequestObject=function(){if(xajaxDebug)this.DebugMessage("Initializing Request Object..");var req=null;if(typeof XMLHttpRequest!="undefined")
-req=new XMLHttpRequest();if(!req&&typeof ActiveXObject!="undefined"){try{req=new ActiveXObject("Msxml2.XMLHTTP");}
-catch(e){try{req=new ActiveXObject("Microsoft.XMLHTTP");}
-catch(e2){try{req=new ActiveXObject("Msxml2.XMLHTTP.4.0");}
-catch(e3){req=null;}
-}
-}
-}
-if(!req&&window.createRequest)
-req=window.createRequest();if(!req)this.DebugMessage("Request Object Instantiation failed.");return req;}
-this.$=function(sId){if(!sId){return null;}
-var returnObj=document.getElementById(sId);if(!returnObj&&document.all){returnObj=document.all[sId];}
-if(xajaxDebug&&!returnObj&&sId!=this.workId){this.DebugMessage("Element with the id \""+sId+"\" not found.");}
-return returnObj;}
-this.include=function(sFileName){var objHead=document.getElementsByTagName('head');var objScript=document.createElement('script');objScript.type='text/javascript';objScript.src=sFileName;objHead[0].appendChild(objScript);}
-this.stripOnPrefix=function(sEventName){sEventName=sEventName.toLowerCase();if(sEventName.indexOf('on')==0){sEventName=sEventName.replace(/on/,'');}
-return sEventName;}
-this.addOnPrefix=function(sEventName){sEventName=sEventName.toLowerCase();if(sEventName.indexOf('on')!=0){sEventName='on'+sEventName;}
-return sEventName;}
-this.addHandler=function(sElementId,sEvent,sFunctionName){if(window.addEventListener){sEvent=this.stripOnPrefix(sEvent);eval("this.$('"+sElementId+"').addEventListener('"+sEvent+"',"+sFunctionName+",false);");}
-else{sAltEvent=this.addOnPrefix(sEvent);eval("this.$('"+sElementId+"').attachEvent('"+sAltEvent+"',"+sFunctionName+",false);");}
-}
-this.removeHandler=function(sElementId,sEvent,sFunctionName){if(window.addEventListener){sEvent=this.stripOnPrefix(sEvent);eval("this.$('"+sElementId+"').removeEventListener('"+sEvent+"',"+sFunctionName+",false);");}
-else{sAltEvent=this.addOnPrefix(sEvent);eval("this.$('"+sElementId+"').detachEvent('"+sAltEvent+"',"+sFunctionName+",false);");}
-}
-this.create=function(sParentId,sTag,sId){var objParent=this.$(sParentId);objElement=document.createElement(sTag);objElement.setAttribute('id',sId);if(objParent)
-objParent.appendChild(objElement);}
-this.insert=function(sBeforeId,sTag,sId){var objSibling=this.$(sBeforeId);objElement=document.createElement(sTag);objElement.setAttribute('id',sId);objSibling.parentNode.insertBefore(objElement,objSibling);}
-this.insertAfter=function(sAfterId,sTag,sId){var objSibling=this.$(sAfterId);objElement=document.createElement(sTag);objElement.setAttribute('id',sId);objSibling.parentNode.insertBefore(objElement,objSibling.nextSibling);}
-this.getInput=function(sType,sName,sId){var Obj;if(!window.addEventListener){Obj=document.createElement('<input type="'+sType+'" id="'+sId+'" name="'+sName+'">');}
-else{Obj=document.createElement('input');Obj.setAttribute('type',sType);Obj.setAttribute('name',sName);Obj.setAttribute('id',sId);}
-return Obj;}
-this.createInput=function(sParentId,sType,sName,sId){var objParent=this.$(sParentId);var objElement=this.getInput(sType,sName,sId);if(objParent&&objElement)
-objParent.appendChild(objElement);}
-this.insertInput=function(sBeforeId,sType,sName,sId){var objSibling=this.$(sBeforeId);var objElement=this.getInput(sType,sName,sId);if(objElement&&objSibling&&objSibling.parentNode)
-objSibling.parentNode.insertBefore(objElement,objSibling);}
-this.insertInputAfter=function(sAfterId,sType,sName,sId){var objSibling=this.$(sAfterId);var objElement=this.getInput(sType,sName,sId);if(objElement&&objSibling&&objSibling.parentNode){objSibling.parentNode.insertBefore(objElement,objSibling.nextSibling);}
-}
-this.remove=function(sId){objElement=this.$(sId);if(objElement&&objElement.parentNode&&objElement.parentNode.removeChild){objElement.parentNode.removeChild(objElement);}
-}
-this.replace=function(sId,sAttribute,sSearch,sReplace){var bFunction=false;if(sAttribute=="innerHTML")
-sSearch=this.getBrowserHTML(sSearch);eval("var txt=this.$('"+sId+"')."+sAttribute);if(typeof txt=="function"){txt=txt.toString();bFunction=true;}
-if(txt.indexOf(sSearch)>-1){var newTxt='';while(txt.indexOf(sSearch)>-1){x=txt.indexOf(sSearch)+sSearch.length+1;newTxt+=txt.substr(0,x).replace(sSearch,sReplace);txt=txt.substr(x,txt.length-x);}
-newTxt+=txt;if(bFunction){eval('this.$("'+sId+'").'+sAttribute+'=newTxt;');}
-else if(this.willChange(sId,sAttribute,newTxt)){eval('this.$("'+sId+'").'+sAttribute+'=newTxt;');}
-}
-}
-this.getFormValues=function(frm){var objForm;var submitDisabledElements=false;if(arguments.length > 1&&arguments[1]==true)
-submitDisabledElements=true;var prefix="";if(arguments.length > 2)
-prefix=arguments[2];if(typeof(frm)=="string")
-objForm=this.$(frm);else
-objForm=frm;var sXml="<xjxquery><q>";if(objForm&&objForm.tagName=='FORM'){var formElements=objForm.elements;for(var i=0;i < formElements.length;i++){if(!formElements[i].name)
-continue;if(formElements[i].name.substring(0,prefix.length)!=prefix)
-continue;if(formElements[i].type&&(formElements[i].type=='radio'||formElements[i].type=='checkbox')&&formElements[i].checked==false)
-continue;if(formElements[i].disabled&&formElements[i].disabled==true&&submitDisabledElements==false)
-continue;var name=formElements[i].name;if(name){if(sXml!='<xjxquery><q>')
-sXml+='&';if(formElements[i].type=='select-multiple'){for(var j=0;j < formElements[i].length;j++){if(formElements[i].options[j].selected==true)
-sXml+=name+"="+encodeURIComponent(formElements[i].options[j].value)+"&";}
-}
-else{sXml+=name+"="+encodeURIComponent(formElements[i].value);}
-}
-}
-}
-sXml+="</q></xjxquery>";return sXml;}
-this.objectToXML=function(obj){var sXml="<xjxobj>";for(i in obj){try{if(i=='constructor')
-continue;if(obj[i]&&typeof(obj[i])=='function')
-continue;var key=i;var value=obj[i];if(value&&typeof(value)=="object"&&this.depth <=50){this.depth++;value=this.objectToXML(value);this.depth--;}
-sXml+="<e><k>"+key+"</k><v>"+value+"</v></e>";}
-catch(e){if(xajaxDebug)this.DebugMessage(e.name+": "+e.message);}
-}
-sXml+="</xjxobj>";return sXml;}
-this._nodeToObject=function(node){if(node.nodeName=='#cdata-section'){var data="";for(var j=0;j<node.parentNode.childNodes.length;j++){data+=node.parentNode.childNodes[j].data;}
-return data;}
-else if(node.nodeName=='xjxobj'){var data=new Array();for(var j=0;j<node.childNodes.length;j++){var child=node.childNodes[j];var key;var value;if(child.nodeName=='e'){for(var k=0;k<child.childNodes.length;k++){if(child.childNodes[k].nodeName=='k'){key=child.childNodes[k].firstChild.data;}
-else if(child.childNodes[k].nodeName=='v'){value=this._nodeToObject(child.childNodes[k].firstChild);}
-}
-if(key!=null&&value!=null){data[key]=value;key=value=null;}
-}
-}
-return data;}
-}
-this.loadingFunction=function(){};this.doneLoadingFunction=function(){};var loadingTimeout;this.call=function(sFunction,aArgs,sRequestType){var i,r,postData;if(document.body&&xajaxWaitCursor)
-document.body.style.cursor='wait';if(xajaxStatusMessages==true)window.status='Sending Request...';clearTimeout(loadingTimeout);loadingTimeout=setTimeout("xajax.loadingFunction();",400);if(xajaxDebug)this.DebugMessage("Starting xajax...");if(sRequestType==null){var xajaxRequestType=xajaxDefinedPost;}
-else{var xajaxRequestType=sRequestType;}
-var uri=xajaxRequestUri;var value;switch(xajaxRequestType){case xajaxDefinedGet:{var uriGet=uri.indexOf("?")==-1?"?xajax="+encodeURIComponent(sFunction):"&xajax="+encodeURIComponent(sFunction);if(aArgs){for(i=0;i<aArgs.length;i++){value=aArgs[i];if(typeof(value)=="object")
-value=this.objectToXML(value);uriGet+="&xajaxargs[]="+encodeURIComponent(value);}
-}
-uriGet+="&xajaxr="+new Date().getTime();uri+=uriGet;postData=null;}break;case xajaxDefinedPost:{postData="xajax="+encodeURIComponent(sFunction);postData+="&xajaxr="+new Date().getTime();if(aArgs){for(i=0;i <aArgs.length;i++){value=aArgs[i];if(typeof(value)=="object")
-value=this.objectToXML(value);postData=postData+"&xajaxargs[]="+encodeURIComponent(value);}
-}
-}break;default:
-alert("Illegal request type: "+xajaxRequestType);return false;break;}
-r=this.getRequestObject();if(!r)return false;r.open(xajaxRequestType==xajaxDefinedGet?"GET":"POST",uri,true);if(xajaxRequestType==xajaxDefinedPost){try{r.setRequestHeader("Method","POST "+uri+" HTTP/1.1");r.setRequestHeader("Content-Type","application/x-www-form-urlencoded");}
-catch(e){alert("Your browser does not appear to  support asynchronous requests using POST.");return false;}
-}
-r.onreadystatechange=function(){if(r.readyState!=4)
-return;if(r.status==200){if(xajaxDebug)xajax.DebugMessage("Received:\n"+r.responseText);if(r.responseXML&&r.responseXML.documentElement)
-xajax.processResponse(r.responseXML);else{var errorString="Error: the XML response that was returned from the server is invalid.";errorString+="\nReceived:\n"+r.responseText;trimmedResponseText=r.responseText.replace(/^\s+/g,"");trimmedResponseText=trimmedResponseText.replace(/\s+$/g,"");if(trimmedResponseText!=r.responseText)
-errorString+="\nYou have whitespace in your response.";alert(errorString);document.body.style.cursor='default';if(xajaxStatusMessages==true)window.status='Invalid XML response error';}
-}
-else{if(xajax.responseErrorsForAlert.containsValue(r.status)){var errorString="Error: the server returned the following HTTP status: "+r.status;errorString+="\nReceived:\n"+r.responseText;alert(errorString);}
-document.body.style.cursor='default';if(xajaxStatusMessages==true)window.status='Invalid XML response error';}
-delete r;r=null;}
-if(xajaxDebug)this.DebugMessage("Calling "+sFunction+" uri="+uri+" (post:"+postData+")");r.send(postData);if(xajaxStatusMessages==true)window.status='Waiting for data...';delete r;return true;}
-this.getBrowserHTML=function(html){tmpXajax=this.$(this.workId);if(!tmpXajax){tmpXajax=document.createElement("div");tmpXajax.setAttribute('id',this.workId);tmpXajax.style.display="none";tmpXajax.style.visibility="hidden";document.body.appendChild(tmpXajax);}
-tmpXajax.innerHTML=html;var browserHTML=tmpXajax.innerHTML;tmpXajax.innerHTML='';return browserHTML;}
-this.willChange=function(element,attribute,newData){if(!document.body){return true;}
-if(attribute=="innerHTML"){newData=this.getBrowserHTML(newData);}
-elementObject=this.$(element);if(elementObject){var oldData;eval("oldData=this.$('"+element+"')."+attribute);if(newData!==oldData)
-return true;}
-return false;}
-this.viewSource=function(){return "<html>"+document.getElementsByTagName("HTML")[0].innerHTML+"</html>";}
-this.processResponse=function(xml){clearTimeout(loadingTimeout);this.doneLoadingFunction();if(xajaxStatusMessages==true)window.status='Processing...';var tmpXajax=null;xml=xml.documentElement;if(xml==null)
-return;var skipCommands=0;for(var i=0;i<xml.childNodes.length;i++){if(skipCommands > 0){skipCommands--;continue;}
-if(xml.childNodes[i].nodeName=="cmd"){var cmd;var id;var property;var data;var search;var type;var before;var objElement=null;for(var j=0;j<xml.childNodes[i].attributes.length;j++){if(xml.childNodes[i].attributes[j].name=="n"){cmd=xml.childNodes[i].attributes[j].value;}
-else if(xml.childNodes[i].attributes[j].name=="t"){id=xml.childNodes[i].attributes[j].value;}
-else if(xml.childNodes[i].attributes[j].name=="p"){property=xml.childNodes[i].attributes[j].value;}
-else if(xml.childNodes[i].attributes[j].name=="c"){type=xml.childNodes[i].attributes[j].value;}
-}
-if(xml.childNodes[i].childNodes.length > 1&&xml.childNodes[i].firstChild.nodeName=="#cdata-section"){data="";for(var j=0;j<xml.childNodes[i].childNodes.length;j++){data+=xml.childNodes[i].childNodes[j].data;}
-}
-else if(xml.childNodes[i].firstChild&&xml.childNodes[i].firstChild.nodeName=='xjxobj'){data=this._nodeToObject(xml.childNodes[i].firstChild);objElement="XJX_SKIP";}
-else if(xml.childNodes[i].childNodes.length > 1){for(var j=0;j<xml.childNodes[i].childNodes.length;j++){if(xml.childNodes[i].childNodes[j].childNodes.length > 1&&xml.childNodes[i].childNodes[j].firstChild.nodeName=="#cdata-section"){var internalData="";for(var k=0;k<xml.childNodes[i].childNodes[j].childNodes.length;k++){internalData+=xml.childNodes[i].childNodes[j].childNodes[k].nodeValue;}
-}else{var internalData=xml.childNodes[i].childNodes[j].firstChild.nodeValue;}
-if(xml.childNodes[i].childNodes[j].nodeName=="s"){search=internalData;}
-if(xml.childNodes[i].childNodes[j].nodeName=="r"){data=internalData;}
-}
-}
-else if(xml.childNodes[i].firstChild)
-data=xml.childNodes[i].firstChild.nodeValue;else
-data="";if(objElement!="XJX_SKIP")objElement=this.$(id);var cmdFullname;try{if(cmd=="cc"){cmdFullname="addConfirmCommands";var confirmResult=confirm(data);if(!confirmResult){skipCommands=id;}
-}
-if(cmd=="al"){cmdFullname="addAlert";alert(data);}
-else if(cmd=="js"){cmdFullname="addScript/addRedirect";eval(data);}
-else if(cmd=="jc"){cmdFullname="addScriptCall";var scr=id+'(';if(data[0]!=null){scr+='data[0]';for(var l=1;l<data.length;l++){scr+=',data['+l+']';}
-}
-scr+=');';eval(scr);}
-else if(cmd=="in"){cmdFullname="addIncludeScript";this.include(data);}
-else if(cmd=="as"){cmdFullname="addAssign/addClear";if(this.willChange(id,property,data)){eval("objElement."+property+"=data;");}
-}
-else if(cmd=="ap"){cmdFullname="addAppend";eval("objElement."+property+"+=data;");}
-else if(cmd=="pp"){cmdFullname="addPrepend";eval("objElement."+property+"=data+objElement."+property);}
-else if(cmd=="rp"){cmdFullname="addReplace";this.replace(id,property,search,data)
-}
-else if(cmd=="rm"){cmdFullname="addRemove";this.remove(id);}
-else if(cmd=="ce"){cmdFullname="addCreate";this.create(id,data,property);}
-else if(cmd=="ie"){cmdFullname="addInsert";this.insert(id,data,property);}
-else if(cmd=="ia"){cmdFullname="addInsertAfter";this.insertAfter(id,data,property);}
-else if(cmd=="ci"){cmdFullname="addCreateInput";this.createInput(id,type,data,property);}
-else if(cmd=="ii"){cmdFullname="addInsertInput";this.insertInput(id,type,data,property);}
-else if(cmd=="iia"){cmdFullname="addInsertInputAfter";this.insertInputAfter(id,type,data,property);}
-else if(cmd=="ev"){cmdFullname="addEvent";property=this.addOnPrefix(property);eval("this.$('"+id+"')."+property+"= function(){"+data+";}");}
-else if(cmd=="ah"){cmdFullname="addHandler";this.addHandler(id,property,data);}
-else if(cmd=="rh"){cmdFullname="addRemoveHandler";this.removeHandler(id,property,data);}
-}
-catch(e){if(xajaxDebug)
-alert("While trying to '"+cmdFullname+"' (command number "+i+"), the following error occured:\n"
-+e.name+": "+e.message+"\n"
-+(id&&!objElement?"Object with id='"+id+"' wasn't found.\n":""));}
-delete objElement;delete cmd;delete cmdFullname;delete id;delete property;delete search;delete data;delete type;delete before;delete internalData;delete j;delete k;}
-}
-delete xml;delete i;document.body.style.cursor='default';if(xajaxStatusMessages==true)window.status='Done';}
-}
-var xajax=new Xajax();xajaxLoaded=true;
\ No newline at end of file
diff --git a/phpgwapi/js/xajax_js/xajax_uncompressed.js b/phpgwapi/js/xajax_js/xajax_uncompressed.js
deleted file mode 100644
index df51ccdeb2..0000000000
--- a/phpgwapi/js/xajax_js/xajax_uncompressed.js
+++ /dev/null
@@ -1,795 +0,0 @@
-/* xajax Javascript library :: version 0.2.4 */
-
-Array.prototype.containsValue = function(valueToCheck)
-{
-	for (var i=0;i<this.length;i++) {
-		if (this[i] == valueToCheck) return true;
-	}
-	return false;
-}
-
-function Xajax()
-{
-	this.DebugMessage = function(text)
-	{
-		if (text.length > 1000) text = text.substr(0,1000)+"...\n[long response]\n...";
-		try {
-			if (this.debugWindow == undefined || this.debugWindow.closed == true) {
-				this.debugWindow = window.open('about:blank', 'xajax-debug', 'width=800,height=600,scrollbars=1,resizable,status');
-				this.debugWindow.document.write('<html><head><title>Xajax debug output</title></head><body><h2>Xajax debug output</h2><div id="debugTag"></div></body></html>');
-			}
-			text = text.replace(/&/g, "&amp;")
-			text = text.replace(/</g, "&lt;")
-			text = text.replace(/>/g, "&gt;")
-			debugTag = this.debugWindow.document.getElementById('debugTag');
-			debugTag.innerHTML = ('<b>'+(new Date()).toString()+'</b>: ' + text + '<hr/>') + debugTag.innerHTML;
-		} catch (e) {
-			alert("Xajax Debug:\n " + text);
-		}
-	};
-	
-	this.workId = 'xajaxWork'+ new Date().getTime();
-	this.depth = 0;
-	this.responseErrorsForAlert = ["400","401","402","403","404","500","501","502","503"];
-	
-	//Get the XMLHttpRequest Object
-	this.getRequestObject = function()
-	{
-		if (xajaxDebug) this.DebugMessage("Initializing Request Object..");
-		var req = null;
-		if (typeof XMLHttpRequest != "undefined")
-			req = new XMLHttpRequest();
-		if (!req && typeof ActiveXObject != "undefined")
-		{
-			try
-			{
-				req=new ActiveXObject("Msxml2.XMLHTTP");
-			}
-			catch (e)
-			{
-				try
-				{
-					req=new ActiveXObject("Microsoft.XMLHTTP");
-				}
-				catch (e2)
-				{
-					try {
-						req=new ActiveXObject("Msxml2.XMLHTTP.4.0");
-					}
-					catch (e3)
-					{
-						req=null;
-					}
-				}
-			}
-		}
-		if(!req && window.createRequest)
-			req = window.createRequest();
-		
-		if (!req) this.DebugMessage("Request Object Instantiation failed.");
-			
-		return req;
-	}
-
-	// xajax.$() is shorthand for document.getElementById()
-	this.$ = function(sId)
-	{
-		if (!sId) {
-			return null;
-		}
-		var returnObj = document.getElementById(sId);
-		if (!returnObj && document.all) {
-			returnObj = document.all[sId];
-		}
-		if (xajaxDebug && !returnObj && sId != this.workId) {
-			this.DebugMessage("Element with the id \"" + sId + "\" not found.");
-		}
-		return returnObj;
-	}
-	
-	// xajax.include(sFileName) dynamically includes an external javascript file
-	this.include = function(sFileName)
-	{
-		var objHead = document.getElementsByTagName('head');
-		var objScript = document.createElement('script');
-		objScript.type = 'text/javascript';
-		objScript.src = sFileName;
-		objHead[0].appendChild(objScript);
-	}
-	
-	this.stripOnPrefix = function(sEventName)
-	{
-		sEventName = sEventName.toLowerCase();
-		if (sEventName.indexOf('on') == 0)
-		{
-			sEventName = sEventName.replace(/on/,'');
-		}
-		
-		return sEventName;
-	}
-	
-	this.addOnPrefix = function(sEventName)
-	{
-		sEventName = sEventName.toLowerCase();
-		if (sEventName.indexOf('on') != 0)
-		{
-			sEventName = 'on' + sEventName;
-		}
-		
-		return sEventName;
-	}
-	
-	// xajax.addHandler adds an event handler to an element
-	this.addHandler = function(sElementId, sEvent, sFunctionName)
-	{
-		if (window.addEventListener)
-		{
-			sEvent = this.stripOnPrefix(sEvent);
-			eval("this.$('"+sElementId+"').addEventListener('"+sEvent+"',"+sFunctionName+",false);");
-		}
-		else
-		{
-			sAltEvent = this.addOnPrefix(sEvent);
-			eval("this.$('"+sElementId+"').attachEvent('"+sAltEvent+"',"+sFunctionName+",false);");
-		}
-	}
-	
-	// xajax.removeHandler removes an event handler from an element
-	this.removeHandler = function(sElementId, sEvent, sFunctionName)
-	{
-		if (window.addEventListener)
-		{
-			sEvent = this.stripOnPrefix(sEvent);
-			eval("this.$('"+sElementId+"').removeEventListener('"+sEvent+"',"+sFunctionName+",false);");
-		}
-		else
-		{
-			sAltEvent = this.addOnPrefix(sEvent);
-			eval("this.$('"+sElementId+"').detachEvent('"+sAltEvent+"',"+sFunctionName+",false);");
-		}
-	}
-	
-	// xajax.create creates a new child node under a parent
-	this.create = function(sParentId, sTag, sId)
-	{
-		var objParent = this.$(sParentId);
-		objElement = document.createElement(sTag);
-		objElement.setAttribute('id',sId);
-		if (objParent)
-			objParent.appendChild(objElement);
-	}
-	
-	// xajax.insert inserts a new node before another node
-	this.insert = function(sBeforeId, sTag, sId)
-	{
-		var objSibling = this.$(sBeforeId);
-		objElement = document.createElement(sTag);
-		objElement.setAttribute('id',sId);
-		objSibling.parentNode.insertBefore(objElement, objSibling);
-	}
-
-	// xajax.insertAfter inserts a new node after another node
-	this.insertAfter = function(sAfterId, sTag, sId)
-	{
-		var objSibling = this.$(sAfterId);
-		objElement = document.createElement(sTag);
-		objElement.setAttribute('id',sId);
-		objSibling.parentNode.insertBefore(objElement, objSibling.nextSibling);
-	}
-	
-	this.getInput = function(sType, sName, sId)
-	{
-		var Obj;
-		if (!window.addEventListener)
-		{
-			Obj = document.createElement('<input type="'+sType+'" id="'+sId+'" name="'+sName+'">');
-		}
-		else
-		{
-			Obj = document.createElement('input');
-			Obj.setAttribute('type',sType);
-			Obj.setAttribute('name',sName);
-			Obj.setAttribute('id',sId);
-		}
-		return Obj;
-	}
-	
-	// xajax.createInput creates a new input node under a parent
-	this.createInput = function(sParentId, sType, sName, sId)
-	{
-		var objParent = this.$(sParentId);
-		var objElement = this.getInput(sType, sName, sId);
-		if (objParent && objElement)
-			objParent.appendChild(objElement);
-	}
-	
-	// xajax.insertInput creates a new input node before another node
-	this.insertInput = function(sBeforeId, sType, sName, sId)
-	{
-		var objSibling = this.$(sBeforeId);
-		var objElement = this.getInput(sType, sName, sId);
-		if (objElement && objSibling && objSibling.parentNode)
-			objSibling.parentNode.insertBefore(objElement, objSibling);
-	}
-
-	// xajax.insertInputAfter creates a new input node after another node
-	this.insertInputAfter = function(sAfterId, sType, sName, sId)
-	{
-		var objSibling = this.$(sAfterId);
-		var objElement = this.getInput(sType, sName, sId);
-		if (objElement && objSibling && objSibling.parentNode) {
-			objSibling.parentNode.insertBefore(objElement, objSibling.nextSibling);
-		}
-	}
-		
-	// xajax.remove deletes an element
-	this.remove = function(sId)
-	{
-		objElement = this.$(sId);
-		if (objElement && objElement.parentNode && objElement.parentNode.removeChild)
-		{
-			objElement.parentNode.removeChild(objElement);
-		}
-	}
-	
-	//xajax.replace searches for text in an attribute of an element and replaces it
-	//with a different text
-	this.replace = function(sId,sAttribute,sSearch,sReplace)
-	{
-		var bFunction = false;
-		
-		if (sAttribute == "innerHTML")
-			sSearch = this.getBrowserHTML(sSearch);
-		
-		eval("var txt=this.$('"+sId+"')."+sAttribute);
-		if (typeof txt == "function")
-        {
-            txt = txt.toString();
-            bFunction = true;
-        }
-		if (txt.indexOf(sSearch)>-1)
-		{
-			var newTxt = '';
-			while (txt.indexOf(sSearch) > -1)
-			{
-				x = txt.indexOf(sSearch)+sSearch.length+1;
-				newTxt += txt.substr(0,x).replace(sSearch,sReplace);
-				txt = txt.substr(x,txt.length-x);
-			}
-			newTxt += txt;
-			if (bFunction)
-			{
-				eval('this.$("'+sId+'").'+sAttribute+'=newTxt;');
-			}
-			else if (this.willChange(sId,sAttribute,newTxt))
-			{
-				eval('this.$("'+sId+'").'+sAttribute+'=newTxt;');
-			}
-		}
-	}
-	
-	// xajax.getFormValues() builds a query string XML message from the elements of a form object
-	// * The first argument is the id of the form
-	// * The second argument (optional) can be set to true if you want to submit disabled elements
-	// * The third argument (optional) allows you to specify a string prefix that a form element
-	//   name must contain if you want that element to be submitted
-	this.getFormValues = function(frm)
-	{
-		var objForm;
-		var submitDisabledElements = false;
-		if (arguments.length > 1 && arguments[1] == true)
-			submitDisabledElements = true;
-		var prefix="";
-		if(arguments.length > 2)
-			prefix = arguments[2];
-		
-		if (typeof(frm) == "string")
-			objForm = this.$(frm);
-		else
-			objForm = frm;
-		var sXml = "<xjxquery><q>";
-		if (objForm && objForm.tagName == 'FORM')
-		{
-			var formElements = objForm.elements;
-			for( var i=0; i < formElements.length; i++)
-			{
-				if (!formElements[i].name)
-					continue;
-				if (formElements[i].name.substring(0, prefix.length) != prefix)
-					continue;
-				if (formElements[i].type && (formElements[i].type == 'radio' || formElements[i].type == 'checkbox') && formElements[i].checked == false)
-					continue;
-				if (formElements[i].disabled && formElements[i].disabled == true && submitDisabledElements == false)
-					continue;
-				var name = formElements[i].name;
-				if (name)
-				{
-					if (sXml != '<xjxquery><q>')
-						sXml += '&';
-					if(formElements[i].type=='select-multiple')
-					{
-						for (var j = 0; j < formElements[i].length; j++)
-						{
-							if (formElements[i].options[j].selected == true)
-								sXml += name+"="+encodeURIComponent(formElements[i].options[j].value)+"&";
-						}
-					}
-					else
-					{
-						sXml += name+"="+encodeURIComponent(formElements[i].value);
-					}
-				} 
-			}
-		}
-		
-		sXml +="</q></xjxquery>";
-		
-		return sXml;
-	}
-	
-	// Generates an XML message that xajax can understand from a javascript object
-	this.objectToXML = function(obj)
-	{
-		var sXml = "<xjxobj>";
-		for (i in obj)
-		{
-			try
-			{
-				if (i == 'constructor')
-					continue;
-				if (obj[i] && typeof(obj[i]) == 'function')
-					continue;
-					
-				var key = i;
-				var value = obj[i];
-				if (value && typeof(value)=="object" && this.depth <= 50)
-				{
-					this.depth++;
-					value = this.objectToXML(value);
-					this.depth--;
-				}
-				
-				sXml += "<e><k>"+key+"</k><v>"+value+"</v></e>";
-				
-			}
-			catch(e)
-			{
-				if (xajaxDebug) this.DebugMessage(e.name+": "+e.message);
-			}
-		}
-		sXml += "</xjxobj>";
-	
-		return sXml;
-	}
-
-	// unserializes data structure from xajaxResponse::_buildObjXml()
-	this._nodeToObject = function(node) {
-		// parentNode here is weird, have to tune
-		if (node.nodeName == '#cdata-section') {
-			var data = "";
-			for (var j=0; j<node.parentNode.childNodes.length; j++) {
-				data += node.parentNode.childNodes[j].data;
-			}
-			return data;
-		}
-		else if (node.nodeName == 'xjxobj') {
-			var data = new Array();
-			for (var j=0; j<node.childNodes.length; j++) {
-				var child = node.childNodes[j];
-				var key;
-				var value;
-				if (child.nodeName == 'e') {
-					for (var k=0; k<child.childNodes.length; k++) {
-						if (child.childNodes[k].nodeName == 'k') {
-							key = child.childNodes[k].firstChild.data;
-						}
-						else if (child.childNodes[k].nodeName == 'v') {
-							value = this._nodeToObject(child.childNodes[k].firstChild);
-						}
-					}
-					if (key != null && value != null) {
-						data[key] = value;
-						key = value = null;
-					}
-				}
-			}
-			return data;
-		}		
-	}
-
-	this.loadingFunction = function(){};
-	this.doneLoadingFunction = function(){};
-	var loadingTimeout;
-
-	// Sends a XMLHttpRequest to call the specified PHP function on the server
-	// * sRequestType is optional -- defaults to POST
-	this.call = function(sFunction, aArgs, sRequestType)
-	{
-		var i,r,postData;
-		if (document.body && xajaxWaitCursor)
-			document.body.style.cursor = 'wait';
-		if (xajaxStatusMessages == true) window.status = 'Sending Request...';
-		clearTimeout(loadingTimeout);
-		loadingTimeout = setTimeout("xajax.loadingFunction();",400);
-		if (xajaxDebug) this.DebugMessage("Starting xajax...");
-		if (sRequestType == null) {
-		   var xajaxRequestType = xajaxDefinedPost;
-		}
-		else {
-			var xajaxRequestType = sRequestType;
-		}
-		var uri = xajaxRequestUri;
-		var value;
-		switch(xajaxRequestType)
-		{
-			case xajaxDefinedGet:{
-				var uriGet = uri.indexOf("?")==-1?"?xajax="+encodeURIComponent(sFunction):"&xajax="+encodeURIComponent(sFunction);
-				if (aArgs) {
-					for (i = 0; i<aArgs.length; i++)
-					{
-						value = aArgs[i];
-						if (typeof(value)=="object")
-							value = this.objectToXML(value);
-						uriGet += "&xajaxargs[]="+encodeURIComponent(value);
-					}
-				}
-				uriGet += "&xajaxr=" + new Date().getTime();
-				uri += uriGet;
-				postData = null;
-				} break;
-			case xajaxDefinedPost:{
-				postData = "xajax="+encodeURIComponent(sFunction);
-				postData += "&xajaxr="+new Date().getTime();
-				if (aArgs) {
-					for (i = 0; i <aArgs.length; i++)
-					{
-						value = aArgs[i];
-						if (typeof(value)=="object")
-							value = this.objectToXML(value);
-						postData = postData+"&xajaxargs[]="+encodeURIComponent(value);
-					}
-				}
-				} break;
-			default:
-				alert("Illegal request type: " + xajaxRequestType); return false; break;
-		}
-		r = this.getRequestObject();
-		if (!r) return false;
-		r.open(xajaxRequestType==xajaxDefinedGet?"GET":"POST", uri, true);
-		if (xajaxRequestType == xajaxDefinedPost)
-		{
-			try
-			{
-				r.setRequestHeader("Method", "POST " + uri + " HTTP/1.1");
-				r.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-			}
-			catch(e)
-			{
-				alert("Your browser does not appear to  support asynchronous requests using POST.");
-				return false;
-			}
-		}
-		r.onreadystatechange = function()
-		{
-			if (r.readyState != 4)
-				return;
-			
-			if (r.status==200)
-			{
-				if (xajaxDebug) xajax.DebugMessage("Received:\n" + r.responseText);
-				if (r.responseXML && r.responseXML.documentElement)
-					xajax.processResponse(r.responseXML);
-				else {
-					var errorString = "Error: the XML response that was returned from the server is invalid.";
-					errorString += "\nReceived:\n" + r.responseText;
-					trimmedResponseText = r.responseText.replace( /^\s+/g, "" );// strip leading space
-					trimmedResponseText = trimmedResponseText.replace( /\s+$/g, "" );// strip trailing
-					if (trimmedResponseText != r.responseText)
-						errorString += "\nYou have whitespace in your response.";
-					alert(errorString);
-					document.body.style.cursor = 'default';
-					if (xajaxStatusMessages == true) window.status = 'Invalid XML response error';				
-				}
-			}
-			else {
-				if (xajax.responseErrorsForAlert.containsValue(r.status)) {
-					var errorString = "Error: the server returned the following HTTP status: " + r.status;
-					errorString += "\nReceived:\n" + r.responseText;
-					alert(errorString);
-				}
-				document.body.style.cursor = 'default';
-				if (xajaxStatusMessages == true) window.status = 'Invalid XML response error';								
-			}
-			
-			delete r;
-			r = null;
-		}
-		if (xajaxDebug) this.DebugMessage("Calling "+sFunction +" uri="+uri+" (post:"+ postData +")");
-		r.send(postData);
-		if (xajaxStatusMessages == true) window.status = 'Waiting for data...';
-		delete r;
-		return true;
-	}
-	
-	//Gets the text as it would be if it were being retrieved from
-	//the innerHTML property in the current browser
-	this.getBrowserHTML = function(html)
-	{
-		tmpXajax = this.$(this.workId);
-		if (!tmpXajax)
-		{
-			tmpXajax = document.createElement("div");
-			tmpXajax.setAttribute('id',this.workId);
-			tmpXajax.style.display = "none";
-			tmpXajax.style.visibility = "hidden";
-			document.body.appendChild(tmpXajax);
-		}
-		tmpXajax.innerHTML = html;
-		var browserHTML = tmpXajax.innerHTML;
-		tmpXajax.innerHTML = '';	
-		
-		return browserHTML;
-	}
-	
-	// Tests if the new Data is the same as the extant data
-	this.willChange = function(element, attribute, newData)
-	{
-		if (!document.body)
-		{
-			return true;
-		}
-		if (attribute == "innerHTML")
-		{
-			newData = this.getBrowserHTML(newData);
-		}
-		elementObject = this.$(element);
-		if (elementObject) {
-			var oldData;		
-			eval("oldData=this.$('"+element+"')."+attribute);
-			if (newData !== oldData)
-				return true;
-		}
-
-		return false;
-	}
-	
-	//Returns the source code of the page after it's been modified by xajax
-	this.viewSource = function()
-	{
-		return "<html>"+document.getElementsByTagName("HTML")[0].innerHTML+"</html>";
-	}
-	
-	//Process XML xajaxResponses returned from the request
-	this.processResponse = function(xml)
-	{
-		clearTimeout(loadingTimeout);
-		this.doneLoadingFunction();
-		if (xajaxStatusMessages == true) window.status = 'Processing...';
-		var tmpXajax = null;
-		xml = xml.documentElement;
-		if (xml == null)
-			return;
-		
-		var skipCommands = 0;
-		for (var i=0; i<xml.childNodes.length; i++)
-		{
-			if (skipCommands > 0) {
-				skipCommands--;
-				continue;
-			}
-			if (xml.childNodes[i].nodeName == "cmd")
-			{
-				var cmd;
-				var id;
-				var property;
-				var data;
-				var search;
-				var type;
-				var before;
-				var objElement = null;
-
-				for (var j=0; j<xml.childNodes[i].attributes.length; j++)
-				{
-					if (xml.childNodes[i].attributes[j].name == "n")
-					{
-						cmd = xml.childNodes[i].attributes[j].value;
-					}
-					else if (xml.childNodes[i].attributes[j].name == "t")
-					{
-						id = xml.childNodes[i].attributes[j].value;
-					}
-					else if (xml.childNodes[i].attributes[j].name == "p")
-					{
-						property = xml.childNodes[i].attributes[j].value;
-					}
-					else if (xml.childNodes[i].attributes[j].name == "c")
-					{
-						type = xml.childNodes[i].attributes[j].value;
-					}
-				}
-				if (xml.childNodes[i].childNodes.length > 1 && xml.childNodes[i].firstChild.nodeName == "#cdata-section")
-				{
-					data = "";
-					for (var j=0; j<xml.childNodes[i].childNodes.length; j++)
-					{
-						data += xml.childNodes[i].childNodes[j].data;
-					}
-				}
-				else if (xml.childNodes[i].firstChild && xml.childNodes[i].firstChild.nodeName == 'xjxobj') {
-					data = this._nodeToObject(xml.childNodes[i].firstChild);
-					objElement = "XJX_SKIP";
-				}
-				else if (xml.childNodes[i].childNodes.length > 1)
-				{
-					for (var j=0; j<xml.childNodes[i].childNodes.length; j++)
-					{
-						if (xml.childNodes[i].childNodes[j].childNodes.length > 1 && xml.childNodes[i].childNodes[j].firstChild.nodeName == "#cdata-section")
-						{
-							var internalData = "";
-							for (var k=0; k<xml.childNodes[i].childNodes[j].childNodes.length;k++)
-							{
-								internalData+=xml.childNodes[i].childNodes[j].childNodes[k].nodeValue;
-							}
-						} else {
-							var internalData = xml.childNodes[i].childNodes[j].firstChild.nodeValue;
-						}
-					
-						if (xml.childNodes[i].childNodes[j].nodeName == "s")
-						{
-							search = internalData;
-						}
-						if (xml.childNodes[i].childNodes[j].nodeName == "r")
-						{
-							data = internalData;
-						}
-					}
-				}
-				else if (xml.childNodes[i].firstChild)
-					data = xml.childNodes[i].firstChild.nodeValue;
-				else
-					data = "";
-				
-				if (objElement != "XJX_SKIP") objElement = this.$(id);
-				var cmdFullname;
-				try
-				{
-					if (cmd=="cc") {
-						cmdFullname = "addConfirmCommands";
-						var confirmResult = confirm(data);
-						if (!confirmResult) {
-							skipCommands = id;
-						}
-					}
-					if (cmd=="al")
-					{
-						cmdFullname = "addAlert";
-						alert(data);
-					}
-					else if (cmd=="js")
-					{
-						cmdFullname = "addScript/addRedirect";
-						eval(data);
-					}
-					else if (cmd=="jc")
-					{
-						cmdFullname = "addScriptCall";
-						var scr = id + '(';
-						if (data[0] != null) {
-							scr += 'data[0]';
-							for (var l=1; l<data.length; l++) {
-								scr += ',data['+l+']';
-							}
-						}
-						scr += ');';
-						eval(scr);
-					}
-					else if (cmd=="in")
-					{
-						cmdFullname = "addIncludeScript";
-						this.include(data);
-					}
-					else if (cmd=="as")
-					{
-						cmdFullname = "addAssign/addClear";
-						if (this.willChange(id,property,data))
-						{
-							eval("objElement."+property+"=data;");
-						}
-					}
-					else if (cmd=="ap")
-					{
-						cmdFullname = "addAppend";
-						eval("objElement."+property+"+=data;");
-					}
-					else if (cmd=="pp")
-					{
-						cmdFullname = "addPrepend";
-						eval("objElement."+property+"=data+objElement."+property);
-					}
-					else if (cmd=="rp")
-					{
-						cmdFullname = "addReplace";
-						this.replace(id,property,search,data)
-					}
-					else if (cmd=="rm")
-					{
-						cmdFullname = "addRemove";
-						this.remove(id);
-					}
-					else if (cmd=="ce")
-					{
-						cmdFullname = "addCreate";
-						this.create(id,data,property);
-					}
-					else if (cmd=="ie")
-					{
-						cmdFullname = "addInsert";
-						this.insert(id,data,property);
-					}
-					else if (cmd=="ia")
-					{
-						cmdFullname = "addInsertAfter";
-						this.insertAfter(id,data,property);
-					}
-					else if (cmd=="ci")
-					{
-						cmdFullname = "addCreateInput";
-						this.createInput(id,type,data,property);
-					}
-					else if (cmd=="ii")
-					{
-						cmdFullname = "addInsertInput";
-						this.insertInput(id,type,data,property);
-					}
-					else if (cmd=="iia")
-					{
-						cmdFullname = "addInsertInputAfter";
-						this.insertInputAfter(id,type,data,property);
-					}
-					else if (cmd=="ev")
-					{
-						cmdFullname = "addEvent";
-						property = this.addOnPrefix(property);
-						eval("this.$('"+id+"')."+property+"= function(){"+data+";}");
-					}
-					else if (cmd=="ah")
-					{
-						cmdFullname = "addHandler";
-						this.addHandler(id, property, data);
-					}
-					else if (cmd=="rh")
-					{
-						cmdFullname = "addRemoveHandler";
-						this.removeHandler(id, property, data);
-					}
-				}
-				catch(e)
-				{
-					if (xajaxDebug)
-						alert("While trying to '"+cmdFullname+"' (command number "+i+"), the following error occured:\n"
-							+ e.name+": "+e.message+"\n"
-							+ (id&&!objElement?"Object with id='"+id+"' wasn't found.\n":""));
-				}
-				delete objElement;
-				delete cmd;
-				delete cmdFullname;
-				delete id;
-				delete property;
-				delete search;
-				delete data;
-				delete type;
-				delete before;
-				delete internalData;
-				delete j;
-				delete k;
-			}	
-		}
-		delete xml;
-		delete i;
-		document.body.style.cursor = 'default';
-		if (xajaxStatusMessages == true) window.status = 'Done';
-	}
-}
-
-var xajax = new Xajax();
-xajaxLoaded = true;
diff --git a/xajax.php b/xajax.php
index d588da598d..0c7bf20d65 100644
--- a/xajax.php
+++ b/xajax.php
@@ -11,7 +11,7 @@
  * @version $Id$
  */
 
-require_once('./phpgwapi/inc/xajax.inc.php');
+require_once('./phpgwapi/inc/xajax/xajax_core/xajax.inc.php');
 
 /**
  * callback if the session-check fails, redirects via xajax to login.php
@@ -22,15 +22,15 @@ require_once('./phpgwapi/inc/xajax.inc.php');
 function xajax_redirect(&$anon_account)
 {
 	// now the header is included, we can set the charset
-	$GLOBALS['xajax']->setCharEncoding($GLOBALS['egw']->translation->charset());
-	define('XAJAX_DEFAULT_CHAR_ENCODING',$GLOBALS['egw']->translation->charset());
+	$GLOBALS['xajax']->configure('characterEncoding',translation::charset());
+	define('XAJAX_DEFAULT_CHAR_ENCODING',translation::charset());
 
 	$response = new xajaxResponse();
 	$response->addScript("location.href='".$GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=10'."';");
 
-	header('Content-type: text/xml; charset='.$GLOBALS['egw']->translation->charset());
+	header('Content-type: text/xml; charset='.translation::charset());
 	echo $response->getXML();
-	$GLOBALS['egw']->common->egw_exit();
+	common::egw_exit();
 }
 
 /**
@@ -44,11 +44,11 @@ function ajax_exception_handler(Exception $e)
 {
 	$response = new xajaxResponse();
 	$response->addAlert($e->getMessage()."\n\n".$e->getTraceAsString());
-	header('Content-type: text/xml; charset='.(is_object($GLOBALS['egw'])?$GLOBALS['egw']->translation->charset():'utf-8'));
+	header('Content-type: text/xml; charset='.(is_object($GLOBALS['egw'])?translation::charset():'utf-8'));
 	echo $response->getXML();
 	if (is_object($GLOBALS['egw']))
 	{
-		$GLOBALS['egw']->common->egw_exit();
+		common::egw_exit();
 	}
 	exit;
 }
@@ -109,8 +109,8 @@ function doXMLHTTP()
 	include('./header.inc.php');
 
 	// now the header is included, we can set the charset
-	$GLOBALS['xajax']->setCharEncoding($GLOBALS['egw']->translation->charset());
-	define('XAJAX_DEFAULT_CHAR_ENCODING',$GLOBALS['egw']->translation->charset());
+	$GLOBALS['xajax']->configure('characterEncoding',translation::charset());
+	define('XAJAX_DEFAULT_CHAR_ENCODING',translation::charset());
 
 	switch($handler)
 	{
@@ -147,7 +147,7 @@ function doXMLHTTP()
 
 	return call_user_func_array(array(&$ajaxClass, $functionName), (array)$argList );
 }
-
-$xajax = new xajax($_SERVER['PHP_SELF']);
-$xajax->registerFunction('doXMLHTTP');
-$xajax->processRequests();
+$xajax = new xajax();
+//$xajax->configure('requestURI',$_SERVER['PHP_SELF']);
+$xajax->register(XAJAX_FUNCTION,'doXMLHTTP');
+$xajax->processRequest();