1 files changed, 10 insertions, 12 deletions

diff --git a/frontend/beta/js/Clipperz/PM/DataModel/Record.js b/frontend/beta/js/Clipperz/PM/DataModel/Record.js
index f89f79c..7b06f29 100644
--- a/frontend/beta/js/Clipperz/PM/DataModel/Record.js
+++ b/frontend/beta/js/Clipperz/PM/DataModel/Record.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.Record = function(args) {
         args = args || {};
 
         this._user = args['user'] || null;
         this._reference = args['reference'] || Clipperz.PM.Crypto.randomKey();
         this._version = args['version'] || Clipperz.PM.Crypto.encryptingFunctions.currentVersion;
         this._key = args['key'] || Clipperz.PM.Crypto.randomKey();
 
         this.setLabel(args['label'] || Clipperz.PM.Strings['newRecordTitleLabel']);
         
         this.setHeaderNotes(args['headerNotes'] || null);
         this.setNotes(args['notes'] || args['headerNotes'] || "");
 //MochiKit.Logging.logDebug("--- new Record ('" + this._label + "')- _headerNotes: '" + this._headerNotes + "'");
 //MochiKit.Logging.logDebug("--- new Record ('" + this._label + "')- _notes: '" + this._notes + "'");
         //this._notes = args.notes || "";
         
         this._versions = {};
         this._directLogins = {};
         this._removedDirectLogins = [];
         
         this.setIsBrandNew(args['reference'] == null);
 
         this.setShouldLoadData(this.isBrandNew() ? false: true);
         this.setShouldDecryptData(this.isBrandNew() ? false: true);
         this.setShouldProcessData(this.isBrandNew() ? false: true);
 
         this.setCurrentVersion(this.isBrandNew() ? new Clipperz.PM.DataModel.RecordVersion(this, null): null);
         this.setCurrentVersionKey(null);
 
         this._serverData = null;
         this._decryptedData = null;
         this._cachedData = null;
         
         return this;
 }
 
 Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, {
 
         'toString': function() {
                 return "Record (" + this.label() + ")";
         },
 
         //-------------------------------------------------------------------------
 
         'isBrandNew': function() {
                 return this._isBrandNew;
         },
         
         'setIsBrandNew': function(aValue) {
                 this._isBrandNew = aValue;
         },
 
         //-------------------------------------------------------------------------
 /*
         'shouldRunTheRecordCreationWizard': function() {
                 return (this.isBrandNew() && (MochiKit.Base.keys(this.currentVersion().fields()).length == 0));
         },
         */
         //-------------------------------------------------------------------------
 
         'user': function() {
                 return this._user;
         },
         
         //-------------------------------------------------------------------------
 
         'reference': function() {
                 return this._reference;
         },
         
         //-------------------------------------------------------------------------
 
         'key': function() {
                 return this._key;
         },
         
         'updateKey': function() {
                 this._key = Clipperz.PM.Crypto.randomKey();
         },
         
         //-------------------------------------------------------------------------
         
         'label': function() {
                 return this._label;
         },
 
         'setLabel': function(aValue) {
                 this._label = aValue;
         },
         
         'lowerCaseLabel': function() {
                 return this.label().toLowerCase();
         },
         
         //-------------------------------------------------------------------------
 
         'versions': function() {
                 return this._versions;
         },
         
         //-------------------------------------------------------------------------
 
         'currentVersion': function() {
                 return this._currentVersion;
         },
         
         'setCurrentVersion': function(aValue) {
                 this._currentVersion = aValue;
         },
         
         //-------------------------------------------------------------------------
 
         'currentVersionKey': function() {
                 return this._currentVersionKey;
         },
 
         'setCurrentVersionKey': function(aValue) {
                 this._currentVersionKey = aValue;
         },
         
         //-------------------------------------------------------------------------
 
         'deferredData': function() {
                         vardeferredResult;
 
 //MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Record.deferredData - this: " + this);
                 deferredResult = new MochiKit.Async.Deferred();
                 deferredResult.addCallback(MochiKit.Base.method(this, 'loadData'));
                 deferredResult.addCallback(MochiKit.Base.method(this, 'decryptData'));
                 deferredResult.addCallback(MochiKit.Base.method(this, 'processData'));
                 deferredResult.addCallback(function(aRecord) {
                         return aRecord.currentVersion().deferredData();
                 });
                 deferredResult.addCallback(MochiKit.Base.method(this, 'takeSnapshotOfCurrentData'));
                 deferredResult.addCallback(MochiKit.Async.succeed, this);
                 deferredResult.callback();
 //MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.deferredData");
                 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'exportedData': function() {
                 var result;
                 
                 result = {};
                 result['label'] = this.label();
                 result['data'] = this.serializedData();
                 result['currentVersion'] = this.currentVersion().serializedData();
                 result['currentVersion']['reference'] = this.currentVersion().reference();
         //      result['versions'] = MochiKit.Base.map(MochiKit.Base.methodcaller("serializedData"), MochiKit.Base.values(this.versions()));
                 
                 return Clipperz.Base.serializeJSON(result);
         },
         
         //-------------------------------------------------------------------------
 
         'shouldLoadData': function() {
                 return this._shouldLoadData;
         },
 
         'setShouldLoadData': function(aValue) {
                 this._shouldLoadData = aValue;
         },
 
         //-------------------------------------------------------------------------
 
         'shouldDecryptData': function() {
                 return this._shouldDecryptData;
         },
 
         'setShouldDecryptData': function(aValue) {
                 this._shouldDecryptData = aValue;
         },
 
         //-------------------------------------------------------------------------
 
         'shouldProcessData': function() {
                 return this._shouldProcessData;
         },