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

[svn at pti.co.il]

Author: gabor
Date: 2005-02-05 23:33:56 +0200 (Sat, 05 Feb 2005)
New Revision: 88

Modified:
   trunk/lib/CPAN/Forum.pm
   trunk/templates/pwreminder.tmpl
Log:
put a selction box on the password reminder page

Modified: trunk/lib/CPAN/Forum.pm
===================================================================
--- trunk/lib/CPAN/Forum.pm	2005-02-05 20:57:15 UTC (rev 87)
+++ trunk/lib/CPAN/Forum.pm	2005-02-05 21:33:56 UTC (rev 88)
@@ -1052,6 +1052,7 @@
 	);
 
 	$t->param($errs) if $errs;
+	$t->param($q->param('field') => 1);
 	return $t->output;
 }
 
@@ -1059,16 +1060,12 @@
 sub pwreminder_process {
 	my ($self) = @_;
 	my $q = $self->query;
-	if (not $q->param('nickname') and not $q->param('email')) {
+	my $field = $q->param('field');
+	if (not $field or $field !~ /^username|email$/ or not $q->param('value')) {
 		return $self->pwreminder({"no_data" => 1});
 	}
 
-	my $user;
-	if ($q->param('nickname')) {
-		($user) = CPAN::Forum::Users->search({username => $q->param('nickname')});
-	} else {
-		($user) = CPAN::Forum::Users->search({email    => $q->param('email')});
-	};
+	my ($user) = CPAN::Forum::Users->search({$field => $q->param('value')});
 	return $self->pwreminder({"no_data" => 1}) if not $user;
 
 	# TODO: put this text in a template
@@ -1085,8 +1082,8 @@
 
 MSG
 
-	my ($field) = CPAN::Forum::Configure->search({field => "from"});
-	my $FROM = $field->value;
+	my ($from) = CPAN::Forum::Configure->search({field => "from"});
+	my $FROM = $from->value;
 	$self->log->debug("FROM field set to be $FROM");
 
 	my %mail = (

Modified: trunk/templates/pwreminder.tmpl
===================================================================
--- trunk/templates/pwreminder.tmpl	2005-02-05 20:57:15 UTC (rev 87)
+++ trunk/templates/pwreminder.tmpl	2005-02-05 21:33:56 UTC (rev 88)
@@ -15,12 +15,13 @@
 <form method="post" action="/">
 <p>
 <input type="hidden" name="rm" value="pwreminder_process" />
+<select name="field">
+ <option value="username" <TMPL_IF username>SELECTED</TMPL_IF>>Nickname</option>
+ <option value="email"    <TMPL_IF email>SELECTED</TMPL_IF>>Email</option>
+</select>
+<input name="value" value="<TMPL_VAR value>" /> 
+<input type="submit" value="Remind me" />
 </p>
-	<table>
-	<tr><td>Nickname:</td><td><input name="nickname" value="<TMPL_VAR nickname>" /> or</td></tr>
-	<tr><td>Email:</td><td><input name="email" value="<TMPL_VAR email>" /></td></tr>
-	<tr><td></td><td><input type="submit" value="Remind me" /></td></tr>
-	</table>
 </form>
 </TMPL_IF>