1 |
diff -ur -N e-smith-base+ldap-4.19.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts |
2 |
--- e-smith-base+ldap-4.19.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts 2008-08-07 21:41:01.000000000 +0200 |
3 |
+++ /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts 2008-08-07 21:42:02.000000000 +0200 |
4 |
@@ -163,10 +163,6 @@ |
5 |
<trans>Enter the new password in the fields below</trans> |
6 |
</entry> |
7 |
<entry> |
8 |
- <base>RESET_PASSWORD_TITLE</base> |
9 |
- <trans>Reset user password</trans> |
10 |
- </entry> |
11 |
- <entry> |
12 |
<base>ERR_OCCURRED_MODIFYING_PASSWORD</base> |
13 |
<trans>An error occurred while updating the password</trans> |
14 |
</entry> |
15 |
diff -ur -N e-smith-base+ldap-4.19.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/panels/password/cgi-bin/userpassword /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/panels/password/cgi-bin/userpassword |
16 |
--- e-smith-base+ldap-4.19.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/panels/password/cgi-bin/userpassword 2008-08-07 21:41:01.000000000 +0200 |
17 |
+++ /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/panels/password/cgi-bin/userpassword 2008-08-07 21:42:02.000000000 +0200 |
18 |
@@ -16,6 +16,4 @@ |
19 |
</trans> |
20 |
</entry> |
21 |
|
22 |
- <entry> |
23 |
- |
24 |
</lexicon> |
25 |
diff -ur -N e-smith-base+ldap-4.19.1/root/etc/e-smith/web/functions/useraccounts /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/etc/e-smith/web/functions/useraccounts |
26 |
--- e-smith-base+ldap-4.19.1/root/etc/e-smith/web/functions/useraccounts 2008-08-07 21:41:01.000000000 +0200 |
27 |
+++ /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/etc/e-smith/web/functions/useraccounts 2008-08-07 21:42:02.000000000 +0200 |
28 |
@@ -257,7 +257,7 @@ |
29 |
<page name="CheckMaxUsersUnlock" post-event="checkMaxUsers('ResetPassword')"> |
30 |
</page> |
31 |
<page name="ResetPassword" pre-event="turn_off_buttons()" post-event="reset_password()"> |
32 |
- <title>PASSWORD_RESET_TITLE</title> |
33 |
+ <title>RESET_PASSWORD_TITLE</title> |
34 |
<subroutine src="print_page_description('reset')" /> |
35 |
<field type="password" id="password1" validation="nonblank, check_password"> |
36 |
<label>PASSWORD_NEW</label> |
37 |
diff -ur -N e-smith-base+ldap-4.19.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword |
38 |
--- e-smith-base+ldap-4.19.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword 2008-08-07 21:41:01.000000000 +0200 |
39 |
+++ /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword 2008-08-07 21:42:02.000000000 +0200 |
40 |
@@ -103,7 +103,7 @@ |
41 |
my $pass1 = $fm->{cgi}->param('pass'); |
42 |
unless ($pass1 eq $pass2) { |
43 |
$fm->{cgi}->param( -name => 'wherenext', -value => 'Password' ); |
44 |
- return "PASSWORD_NO_MATCH"; |
45 |
+ return "PASSWORD_VERIFY_ERROR"; |
46 |
} |
47 |
return "OK"; |
48 |
} |
49 |
diff -ur -N e-smith-base+ldap-4.19.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm |
50 |
--- e-smith-base+ldap-4.19.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm 2008-08-07 21:41:01.000000000 +0200 |
51 |
+++ /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm 2008-08-07 21:42:02.000000000 +0200 |
52 |
@@ -605,7 +605,7 @@ |
53 |
my $pass1 = $self->{cgi}->param('password1'); |
54 |
unless ($pass1 eq $pass2) { |
55 |
$self->{cgi}->param( -name => 'wherenext', -value => 'Password' ); |
56 |
- return "PASSWORD_NO_MATCH"; |
57 |
+ return "PASSWORD_VERIFY_ERROR"; |
58 |
} |
59 |
return "OK"; |
60 |
} |
61 |
@@ -1140,7 +1140,7 @@ |
62 |
my $pass1 = $self->{cgi}->param('pass'); |
63 |
unless ($pass1 eq $pass2) { |
64 |
$self->{cgi}->param( -name => 'wherenext', -value => 'Password' ); |
65 |
- return "SYSTEM_PASSWORD_NO_MATCH"; |
66 |
+ return "SYSTEM_PASSWORD_VERIFY_ERROR"; |
67 |
} |
68 |
return "OK"; |
69 |
} |