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 --- 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 +++ /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 @@ -163,10 +163,6 @@ Enter the new password in the fields below - RESET_PASSWORD_TITLE - Reset user password - - ERR_OCCURRED_MODIFYING_PASSWORD An error occurred while updating the password 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 --- 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 +++ /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 @@ -16,6 +16,4 @@ - - 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 --- e-smith-base+ldap-4.19.1/root/etc/e-smith/web/functions/useraccounts 2008-08-07 21:41:01.000000000 +0200 +++ /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 @@ -257,7 +257,7 @@ - PASSWORD_RESET_TITLE + RESET_PASSWORD_TITLE 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 --- 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 +++ /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 @@ -103,7 +103,7 @@ my $pass1 = $fm->{cgi}->param('pass'); unless ($pass1 eq $pass2) { $fm->{cgi}->param( -name => 'wherenext', -value => 'Password' ); - return "PASSWORD_NO_MATCH"; + return "PASSWORD_VERIFY_ERROR"; } return "OK"; } 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 --- 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 +++ /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 @@ -605,7 +605,7 @@ my $pass1 = $self->{cgi}->param('password1'); unless ($pass1 eq $pass2) { $self->{cgi}->param( -name => 'wherenext', -value => 'Password' ); - return "PASSWORD_NO_MATCH"; + return "PASSWORD_VERIFY_ERROR"; } return "OK"; } @@ -1140,7 +1140,7 @@ my $pass1 = $self->{cgi}->param('pass'); unless ($pass1 eq $pass2) { $self->{cgi}->param( -name => 'wherenext', -value => 'Password' ); - return "SYSTEM_PASSWORD_NO_MATCH"; + return "SYSTEM_PASSWORD_VERIFY_ERROR"; } return "OK"; }