Changeset 629

Timestamp:

01/17/10 16:10:58 (14 years ago)

Author:

nanardon

Message:

• improve password form

Location:

LATMOS-Accounts-Web

Files:

• lib/LATMOS/Accounts/Web/Controller/Ajax.pm (modified) (1 diff)
• root/html/users/passwd.tt (modified) (2 diffs)

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Ajax.pm

@@ -85 +85 @@
     if (my $obj = $base->get_object('user', $login)) {
         if ($password) {
-            if ($cpassword) {
+            if ((my $crl = $obj->check_password($password)) ne 'ok') {
+                $c->stash->{cracklib} = 'Mauvais mot de passe: ' . $crl;
+            } elsif ($cpassword) {
                 if ($password ne $cpassword) {
                     $c->stash->{cracklib} = "Mot de passe différents";
                 } else {
-                    $c->stash->{cracklib} = $obj->check_password($password);
+                    $c->stash->{cracklib} = 'ok';
                 }
             } else {

LATMOS-Accounts-Web/root/html/users/passwd.tt

@@ -6 +6 @@
 [% IF c.model('Accounts').db.check_acl(user, 'userPassword', 'w') %]
 <form id="fpasswd" action="[% c.uri_for(username, subform) %]" method="POST">
+[% c.prototype.observe_form('fpasswd', {
+    url => c.uri_for('/ajax', 'cracklib', username),
+    update => 'perror',
+    frequency => 1,
+}) %]
 <table border="1">
-[% IF pmerror %]
-<tr><td colspan="2">[% pmerror | html %]</td></tr>
-[% END %]
 <tr>
 <th>Nouveau mot de passe:</th>
@@ -18 +20 @@
 <td><input type="password" name="cpasswd"></td>
 </tr>
-[% c.prototype.observe_form('fpasswd', {
-    url => c.uri_for('/ajax', 'cracklib', username),
-    update => 'perror',
-    frequency => 1,
-}) %]
-<tr><td colspan="2">
-<span id="perror"></span>
-</td></tr>
+<tr><td colspan="2"><span id="perror">[% pmerror | html %]</span></td></tr>
 </table>
 </form>