1 files changed, 10 insertions, 12 deletions

diff --git a/frontend/beta/js/Clipperz/PM/Connection.js b/frontend/beta/js/Clipperz/PM/Connection.js
index e81c7a6..613e7d6 100644
--- a/frontend/beta/js/Clipperz/PM/Connection.js
+++ b/frontend/beta/js/Clipperz/PM/Connection.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 = {}; }
 
 //-----------------------------------------------------------------------------
 //
         //      Abstract   C O N N E C T I O N   class
 //
 //-----------------------------------------------------------------------------
 
 Clipperz.PM.Connection = function (args) {
         args = args || {};
 
         this._user = args.user;
         this._clipperz_pm_crypto_version = null;
         this._connectionId = null;
         this._oneTimePassword = null;
         
         return this;
 }
 
 Clipperz.PM.Connection.prototype = MochiKit.Base.update(null, {
 
         'user': function() {
                 return this._user;
         },
         
         'toString': function() {
                 return "Connection [" + this.version() + "] - user: " + this.user();
         },
         
         //=========================================================================
 
         'version': function() {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
         
         'clipperz_pm_crypto_version': function() {
                 if (this._clipperz_pm_crypto_version == null) {
                         var connectionVersions;
                                 varversions;
                                 varversion;
                         var i, c;
 
                         version = null;
                         connectionVersions = Clipperz.PM.Crypto.communicationProtocol.versions;
                         versions = MochiKit.Base.keys(connectionVersions);
                         c = versions.length;
                         for (i=0; i<c; i++) {
                                 if (! (versions[i] == 'current')) {
                                         if (this instanceof connectionVersions[versions[i]]) {
                                                 version = versions[i];
                                         };
                                 }
                         }
                         
                         this._clipperz_pm_crypto_version = version;
                 }
                 
                 return this._clipperz_pm_crypto_version;
         },
 
         //-------------------------------------------------------------------------
 
         'defaultErrorHandler': function(anErrorString, anException) {
 MochiKit.Logging.logError("### Connection.defaultErrorHandler: " + anErrorString + " (" + anException + ")");
         },
         
         //-------------------------------------------------------------------------
 
         'login': function(someArguments, aCallback) {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
 
         //-------------------------------------------------------------------------
 
         'message': function(someArguments, aCallback) {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
 
         //-------------------------------------------------------------------------
 
         'sharedSecret': function() {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
 
         'serverSideUserCredentials': function() {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
 
         //=========================================================================
 
         'connectionId': function() {
                 return this._connectionId;
         },
         
         'setConnectionId': function(aValue) {
                 this._connectionId = aValue;
         },
 
         //=========================================================================
 
         'oneTimePassword': function() {
                 return this._oneTimePassword;
         },
         
         'setOneTimePassword': function(aValue) {
                 this._oneTimePassword = aValue;
         },
         
         //=========================================================================
         __syntaxFix__: "syntax fix"
 
 }
 );
 
 
 if (typeof(Clipperz.PM.Connection.SRP) == 'undefined') { Clipperz.PM.Connection.SRP = {}; }
 //-----------------------------------------------------------------------------
 //
         //      S R P [ 1 . 0 ]    C O N N E C T I O N   class
 //
 //-----------------------------------------------------------------------------
 
 Clipperz.PM.Connection.SRP['1.0'] = function (args) {
         args = args || {};
         Clipperz.PM.Connection.call(this, args);
         
         this._C = null;
         this._P = null;
         this._srpConnection = null;
         
         return this;
 }
 
 Clipperz.PM.Connection.SRP['1.0'].prototype = MochiKit.Base.update(new Clipperz.PM.Connection(), {
 
         'version': function() {
                 return '1.0';
         },
 
         //=========================================================================
         
         'register': function(anInvitationCode) {
                 var deferredResult;
                         varparameters;
 
 //MochiKit.Logging.logError(">>> Connection.register: " + this);
                 parameters = {};
                 deferredResult = new MochiKit.Async.Deferred();
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("Connection.register - 1: " + res); return res;});
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'registration_verify');
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("Connection.register - 2: " + res); return res;});
                 deferredResult.addCallback(function(aConnection, anInvitationCode) {
                         var args;
                         
                         args = {};
                         args.message = 'register';
                         args.version = aConnection.clipperz_pm_crypto_version();
                         args.invitationCode = anInvitationCode;
                         
                         return args;
                 }, this);
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("Connection.register - 3: " + res); return res;});
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'registration_sendingCredentials');
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("Connection.register - 4: " + res); return res;});
                 deferredResult.addCallback(MochiKit.Base.method(this.user(), 'encryptedData'));
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("Connection.register - 5: " + res); return res;});
                 deferredResult.addCallback(function(someParameters, anUser, anEncryptedData) {
                         var currentVersionConnection;
                         var args;
 
                         currentVersionConnection = new Clipperz.PM.Crypto.communicationProtocol.versions['current']({user:anUser});
                         
                         args = someParameters
                         args.credentials = currentVersionConnection.serverSideUserCredentials();
                         args.user = anEncryptedData;
                         args.version = args.credentials.version;
                         args.message = "completeRegistration";
 
                         return args;
                 }, parameters, this.user());
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("Connection.register - 6: " + res); return res;});
                 deferredResult.addCallback(MochiKit.Base.method(Clipperz.PM.Proxy.defaultProxy, 'registration'));
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("Connection.register - 7: " + Clipperz.Base.serializeJSON(res)); return res;});
                 deferredResult.addCallback(MochiKit.Base.bind(function(res) {
                         this.user().setLock(res['lock']);
 
                         return res;
                 }, this));