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

[svn at pti.co.il]

Author: gabor
Date: 2005-02-06 23:31:34 +0200 (Sun, 06 Feb 2005)
New Revision: 105

Modified:
   trunk/lib/CPAN/Forum.pm
   trunk/lib/CPAN/Forum/DBI.pm
   trunk/templates/change_password.tmpl
   trunk/templates/register.tmpl
Log:
disable fname/lname during registration, let user change this information later

Modified: trunk/lib/CPAN/Forum/DBI.pm
===================================================================
--- trunk/lib/CPAN/Forum/DBI.pm	2005-02-06 21:02:56 UTC (rev 104)
+++ trunk/lib/CPAN/Forum/DBI.pm	2005-02-06 21:31:34 UTC (rev 105)
@@ -57,6 +57,12 @@
 			lname            VARCHAR(255),
 			update_on_new_user VARCHAR(1),
 			status           INTEGER
+-- registration_date
+-- last_seen
+-- locaton
+-- user_localtime
+-- scratch_pad
+
 );
 
 CREATE TABLE usergroups (

Modified: trunk/lib/CPAN/Forum.pm
===================================================================
--- trunk/lib/CPAN/Forum.pm	2005-02-06 21:02:56 UTC (rev 104)
+++ trunk/lib/CPAN/Forum.pm	2005-02-06 21:31:34 UTC (rev 105)
@@ -641,7 +641,7 @@
 			admin_edit_user_process
 			response_form 
 			module_search
-			selfconfig change_password update_subscription); 
+			selfconfig change_password change_info update_subscription); 
 			
 my @urls = qw(
 	logout 
@@ -1015,19 +1015,19 @@
 		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});
-	}
+	#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'),
+	#			fname    => $q->param('fname'),
+	#			lname    => $q->param('lname'),
 			});
 	};
 	if ($@) {
@@ -1646,10 +1646,35 @@
 sub selfconfig {
 	my ($self, $errs) = @_;
 	my $t = $self->load_tmpl("change_password.tmpl");
+	my ($user) = CPAN::Forum::Users->retrieve($self->session->param('uid'));
+	$t->param(fname => $user->fname);
+	$t->param(lname => $user->lname);
+
 	$t->param($errs) if $errs;
 	$t->output;
 }
 
+sub change_info {
+	my ($self) = @_;
+	my $q = $self->query;
+	
+	if ($q->param('fname') !~ /^[a-zA-Z]*$/) {
+		return $self->selfconfig({"bad_fname" => 1});
+	}
+	if ($q->param('lname') !~ /^[a-zA-Z]*$/) {
+		return $self->selfconfig({"bad_lname" => 1});
+	}
+
+	my ($user) = CPAN::Forum::Users->retrieve($self->session->param('uid'));
+	$user->fname($q->param('fname'));
+	$user->lname($q->param('lname'));
+	$user->update;
+
+	return $self->selfconfig({done => 1});
+
+}
+
+
 sub change_password {
 	my ($self) = @_;
 	my $q = $self->query;

Modified: trunk/templates/change_password.tmpl
===================================================================
--- trunk/templates/change_password.tmpl	2005-02-06 21:02:56 UTC (rev 104)
+++ trunk/templates/change_password.tmpl	2005-02-06 21:31:34 UTC (rev 105)
@@ -1,18 +1,19 @@
 <TMPL_INCLUDE NAME="head.tmpl">
-<p id="pageTitle">Change Password</p>
+<p id="pageTitle">Change Personal information</p>
 
 <TMPL_INCLUDE NAME="navigation.tmpl">
 
 
 <TMPL_IF done>
 <p>
-Your password was updated.
+Updated.
 </p>
 <TMPL_ELSE>
 <div class="error">
 <TMPL_IF bad_pw_pair>The two passwords mustbe the same<br></TMPL_IF>
 </div>
 
+<p>Change Password</p>
 <form method="post" action="/">
 <p>
 <input type="hidden" name="rm" value="change_password" />
@@ -21,6 +22,20 @@
 <input type="submit" value="Change password" />
 </p>
 </form>
+
+<p>Change Personal Information</p>
+<form method="post" action="/">
+<p>
+<input type="hidden" name="rm" value="change_info" />
+First name: <input name="fname" value="<TMPL_VAR fname>" />
+Last name: <input name="lname" value="<TMPL_VAR lname>" />
+<input type="submit" value="Change information" />
+</p>
+</form>
+
+
+
+
 </TMPL_IF>
 
 <TMPL_INCLUDE NAME="footer.tmpl">

Modified: trunk/templates/register.tmpl
===================================================================
--- trunk/templates/register.tmpl	2005-02-06 21:02:56 UTC (rev 104)
+++ trunk/templates/register.tmpl	2005-02-06 21:31:34 UTC (rev 105)
@@ -22,10 +22,12 @@
 <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>