1 files changed, 2 insertions, 2 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/User.js b/frontend/gamma/js/Clipperz/PM/DataModel/User.js
index fd18faf..b94fe4c 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/User.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/User.js
@@ -681,98 +681,98 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
                         MochiKit.Base.method(this, 'invokeMethodNamedOnRecords', 'deleteAllCleanTextData'),
                         MochiKit.Base.method(this, 'invokeMethodNamedOnHeader',  'deleteAllCleanTextData'),
 
                         MochiKit.Base.method(this.data(), 'removeAllData'),
                         MochiKit.Base.method(this, 'resetTransientState', false)
                 ], {trace:false});
         },
 
         //-------------------------------------------------------------------------
 
         'hasAnyCleanTextData': function () {
                         vardeferredResult;
                 
                 deferredResult = new Clipperz.Async.Deferred("User.hasAnyCleanTextData", {trace:false});
                 deferredResult.collectResults({
                                 'header':[
                                 MochiKit.Base.method(this, 'invokeMethodNamedOnHeader',  'hasAnyCleanTextData'),
                                 MochiKit.Base.values
                         ],
                                 'records':MochiKit.Base.method(this, 'invokeMethodNamedOnRecords', 'hasAnyCleanTextData'),
                                 'data':         MochiKit.Base.bind(function () {
                                                         return MochiKit.Async.succeed(! this.data().isEmpty());
                                                 }, this),
                                 'transientState':MochiKit.Base.bind(function () {
                                                         return MochiKit.Async.succeed(MochiKit.Base.keys(this.transientState()).length != 0);
                                                 }, this)
                 });
                 deferredResult.addCallback(Clipperz.Async.or);
                 deferredResult.callback();
 
                 return deferredResult;
         },
 
         //=========================================================================
 
         'prepareRemoteDataWithKey': function (aKey /*, aCurrentKey*/) {
                 var deferredResult;
                         varresult;
 
                 result = {};
                 deferredResult = new Clipperz.Async.Deferred("User.prepareRemoteDataWithKey", {trace:false});
                 deferredResult.addMethod(this, 'invokeMethodNamedOnHeader', 'prepareRemoteDataWithKey', aKey /*, aCurrentKey*/);
                 deferredResult.addCallback(MochiKit.Base.bind(function (aResult, someHeaderPackedData) {
                         var header;
 
                         header = {};
                                 header['records']               = someHeaderPackedData['recordIndex']['records'];
                                 header['directLogins']  = someHeaderPackedData['recordIndex']['directLogins'];
-                                header['preferences']           = {'data': someHeaderPackedData['preferences']['data']};                //      this._serverData['header']['preferences'];              //      Clipperz.Base.evalJSON(this._serverData['header']['data'])['preferences'];              //???????????
-                                header['oneTimePasswords']      = {'data': someHeaderPackedData['oneTimePasswords']['data']};   //      this._serverData['header']['oneTimePasswords'];         //      Clipperz.Base.evalJSON(this._serverData['header']['data'])['oneTimePasswords'];         //???????????
+                                header['preferences']   = {'data': someHeaderPackedData['preferences']['data']};
+                                header['oneTimePasswords']= {'data': someHeaderPackedData['oneTimePasswords']['data']};
                                 header['version']               = '0.1';
 
                                 aResult['header']       = Clipperz.Base.serializeJSON(header);
                                 aResult['statistics']   = this._serverData['statistics'];       //"someHeaderPackedData['statistics']['data']";
                         
                         return aResult;
                 }, this), result);
                 deferredResult.addCallback(Clipperz.Async.setItem, result, 'version', Clipperz.PM.Crypto.encryptingFunctions.currentVersion);
         //      deferredResult.addCallback(Clipperz.Async.setItem, result, 'lock', this.serverLockValue());
                 deferredResult.callback();
 
                 return deferredResult;
         },
 
         //=========================================================================
 
         'saveChanges': function () {
                         vardeferredResult;
                 var messageParameters;
                 
                 messageParameters = {};
 
                 deferredResult = new Clipperz.Async.Deferred("User.saveChangaes", {trace:false});
 
                 deferredResult.addMethod(this, 'getHeaderIndex', 'recordsIndex');
                 deferredResult.addCallback(MochiKit.Base.methodcaller('prepareRemoteDataForChangedRecords'));
                 deferredResult.addCallback(Clipperz.Async.setItem, messageParameters, 'records');
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
 
                 deferredResult.addMethod(this, 'getPassphrase');
                 deferredResult.addMethod(this, 'prepareRemoteDataWithKey');
                 deferredResult.addCallback(Clipperz.Async.setItem, messageParameters, 'user');
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
 
                 deferredResult.addCallback(MochiKit.Async.succeed, messageParameters);
                 deferredResult.addMethod(this.connection(), 'message', 'saveChanges');
                 deferredResult.addCallback(MochiKit.Base.update, this.transientState())
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
 
                 deferredResult.addMethod(this, 'commitTransientState');
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'userDataSuccessfullySaved');
 
                 deferredResult.addErrbackPass(MochiKit.Base.method(this, 'revertChanges'));
                 deferredResult.addErrbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'failureWhileSavingUserData');
 
                 deferredResult.callback();