1 files changed, 6 insertions, 0 deletions

diff --git a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
index e7c2bc1..6a4f637 100755
--- a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
+++ b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
@@ -193,67 +193,73 @@ YAHOO.extendX(Clipperz.PM.Proxy.PHP, Clipperz.PM.Proxy, {
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("x.3 Proxy.PHP.sendMessage - 3: " + res); return res;});
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("x.3 Proxy.PHP.sendMessage - 3.1: " + Clipperz.Base.serializeJSON(res)); return res;});
 
                 deferredResult.callback(someParameters);
 
                 return deferredResult;
         },
 
         //=========================================================================
         
         'sendRemoteMessage': function(aFunctionName, someParameters) {
 /*
                         vardeferredResult;
 
 //MochiKit.Logging.logDebug(">>> Proxy.DWR.sendRemoteMessage('" + aFunctionName + "', " + Clipperz.Base.serializeJSON(someParameters) + ") - " + this);
                 deferredResult = new MochiKit.Async.Deferred();
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("Proxy.DWR.sendRemoteMessage - 1: " + res); return res;});
         //      deferredResult.addCallback(MochiKit.Base.method(this, 'setTollCallback'));
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("Proxy.DWR.sendRemoteMessage - 2: " + res); return res;});
                 
                 com_clipperz_pm_Proxy[aFunctionName](Clipperz.Base.serializeJSON(someParameters), {
                         callback:MochiKit.Base.method(deferredResult, 'callback'),
                         errorHandler:MochiKit.Base.method(deferredResult, 'errback')
                 });
 //MochiKit.Logging.logDebug("<<< Proxy.PHP.sendRemoteMessage - result: " + deferredResult);
 
                 return deferredResult;
 */
 
                         vardeferredResult;
                 var parameters;
                 
 //MochiKit.Logging.logDebug(">>> Proxy.PHP.sendRemoteMessage('" + aFunctionName + "', " + Clipperz.Base.serializeJSON(someParameters) + ") - " + this);
                 parameters = {};
                 parameters['method'] = aFunctionName;
         //      parameters['version'] = someParameters['version'];
         //      parameters['message'] = someParameters['message'];
                 parameters['parameters'] = Clipperz.Base.serializeJSON(someParameters);
 //MochiKit.Logging.logDebug("--- Proxy.PHP.sendRemoteMessage('" + Clipperz.Base.serializeJSON(parameters) + ") - " + this);
                 deferredResult = new MochiKit.Async.Deferred();
                 deferredResult.addCallback(MochiKit.Async.doXHR, "./php/index.php", {
                         method:'POST',
                         sendContent:MochiKit.Base.queryString(parameters),
                         headers:{"Content-Type":"application/x-www-form-urlencoded"}
                 });
 //deferredResult.addCallback(function(res) {MochiKit.Logging.logDebug("Proxy.PHP.response - 2: " + res.responseText); return res;});
 //deferredResult.addErrback(function(res) {MochiKit.Logging.logDebug("Proxy.PHP.response - ERROR: " + res); return res;});
                 deferredResult.addCallback(MochiKit.Async.evalJSONRequest);
+                deferredResult.addCallback(function (someValues) {
+                    if (someValues['result'] == 'EXCEPTION') {
+                        throw someValues['message'];
+                    }
+                    return someValues;
+                })
                 deferredResult.callback();
 
                 return deferredResult;
         },
 
         //=========================================================================
 
         'isReadOnly': function() {
                 return false;
         },
 
         //=========================================================================
         __syntaxFix__: "syntax fix"
         
 });
 
 //=============================================================================
 
 //Clipperz.PM.Proxy.defaultProxy = new Clipperz.PM.Proxy.PHP("Proxy.PHP - async test");