1 files changed, 6 insertions, 9 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
index d88af41..d0b378c 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
@@ -1,120 +1,117 @@
 /*
 
 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/>.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.LoginController = function(args) {
         this._args = args || {};
 
         this._loginPage = null;
 
         this._newUserWizardController = null;
         this._newUserCreationComponent = null;
 
         return this;
 }
 
 MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.LoginController.prototype, {
 
         'toString': function() {
                 return "Clipperz.PM.UI.Web.Controllers.LoginController";
         },
 
         'args': function () {
                 return this._args;
         },
 
         //-----------------------------------------------------------------------------
 
         'loginPage': function() {
                 if (this._loginPage == null) {
                         this._loginPage = new Clipperz.PM.UI.Web.Components.LoginPage();
                         
                         MochiKit.Signal.connect(this._loginPage, 'createNewAccountClick', this, 'handleCreateNewAccountClick')
                 }
                 
                 return this._loginPage;
         },
 
         //-----------------------------------------------------------------------------
 
         'run': function(args) {
                         varslot;
                         varloginPage;
                         varloginForm;
 
                 slot = args.slot;
 
                         loginForm =new Clipperz.PM.UI.Web.Components.LoginForm({'autocomplete': this.args()['autocomplete']});
 
                 slot.setContent(this.loginPage());
                 this.loginPage().slotNamed('loginForm').setContent(loginForm);
 
                 MochiKit.Signal.connect(loginForm, 'doLogin', MochiKit.Base.method(this, 'doLogin', loginForm));
                 MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'doLogin', MochiKit.Base.method(this, 'doLogin', loginForm));
         },
 
         //-----------------------------------------------------------------------------
 
         'doLogin': function(aLoginForm, anEvent) {
                 var deferredResult;
                         varparameters;
         //              varshouldUseOTP;
                 var loginProgress;
                         varuser;
                 var getPassphraseDelegate;
 
                 parameters = anEvent;
         //      shouldUseOTP = (typeof(parameters.passphrase) == 'undefined');
 
                 getPassphraseDelegate = MochiKit.Base.partial(MochiKit.Async.succeed, parameters.passphrase);
                 user = new Clipperz.PM.DataModel.User({'username':parameters.username, 'getPassphraseFunction':MochiKit.Base.method(Clipperz.PM.RunTime.mainController, 'getPassphrase')});
 
                 loginProgress = new Clipperz.PM.UI.Web.Components.LoginProgress();
 
                 deferredResult = new Clipperz.Async.Deferred("LoginController.doLogin", {trace:false});
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'initProgress', {'steps':4});
                 deferredResult.addMethod(Clipperz.PM.RunTime.mainController, 'setPassphraseDelegate', getPassphraseDelegate);
                 deferredResult.addMethod(loginProgress, 'deferredShowModal', {deferredObject:deferredResult, openFromElement:aLoginForm.submitButtonElement()});
                 deferredResult.addMethod(Clipperz.Crypto.PRNG.defaultRandomGenerator(), 'deferredEntropyCollection');
         //      if (shouldUseOTP == false) {
                         deferredResult.addMethod(user, 'login');
         //      } else {
         //              deferredResult.addMethod(user, 'loginUsingOTP', parameters.username, parameters.otp);
         //      }
                 deferredResult.addCallback(function(aLoginProgress, res) {
                         aLoginProgress.disableCancel();
                         return res;
                 }, loginProgress);
                 deferredResult.addCallback(function () {
                                 MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'CARDS_CONTROLLER_DID_RUN',MochiKit.Base.method(loginProgress, 'deferredHideModalAndRemove', {closeToElement:MochiKit.DOM.currentDocument().body}));
                 })
                 deferredResult.addMethod(this, 'userLoggedIn', user, loginProgress, aLoginForm);
                 deferredResult.addErrback (MochiKit.Base.method(this, 'handleFailedLogin', loginProgress));
 
                 deferredResult.addErrback (MochiKit.Base.method(loginProgress, 'deferredHideModalAndRemove', {closeToElement:aLoginForm.submitButtonElement()}));