clipperz/password-manager-mirror
1
0
Fork 0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2024-11-14 08:09:02 +01:00
Code Issues Releases Wiki Activity

Merge branch 'timeout'

Browse Source
This commit is contained in:
Giulio Cesare Solaroli 2011-10-05 00:24:50 +01:00
commit 3065be1b71
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/php/src/index.php
View File

@ -721,8 +721,11 @@ error_log("message");
} }
//============================================================= //=============================================================
} else { } else if (isset($_SESSION['K'])) {
$result["error"] = "Wrong shared secret!"; $result["error"] = "Wrong shared secret!";
} else {
$result["result"] = "EXCEPTION";
$result["message"] = "Trying to communicate without an active connection";
} }
break; break;
@ -741,4 +744,4 @@ error_log("default");
echo(json_encode($result)); echo(json_encode($result));
error_log("result: ".json_encode($result)); error_log("result: ".json_encode($result));
?> ?>

6
frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
View File

@ -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.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.addErrback(function(res) {MochiKit.Logging.logDebug("Proxy.PHP.response - ERROR: " + res); return res;});
deferredResult.addCallback(MochiKit.Async.evalJSONRequest); deferredResult.addCallback(MochiKit.Async.evalJSONRequest);
deferredResult.addCallback(function (someValues) {
if (someValues['result'] == 'EXCEPTION') {
throw someValues['message'];
}
return someValues;
})
deferredResult.callback(); deferredResult.callback();
return deferredResult; return deferredResult;