-rw-r--r-- | backend/php/src/index.php | 7 | ||||
-rwxr-xr-x | frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js | 6 |
2 files changed, 11 insertions, 2 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 | |||
@@ -720,10 +720,13 @@ error_log("message"); | |||
720 | $result["result"] = $parameters; | 720 | $result["result"] = $parameters; |
721 | } | 721 | } |
722 | 722 | ||
723 | //============================================================= | 723 | //============================================================= |
724 | } else { | 724 | } else if (isset($_SESSION['K'])) { |
725 | $result["error"] = "Wrong shared secret!"; | 725 | $result["error"] = "Wrong shared secret!"; |
726 | } else { | ||
727 | $result["result"] = "EXCEPTION"; | ||
728 | $result["message"] = "Trying to communicate without an active connection"; | ||
726 | } | 729 | } |
727 | break; | 730 | break; |
728 | 731 | ||
729 | case "logout": | 732 | case "logout": |
@@ -740,5 +743,5 @@ error_log("default"); | |||
740 | session_write_close(); | 743 | session_write_close(); |
741 | 744 | ||
742 | echo(json_encode($result)); | 745 | echo(json_encode($result)); |
743 | error_log("result: ".json_encode($result)); | 746 | error_log("result: ".json_encode($result)); |
744 | ?> \ No newline at end of file | 747 | ?> |
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 | |||
@@ -237,8 +237,14 @@ YAHOO.extendX(Clipperz.PM.Proxy.PHP, Clipperz.PM.Proxy, { | |||
237 | }); | 237 | }); |
238 | //deferredResult.addCallback(function(res) {MochiKit.Logging.logDebug("Proxy.PHP.response - 2: " + res.responseText); return res;}); | 238 | //deferredResult.addCallback(function(res) {MochiKit.Logging.logDebug("Proxy.PHP.response - 2: " + res.responseText); return res;}); |
239 | //deferredResult.addErrback(function(res) {MochiKit.Logging.logDebug("Proxy.PHP.response - ERROR: " + res); return res;}); | 239 | //deferredResult.addErrback(function(res) {MochiKit.Logging.logDebug("Proxy.PHP.response - ERROR: " + res); return res;}); |
240 | deferredResult.addCallback(MochiKit.Async.evalJSONRequest); | 240 | deferredResult.addCallback(MochiKit.Async.evalJSONRequest); |
241 | deferredResult.addCallback(function (someValues) { | ||
242 | if (someValues['result'] == 'EXCEPTION') { | ||
243 | throw someValues['message']; | ||
244 | } | ||
245 | return someValues; | ||
246 | }) | ||
241 | deferredResult.callback(); | 247 | deferredResult.callback(); |
242 | 248 | ||
243 | return deferredResult; | 249 | return deferredResult; |
244 | }, | 250 | }, |