2 files changed, 16 insertions, 44 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginForm.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginForm.js
index 389d876..a10ba4f 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginForm.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginForm.js
@@ -65,24 +65,9 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.LoginForm, Clipperz.PM.UI.Com
 //						{tag:'form', cls:'loginForm', autocomplete:this.autocomplete(), children:[
 						{tag:'form', id:this.getId('form'), cls:'loginForm', children:[
 							{tag:'label', html:'username', 'for':this.getId('usernameField')},
-							{tag:'input', id:this.getId('usernameField'), type:'text', cls:'username'/*, value:'joe'*/},
-							{tag:'ul', id:this.getId('passwordOptions'), children:[
-								{tag:'li', id:this.getId('passphraseOption'), children:[
-									{tag:'label', html:'passphrase / OTP', 'for':this.getId('passphraseField')},
-									{tag:'input', id:this.getId('passphraseField'), type:'password', cls:'password'/*, value:'clipperz'*/}
-								]}	//	,
-/*
-								{tag:'li', id:this.getId('otpOption'), children:[
-									{tag:'label', html:'one-time password', 'for':this.getId('otpField_1')},
-									{tag:'input', id:this.getId('otpField_1'), type:'text', cls:'otp', value:'abcd-efgh'},
-									{tag:'input', id:this.getId('otpField_2'), type:'text', cls:'otp', value:'abcd-efgh'},
-									{tag:'input', id:this.getId('otpField_3'), type:'text', cls:'otp', value:'abcd-efgh'},
-									{tag:'input', id:this.getId('otpField_4'), type:'text', cls:'otp', value:'abcd-efgh'}
-								]}
-*/
-							]},
-//							{tag:'input', id:this.getId('otpCheckbox'), type:'checkbox', cls:'checkbox'},
-//							{tag:'label', html:'use a one-time passphrase', 'for':this.getId('otpCheckbox'), cls:'checkbox'},
+							{tag:'input', id:this.getId('usernameField'), type:'text', cls:'username'},
+							{tag:'label', html:'passphrase / OTP', 'for':this.getId('passphraseField')},
+							{tag:'input', id:this.getId('passphraseField'), type:'password', cls:'password'},
 
 							{tag:'div', cls:'translations', children:[
 								{tag:'h4', html:'choose your language'},
@@ -161,29 +146,22 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.LoginForm, Clipperz.PM.UI.Com
 	//-------------------------------------------------------------------------
 	
 	'loginEventHandler': function(anEvent) {
-		var	username;
-		var passphrase;
-//		var shouldUseOTP;
-//		var otp;
+//		var	username;
+//		var passphrase;
 		var signalArguments;
 
 		anEvent.preventDefault();
 
-		username = this.getElement('usernameField').value;
-		passphrase = this.getElement('passphraseField').value;
-//		otp =	this.getElement('otpField_1').value +
-//				this.getElement('otpField_2').value +
-//				this.getElement('otpField_3').value +
-//				this.getElement('otpField_4').value;
-//		shouldUseOTP = this.getElement('otpCheckbox').checked;
-
-		signalArguments = {username:username};
-
-//		if (shouldUseOTP) {
-//			signalArguments.otp = otp;
-//		} else {
-			signalArguments.passphrase = passphrase;
-//		}
+//		username = this.getElement('usernameField').value;
+//		passphrase = this.getElement('passphraseField').value;
+
+//		signalArguments = {username:username};
+//		signalArguments.passphrase = passphrase;
+
+		signalArguments = {
+			'username':		this.getElement('usernameField').value,
+			'passphrase':	this.getElement('passphraseField').value
+		};
 
 		MochiKit.Signal.signal(this, 'doLogin', signalArguments);
 	},
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 d0b378c..a57152d 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
@@ -81,13 +81,11 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.LoginController.prototype, {
 	'doLogin': function(aLoginForm, anEvent) {
 		var deferredResult;
 		var	parameters;
-//		var	shouldUseOTP;
 		var loginProgress;
 		var	user;
 		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')});
@@ -99,11 +97,7 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.LoginController.prototype, {
 		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.addMethod(user, 'login');
 		deferredResult.addCallback(function(aLoginProgress, res) {
 			aLoginProgress.disableCancel();
 			return res;