[Cpan-forum-commit] rev 104 - in trunk: lib/CPAN templates

[svn at pti.co.il]

Author: gabor
Date: 2005-02-06 23:02:56 +0200 (Sun, 06 Feb 2005)
New Revision: 104

Modified:
   trunk/lib/CPAN/Forum.pm
   trunk/templates/register.tmpl
Log:
enable new users to register first name and last name, fix fatale error caused by global_var

Modified: trunk/lib/CPAN/Forum.pm
===================================================================
--- trunk/lib/CPAN/Forum.pm	2005-02-06 20:40:04 UTC (rev 103)
+++ trunk/lib/CPAN/Forum.pm	2005-02-06 21:02:56 UTC (rev 104)
@@ -886,8 +886,7 @@
 
 sub load_tmpl {
 	my $self = shift;
-
-	my $t = $self->SUPER::load_tmpl(@_, global_vars => 1
+	my $t = $self->SUPER::load_tmpl(@_
 #		      die_on_bad_params => -e ($self->param("ROOT") . "/die_on_bad_param") ? 1 : 0
 	);
 	$t->param("loggedin" => $self->session->param("loggedin") || "");
@@ -896,7 +895,6 @@
 	$t->param("admin" => $self->session->param('admin'));
 	return $t;
 }
-# config_fake_login  (not used currently)
 
 
 sub login {
@@ -944,8 +942,8 @@
 	$session->param(loggedin  => 1);
 	$session->param(username  => $user->username);
 	$session->param(uid       => $user->id);
-	$session->param(fname     => $user->fname); # TODO
-	$session->param(lname     => $user->lname); # TODO
+	$session->param(fname     => $user->fname);
+	$session->param(lname     => $user->lname);
 	$session->param(email     => $user->email);
 	foreach my $g (CPAN::Forum::Usergroups->search_ugs($user->id)) {
 		$self->log->debug("UserGroups: " . $g->name);
@@ -1016,11 +1014,20 @@
 	if ($q->param('email') !~ /^[a-z0-9_+ at .-]+$/) {  
 		return $self->register({"bad_email" => 1});
 	}
+
+	if ($q->param('fname') !~ /^[a-zA-Z]*$/) {
+		return $self->register({"bad_fname" => 1});
+	}
+	if ($q->param('lname') !~ /^[a-zA-Z]*$/) {
+		return $self->register({"bad_lname" => 1});
+	}
 	
 	my $user = eval {
 		CPAN::Forum::Users->create({
 				username => $q->param('nickname'),
 				email    => $q->param('email'),
+				fname    => $q->param('fname'),
+				lname    => $q->param('lname'),
 			});
 	};
 	if ($@) {
@@ -1065,6 +1072,8 @@
 
 	my $FROM = $self->config("from");
 
+	my $msg = "\nUsername: " . $user->username . "\nName: " . $user->fname . " " . $user->lname . "\n"; 
+
 	# TODO: the admin should be able to configure if she wants to get messages on
 	# every new user (field update_on_new_user)
 	my $admin = CPAN::Forum::Users->retrieve(1);
@@ -1072,7 +1081,7 @@
 		To      => $admin->email,
 		From     => $FROM,
 		Subject => "New Forum user: " . $user->username,
-		Message => "\nUsername: " . $user->username . "\n",
+		Message => $msg,
 	);
 	sendmail(%mail);
 }
@@ -1546,6 +1555,7 @@
 
 	my $t = $self->load_tmpl("groups.tmpl",
 		loop_context_vars => 1,
+		global_vars => 1,
 	);
 	$t->param(hide_group => 1);
 				
@@ -1604,6 +1614,7 @@
 
 	my $t = $self->load_tmpl("users.tmpl",
 		loop_context_vars => 1,
+		global_vars => 1,
 	);
 				
 	$t->param(hide_username => 1);

Modified: trunk/templates/register.tmpl
===================================================================
--- trunk/templates/register.tmpl	2005-02-06 20:40:04 UTC (rev 103)
+++ trunk/templates/register.tmpl	2005-02-06 21:02:56 UTC (rev 104)
@@ -22,8 +22,10 @@
 <input type="hidden" name="rm" value="register_process" />
 </p>
 <table>
-<tr><td>Nickname:</td><td><input name="nickname" value="<TMPL_VAR nickname>" /></td></tr>
-<tr><td>Email:</td><td><input name="email" value="<TMPL_VAR email>" /></td></tr>
+<tr><td>Nickname:</td><td><input name="nickname" value="<TMPL_VAR nickname>" /> (*)</td></tr>
+<tr><td>Email:</td><td><input name="email" value="<TMPL_VAR email>" />  (*)</td></tr>
+<tr><td>First name:</td><td><input name="fname" value="<TMPL_VAR fname>" /></td></tr>
+<tr><td>Last name:</td><td><input name="lname" value="<TMPL_VAR lname>" /></td></tr>
 <tr><td></td><td><input type="submit" value="Register" /></td></tr>
 </table>
 </form>