From 27e2d4e631656cff15b09d3b6441ac853771f5ee Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 3 Oct 2011 20:25:18 -0400 Subject: [PATCH 1/3] check for exceptions from the server --- frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js | 6 ++++++ 1 file changed, 6 insertions(+) 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 @@ -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; From d6f7343c97ab28c88ade2b4e4edf0ac29f7c5117 Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 3 Oct 2011 20:29:48 -0400 Subject: [PATCH 2/3] send an exception when a session has timed out on the server side --- backend/php/src/index.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/backend/php/src/index.php b/backend/php/src/index.php index eb3d75a..35752f4 100644 --- a/backend/php/src/index.php +++ b/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; @@ -741,4 +744,4 @@ error_log("default"); echo(json_encode($result)); error_log("result: ".json_encode($result)); -?> \ No newline at end of file +?> From bf22713a7251a2b32700a67456a086a283dbe33a Mon Sep 17 00:00:00 2001 From: Giulio Cesare Solaroli Date: Wed, 5 Oct 2011 00:23:06 +0100 Subject: [PATCH 3/3] Fixed code indentation --- backend/php/src/index.php | 6 +++--- frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/php/src/index.php b/backend/php/src/index.php index 35752f4..58c10a9 100644 --- a/backend/php/src/index.php +++ b/backend/php/src/index.php @@ -723,9 +723,9 @@ error_log("message"); //============================================================= } else if (isset($_SESSION['K'])) { $result["error"] = "Wrong shared secret!"; - } else { - $result["result"] = "EXCEPTION"; - $result["message"] = "Trying to communicate without an active connection"; + } else { + $result["result"] = "EXCEPTION"; + $result["message"] = "Trying to communicate without an active connection"; } break; diff --git a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js index 6a4f637..6185fd6 100755 --- a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js +++ b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js @@ -238,12 +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.addCallback(function (someValues) { + if (someValues['result'] == 'EXCEPTION') { + throw someValues['message']; + } + return someValues; + }) deferredResult.callback(); return deferredResult;