summaryrefslogtreecommitdiff
path: root/backend/php
authorGiulio Cesare Solaroli <giulio.cesare@clipperz.com>2011-10-04 23:24:50 (UTC)
committer Giulio Cesare Solaroli <giulio.cesare@clipperz.com>2011-10-04 23:24:50 (UTC)
commit3065be1b71e4c40428cfa192de560c970ba7f8b3 (patch) (side-by-side diff)
treebd030652e7c1e1556125beeaf7f18e174ab79385 /backend/php
parentc53c209c9b1e86f375aea9262fdb3170cae61ebc (diff)
parentbf22713a7251a2b32700a67456a086a283dbe33a (diff)
downloadclipperz-3065be1b71e4c40428cfa192de560c970ba7f8b3.zip
clipperz-3065be1b71e4c40428cfa192de560c970ba7f8b3.tar.gz
clipperz-3065be1b71e4c40428cfa192de560c970ba7f8b3.tar.bz2
Merge branch 'timeout'
Diffstat (limited to 'backend/php') (more/less context) (ignore whitespace changes)
-rw-r--r--backend/php/src/index.php7
1 files changed, 5 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
@@ -712,33 +712,36 @@ error_log("message");
$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
+?>