diff --git a/common/js/xe.js b/common/js/xe.js index e623edd9a..674a79a5d 100644 --- a/common/js/xe.js +++ b/common/js/xe.js @@ -1533,7 +1533,8 @@ $.exec_xml = window.exec_xml = function(module, act, params, callback_func, resp return $.exec_xml.onerror(module, act, ret, callback_func, response_tags, callback_func_arg, fo_obj); } - alert(ret['message'] || 'error!'); + alert( (ret['message']||'An unknown error occured while loading ['+module+'.'+act+']').replace(/\\n/g, '\n') ); + return null; } diff --git a/common/js/xe.min.js b/common/js/xe.min.js index 637a2db01..c6afc5035 100644 --- a/common/js/xe.min.js +++ b/common/js/xe.min.js @@ -54,12 +54,12 @@ a.nodeValue:4==a.nodeType&&(b+="");return b},a=a.fir a.documentElement;var e=c.toObj(c.removeWhite(a));"object"==typeof JSON&&jQuery.isFunction(JSON.stringify);a=c.toJson(e,a.nodeName,"");return"{"+(b?a.replace(/\t/g,b):a.replace(/\t|\n/g,""))+"}"} (function(a){function b(b,c){a("#xeTmpIframe").length||a(''.replace(/%id%/g,"xeTmpIframe")).appendTo(document.body);a("#xeVirtualForm").remove();var d=a('
'.replace(/%id%/g,"xeVirtualForm")).attr({id:"xeVirtualForm",method:"post",action:b,target:"xeTmpIframe"});c.xeVirtualRequestMethod="xml";c.xeRequestURI=location.href.replace(/#(.*)$/i,"");c.xeVirtualRequestUrl=request_uri; a.each(c,function(b,c){a('').attr("name",b).attr("value",c).appendTo(d)});d.appendTo(document.body).submit()}function d(a){var b={},c;for(c in a)a.hasOwnProperty(c)&&(b[c]=a[c]);return b}function c(){return""}a.exec_xml=window.exec_xml=function(c,g,j,l,m,k,h){function w(b){var b=a(b).find("response")[0],d,w="",o=[],j={};d="";s.css("display","none").trigger("cancel_confirm");if(!b)return alert(u.responseText),null;d=xml2json(b,!1,!1);d="object"==typeof JSON&&a.isFunction(JSON.parse)? -JSON.parse(d):eval("("+d+")");d=d.response;if("undefined"==typeof d){o.error=-1;o.message="Unexpected error occured.";try{if("undefined"!=typeof(w=b.childNodes[0].firstChild.data))o.message+="\r\n"+w}catch(n){}return o}a.each(m,function(a,b){j[b]=!0});j.redirect_url=!0;j.act=!0;a.each(d,function(a,b){j[a]&&(o[a]=b)});if(0!=o.error){if(a.isFunction(a.exec_xml.onerror))return a.exec_xml.onerror(c,g,o,l,m,k,h);alert(o.message||"error!");return null}if(o.redirect_url)return location.href=o.redirect_url.replace(/&/g, -"&"),null;a.isFunction(l)&&l(o,m,k,h)}var o=request_uri+"index.php";j||(j={});a.isArray(j)&&(j=d(j));j.module=c;j.act=g;"undefined"!=typeof xeVid&&(j.vid=xeVid);"undefined"==typeof m||1>m.length?m=["error","message"]:m.push("error","message");if(a.isArray(ssl_actions)&&j.act&&0<=a.inArray(j.act,ssl_actions)){var o=window.https_port||443,n=a("").attr("href",default_url||request_uri)[0],v="https://"+n.hostname.replace(/:\d+$/,"");443!=o&&(v+=":"+o);"/"!=n.pathname[0]&&(v+="/");v+=n.pathname;o=v.replace(/\/$/, -"")+"/index.php"}n=a("").attr("href",location.href)[0];v=a("").attr("href",o)[0];if(n.protocol!=v.protocol||n.port!=v.port)return b(o,j);var x=[],p=0;x[p++]='';x[p++]="";x[p++]="";a.each(j,function(a,b){x[p++]="<"+a+">"});x[p++]="";x[p++]="";var u=null;u&&0!=u.readyState&&u.abort();try{a.ajax({url:o,type:"POST",dataType:"xml",data:x.join("\n"),contentType:"text/plain",beforeSend:function(a){u= -a},success:w,error:function(a,b){s.css("display","none");var c="";if("parsererror"==b){if(""==a.responseText)return;c="The result is not valid XML :\n-------------------------------------\n"+a.responseText.replace(/<[^>]+>/g,"")}else c=b;try{console.log(c)}catch(d){}}})}catch(A){alert(A);return}var s=a(".wfsr");show_waiting_message&&s.length&&s.html(waiting_message).show()};a.exec_json=function(b,c,d){"undefined"==typeof c&&(c={});b=b.split(".");2==b.length&&(show_waiting_message&&a(".wfsr").html(waiting_message).show(), -a.extend(c,{module:b[0],act:b[1]}),"undefined"!=typeof xeVid&&a.extend(c,{vid:xeVid}),a.ajax({type:"POST",dataType:"json",url:request_uri,contentType:"application/json",data:a.param(c),success:function(b){a(".wfsr").hide().trigger("cancel_confirm");0m.length?m=["error","message"]:m.push("error","message");if(a.isArray(ssl_actions)&&j.act&&0<=a.inArray(j.act,ssl_actions)){var o=window.https_port||443,n=a("").attr("href",default_url||request_uri)[0],v="https://"+n.hostname.replace(/:\d+$/, +"");443!=o&&(v+=":"+o);"/"!=n.pathname[0]&&(v+="/");v+=n.pathname;o=v.replace(/\/$/,"")+"/index.php"}n=a("").attr("href",location.href)[0];v=a("").attr("href",o)[0];if(n.protocol!=v.protocol||n.port!=v.port)return b(o,j);var x=[],p=0;x[p++]='';x[p++]="";x[p++]="";a.each(j,function(a,b){x[p++]="<"+a+">"});x[p++]="";x[p++]="";var u=null;u&&0!=u.readyState&&u.abort();try{a.ajax({url:o,type:"POST", +dataType:"xml",data:x.join("\n"),contentType:"text/plain",beforeSend:function(a){u=a},success:w,error:function(a,b){s.css("display","none");var c="";if("parsererror"==b){if(""==a.responseText)return;c="The result is not valid XML :\n-------------------------------------\n"+a.responseText.replace(/<[^>]+>/g,"")}else c=b;try{console.log(c)}catch(d){}}})}catch(A){alert(A);return}var s=a(".wfsr");show_waiting_message&&s.length&&s.html(waiting_message).show()};a.exec_json=function(b,c,d){"undefined"== +typeof c&&(c={});b=b.split(".");2==b.length&&(show_waiting_message&&a(".wfsr").html(waiting_message).show(),a.extend(c,{module:b[0],act:b[1]}),"undefined"!=typeof xeVid&&a.extend(c,{vid:xeVid}),a.ajax({type:"POST",dataType:"json",url:request_uri,contentType:"application/json",data:a.param(c),success:function(b){a(".wfsr").hide().trigger("cancel_confirm");0