1 files changed, 10 insertions, 12 deletions

diff --git a/frontend/beta/js/Clipperz/PM/DataModel/User.js b/frontend/beta/js/Clipperz/PM/DataModel/User.js
index b29d224..3067742 100644
--- a/frontend/beta/js/Clipperz/PM/DataModel/User.js
+++ b/frontend/beta/js/Clipperz/PM/DataModel/User.js
@@ -1,150 +1,148 @@
 /*
 
-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.User = function(args) {
 //MochiKit.Logging.logDebug(">>> new User");
         args = args || {};
 
         this._username = args.username || null;
         this._passphrase = args.passphrase || null;
 
         this._connection = null;
         this._connectionVersion = 'current';
 
         this._header = null;
         this._statistics = null;
         this._lock = 'new lock';
 
         this._preferences = null;
         this._records = {};
         this._directLoginReferences = {};
         this._oneTimePasswordManager = null;
         
         this._isLoadingUserDetails = false;
         this._loadingUserDetailsPendingQueue = [];
         
         this._maxNumberOfRecords = Number.MAX_VALUE;
 
         this._shouldDownloadOfflineCopy = false;
         
         this._loginInfo = null;
         this._loginHistory = null;
         
         this._serverData = null;
 //MochiKit.Logging.logDebug("<<< new User");
 
         return this;
 }
 
 Clipperz.PM.DataModel.User.prototype = MochiKit.Base.update(null, {
 
         'toString': function() {
                 return "Clipperz.PM.DataModel.User - " + this.username();
         },
 
         //-------------------------------------------------------------------------
 
         'username': function() {
                 return this._username;
         },
 
         'setUsername': function(aValue) {
                 this._username = aValue;
         },
         
         //-------------------------------------------------------------------------
 
         'passphrase': function() {
                 return this._passphrase;
         },
 
         'setPassphrase': function(aValue) {
                 this._passphrase = aValue;
         },
         
         //-------------------------------------------------------------------------
 
         'maxNumberOfRecords': function() {
                 return this._maxNumberOfRecords;
         },
         
         'setMaxNumberOfRecords': function(aValue) {
                 this._maxNumberOfRecords = aValue;
         },
 
         //-------------------------------------------------------------------------
 
         'errorHandler': function(anErrorString, anException) {
 MochiKit.Logging.logError("- User.errorHandler: " + anErrorString + " (" + anException + ")");
         },
 
         //-------------------------------------------------------------------------
 
         'connectionVersion': function() {
                 return this._connectionVersion;
         },
         
         'setConnectionVersion': function(aValue) {
                 this._connectionVersion = aValue;
         },
 
         //-------------------------------------------------------------------------
         
         'connection': function() {
                 if ((this._connection == null) && (this.connectionVersion() != null) ){
                         this._connection = new Clipperz.PM.Crypto.communicationProtocol.versions[this.connectionVersion()]({user:this});
                 }
                                 
                 return this._connection;
         },
         
         'resetConnection': function(aValue) {
                 this._connection = null;
         },
 
         //=========================================================================
 
         'register': function(anInvitationCode) {
                         vardeferredResult;
                 var prng;
                 
 //MochiKit.Logging.logError(">>> User.register: " + this);
                 prng = Clipperz.Crypto.PRNG.defaultRandomGenerator();
                 
                 deferredResult = new MochiKit.Async.Deferred()
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.register - 1: " + res); return res;});
                 deferredResult.addCallback(MochiKit.Base.method(prng, 'deferredEntropyCollection'));
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.register - 2: " + res); return res;});
                 deferredResult.addCallback(MochiKit.Base.method(this.header(), 'updateAllSections'), anInvitationCode);
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.register - 2.1: " + res); return res;});
                 deferredResult.addCallback(MochiKit.Base.method(this.connection(), 'register'), anInvitationCode);
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.register - 3: " + res); return res;});