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

[root at musicbrainz.org]

Author: acid2
Date: 2008-06-22 15:26:02 +0000 (Sun, 22 Jun 2008)
New Revision: 9877

Modified:
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/User.pm
   mb_server/branches/TemplateToolkit/root/user/profile.tt
Log:
Fixed collision in displayed username on profile, minor tweak to send verification email - still needs testing

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/User.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/User.pm	2008-06-22 14:52:00 UTC (rev 9876)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/User.pm	2008-06-22 15:26:02 UTC (rev 9877)
@@ -98,11 +98,16 @@
 	my ($userobj, $createlogin) = $ui->CreateLogin($c->form->field('username'),
 						    $c->form->field('password'),
 						    $c->form->field('confirm_password'));
+
+	my $email = $c->form->field('email');
 	
 	# if createlogin list is empty, the user was created.
 	if (@$createlogin == 0)
 	{
-	    $c->detach('registered');
+	    # Send the email if possible
+	    my $couldSend = $userobj->SendVerificationEmail($email);
+	    
+	    $c->detach('registered', $couldSend, $email);
 	}
 	else
 	{
@@ -120,8 +125,11 @@
 
 sub registered : Private
 {
-    my ($self, $c) = @_;
+    my ($self, $c, $couldSend, $email) = @_;
 
+    $c->stash->{emailed} = $couldSend;
+    $c->stash->{email} = $email;
+
     $c->stash->{template} = 'user/registered.tt';
 }
 
@@ -136,18 +144,22 @@
     
     my ($self, $c, $userName) = @_;
 
-    my $userId = $userName or $c->session->{user}->{name};
+    $userName ||= $c->session->{user}->{name};
+    $c->error("No username specified (not logged in?)") unless $userName;
 
     my $mb = new MusicBrainz;
     $mb->Login();
     
     my $us = UserStuff->new($mb->{DBH});
-    my $user = $us->newFromName($userId);
+    my $user = $us->newFromName($userName);
 
-    $c->stash->{viewing_own_profile} = $c->session->{user}->{name} eq $userId;
+    $c->error("The user with username '" . $userName . "' could not be found")
+	unless $user;
 
-    $c->stash->{user} = {
-	name => $userId,
+    $c->stash->{viewing_own_profile} = $c->session->{user}->{name} eq $userName;
+
+    $c->stash->{profile} = {
+	name => $userName,
 	type => $user->GetUserType,
 	email => {
 	    address => $user->GetEmail,

Modified: mb_server/branches/TemplateToolkit/root/user/profile.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/user/profile.tt	2008-06-22 14:52:00 UTC (rev 9876)
+++ mb_server/branches/TemplateToolkit/root/user/profile.tt	2008-06-22 15:26:02 UTC (rev 9877)
@@ -27,49 +27,49 @@
    ]
 %]
 
-[% WRAPPER "components/box.tt" header="Editor \"$user.name\"" %]
+[% WRAPPER "components/box.tt" header="Editor \"$profile.name\"" %]
   <h3>General Information:</h3>
   <dl>
-    [% INCLUDE "components/piped-list.tt" list = review_options
-         WRAPPER property name = "Review" %]
+    [% INCLUDE "components/piped-list.tt" list=review_options
+         WRAPPER property name="Review" %]
 
-    [% INCLUDE "components/piped-list.tt" list = edit_account_options
-         WRAPPER property name = "Edit My Account" IF viewing_own_profile%]
+    [% INCLUDE "components/piped-list.tt" list=edit_account_options
+         WRAPPER property name="Edit My Account" IF viewing_own_profile%]
 	
-    [% user.name WRAPPER property name = "Name" %]
+    [% profile.name WRAPPER property name="Name" %]
 
-    [% user.type or "Unknown" WRAPPER property name = "User Type" %]
+    [% profile.type or "Unknown" WRAPPER property name="User Type" %]
 
-    [% WRAPPER property name = "E-Mail" %]
-      [% viewing_own_profile ? user.email.address or "[None]" : "[Hidden]" %]
+    [% WRAPPER property name="E-Mail" %]
+      [% viewing_own_profile ? profile.email.address or "[None]" : "[Hidden]" %]
       
-      [% IF user.email.verified_at %]
-        (verified [% user.email.verified_at %])
+      [% IF profile.email.verified_at %]
+        (verified [% profile.email.verified_at %])
       [% ELSE %]
         [% IF viewing_own_profile %](<em>unverified!</em>)[% END %]
       [% END %]
     [% END %]
 	
-    [% user.homepage or "[None]" WRAPPER property name = "Homepage" %]
+    [% profile.homepage or "[None]" WRAPPER property name="Homepage" %]
 	
-    [% user.biography or "[None]" WRAPPER property name = "Biography" %]
+    [% profile.biography or "[None]" WRAPPER property name="Biography" %]
 	
-    [% WRAPPER property name = "Subscriptions" %]
-      [% viewing_own_profile ? "Your" : user.name %] subscriptions are [% user.public_subscriptions ? "public" : "private" %]
+    [% WRAPPER property name="Subscriptions" %]
+      [% viewing_own_profile ? "Your" : profile.name %] subscriptions are [% profile.public_subscriptions ? "public" : "private" %]
     [% END %]
 	
-    [% WRAPPER property name = "Subscribers" %]
-      [% user.subscriber_count %] (<a href="/bad_link">view all</a>)
+    [% WRAPPER property name="Subscribers" %]
+      [% profile.subscriber_count %] (<a href="/bad_link">view all</a>)
     [% END %]
   </dl>
   
  <h3>User Statistics</h3>
  <dl>
-   [% user.member_since | mb_date WRAPPER property name = "Member Since" %]
-   [% user.accepted_non_autoedits WRAPPER property name = "Accepted Non-autoedits" %]
-   [% user.accepted_autoedits WRAPPER property name = "Autoedits" %]
-   [% user.edits_voted_down WRAPPER property name = "Edits Voted Down" %]
-   [% user.other_failed_edits WRAPPER property name = "Other Failed Edits" %]
+   [% profile.member_since | mb_date WRAPPER property name="Member Since" %]
+   [% profile.accepted_non_autoedits WRAPPER property name="Accepted Non-autoedits" %]
+   [% profile.accepted_autoedits WRAPPER property name="Autoedits" %]
+   [% profile.edits_voted_down WRAPPER property name="Edits Voted Down" %]
+   [% profile.other_failed_edits WRAPPER property name="Other Failed Edits" %]
  </dl>
 [% END %]