[mb-commits] r9876 - in mb_server/branches/TemplateToolkit: lib/MusicBrainz/Server/Controller root/components root/forms/user root/user

[root at musicbrainz.org]

Author: acid2
Date: 2008-06-22 14:52:00 +0000 (Sun, 22 Jun 2008)
New Revision: 9876

Added:
   mb_server/branches/TemplateToolkit/root/components/form-errors.tt
   mb_server/branches/TemplateToolkit/root/user/registered.tt
Modified:
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/User.pm
   mb_server/branches/TemplateToolkit/root/forms/user/login.fb
   mb_server/branches/TemplateToolkit/root/user/login.tt
   mb_server/branches/TemplateToolkit/root/user/register.tt
Log:
Almost completed user registration (needs email verifacation). Continued work on login

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/User.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/User.pm	2008-06-20 17:04:46 UTC (rev 9875)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/User.pm	2008-06-22 14:52:00 UTC (rev 9876)
@@ -48,8 +48,10 @@
     
 	my ($self, $c) = @_;
 
-	my $username = $c->request->params->{username};
-	my $password = $c->request->params->{password};
+	my $username = $c->form->field('username');
+	my $password = $c->form->field('password');
+	my $singleIp = $c->form->field('singleIp');
+	my $remember = $c->form->field('remember');
 	
 	my $mb = new MusicBrainz;
 	$mb->Login();
@@ -61,17 +63,19 @@
 	    $c->session->{user} = {
 		name => $user->GetName
 	    };
+	    
+	    $user->SetPermanentCookie(only_this_ip => $singleIp)
+		if $remember;
+
 	    $c->response->redirect($c->uri_for('/user/profile'));
 	}
 	else
 	{
-	    $c->error("FAIL");
+	    $c->stash->{errors} = ['Username and password combination is invalid'];
 	}
     }
-    else
-    {
-	$c->stash->{template} = 'user/login.tt';
-    }
+
+    $c->stash->{template} = 'user/login.tt';
 }
 
 =head2 register
@@ -98,19 +102,29 @@
 	# if createlogin list is empty, the user was created.
 	if (@$createlogin == 0)
 	{
-	    $c->error(":)");
+	    $c->detach('registered');
 	}
 	else
 	{
-	    $c->error(":(");
+	    $c->stash->{errors} = \@$createlogin;
 	}
-
-	$c->stash->{template} = 'user/register.tt';
     }
 
     $c->stash->{template} = 'user/register.tt';
 }
 
+=head2 registered
+Called when a user has completed registration. We use this to notify the user that everything
+went ok
+=cut
+
+sub registered : Private
+{
+    my ($self, $c) = @_;
+
+    $c->stash->{template} = 'user/registered.tt';
+}
+
 =head2 profile
 Display a users profile page.
 =cut 

Added: mb_server/branches/TemplateToolkit/root/components/form-errors.tt

Modified: mb_server/branches/TemplateToolkit/root/forms/user/login.fb
===================================================================
--- mb_server/branches/TemplateToolkit/root/forms/user/login.fb	2008-06-20 17:04:46 UTC (rev 9875)
+++ mb_server/branches/TemplateToolkit/root/forms/user/login.fb	2008-06-22 14:52:00 UTC (rev 9876)
@@ -3,13 +3,23 @@
 fields:
 	username:
 		label: Username
-		type: text
 		size: 50
 		required: 1
+		
 	password:
 		label: Password
 		type: password
 		size: 50
 		required: 1
 
+	remember:
+		label: -
+		options: Log In Permenantly
+
+
+	singleIp:
+		label: -
+		options: Only From This IP Address
+
+
 submit: Login
\ No newline at end of file

Modified: mb_server/branches/TemplateToolkit/root/user/login.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/user/login.tt	2008-06-20 17:04:46 UTC (rev 9875)
+++ mb_server/branches/TemplateToolkit/root/user/login.tt	2008-06-22 14:52:00 UTC (rev 9876)
@@ -3,6 +3,15 @@
 
 [% WRAPPER "components/box.tt" header="Login" %]
   <p>Please login using the form below. Note that the password field <em>is</em> case sensitive.</p>
+  [% IF errors %]
+    <p>Uh oh - we've encountered some errors!</p>
+    <ul>
+    [% FOR error IN errors %]
+      <li>[% error %]</li>    
+    [% END %]
+    </ul>
+  [% END %]
+  
   [% form.render %]
 [% END %]
 

Modified: mb_server/branches/TemplateToolkit/root/user/register.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/user/register.tt	2008-06-20 17:04:46 UTC (rev 9875)
+++ mb_server/branches/TemplateToolkit/root/user/register.tt	2008-06-22 14:52:00 UTC (rev 9876)
@@ -8,6 +8,7 @@
     or post it to the appropriate [% INCLUDE "components/doc-link.tt" to="MailingList" text="Mailing List" %].</li>
 </ul>
 
+[% INCLUDE 'components/form-errors.tt' %]
 [% form.render %]
 
 <h3>We respect your privacy</h3>

Added: mb_server/branches/TemplateToolkit/root/user/registered.tt