Fixed the formatting of PHP code

1 files changed, 3 insertions, 2 deletions

diff --git a/backend/php/src/index.php b/backend/php/src/index.php
index 3d23e7a..214ac01 100644
--- a/backend/php/src/index.php
+++ b/backend/php/src/index.php
@@ -250,263 +250,264 @@ error_log("handshake");
 
                         $message = $parameters["message"];
 
                         //=============================================================
                         if ($message == "connect") {
                                 $user= new user();
                                 $_SESSION["C"] = $parameters["parameters"]["C"];
                                 $_SESSION["A"] = $parameters["parameters"]["A"];
 
                                 $userList = $user->GetList(array(array("username", "=", $_SESSION["C"])));
                         
                                 if (count($userList) == 1) {
                                         $currentUser = $userList[ 0 ];
 
                                         if (array_key_exists("otpId", $_SESSION)) {
                                                 $otp = new onetimepassword();
                                                 $otp = $otp->Get($_SESSION["otpId"]);
                                                 
                                                 if ($otp->GetUser()->userId != $currentUser->userId) {
                                                         throw new Exception("User missmatch between the current session and 'One Time Password' user");
                                                 } else if ($otp->GetOnetimepasswordstatus()->code != "REQUESTED") {
                                                         throw new Exception("Tring to use an 'One Time Password' in the wrong state");
                                                 }
 
                                                 resetOTP($otp, "USED");
                                                 $result["oneTimePassword"] = $otp->reference;
                                         }
 
                                         $_SESSION["s"] = $currentUser->srp_s;
                                         $_SESSION["v"] = $currentUser->srp_v;
                                         $_SESSION["userId"] = $currentUser->userId;
                                 } else {
                                         $_SESSION["s"] = "112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00";
                                         $_SESSION["v"] = "112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00";
                                 }
 
                                 $_SESSION["b"] = clipperz_randomSeed();
         //                      $_SESSION["b"] = "5761e6c84d22ea3c5649de01702d60f674ccfe79238540eb34c61cd020230c53";
                                 $_SESSION["B"] = dec2base(bcadd(base2dec($_SESSION["v"], 16), bcpowmod($srp_g, base2dec($_SESSION["b"], 16), $srp_n)), 16);
 
                                 $result["s"] = $_SESSION["s"];
                                 $result["B"] = $_SESSION["B"];
                                 
                         //=============================================================
                         } else if ($message == "credentialCheck") {
 error_log("credentialCheck");
                                 $u = clipperz_hash(base2dec($_SESSION["B"],16));
                                 $A = base2dec($_SESSION["A"], 16);
                                 $S = bcpowmod(bcmul($A, bcpowmod(base2dec($_SESSION["v"], 16), base2dec($u, 16), $srp_n)), base2dec($_SESSION["b"], 16), $srp_n);
                                 $K = clipperz_hash($S);
                                 $M1 = clipperz_hash($A.base2dec($_SESSION["B"],16).$K);
 
 //$result["B"] = $_SESSION["B"];
 //$result["u"] = $u;
 //$result["A"] = $A;
 //$result["S"] = $S;
 //$result["K"] = $K;
 //$result["M1"] = $M1;
 //$result["_M1"] = $parameters["parameters"]["M1"];
 
                                 if ($M1 == $parameters["parameters"]["M1"]) {
                                         $_SESSION["K"] = $K;
                                         $M2 = clipperz_hash($A.$M1.$K);
 
                                         $result["M2"] = $M2;
                                         $result["connectionId"] = "";
                                         $result["loginInfo"] = array();
                                         $result["loginInfo"]["latest"] = array();
                                         $result["loginInfo"]["current"] = array();
                                         $result["offlineCopyNeeded"] = "false";
                                         $result["lock"] = "----";
                                 } else {
                                         $result["error"] = "?";
                                 }
                         //=============================================================
                         } else if ($message == "oneTimePassword") {
 error_log("oneTimePassword");
 //{
         //"message":"oneTimePassword",
         //"version":"0.2",
         //"parameters":{
         //      "oneTimePasswordKey":"06dfa7f428081f8b2af98b0895e14e18af90b0ef2ff32828e55cc2ac6b24d29b",
         //      "oneTimePasswordKeyChecksum":"60bcba3f72e56f6bb3f0ff88509b9a0e5ec730dfa71daa4c1e892dbd1b0c360d"
         //}
 //}
                                 $otp = new onetimepassword();
                                 $otpList = $otp->GetList(array(array("key", "=", $parameters["parameters"]["oneTimePasswordKey"])));
 
                                 if (count($otpList) == 1) {
                                         $currentOtp = $otpList[0];
                                         
                                         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;
+
                                         $records = $user->GetRecordList();
-                                        foreach ($records as $record)
-                                        {
+                                        foreach ($records as $record) {
                                                 $recordStats["updateDate"] = $record->update_date;
                                                 $recordsStats[$record->reference] = $recordStats;
                                         }
                                         $result["recordsStats"] = $recordsStats;
+
                                                 $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"
         //                      },