1 files changed, 6 insertions, 9 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/EncryptedRemoteObject.js b/frontend/gamma/js/Clipperz/PM/DataModel/EncryptedRemoteObject.js
index 3408b08..cdeec8b 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/EncryptedRemoteObject.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/EncryptedRemoteObject.js
@@ -1,216 +1,213 @@
 /*
 
 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.
+This file is part of Clipperz Community Edition.
+Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
-refer to http://www.clipperz.com
+refer to http://www.clipperz.com.
 
-* Javascript Crypto Library is free software: you can redistribute
+* Clipperz Community Edition 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
+* Clipperz Community Edition 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
+  License along with Clipperz Community Edition.  If not, see
   <http://www.gnu.org/licenses/>.
 
 */
 
 try { if (typeof(Clipperz.KeyValueObjectStore) == 'undefined') { throw ""; }} catch (e) {
 	throw "Clipperz.PM.DataModel.EncryptedRemoteObject depends on Clipperz.KeyValueObjectStore!";
 }  
 
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; }
 
 Clipperz.PM.DataModel.EncryptedRemoteObject = function(args) {
 	args = args || {};
 
 	this._name = args.name || null;
 	this._reference = args.reference || Clipperz.PM.Crypto.randomKey();
 	this._isBrandNew = ((args.reference == null) && (args.remoteData == null));
 
 	if ((this._isBrandNew == false) && (args['retrieveKeyFunction'] == null)) {
 		Clipperz.Base.exception.raise('MandatoryParameter');
 	} else {
 		this._retrieveKeyFunction = args['retrieveKeyFunction'];
 	}
 
 	this._retrieveRemoteDataFunction	= args.retrieveRemoteDataFunction	|| null;
 	this._remoteData					= args.remoteData					|| null;
 //	this._remoteData					= args.remoteData ? Clipperz.Base.deepClone(args.remoteData) : null;
 	if ((!this._isBrandNew) && ((this._retrieveRemoteDataFunction == null) && (this._remoteData == null))) {
 		Clipperz.Base.exception.raise('MandatoryParameter');
 	}
 
 
 	this._encryptedDataKeypath			= args.encryptedDataKeypath			|| 'data';		//Clipperz.Base.exception.raise('MandatoryParameter');
 	this._encryptedVersionKeypath		= args.encryptedVersionKeypath		|| 'version';	//Clipperz.Base.exception.raise('MandatoryParameter');
 
 	
 	this._transientState = null;
 	this._deferredLocks = {};
 
 	if (this._isBrandNew == true) {
 		this._objectDataStore = new Clipperz.KeyValueObjectStore(/*{'name':'EncryptedRemoteObject.objectDataStore [1]'}*/);
 	} else {
 		this._objectDataStore = null;
 	}
 
 	return this;
 }
 
 //
 //	  Basic data workflow
 //	=======================
 //
 //	getRemoteData
 //		unpackRemoteData
 //			getDecryptData [encryptedDataKeypath, encryptedVersionKeypath]
 //				unpackData
 //				
 //				
 //	??			packData
 //	??		encryptDataWithKey
 //	??	packRemoteData [encryptedDataKeypath (?), encryptedVersionKeypath (?)]
 //
 
 Clipperz.PM.DataModel.EncryptedRemoteObject.prototype = MochiKit.Base.update(null, {
 
 	'toString': function () {
 		return "Clipperz.PM.DataModel.EncryptedRemoteObject" + (this.name() != null ? " - " + this.name() : "");
 	},
 
 	//-------------------------------------------------------------------------
 
 	'name': function () {
 		return this._name;
 	},
 
 	//-------------------------------------------------------------------------
 
 	'reference': function () {
 		return this._reference;
 	},
 
 	'setReference': function (aValue) {
 		this._reference = aValue;
 
 		return this._reference;
 	},
 
 	//-------------------------------------------------------------------------
 
 	'transientState': function () {
 		if (this._transientState == null) {
 			this._transientState = new Clipperz.KeyValueObjectStore(/*{'name':'EncryptedRemoteObject.transientState [2]'}*/);
 		}
 		
 		return this._transientState;
 	},
 
 	'resetTransientState': function (isCommitting) {
 		if (this._transientState != null) {
 			this._transientState.removeAllData();
 		}
 
 		this._transientState = null;
 	},
 
 	//-------------------------------------------------------------------------
 
 	'isBrandNew': function () {
 		return this._isBrandNew;
 	},
 
 	//-------------------------------------------------------------------------
 
 	'getKey': function () {
 		var deferredResult;
 		var deferredLock;
 
 		deferredLock = this.getDeferredLockForKey('key');
 
 		deferredResult = new Clipperz.Async.Deferred("EncryptedRemoteObject.getKey", {trace:false});
 		deferredResult.acquireLock(deferredLock);
 		deferredResult.addMethod(
 			this.decryptedDataStore(),
 			'deferredGetOrSet',
 			'decryptionKey',
 			MochiKit.Base.partial(this.retrieveKeyFunction(), this.reference())
 		);
 		deferredResult.releaseLock(deferredLock);
 		deferredResult.callback();
 		
 		return deferredResult;
 	},
 
 	// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 	'retrieveKeyFunction': function () {
 		return this._retrieveKeyFunction;
 	},
 
 	'setRetrieveKeyFunction': function (aFunction) {
 		this._retrieveKeyFunction = aFunction;
 	},
 
 	//-------------------------------------------------------------------------
 
 	'hasLoadedRemoteData': function () {
 		return (this._remoteData != null);
 	},
 
 	'getRemoteData': function () {
 		var deferredResult;
 		var	deferredLock;
 		
 		deferredLock = this.getDeferredLockForKey('remoteData');
 
 		deferredResult = new Clipperz.Async.Deferred("EncryptedRemoteObjects.getRemoteData", {trace:false});
 		deferredResult.acquireLock(deferredLock);
 		deferredResult.addCallback(MochiKit.Base.bind(function () {
 			var innerDeferredResult;
 			
 			if (this._remoteData != null) {
 				innerDeferredResult = MochiKit.Async.succeed(this._remoteData);
 			} else {
 				innerDeferredResult = Clipperz.Async.callbacks("EncryptedRemoteObjects.getRemoteData <inner deferred>", [
 					MochiKit.Base.partial(this.retrieveRemoteDataFunction(), this.reference()),
 					MochiKit.Base.method(this, 'unpackRemoteData'),
 					MochiKit.Base.bind(function (someData) {
 						this._remoteData = someData;
 						return this._remoteData;
 					}, this)
 				], {trace:false});
 			}
 
 			return innerDeferredResult;
 		}, this))
 		deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
 		deferredResult.releaseLock(deferredLock);
 		
 		deferredResult.callback();
 		
 		return deferredResult;
 	},
 
 	//-------------------------------------------------------------------------
 
 	'unpackRemoteData': function (someData) {
 		return MochiKit.Async.succeed(someData);
 	},
 
 	//.........................................................................
 
 	'packRemoteData': function (someData) {