From: <Ste...@nt...> - 2006-02-07 21:47:39
|
Author: SteffenPoulsen Date: 2006-02-07 13:45:38 -0800 (Tue, 07 Feb 2006) New Revision: 8744 Modified: twiki/branches/DEVELOP/data/TWiki/TWikiRegistration.txt twiki/branches/DEVELOP/twikiplugins/BlackListPlugin/lib/TWiki/Plugins/BlackListPlugin.pm Log: Item1586: BlackListPlugin: magic added to registration form by default, logic updated to allow for e-mail verifications Modified: twiki/branches/DEVELOP/data/TWiki/TWikiRegistration.txt =================================================================== --- twiki/branches/DEVELOP/data/TWiki/TWikiRegistration.txt 2006-02-07 20:11:21 UTC (rev 8743) +++ twiki/branches/DEVELOP/data/TWiki/TWikiRegistration.txt 2006-02-07 21:45:38 UTC (rev 8744) @@ -215,7 +215,7 @@ <td><span class="twikiSmall">%MAKETEXT{"Fields marked [_1] are required" args="=<font color='red'>**</font>="}%</span></td> </tr> <tr> - <td valign="top" align="right"> <input type="hidden" name="topic" value="%TOPIC%" /><input type="hidden" name="action" value="register" /></td> + <td valign="top" align="right"> <input type="hidden" name="rx" value='%BLACKLISTPLUGIN{ action="magic" }%' /><input type="hidden" name="topic" value="%TOPIC%" /><input type="hidden" name="action" value="register" /></td> <td><input type="submit" class="twikiSubmit" value=' %MAKETEXT{"Submit"}% ' /></td> </tr> </table> Modified: twiki/branches/DEVELOP/twikiplugins/BlackListPlugin/lib/TWiki/Plugins/BlackListPlugin.pm =================================================================== --- twiki/branches/DEVELOP/twikiplugins/BlackListPlugin/lib/TWiki/Plugins/BlackListPlugin.pm 2006-02-07 20:11:21 UTC (rev 8743) +++ twiki/branches/DEVELOP/twikiplugins/BlackListPlugin/lib/TWiki/Plugins/BlackListPlugin.pm 2006-02-07 21:45:38 UTC (rev 8744) @@ -107,8 +107,8 @@ } } } - unless( $ok ) { - # magic number expired + unless( $ok || ( ( $cgiQuery ) && ( $ENV{'QUERY_STRING'} ) && ( $ENV{'QUERY_STRING'} =~ /^action=verify/ ) ) ) { + # magic number expired and this is not an e-mail verification scenario _writeLog( "REGEXPIRE: Magic $magic is missing, bad or expired" ); my $msg = TWiki::Func::getPreferencesValue( "\U$pluginName\E_REGMESSAGE" ) || "Registration failed, please try again."; |