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
@@ -340,405 +340,408 @@ error_log("oneTimePassword");
                                         
                                         if ($currentOtp->GetOnetimepasswordstatus()->code == "ACTIVE") {
                                                 if ($currentOtp->key_checksum == $parameters["parameters"]["oneTimePasswordKeyChecksum"]) {
                                                         $_SESSION["userId"] = $currentOtp->GetUser()->userId;
                                                                 $_SESSION["otpId"]= $currentOtp->onetimepasswordId;
                                                         
                                                         $result["data"] = $currentOtp->data;
                                                         $result["version"] = $currentOtp->version;
 
                                                         resetOTP($currentOtp, "REQUESTED");
                                                 } else {
                                                         resetOTP($currentOtp, "DISABLED");
                                                         throw new Exception("The requested One Time Password has been disabled, due to a wrong keyChecksum");
                                                 }
                                         } else {
                                                 throw new Exception("The requested One Time Password was not active");
                                         }
                                 } else {
                                 throw new Exception("The requested One Time Password has not been found");
                                 }
 
                         //=============================================================
                         }
 
                         break;
 
                 case "message":
 error_log("message");
                         if ($parameters["srpSharedSecret"] == $_SESSION["K"]) {
                                 $message = $parameters["message"];
                                 
                                 //=============================================================
                                 if ($message == "getUserDetails") {
 //{"message":"getUserDetails", "srpSharedSecret":"f18e5cf7c3a83b67d4db9444af813ee48c13daf4f8f6635397d593e52ba89a08", "parameters":{}}
                                         $user = new user();
                                         $user = $user->Get($_SESSION["userId"]);
                                         
                                                 $result["header"] =     $user->header;
                                                 $result["statistics"] =$user->statistics;
                                                 $result["version"] =$user->version;
 
                                 //=============================================================
                                 } else if ($message == "addNewRecords") {
 /*
 //{
         //"message":"addNewRecords",
         //"srpSharedSecret":"b58fdf62acebbcb67f63d28c0437f166069f45690c648cd4376a792ae7a325f7",
         //"parameters":{
         //      "records":[
         //              {
         //                      "record":{
         //                              "reference":"fda703707fee1fff42443124cd0e705f5bea0ac601758d81b2e832705339a610",
         //                              "data":"OBSGtcb6blXq/xaYG.....4EqlQqgAvITN",
         //                              "version":"0.3"
         //                      },
         //                      "currentRecordVersion":{
         //                              "reference":"83ad301525c18f2afd72b6ac82c0a713382e1ef70ac69935ca7e2869dd4ff980",
         //                              "recordReference":"fda703707fee1fff42443124cd0e705f5bea0ac601758d81b2e832705339a610",
         //                              "data":"NXJ5jiZhkd0CMiwwntAq....1TjjF+SGfE=",
         //                              "version":"0.3",
         //                              "previousVersion":"3e174a86afc322271d8af28bc062b0f1bfd7344fad01212cd08b2757c4b199c4",
         //                              "previousVersionKey":"kozaaGCzXWr71LbOKu6Z3nz520V..5U85tSBvb+u44twttv54Kw=="
         //                      }
         //              }
         //      ],
         //      "user":{
         //              "header":"{\"reco...ersion\":\"0.1\"}",
         //              "statistics":"rKI6nR6iqggygQJ3SQ58bFUX",
         //              "version":"0.3",
         //              "lock":"----"
         //      }
         //}
 //}
 */
                                         $user = new user();
                                         $record = new record();
                                         $recordVersion = new recordversion();
 
                                         $user = $user->Get($_SESSION["userId"]);
                                         updateUserData($parameters["parameters"]["user"], $user);
 
                                         $recordParameterList = $parameters["parameters"]["records"];
                                         $c = count($recordParameterList);
                                         for ($i=0; $i<$c; $i++) {
                                                 updateRecordData($recordParameterList[$i], $record, $recordVersion);
 
                                                 $record->SaveNew();
                                                 $recordVersion->SaveNew();
 
                                                 $record->AddRecordversion($recordVersion);
                                                 $user->AddRecord($record);
                                                 
                                                 $record->Save();
                                                 $recordVersion->Save();
                                         }
 
                                         $user->Save();
 
                                         $result["lock"] = $user->lock;
                                         $result["result"] = "done";
 
                                 //=============================================================
                                 } else if ($message == "getRecordDetail") {
 //{
         //"message":"getRecordDetail",
         //"srpSharedSecret":"4c00dcb66a9f2aea41a87e4707c526874e2eb29cc72d2c7086837e53d6bf2dfe",
         //"parameters":{
         //      "reference":"740009737139a189cfa2b1019a6271aaa39467b59e259706564b642ff3838d50"
         //}
 //}
 //
         //result = {
         //      currentVersion:{
         //              reference:"88943d709c3ea2442d4f58eaaec6409276037e5a37e0a6d167b9dad9e947e854",
         //              accessDate:"Wed, 13 February 2008 14:25:12 UTC",
         //              creationDate:"Tue, 17 April 2007 17:17:52 UTC",
         //              version:"0.2",
         //              data:"xI3WXddQLFtL......EGyKnnAVik",
         //              updateDate:"Tue, 17 April 2007 17:17:52 UTC",
         //              header:"####"
         //      }
         //      reference:"13a5e52976337ab210903cd04872588e1b21fb72bc183e91aa25c494b8138551",
         //      oldestUsedEncryptedVersion:"0.2",
         //      accessDate:"Wed, 13 February 2008 14:25:12 UTC",
         //      creationDate:"Wed, 14 March 2007 13:53:11 UTC",
         //      version:"0.2",
         //      updatedDate:"Tue, 17 April 2007 17:17:52 UTC",
         //      data:"0/BjzyY6jeh71h...pAw2++NEyylGhMC5C5f5m8pBApYziN84s4O3JQ3khW/1UttQl4="
         //}
                                         $record = new record();
 
                                         $recordList = $record->GetList(array(array("reference", "=", $parameters["parameters"]["reference"])));
                                         $currentRecord = $recordList[0];
                                         $currentRecordVersions = $currentRecord->GetRecordversionList();
                                         $currentVersion = $currentRecordVersions[0];
                                 
                                         $result["currentVersion"] = array();
                                                 $result["currentVersion"]["reference"] =$currentVersion->reference;
                                                 $result["currentVersion"]["data"] =             $currentVersion->data;
                                                 $result["currentVersion"]["header"] =   $currentVersion->header;
                                                 $result["currentVersion"]["version"] =  $currentVersion->version;
                                                 $result["currentVersion"]["creationDate"] =$currentVersion->creation_date;
                                                 $result["currentVersion"]["updateDate"] =$currentVersion->update_date;
                                                 $result["currentVersion"]["accessDate"] =$currentVersion->access_date;
 
                                                 $result["reference"] =  $currentRecord->reference;
                                                 $result["data"] =               $currentRecord->data;
                                                 $result["version"] =    $currentRecord->version;
                                                 $result["creationDate"] =$currentRecord->creation_date;
                                                 $result["updateDate"] =         $currentRecord->update_date;
                                                 $result["accessDate"] =         $currentRecord->access_date;
                                                 $result["oldestUsedEncryptedVersion"] ="---";
 
                                 //=============================================================
                                 } else if ($message == "updateData") {
 //{
         //"message":"updateData",
         //"srpSharedSecret":"4e4aadb1d64513ec4dd42f5e8d5b2d4363de75e4424b6bcf178c9d6a246356c5",
         //"parameters":{
         //      "records":[
         //              {
         //                      "record":{
         //                              "reference":"740009737139a189cfa2b1019a6271aaa39467b59e259706564b642ff3838d50",
         //                              "data":"8hgR0Z+JDrUa812polDJ....JnZUKXNEqKI",
         //                              "version":"0.3"
         //                      },
         //                      "currentRecordVersion":{
         //                              "reference":"b1d82aeb9a0c4f6584bea68ba80839f43dd6ede79791549e29a1860554b144ee",
         //                              "recordReference":"740009737139a189cfa2b1019a6271aaa39467b59e259706564b642ff3838d50",
         //                              "data":"2d/UgKxxV+kBPV9GRUE.....VGonDoW0tqefxOJo=",
         //                              "version":"0.3",
         //                              "previousVersion":"55904195249037394316d3be3f5e78f08073170103bf0e7ab49a911c159cb0be",
         //                              "previousVersionKey":"YWiaZeMIVHaIl96OWW+2e8....6d6nHbn6cr2NA/dbQRuC2w=="
         //                      }
         //              }
         //      ],
         //      "user":{
         //              "header":"{\"rec.....sion\":\"0.1\"}",
         //              "statistics":"tt3uU9hWBy8rNnMckgCnxMJh",
         //              "version":"0.3",
         //              "lock":"----"
         //      }
         //}
 //}
 
                                         $user = new user();
                                         $user = $user->Get($_SESSION["userId"]);
                                         updateUserData($parameters["parameters"]["user"], $user);
                                         $user->Save();
 
                                         $recordParameterList = $parameters["parameters"]["records"];
                                         $c = count($recordParameterList);
                                         for ($i=0; $i<$c; $i++) {
                                                 $recordList = $user->GetRecordList(array(array("reference", "=", $recordParameterList[$i]["record"]["reference"])));
                                                 $currentRecord = $recordList[0];
                                                 $currentRecordVersions = $currentRecord->GetRecordversionList();
                                                 $currentVersion = $currentRecordVersions[0];
 
                                                 updateRecordData($recordParameterList[$i], $currentRecord, $currentVersion);
 
 
                                                 $currentRecord->Save();
                                                 $currentVersion->Save();
                                         }
 
                                         
                                         $result["lock"] = $user->lock;
                                         $result["result"] = "done";
 
                                 //=============================================================
                                 } else if ($message == "deleteRecords") {
 //{
         //"message":"deleteRecords",
         //"srpSharedSecret":"4a64982f7ee366954ec50b9efea62a902a097ef111410c2aa7c4d5343bd1cdd1",
         //"parameters":{
         //      "recordReferences":["46494c81d10b80ab190d41e6806ef63869cfcc7a0ab8fe98cc3f93de4729bb9a"],
         //      "user":{
         //              "header":"{\"rec...rsion\":\"0.1\"}",
         //              "statistics":"44kOOda0xYZjbcugJBdagBQx",
         //              "version":"0.3",
         //              "lock":"----"
         //      }
         //}
 //}
                                         $user = new user();
                                         $user = $user->Get($_SESSION["userId"]);
 
                                         $recordReferenceList = $parameters["parameters"]["recordReferences"];
                                         $recordList = array();
                                         $c = count($recordReferenceList);
                                         for ($i=0; $i<$c; $i++) {
                                                 array_push($recordList, array("reference", "=", $recordReferenceList[$i]));
                                         }
 
                                         $record = new record();
                                         $record->DeleteList($recordList, true);
 
                                         updateUserData($parameters["parameters"]["user"], $user);
                                         $user->Save();
 
                                         $result["recordList"] = $recordList;
                                         $result["lock"] = $user->lock;
                                         $result["result"] = "done";
 
                                 //=============================================================
                                 } else if ($message == "deleteUser") {
 //{"message":"deleteUser", "srpSharedSecret":"e8e4ca6544dca49c95b3647d8358ad54c317048b74d2ac187ac25f719c9bac58", "parameters":{}}
                                         $user = new user();
                                         $user->Get($_SESSION["userId"]);
                                         $user->Delete(true);
 
                                         $result["result"] = "ok";
 
                                 //=============================================================
                                 } else if ($message == "addNewOneTimePassword") {
 //{
         //"message":"addNewOneTimePassword",
         //"srpSharedSecret":"96fee4af06c09ce954fe7a9f87970e943449186bebf70bac0af1d6ebb818dabb",
         //"parameters":{
         //      "user":{
         //              "header":"{\"records\":{\"index\":{\"419ea6....rsion\":\"0.1\"}",
         //              "statistics":"rrlwNbDt83rpWT4S72upiVsC",
         //              "version":"0.3",
         //              "lock":"----"
         //      },
         //      "oneTimePassword":{
         //              "reference":"29e26f3a2aae61fe5cf58c45296c6df4f3dceafe067ea550b455be345f44123c",
         //              "key":"afb848208758361a96a298b9db08995cf036011747809357a90645bc93fdfa03",
         //              "keyChecksum":"d1599ae443b5a566bfd93c0aeec4c81b42c0506ee09874dae050449580bb3486",
         //              "data":"hsyY8DHksgR52x6c4j7XAtIUeY.....dxsr3XWt7CbGg==",
         //              "version":"0.3"
         //      }
         //}
 //}
 
                                         fixOTPStatusTable();
 
                                         $user = new user();
                                         $user = $user->Get($_SESSION["userId"]);
 
                                         $otp = new onetimepassword();
                                         updateOTP($parameters["parameters"]["oneTimePassword"], $otp, "ACTIVE");
                                         $user->AddOnetimepassword($otp);
 
                                         updateUserData($parameters["parameters"]["user"], $user);
                                         $user->Save();
 
                                         $result["lock"] = $user->lock;
                                         $result["result"] = "done";
 
                                 //=============================================================
                                 } else if ($message == "updateOneTimePasswords") {
 //{
         //"message":"updateOneTimePasswords",
         //"srpSharedSecret":"c78f8ed099ea421f4dd0a4e02dbaf1f7da925f0088188d99399874ff064a3d27",
         //"parameters":{
         //      "user":{
         //              "header":"{\"reco...sion\":\"0.1\"}",
         //              "statistics":"UeRq75RZHzDC7elzrh/+OB5d",
         //              "version":"0.3",
         //              "lock":"----"
         //      },
         //      "oneTimePasswords":["f5f44c232f239efe48ab81a6236deea1a840d52946f7d4d782dad52b4c5359ce"]
         //}
 //}
 
                                         $user = new user();
                                         $user = $user->Get($_SESSION["userId"]);
 
                                         $validOtpReferences = $parameters["parameters"]["oneTimePasswords"];
                                         
                                         $otpList = $user->GetOnetimepasswordList();
                                         $c = count($otpList);
                                         for ($i=0; $i<$c; $i++) {
                                                 $currentOtp = $otpList[$i];
                                                 if (arrayContainsValue($validOtpReferences, $currentOtp->reference) == false) {
                                                         $currentOtp->Delete();
                                                 }
                                         }
                                         
                                         updateUserData($parameters["parameters"]["user"], $user);
                                         $user->Save();
 
                                         $result["result"] = $user->lock;
 
                                 //=============================================================
                                 } else if ($message == "getOneTimePasswordsDetails") {
 
                                 //=============================================================
                                 } else if ($message == "getLoginHistory") {
                                         $result["result"] = array();
 
                                 //=============================================================
                                 } else if ($message == "upgradeUserCredentials") {
 //{
         //"message":"upgradeUserCredentials",
         //"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
+?>
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
@@ -1,259 +1,265 @@
 /*
 
 Copyright 2008-2011 Clipperz Srl
 
 This file is part of Clipperz's Javascript Crypto Library.
 Javascript Crypto Library provides web developers with an extensive
 and efficient set of cryptographic functions. The library aims to
 obtain maximum execution speed while preserving modularity and
 reusability.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com
 
 * Javascript Crypto Library is free software: you can redistribute
   it and/or modify it under the terms of the GNU Affero General Public
   License as published by the Free Software Foundation, either version
   3 of the License, or (at your option) any later version.
 
 * Javascript Crypto Library is distributed in the hope that it will
   be useful, but WITHOUT ANY WARRANTY; without even the implied
   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
   License along with Javascript Crypto Library.  If not, see
   <http://www.gnu.org/licenses/>.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 
 //=============================================================================
 
 Clipperz.PM.Proxy.PHP = function(args) {
         Clipperz.PM.Proxy.PHP.superclass.constructor.call(this, args);
 /*
         this._tolls = {
                         'CONNECT':[],
                         'REGISTER':[],
                         'MESSAGE':[]
         };
         */
         return this;
 }
 
 YAHOO.extendX(Clipperz.PM.Proxy.PHP, Clipperz.PM.Proxy, {
 
         'toString': function() {
                 return "Clipperz.PM.Proxy.PHP - " + this.args();
         },
 
         //=========================================================================
 /*
         'tolls': function() {
                 return this._tolls;
         },
 */
         //-------------------------------------------------------------------------
 /*
         'payToll': function(aRequestType, someParameters) {
                         vardeferredResult;
 
 //MochiKit.Logging.logDebug(">>> Proxy.DWR.payToll: " + aRequestType);
                 if (this.tolls()[aRequestType].length > 0) {
                         deferredResult = MochiKit.Async.succeed(this.tolls()[aRequestType].pop());
                 } else {
 //MochiKit.Logging.logDebug("### " + aRequestType + " toll NOT immediately available; request queued.");
                         deferredResult = new MochiKit.Async.Deferred();
                         deferredResult.addCallback(function(someParameters) {
                                 return new Clipperz.PM.Toll(someParameters['toll']);
                         })
                         com_clipperz_pm_Proxy.knock(Clipperz.Base.serializeJSON({requestType:aRequestType}), {
                                 callback:MochiKit.Base.method(deferredResult, 'callback'),
                                 errorHandler:MochiKit.Base.method(deferredResult, 'errback')
                         });
                 }
                 
                 deferredResult.addCallback(function(aToll) {
                         return aToll.deferredPay();
                 });
                 deferredResult.addCallback(function(someParameters, aToll) {
                         var result;
                         
                         result = {
                                 parameters: someParameters,
                                 toll: aToll
                         }
                         
                         return result;
                 }, someParameters);
                 
                 return deferredResult;
         },
 */
         //-------------------------------------------------------------------------
 /*
         'addToll': function(aToll) {
                 this.tolls()[aToll.requestType()].push(aToll);
         },
 */
         //=========================================================================
 /*
         'setTollCallback': function(someParameters) {
 //MochiKit.Logging.logDebug(">>> Proxy.DWR.setTollCallback");
 //MochiKit.Logging.logDebug("--- Proxy.DWR.setTollCallback - " + Clipperz.Base.serializeJSON(someParameters));
                 if (typeof(someParameters['toll']) != 'undefined') {
                         this.addToll(new Clipperz.PM.Toll(someParameters['toll']));
                 }
                 return someParameters['result'];
         },
 */
         //=========================================================================
 
         'registration': function(someParameters) {
                 return this.sendMessage('registration', someParameters, 'REGISTER');
         },
 
         //-------------------------------------------------------------------------
 
         'handshake': function(someParameters) {
 /*
                 _s = "e8a2162f29aeaabb729f5625e9740edbf0cd80ac77c6b19ab951ed6c88443b8c";
                 _v = new Clipperz.Crypto.BigInt("955e2db0f7844aca372f5799e5f7e51b5866718493096908bd66abcf1d068108", 16);
                 _b = new Clipperz.Crypto.BigInt("5761e6c84d22ea3c5649de01702d60f674ccfe79238540eb34c61cd020230c53", 16);
 
                 _B = _v.add(Clipperz.Crypto.SRP.g().powerModule(_b, Clipperz.Crypto.SRP.n()));
                 _u = new Clipperz.Crypto.BigInt(Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(_B.asString(10))).toHexString(), 16);
                 _A = new Clipperz.Crypto.BigInt("3b3567ec33d73673552e960872eb154d091a2488915941038aef759236a27e64", 16);
                 _S = (_A.multiply(_v.powerModule(_u, Clipperz.Crypto.SRP.n()))).powerModule(_b, Clipperz.Crypto.SRP.n());
                 _K = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(_S.asString(10))).toHexString().slice(2);
                 _M1 = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(_A.asString(10) + _B.asString(10) + _K)).toHexString().slice(2);
                 _M2 = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(_A.asString(10) + _M1 + _K)).toHexString().slice(2);
                 
         //      MochiKit.Logging.logDebug("b = " + _b.asString(16));
         //      MochiKit.Logging.logDebug("v = " + _v.asString(16));
                 MochiKit.Logging.logDebug("B = " + _B.asString(16));
                 MochiKit.Logging.logDebug("u = " + _u.asString(16));
                 MochiKit.Logging.logDebug("S = " + _S.asString(16));
                 MochiKit.Logging.logDebug("K = " + _K);
                 MochiKit.Logging.logDebug("M1 = " + _M1);
                 MochiKit.Logging.logDebug("M2 = " + _M2);
         //      MochiKit.Logging.logDebug("someParameters.version: " + someParameters.version);
         */      
                 return this.sendMessage('handshake', someParameters, 'CONNECT');
         },
 
         //-------------------------------------------------------------------------
 
         'message': function(someParameters) {
                 return this.sendMessage('message', someParameters, 'MESSAGE');
         },
 
         //-------------------------------------------------------------------------
 
         'logout': function(someParameters) {
 //MochiKit.Logging.logDebug("=== Proxy.DWR.logout");
                 return this.sendMessage('logout', someParameters, 'MESSAGE');
         },
 
         //=========================================================================
 
         'sendMessage': function(aFunctionName, someParameters, aRequestType) {
 /*
                         vardeferredResult;
                 var proxy;
                 
 //MochiKit.Logging.logDebug(">>> Proxy.DWR.sendMessage - " + aFunctionName + " - " + aRequestType);
                 proxy = this;
                 
                 deferredResult = new MochiKit.Async.Deferred();
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("x.1 Proxy.DWR.sendMessage - 1: " + res); return res;});
                 deferredResult.addCallback(MochiKit.Base.method(proxy, 'payToll'), aRequestType);
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("x.2 Proxy.DWR.sendMessage - 2: " + Clipperz.Base.serializeJSON(res)); return res;});
                 deferredResult.addCallback(MochiKit.Base.method(proxy, 'sendRemoteMessage'), aFunctionName);
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("x.3 Proxy.DWR.sendMessage - 3: " + res); return res;});
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("x.3 Proxy.DWR.sendMessage - 3: " + Clipperz.Base.serializeJSON(res)); return res;});
                 deferredResult.callback(someParameters);
                 
 //MochiKit.Logging.logDebug("<<< Proxy.DWR.sendMessage");
                         return deferredResult;  
 */
 
         //      return this.sendRemoteMessage(aFunctionName, someParameters);
 
 
                         vardeferredResult;
                 var proxy;
 
                 proxy = this;
 
                 deferredResult = new MochiKit.Async.Deferred();
                 deferredResult.addCallback(MochiKit.Base.method(proxy, 'sendRemoteMessage'), aFunctionName);
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("x.3 Proxy.PHP.sendMessage - 3: " + res); return res;});
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("x.3 Proxy.PHP.sendMessage - 3.1: " + Clipperz.Base.serializeJSON(res)); return res;});
 
                 deferredResult.callback(someParameters);
 
                 return deferredResult;
         },
 
         //=========================================================================
         
         'sendRemoteMessage': function(aFunctionName, someParameters) {
 /*
                         vardeferredResult;
 
 //MochiKit.Logging.logDebug(">>> Proxy.DWR.sendRemoteMessage('" + aFunctionName + "', " + Clipperz.Base.serializeJSON(someParameters) + ") - " + this);
                 deferredResult = new MochiKit.Async.Deferred();
 //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");