Permalink
Browse files

less rigid password check also for lost password, add captcha error d…

…isplay to views
  • Loading branch information...
1 parent 30f2ca0 commit 64190d525c0dd11f35dddabb004b3f21c9e556b5 @mpollmeier committed Feb 11, 2012
@@ -235,8 +235,8 @@ public static void lostPasswordNewPassword(@Required String code) {
*/
public static void lostPasswordNewPasswordFinish(@Required String code,
@Recaptcha String captcha,
- @Required @Equals("passwordConfirm") @MinSize(8) String password,
- @Required @MinSize(8) String passwordConfirm) {
+ @Required @Equals("passwordConfirm") @MinSize(4) String password,
+ @Required @MinSize(4) String passwordConfirm) {
// check:
checkAuthenticity();
@@ -21,6 +21,7 @@
</li>
<li>
#{ugot.recaptcha theme:"clean", tabindex:"2"/}
+ #{ifError 'captcha'}<span class="error">#{error 'captcha' /}</span>#{/ifError}
</li>
<li>
<input type="submit" id="submit" value="&{'registration.register'}" />
@@ -4,6 +4,11 @@
#{form @lostPasswordNewPasswordFinish()}
+ #{if flash.error}
+ <p class="error">
+ &{flash.error}
+ </p>
+ #{/if}
<ul>
<li>
<label for="password">&{'registration.password'}</label>
@@ -17,6 +22,7 @@
</li>
<li>
#{ugot.recaptcha theme:"clean", tabindex:"2"/}
+ #{ifError 'captcha'}<span class="error">#{error 'captcha' /}</span>#{/ifError}
</li>
<li>
<input type="hidden" name="code" value="${code}" />

0 comments on commit 64190d5

Please sign in to comment.