2 files changed, 179 insertions, 16 deletions
diff --git a/backend/php/src/configuration.php b/backend/php/src/configuration.php
index 291e3a1..85f680e 100644
--- a/backend/php/src/configuration.php
+++ b/backend/php/src/configuration.php
@@ -11,20 +11,20 @@ $configuration['setup_password'] = '';
 // to enable automatic data encoding, run setup, go to the manage plugins tab and install the base64 plugin.
 // then set db_encoding = 1 below.
 // when enabled, db_encoding transparently encodes and decodes data to and from the database without any
 // programmatic effort on your part.
 $configuration['db_encoding'] = 0;
 // edit the information below to match your database settings
-        $configuration['db']    = 'clipperz';           //database name
+        $configuration['db']    = 'clipperz';   //database name
        $configuration['host']  = 'localhost';  //database host
-        $configuration['user']  = 'root';               //database user
+        $configuration['user']  = 'clipperz';   //database user
-        $configuration['pass']  = 'pass';               //database password
+        $configuration['pass']  = 'clipperz';   //database password
        $configuration['port']          = '3306';               //database port
 //proxy settings - if you are behnd a proxy, change the settings below
 $configuration['proxy_host'] = false;
 $configuration['proxy_port'] = false;
 $configuration['proxy_username'] = false;
 $configuration['proxy_password'] = false;
diff --git a/backend/php/src/index.php b/backend/php/src/index.php
index 214ac01..da7c60c 100644
--- a/backend/php/src/index.php
+++ b/backend/php/src/index.php
@@ -135,30 +135,34 @@ function updateUserCredentials($parameters, &$user) {
                $user->srp_v =          $parameters["v"];
                $user->auth_version =$parameters["version"];
 }
 function updateUserData($parameters, &$user) {
                $user->header =         $parameters["header"];
                $user->statistics =$parameters["statistics"];
                $user->version =$parameters["version"];
-                $user->lock =   $parameters["lock"];
+        if (array_key_exists("lock", $parameters)) {
+                        $user->lock =   $parameters["lock"];
+        }
 }
 function updateRecordData($parameters, &$record, &$recordVersion) {
        $recordData = $parameters["record"];
                $record->reference =$recordData["reference"];
                $record->data =                 $recordData["data"];
                $record->version =      $recordData["version"];
        $recordVersionData = $parameters["currentRecordVersion"];
                $recordVersion->reference =                     $recordVersionData ["reference"];
                $recordVersion->data =                          $recordVersionData ["data"];
                $recordVersion->version =                       $recordVersionData ["version"];
-                $recordVersion->previous_version_id =$recordVersionData ["previousVersion"];
+        if (array_key_exists("previousVersion", $recordVersionData)) {
+                        $recordVersion->previous_version_id =$recordVersionData ["previousVersion"];
+        }
                $recordVersion->previous_version_key =$recordVersionData ["previousVersionKey"];
 }
 //-----------------------------------------------------------------------------
 function updateOTPStatus(&$otp, $status) {
        $otpStatus = new onetimepasswordstatus();
        $selectedStatuses = $otpStatus->GetList(array(array("code", "=", $status)));
@@ -360,16 +364,17 @@ error_log("oneTimePassword");
                        //=============================================================
                        }
                        break;
                case "message":
 error_log("message");
+//error_log("message: ".json_encode($parameters));
                        if ($parameters["srpSharedSecret"] == $_SESSION["K"]) {
                                $message = $parameters["message"];
                                
                                //=============================================================
                                if ($message == "getUserDetails") {
 //{"message":"getUserDetails", "srpSharedSecret":"f18e5cf7c3a83b67d4db9444af813ee48c13daf4f8f6635397d593e52ba89a08", "parameters":{}}
                                        $user = new user();
                                        $user = $user->Get($_SESSION["userId"]);
@@ -442,16 +447,98 @@ error_log("message");
                                        }
                                        $user->Save();
                                        $result["lock"] = $user->lock;
                                        $result["result"] = "done";
                                //=============================================================
+                                } else if ($message == "saveChanges") {
+//{
+//   "message":"saveChanges",
+//   "srpSharedSecret":"edc78508907c942173818f7247fa64869ba80672a7aa8d27b8fa6bfe524fb9c8",
+//   "parameters":{
+//      "records":{
+//         "updated":[
+//            {
+//               "currentRecordVersion":{
+//                  "previousVersionKey":"####",
+//                  "reference":"08c8eb7ec528fbf987bbfb84fe2e960cf9ae937b19fbb5f05d8d90a7039fac6a",
+//                  "data":"WYQ16AjodjsmyZDXa4MKxOju0F…beD/zXlbVb0Zj0ZI/N55bZ",
+//                  "version":"0.3"
+//               },
+//               "record":{
+//                  "reference":"83de5304f60a808e48a815c6203d7d3f24874d3f40faba420bbc60b376fcc356",
+//                  "data":"B6uBuBE Aly0knvgrUppodDTGZQC…guizL9QvHCWyM bQQBGBVvHZ6LfA==",
+//                  "version":"0.3"
+//               }
+//            }
+//         ],
+//         "deleted":[
+//
+//         ]
+//      },
+//      "user":{
+//         "header":"{\"rec…sion\":\"0.1\"}",
+//         "statistics":"e6iXVEM4i8ZatPZFCCads/9F",
+//         "version":"0.3"
+//      }
+//   }
+//}
+                                        $user = new user();
+                                        $user = $user->Get($_SESSION["userId"]);
+                                        updateUserData($parameters["parameters"]["user"], $user);
+                                        $recordToUpdateParameterList = $parameters["parameters"]["records"]["updated"];
+                                        $c = count($recordToUpdateParameterList);
+                                        for ($i=0; $i<$c; $i++) {
+                                                $recordList = $user->GetRecordList(array(array("reference", "=", $recordToUpdateParameterList [$i]["record"]["reference"])));
+                                                if (count($recordList) == 0) {
+                                                        $currentRecord = new record();
+                                                        $currentVersion = new recordversion();
+                                                        $isNewRecord = true;
+                                                } else {
+                                                        $currentRecord = $recordList[0];
+                                                        $currentRecordVersions = $currentRecord->GetRecordversionList();
+                                                        $currentVersion = $currentRecordVersions[0];
+                                                        $isNewRecord = false;
+                                                }
+                                                updateRecordData($recordToUpdateParameterList[$i], $currentRecord, $currentVersion);
+                                                if ($isNewRecord == true) {
+                                                        $currentRecord->SaveNew();
+                                                        $currentVersion->SaveNew();
+                                                        $currentRecord->AddRecordversion($currentVersion);
+                                                        $user->AddRecord($currentRecord);
+                                                }
+                                                $currentRecord->Save();
+                                                $currentVersion->Save();
+                                        }
+                                        $user->Save();
+                                        $recordToDeleteReferenceList = $parameters["parameters"]["records"]["deleted"];
+                                        $recordList = array();
+                                        $c = count($recordToDeleteReferenceList);
+                                        for ($i=0; $i<$c; $i++) {
+                                                array_push($recordList, array("reference", "=", $recordToDeleteReferenceList[$i]));
+                                        }
+                                        $record = new record();
+                                        $record->DeleteList($recordList, true);
+                                        $result["lock"] = $user->lock;
+                                        $result["result"] = "done";
+                                //=============================================================
                                } else if ($message == "getRecordDetail") {
 //{
        //"message":"getRecordDetail",
        //"srpSharedSecret":"4c00dcb66a9f2aea41a87e4707c526874e2eb29cc72d2c7086837e53d6bf2dfe",
        //"parameters":{
        //      "reference":"740009737139a189cfa2b1019a6271aaa39467b59e259706564b642ff3838d50"
        //}
 //}
@@ -469,31 +556,104 @@ error_log("message");
        //      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="
        //}
+        
+        //      #Actual result (causing error in /gamma)
+        //{
+        //      "result" : {
+        //              "currentVersion" : {
+        //                      "reference" : "cb05177f96a832062c6b936d24323cb74a64e2ef1d97ee026cd1003755af7495",
+        //                      "data" : "RAnoHmikp7RmiZ2WVyEMW+Ia",
+        //                      "header" : "",
+        //                      "version" : "0.3",
+        //                      "creationDate" : "0000-00-00 00:00:00",
+        //                      "updateDate" : "2011-10-09 19:49:11",
+        //                      "accessDate" : "2011-10-09 19:49:11"
+        //              },
+        //              "reference" : "b07e2afa2ba782b9f379649b36ded6de0452b43c27e6b887c7ce4f2a93f44346",
+        //              "data" : "NtK1nkLUabbJQx5uO8ept...ZJ5dkJYYkyh3VQ==",
+        //              "version" : "0.3",
+        //              "creationDate" : "2011-10-09 19:49:11",
+        //              "updateDate" : "Tue, 30 Nov 1999 00:00:00 +0000",
+        //              "accessDate" : "0000-00-00 00:00:00",
+        //              "oldestUsedEncryptedVersion" : "---"
+        //      }
+        //}
+        //      #Response from the online /gamma version
+        //{
+        //      "result" : {
+        //              "versions" : {
+        //                      "e2c193f017ad4f6babf51de59f7550a40596afc0c27373b6a360e426b5bc06de" : {
+        //                              "reference" : "e2c193f017ad4f6babf51de59f7550a40596afc0c27373b6a360e426b5bc06de",
+        //                              "data" : "s\/3ClggH4uCcf+BkIMqQ...+W0PVt\/MJ3t7s1g0g",
+        //                              "creationDate" : "Mon, 10 October 2011 14:42:42 UTC",
+        //                              "header" : "####",
+        //                              "updateDate" : "Mon, 10 October 2011 14:42:42 UTC",
+        //                              "previousVersion" : "a96a6d8b9ac73fcdf874d8a8534ffb2d43da8f5222e96a4a29bd2ae437619463",
+        //                              "version" : "0.3",
+        //                              "accessDate" : "Mon, 10 October 2011 14:42:42 UTC",
+        //                              "previousVersionKey" : "####"
+        //                      },
+        //                      [...]
+        //                      "a96a6d8b9ac73fcdf874d8a8534ffb2d43da8f5222e96a4a29bd2ae437619463" : {
+        //                              "reference" : "a96a6d8b9ac73fcdf874d8a8534ffb2d43da8f5222e96a4a29bd2ae437619463",
+        //                              "accessDate" : "Mon, 10 October 2011 14:41:17 UTC",
+        //                              "creationDate" : "Mon, 27 October 2008 08:16:14 UTC",
+        //                              "version" : "0.3",
+        //                              "data" : "m3yhZu81UAjCY6U2Kn...IUCb9suV0fldGOg=",
+        //                              "updateDate" : "Mon, 27 October 2008 08:16:14 UTC",
+        //                              "header" : "####"
+        //                      }
+        //              },
+        //              "oldestUsedEncryptedVersion" : "0.2",
+        //              "reference" : "36ec1a41118813ced3553534fa2607d781cba687768db305beed368a8e06e113",
+        //              "data" : "frlUkTbaOWD9j2ROat...ruWioCK0Mss27oHjPg==",
+        //              "creationDate" : "Wed, 14 March 2007 17:39:35 UTC",
+        //              "version" : "0.3",
+        //              "accessDate" : "Mon, 10 October 2011 14:45:12 UTC",
+        //              "currentVersion" : "e2c193f017ad4f6babf51de59f7550a40596afc0c27373b6a360e426b5bc06de",
+        //              "updatedDate" : "Mon, 10 October 2011 14:45:12 UTC"
+        //      },
+        //      "toll" : {
+        //              "requestType" : "MESSAGE",
+        //              "targetValue" : "a516c942a3792cc620775a41f8870a6c7b51796d9a94da978a75da6a52eb1e10",
+        //              "cost" : 2
+        //      }
+        //      }
                                        $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["versions"] = array();
-                                                $result["currentVersion"]["reference"] =$currentVersion->reference;
+        //                              foreach ($currentRecordVersions as $currentVersion) {
-                                                $result["currentVersion"]["data"] =             $currentVersion->data;
+                                                $result["versions"][$currentVersion->reference] = array();
-                                                $result["currentVersion"]["header"] =   $currentVersion->header;
+                                                        $result["versions"][$currentVersion->reference]["reference"]= $currentVersion->reference;
-                                                $result["currentVersion"]["version"] =  $currentVersion->version;
+                                                        $result["versions"][$currentVersion->reference]["data"]                 = $currentVersion->data;
-                                                $result["currentVersion"]["creationDate"] =$currentVersion->creation_date;
+                                                        $result["versions"][$currentVersion->reference]["header"]       = $currentVersion->header;
-                                                $result["currentVersion"]["updateDate"] =$currentVersion->update_date;
+                                                        $result["versions"][$currentVersion->reference]["version"]      = $currentVersion->version;
-                                                $result["currentVersion"]["accessDate"] =$currentVersion->access_date;
+                                                        $result["versions"][$currentVersion->reference]["creationDate"]= $currentVersion->creation_date;
+                                                        $result["versions"][$currentVersion->reference]["updateDate"]= $currentVersion->update_date;
+                                                        $result["versions"][$currentVersion->reference]["accessDate"]= $currentVersion->access_date;
+        //                              }
+                                        $result["currentVersion"] = $currentVersion->reference; 
+        //                                      $result["currentVersion"] = $currentRecord->currentVersion;     //???? 
                                                $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"] ="---";
@@ -744,12 +904,15 @@ error_log("logout");
                default:
 error_log("default");
                        $result["result"] = $parameters;
                        break;
        }
        session_write_close();
+        $finalResult = Array();
+        $finalResult["result"] = $result;
        
-        echo(json_encode($result));
+        echo(json_encode($finalResult));
-error_log("result: ".json_encode($result));
+error_log("result: ".json_encode($finalResult));
 ?>

diff --git a/backend/php/src/configuration.php b/backend/php/src/configuration.php index 291e3a1..85f680e 100644 --- a/backend/php/src/configuration.php +++ b/backend/php/src/configuration.php
@@ -11,20 +11,20 @@ $configuration['setup_password'] = '';
11	// to enable automatic data encoding, run setup, go to the manage plugins tab and install the base64 plugin.	11	// to enable automatic data encoding, run setup, go to the manage plugins tab and install the base64 plugin.
12	// then set db_encoding = 1 below.	12	// then set db_encoding = 1 below.
13	// when enabled, db_encoding transparently encodes and decodes data to and from the database without any	13	// when enabled, db_encoding transparently encodes and decodes data to and from the database without any
14	// programmatic effort on your part.	14	// programmatic effort on your part.
15	$configuration['db_encoding'] = 0;	15	$configuration['db_encoding'] = 0;
16		16
17	// edit the information below to match your database settings	17	// edit the information below to match your database settings
18		18
19	$configuration['db'] = 'clipperz'; //database name	19	$configuration['db'] = 'clipperz'; //database name
20	$configuration['host'] = 'localhost'; //database host	20	$configuration['host'] = 'localhost'; //database host
21	$configuration['user'] = 'root'; //database user	21	$configuration['user'] = 'clipperz'; //database user
22	$configuration['pass'] = 'pass'; //database password	22	$configuration['pass'] = 'clipperz'; //database password
23	$configuration['port'] = '3306'; //database port	23	$configuration['port'] = '3306'; //database port
24		24
25		25
26	//proxy settings - if you are behnd a proxy, change the settings below	26	//proxy settings - if you are behnd a proxy, change the settings below
27	$configuration['proxy_host'] = false;	27	$configuration['proxy_host'] = false;
28	$configuration['proxy_port'] = false;	28	$configuration['proxy_port'] = false;
29	$configuration['proxy_username'] = false;	29	$configuration['proxy_username'] = false;
30	$configuration['proxy_password'] = false;	30	$configuration['proxy_password'] = false;


diff --git a/backend/php/src/index.php b/backend/php/src/index.php index 214ac01..da7c60c 100644 --- a/backend/php/src/index.php +++ b/backend/php/src/index.php
@@ -135,30 +135,34 @@ function updateUserCredentials($parameters, &$user) {
135	$user->srp_v = $parameters["v"];	135	$user->srp_v = $parameters["v"];
136	$user->auth_version =$parameters["version"];	136	$user->auth_version =$parameters["version"];
137	}	137	}
138		138
139	function updateUserData($parameters, &$user) {	139	function updateUserData($parameters, &$user) {
140	$user->header = $parameters["header"];	140	$user->header = $parameters["header"];
141	$user->statistics =$parameters["statistics"];	141	$user->statistics =$parameters["statistics"];
142	$user->version =$parameters["version"];	142	$user->version =$parameters["version"];
143	$user->lock = $parameters["lock"];	143	if (array_key_exists("lock", $parameters)) {
		144	$user->lock = $parameters["lock"];
		145	}
144	}	146	}
145		147
146	function updateRecordData($parameters, &$record, &$recordVersion) {	148	function updateRecordData($parameters, &$record, &$recordVersion) {
147	$recordData = $parameters["record"];	149	$recordData = $parameters["record"];
148	$record->reference =$recordData["reference"];	150	$record->reference =$recordData["reference"];
149	$record->data = $recordData["data"];	151	$record->data = $recordData["data"];
150	$record->version = $recordData["version"];	152	$record->version = $recordData["version"];
151		153
152	$recordVersionData = $parameters["currentRecordVersion"];	154	$recordVersionData = $parameters["currentRecordVersion"];
153	$recordVersion->reference = $recordVersionData ["reference"];	155	$recordVersion->reference = $recordVersionData ["reference"];
154	$recordVersion->data = $recordVersionData ["data"];	156	$recordVersion->data = $recordVersionData ["data"];
155	$recordVersion->version = $recordVersionData ["version"];	157	$recordVersion->version = $recordVersionData ["version"];
156	$recordVersion->previous_version_id =$recordVersionData ["previousVersion"];	158	if (array_key_exists("previousVersion", $recordVersionData)) {
		159	$recordVersion->previous_version_id =$recordVersionData ["previousVersion"];
		160	}
157	$recordVersion->previous_version_key =$recordVersionData ["previousVersionKey"];	161	$recordVersion->previous_version_key =$recordVersionData ["previousVersionKey"];
158	}	162	}
159		163
160	//-----------------------------------------------------------------------------	164	//-----------------------------------------------------------------------------
161		165
162	function updateOTPStatus(&$otp, $status) {	166	function updateOTPStatus(&$otp, $status) {
163	$otpStatus = new onetimepasswordstatus();	167	$otpStatus = new onetimepasswordstatus();
164	$selectedStatuses = $otpStatus->GetList(array(array("code", "=", $status)));	168	$selectedStatuses = $otpStatus->GetList(array(array("code", "=", $status)));
@@ -360,16 +364,17 @@ error_log("oneTimePassword");
360		364
361	//=============================================================	365	//=============================================================
362	}	366	}
363		367
364	break;	368	break;
365		369
366	case "message":	370	case "message":
367	error_log("message");	371	error_log("message");
		372	//error_log("message: ".json_encode($parameters));
368	if ($parameters["srpSharedSecret"] == $_SESSION["K"]) {	373	if ($parameters["srpSharedSecret"] == $_SESSION["K"]) {
369	$message = $parameters["message"];	374	$message = $parameters["message"];
370		375
371	//=============================================================	376	//=============================================================
372	if ($message == "getUserDetails") {	377	if ($message == "getUserDetails") {
373	//{"message":"getUserDetails", "srpSharedSecret":"f18e5cf7c3a83b67d4db9444af813ee48c13daf4f8f6635397d593e52ba89a08", "parameters":{}}	378	//{"message":"getUserDetails", "srpSharedSecret":"f18e5cf7c3a83b67d4db9444af813ee48c13daf4f8f6635397d593e52ba89a08", "parameters":{}}
374	$user = new user();	379	$user = new user();
375	$user = $user->Get($_SESSION["userId"]);	380	$user = $user->Get($_SESSION["userId"]);
@@ -442,16 +447,98 @@ error_log("message");
442	}	447	}
443		448
444	$user->Save();	449	$user->Save();
445		450
446	$result["lock"] = $user->lock;	451	$result["lock"] = $user->lock;
447	$result["result"] = "done";	452	$result["result"] = "done";
448		453
449	//=============================================================	454	//=============================================================
		455	} else if ($message == "saveChanges") {
		456
		457	//{
		458	// "message":"saveChanges",
		459	// "srpSharedSecret":"edc78508907c942173818f7247fa64869ba80672a7aa8d27b8fa6bfe524fb9c8",
		460	// "parameters":{
		461	// "records":{
		462	// "updated":[
		463	// {
		464	// "currentRecordVersion":{
		465	// "previousVersionKey":"####",
		466	// "reference":"08c8eb7ec528fbf987bbfb84fe2e960cf9ae937b19fbb5f05d8d90a7039fac6a",
		467	// "data":"WYQ16AjodjsmyZDXa4MKxOju0F…beD/zXlbVb0Zj0ZI/N55bZ",
		468	// "version":"0.3"
		469	// },
		470	// "record":{
		471	// "reference":"83de5304f60a808e48a815c6203d7d3f24874d3f40faba420bbc60b376fcc356",
		472	// "data":"B6uBuBE Aly0knvgrUppodDTGZQC…guizL9QvHCWyM bQQBGBVvHZ6LfA==",
		473	// "version":"0.3"
		474	// }
		475	// }
		476	// ],
		477	// "deleted":[
		478	//
		479	// ]
		480	// },
		481	// "user":{
		482	// "header":"{\"rec…sion\":\"0.1\"}",
		483	// "statistics":"e6iXVEM4i8ZatPZFCCads/9F",
		484	// "version":"0.3"
		485	// }
		486	// }
		487	//}
		488	$user = new user();
		489	$user = $user->Get($_SESSION["userId"]);
		490	updateUserData($parameters["parameters"]["user"], $user);
		491
		492	$recordToUpdateParameterList = $parameters["parameters"]["records"]["updated"];
		493	$c = count($recordToUpdateParameterList);
		494	for ($i=0; $i<$c; $i++) {
		495	$recordList = $user->GetRecordList(array(array("reference", "=", $recordToUpdateParameterList [$i]["record"]["reference"])));
		496	if (count($recordList) == 0) {
		497	$currentRecord = new record();
		498	$currentVersion = new recordversion();
		499	$isNewRecord = true;
		500	} else {
		501	$currentRecord = $recordList[0];
		502	$currentRecordVersions = $currentRecord->GetRecordversionList();
		503	$currentVersion = $currentRecordVersions[0];
		504	$isNewRecord = false;
		505	}
		506
		507	updateRecordData($recordToUpdateParameterList[$i], $currentRecord, $currentVersion);
		508
		509	if ($isNewRecord == true) {
		510	$currentRecord->SaveNew();
		511	$currentVersion->SaveNew();
		512
		513	$currentRecord->AddRecordversion($currentVersion);
		514	$user->AddRecord($currentRecord);
		515	}
		516
		517	$currentRecord->Save();
		518	$currentVersion->Save();
		519	}
		520
		521	$user->Save();
		522
		523	$recordToDeleteReferenceList = $parameters["parameters"]["records"]["deleted"];
		524	$recordList = array();
		525	$c = count($recordToDeleteReferenceList);
		526	for ($i=0; $i<$c; $i++) {
		527	array_push($recordList, array("reference", "=", $recordToDeleteReferenceList[$i]));
		528	}
		529
		530	$record = new record();
		531	$record->DeleteList($recordList, true);
		532
		533	$result["lock"] = $user->lock;
		534	$result["result"] = "done";
		535
		536	//=============================================================
450	} else if ($message == "getRecordDetail") {	537	} else if ($message == "getRecordDetail") {
451	//{	538	//{
452	//"message":"getRecordDetail",	539	//"message":"getRecordDetail",
453	//"srpSharedSecret":"4c00dcb66a9f2aea41a87e4707c526874e2eb29cc72d2c7086837e53d6bf2dfe",	540	//"srpSharedSecret":"4c00dcb66a9f2aea41a87e4707c526874e2eb29cc72d2c7086837e53d6bf2dfe",
454	//"parameters":{	541	//"parameters":{
455	// "reference":"740009737139a189cfa2b1019a6271aaa39467b59e259706564b642ff3838d50"	542	// "reference":"740009737139a189cfa2b1019a6271aaa39467b59e259706564b642ff3838d50"
456	//}	543	//}
457	//}	544	//}
@@ -469,31 +556,104 @@ error_log("message");
469	// reference:"13a5e52976337ab210903cd04872588e1b21fb72bc183e91aa25c494b8138551",	556	// reference:"13a5e52976337ab210903cd04872588e1b21fb72bc183e91aa25c494b8138551",
470	// oldestUsedEncryptedVersion:"0.2",	557	// oldestUsedEncryptedVersion:"0.2",
471	// accessDate:"Wed, 13 February 2008 14:25:12 UTC",	558	// accessDate:"Wed, 13 February 2008 14:25:12 UTC",
472	// creationDate:"Wed, 14 March 2007 13:53:11 UTC",	559	// creationDate:"Wed, 14 March 2007 13:53:11 UTC",
473	// version:"0.2",	560	// version:"0.2",
474	// updatedDate:"Tue, 17 April 2007 17:17:52 UTC",	561	// updatedDate:"Tue, 17 April 2007 17:17:52 UTC",
475	// data:"0/BjzyY6jeh71h...pAw2++NEyylGhMC5C5f5m8pBApYziN84s4O3JQ3khW/1UttQl4="	562	// data:"0/BjzyY6jeh71h...pAw2++NEyylGhMC5C5f5m8pBApYziN84s4O3JQ3khW/1UttQl4="
476	//}	563	//}
		564
		565
		566	// #Actual result (causing error in /gamma)
		567	//{
		568	// "result" : {
		569	// "currentVersion" : {
		570	// "reference" : "cb05177f96a832062c6b936d24323cb74a64e2ef1d97ee026cd1003755af7495",
		571	// "data" : "RAnoHmikp7RmiZ2WVyEMW+Ia",
		572	// "header" : "",
		573	// "version" : "0.3",
		574	// "creationDate" : "0000-00-00 00:00:00",
		575	// "updateDate" : "2011-10-09 19:49:11",
		576	// "accessDate" : "2011-10-09 19:49:11"
		577	// },
		578	// "reference" : "b07e2afa2ba782b9f379649b36ded6de0452b43c27e6b887c7ce4f2a93f44346",
		579	// "data" : "NtK1nkLUabbJQx5uO8ept...ZJ5dkJYYkyh3VQ==",
		580	// "version" : "0.3",
		581	// "creationDate" : "2011-10-09 19:49:11",
		582	// "updateDate" : "Tue, 30 Nov 1999 00:00:00 +0000",
		583	// "accessDate" : "0000-00-00 00:00:00",
		584	// "oldestUsedEncryptedVersion" : "---"
		585	// }
		586	//}
		587
		588
		589	// #Response from the online /gamma version
		590	//{
		591	// "result" : {
		592	// "versions" : {
		593	// "e2c193f017ad4f6babf51de59f7550a40596afc0c27373b6a360e426b5bc06de" : {
		594	// "reference" : "e2c193f017ad4f6babf51de59f7550a40596afc0c27373b6a360e426b5bc06de",
		595	// "data" : "s\/3ClggH4uCcf+BkIMqQ...+W0PVt\/MJ3t7s1g0g",
		596	// "creationDate" : "Mon, 10 October 2011 14:42:42 UTC",
		597	// "header" : "####",
		598	// "updateDate" : "Mon, 10 October 2011 14:42:42 UTC",
		599	// "previousVersion" : "a96a6d8b9ac73fcdf874d8a8534ffb2d43da8f5222e96a4a29bd2ae437619463",
		600	// "version" : "0.3",
		601	// "accessDate" : "Mon, 10 October 2011 14:42:42 UTC",
		602	// "previousVersionKey" : "####"
		603	// },
		604	// [...]
		605	// "a96a6d8b9ac73fcdf874d8a8534ffb2d43da8f5222e96a4a29bd2ae437619463" : {
		606	// "reference" : "a96a6d8b9ac73fcdf874d8a8534ffb2d43da8f5222e96a4a29bd2ae437619463",
		607	// "accessDate" : "Mon, 10 October 2011 14:41:17 UTC",
		608	// "creationDate" : "Mon, 27 October 2008 08:16:14 UTC",
		609	// "version" : "0.3",
		610	// "data" : "m3yhZu81UAjCY6U2Kn...IUCb9suV0fldGOg=",
		611	// "updateDate" : "Mon, 27 October 2008 08:16:14 UTC",
		612	// "header" : "####"
		613	// }
		614	// },
		615	// "oldestUsedEncryptedVersion" : "0.2",
		616	// "reference" : "36ec1a41118813ced3553534fa2607d781cba687768db305beed368a8e06e113",
		617	// "data" : "frlUkTbaOWD9j2ROat...ruWioCK0Mss27oHjPg==",
		618	// "creationDate" : "Wed, 14 March 2007 17:39:35 UTC",
		619	// "version" : "0.3",
		620	// "accessDate" : "Mon, 10 October 2011 14:45:12 UTC",
		621	// "currentVersion" : "e2c193f017ad4f6babf51de59f7550a40596afc0c27373b6a360e426b5bc06de",
		622	// "updatedDate" : "Mon, 10 October 2011 14:45:12 UTC"
		623	// },
		624	// "toll" : {
		625	// "requestType" : "MESSAGE",
		626	// "targetValue" : "a516c942a3792cc620775a41f8870a6c7b51796d9a94da978a75da6a52eb1e10",
		627	// "cost" : 2
		628	// }
		629	// }
		630
477	$record = new record();	631	$record = new record();
478		632
479	$recordList = $record->GetList(array(array("reference", "=", $parameters["parameters"]["reference"])));	633	$recordList = $record->GetList(array(array("reference", "=", $parameters["parameters"]["reference"])));
480	$currentRecord = $recordList[0];	634	$currentRecord = $recordList[0];
481	$currentRecordVersions = $currentRecord->GetRecordversionList();	635	$currentRecordVersions = $currentRecord->GetRecordversionList();
482	$currentVersion = $currentRecordVersions[0];	636	$currentVersion = $currentRecordVersions[0];
483		637
484	$result["currentVersion"] = array();	638	$result["versions"] = array();
485	$result["currentVersion"]["reference"] =$currentVersion->reference;	639	// foreach ($currentRecordVersions as $currentVersion) {
486	$result["currentVersion"]["data"] = $currentVersion->data;	640	$result["versions"][$currentVersion->reference] = array();
487	$result["currentVersion"]["header"] = $currentVersion->header;	641	$result["versions"][$currentVersion->reference]["reference"]= $currentVersion->reference;
488	$result["currentVersion"]["version"] = $currentVersion->version;	642	$result["versions"][$currentVersion->reference]["data"] = $currentVersion->data;
489	$result["currentVersion"]["creationDate"] =$currentVersion->creation_date;	643	$result["versions"][$currentVersion->reference]["header"] = $currentVersion->header;
490	$result["currentVersion"]["updateDate"] =$currentVersion->update_date;	644	$result["versions"][$currentVersion->reference]["version"] = $currentVersion->version;
491	$result["currentVersion"]["accessDate"] =$currentVersion->access_date;	645	$result["versions"][$currentVersion->reference]["creationDate"]= $currentVersion->creation_date;
		646	$result["versions"][$currentVersion->reference]["updateDate"]= $currentVersion->update_date;
		647	$result["versions"][$currentVersion->reference]["accessDate"]= $currentVersion->access_date;
		648
		649	// }
		650	$result["currentVersion"] = $currentVersion->reference;
		651	// $result["currentVersion"] = $currentRecord->currentVersion; //????
492		652
493	$result["reference"] = $currentRecord->reference;	653	$result["reference"] = $currentRecord->reference;
494	$result["data"] = $currentRecord->data;	654	$result["data"] = $currentRecord->data;
495	$result["version"] = $currentRecord->version;	655	$result["version"] = $currentRecord->version;
496	$result["creationDate"] =$currentRecord->creation_date;	656	$result["creationDate"] =$currentRecord->creation_date;
497	$result["updateDate"] = $currentRecord->update_date;	657	$result["updateDate"] = $currentRecord->update_date;
498	$result["accessDate"] = $currentRecord->access_date;	658	$result["accessDate"] = $currentRecord->access_date;
499	$result["oldestUsedEncryptedVersion"] ="---";	659	$result["oldestUsedEncryptedVersion"] ="---";
@@ -744,12 +904,15 @@ error_log("logout");
744		904
745	default:	905	default:
746	error_log("default");	906	error_log("default");
747	$result["result"] = $parameters;	907	$result["result"] = $parameters;
748	break;	908	break;
749	}	909	}
750		910
751	session_write_close();	911	session_write_close();
		912
		913	$finalResult = Array();
		914	$finalResult["result"] = $result;
752		915
753	echo(json_encode($result));	916	echo(json_encode($finalResult));
754	error_log("result: ".json_encode($result));	917	error_log("result: ".json_encode($finalResult));
755	?>	918	?>