2 files changed, 10 insertions, 1 deletions

diff --git a/backend/php/src/index.php b/backend/php/src/index.php
index eb3d75a..58c10a9 100644
--- a/backend/php/src/index.php
+++ b/backend/php/src/index.php
@@ -712,26 +712,29 @@ error_log("message");
 
                                         $user->Save();
 
                                         $result["lock"] = $user->lock;
                                         $result["result"] = "done";
                                         
                                 //=============================================================
                                 } else if ($message == "echo") {
                                         $result["result"] = $parameters;
                                 }
                                 
                                 //=============================================================
-                        } else {
+                        } else if (isset($_SESSION['K'])) {
                                 $result["error"] = "Wrong shared secret!";
+                        } else {
+                                $result["result"] = "EXCEPTION";
+                                $result["message"] = "Trying to communicate without an active connection";
                         }
                         break;
 
                 case "logout":
 error_log("logout");
                         session_destroy();
                         break;
 
                 default:
 error_log("default");
                         $result["result"] = $parameters;
                         break;
diff --git a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
index e7c2bc1..6185fd6 100755
--- a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
+++ b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
@@ -229,24 +229,30 @@ YAHOO.extendX(Clipperz.PM.Proxy.PHP, Clipperz.PM.Proxy, {
         //      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;
         },
 
         //=========================================================================