Merge branch 'timeout'

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
@@ -676,69 +676,72 @@ error_log("message");
 //	"srpSharedSecret":"f1c25322e1478c8fb26063e9eef2f6fc25e0460065a31cb718f80bcff8f8a735",
 //	"parameters":{
 //		"user":{
 //			"header":"{\"reco...sion\":\"0.1\"}",
 //			"statistics":"s72Xva+w7CLgH+ihwqwXUbyu",
 //			"version":"0.3",
 //			"lock":"----"
 //		},
 //		"credentials":{
 //			"C":"57d15a8afbc1ae08103bd991d387ddfd8d26824276476fe709d754f098b6c26d",
 //			"s":"d6735fc0486f391c4f3c947928f9e61a2418e7bed2bc9b25bb43f93acc52f636",
 //			"v":"540c2ebbf941a481b6b2c9026c07fb46e8202e4408ed96864a696deb622baece",
 //			"version":"0.2"
 //		},
 //		"oneTimePasswords":{
 //			"923cdc61c4b877b263236124c44d69b459d240453a461cce8ddf7518b423ca94": "1HD6Ta0xsifEDhDwE....9WDK6tvrS6w==",
 //			"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
+?>