1 files changed, 10 insertions, 12 deletions

diff --git a/frontend/beta/js/Clipperz/PM/DataModel/Header.js b/frontend/beta/js/Clipperz/PM/DataModel/Header.js
index c780855..908d9f4 100644
--- a/frontend/beta/js/Clipperz/PM/DataModel/Header.js
+++ b/frontend/beta/js/Clipperz/PM/DataModel/Header.js
@@ -1,214 +1,212 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* 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.
+* Clipperz 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.
 
-* 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.
+* Clipperz 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 Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; }
 
 
 //#############################################################################
 
 Clipperz.PM.DataModel.Header = function(args) {
 	args = args || {};
 
 	this._user = args.user;
 
 	this._serverData = null;
 	this._serverDataVersion = null;
 	this._jsonEvaledServerData = null;
 	
 	this._decryptedLegacyServerData = null;
 	this._isDecryptingLegacyServerData = false;
 	this._decryptingLegacyServerDataPendingQueue = [];
 
 	this.resetUpdatedSections();
 	
 	this._shouldLoadSections = {};
 
 	Clipperz.NotificationCenter.register(this.user(), 'updatedSection', this, 'updatedSectionHandler');
 	
 	return this;
 }
 
 Clipperz.PM.DataModel.Header.prototype = MochiKit.Base.update(null, {
 
 	//-------------------------------------------------------------------------
 
 	'user': function() {
 		return this._user;
 	},
 		
 	//-------------------------------------------------------------------------
 	//-------------------------------------------------------------------------
 	//-------------------------------------------------------------------------
 	//-------------------------------------------------------------------------
 	//-------------------------------------------------------------------------
 	//-------------------------------------------------------------------------
 	//-------------------------------------------------------------------------
 	//-------------------------------------------------------------------------
 	//-------------------------------------------------------------------------
 	
 	'updatedSections': function() {
 		return this._updatedSections;
 	},
 
 	'markSectionAsUpdated': function(aSectionName) {
 		this.updatedSections().push(aSectionName);
 	},
 	
 	'resetUpdatedSections': function() {
 		this._updatedSections = []
 	},
 	
 	'hasSectionBeenUpdated': function(aSectionName) {
 		return (this.updatedSections().join().indexOf(aSectionName) != -1);
 	},
 	
 	'cachedServerDataSection': function(aSectionName) {
 		return (this.hasSectionBeenUpdated(aSectionName)) ? {} : this.jsonEvaledServerData()[aSectionName];
 	},
 	
 	'updateAllSections': function() {
 		this.resetUpdatedSections();
 		this.markSectionAsUpdated('records');
 		this.markSectionAsUpdated('directLogins');
 		this.markSectionAsUpdated('preferences');
 		this.markSectionAsUpdated('oneTimePasswords');
 		
 		return MochiKit.Async.succeed(this);
 	},
 	
 	'updatedSectionHandler': function(anEvent) {
 		this.markSectionAsUpdated(anEvent.parameters());
 	},
 	
 	//-------------------------------------------------------------------------
 	
 	'getObjectKeyIndex': function(anObject) {
 		var result;
 		var	itemReference;
 		var index;
 		
 		result = {};
 		index = 0;
 
 		for (itemReference in anObject) {
 			result[itemReference] = index.toString();
 			index ++;
 		}
 		
 		return result;
 	},
 
 	//-------------------------------------------------------------------------
 
 	'serializedDataWithRecordAndDirectLoginIndexes': function(aRecordIndexes, aDirectLoginIndexs) {
 		var result;
 		var records;
 		var recordReference;
 
 //MochiKit.Logging.logDebug(">>> Header.serializedData");
 		result = {
 			'records': {},
 			'directLogins': {}
 		};
 
 		records = this.user().records();
 		for (recordReference in records) {
 			result['records'][aRecordIndexes[recordReference]] = this.user().records()[recordReference].headerData();
 		}
 		
 		for (directLoginReference in this.user().directLoginReferences()) {
 			var currentDirectLogin;
 			var	directLoginData;
 			
 			currentDirectLogin = this.user().directLoginReferences()[directLoginReference];
 			if (aRecordIndexes[currentDirectLogin.recordReference()] != null) {
 				directLoginData = {
 //					reference:  currentDirectLogin.reference(),
 					record:		aRecordIndexes[currentDirectLogin.recordReference()].toString(),
 					label:		currentDirectLogin.label(),
 					favicon:	currentDirectLogin.favicon() || ""
 				}
 
 				result['directLogins'][aDirectLoginIndexs[directLoginReference]] = directLoginData;
 			}
 			
 		}
 //MochiKit.Logging.logDebug("<<< Header.serializedData - result: " + Clipperz.Base.serializeJSON(result));
 //MochiKit.Logging.logDebug("<<< Header.serializedData");
 
 		return result;
 	},
 
 	//-------------------------------------------------------------------------
 	
 	'encryptedData': function() {
 		var deferredResult;
 		var recordIndex;
 		var directLoginIndex;
 		var	serializedData;
 		var result;
 
 //MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Header.encryptedData");
 //MochiKit.Logging.logDebug("### Header.encryptedData - " + Clipperz.Base.serializeJSON(this.updatedSections()));
 		result = {
 			'records': this.cachedServerDataSection('records'),
 			'directLogins': this.cachedServerDataSection('directLogins'),
 			'preferences': this.cachedServerDataSection('preferences'),
 			'oneTimePasswords': this.cachedServerDataSection('oneTimePasswords'),
 			'version': '0.1'
 		};
 
 		if (this.hasSectionBeenUpdated('records')) {
 			recordIndex = this.getObjectKeyIndex(this.user().records());
 			result['records']['index'] = recordIndex;
 		} else {
 			recordIndex = result['records']['index'];
 		}
 		
 		if (this.hasSectionBeenUpdated('directLogins')) {
 			directLoginIndex = this.getObjectKeyIndex(this.user().directLoginReferences());
 			result['directLogins']['index'] = directLoginIndex;
 		} else {
 			directLoginIndex = result['directLogins']['index'];
 		}
 		
 		if (this.hasSectionBeenUpdated('records') || this.hasSectionBeenUpdated('directLogins')) {
 			serializedData = this.serializedDataWithRecordAndDirectLoginIndexes(recordIndex, directLoginIndex);
 		}
 		
 		deferredResult = new MochiKit.Async.Deferred();
 
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("Header.encryptedData - 1: " + res); return res;});
 		if (this.hasSectionBeenUpdated('records')) {
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("Header.encryptedData - 1.1: " + res); return res;});
 			deferredResult.addCallback(function(anHeader, aResult, aSerializedData, aValue) {
 				return Clipperz.PM.Crypto.deferredEncryptWithCurrentVersion(anHeader.user().passphrase(), aSerializedData['records']);
 			}, this, result, serializedData);
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("Header.encryptedData - 1.2: " + res); return res;});
 			deferredResult.addCallback(function(anHeader, aResult, aValue) {
 				aResult['records']['data'] = aValue;
 			}, this, result);