Merge branch 'timeout'

backend/php/src/index.php

@@ -721,8 +721,11 @@ error_log("message");
 				}
 				
 				//=============================================================
-			} 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;
 

frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js

@@ -238,6 +238,12 @@ YAHOO.extendX(Clipperz.PM.Proxy.PHP, Clipperz.PM.Proxy, {
 //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;