Merge branch 'timeout'

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
@@ -692,53 +692,56 @@ error_log("message");
         //              "fb1573cb9497652a81688a099a524fb116e604c6fbc191cf33406eb8438efa5f": "CocN0cSxLmMRdgNF9....o3xhGUEY68Q=="
         //      }
         //}
 //}
 
                                         $user = new user();
                                         $user->Get($_SESSION["userId"]);
 
                                         $otp = new onetimepassword();
                                         
                                         updateUserCredentials($parameters["parameters"]["credentials"], $user);
                                         updateUserData($parameters["parameters"]["user"], $user);
 
                                         $otpList = $parameters["parameters"]["oneTimePasswords"];
                                         foreach($otpList as $otpReference=>$otpData) {
                                                 $otpList = $otp->GetList(array(array("reference", "=", $otpReference)));
                                                 $currentOtp = $otpList[0];
                                                 $currentOtp->data = $otpData;
                                                 $currentOtp->Save();
                                         }
 
                                         $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;
         }
 
         session_write_close();
         
         echo(json_encode($result));
 error_log("result: ".json_encode($result));
-?>
\ No newline at end of file
+?>
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
@@ -209,51 +209,57 @@ YAHOO.extendX(Clipperz.PM.Proxy.PHP, Clipperz.PM.Proxy, {
 //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");