--- rpms/e-smith-base/sme7/e-smith-base-4.18.1-add2general.patch 2008/04/27 15:57:59 1.2
+++ rpms/e-smith-base/sme7/e-smith-base-4.18.1-add2general.patch 2008/07/04 21:59:38 1.6
@@ -242,8 +242,7 @@ diff -Nur -x '*.orig' -x '*.rej' e-smith
+ . $fm->localise("GROUP_ADD")
. ""));
-- if ( $numGroups == 0 ) {
-+ if ( $numGROUPS == 0 ) {
+ if ( $numGroups == 0 ) {
print $q->Tr($q->td(
- '' . $fm->localise("NO_GROUPS") . '
'));
+ '' . $fm->localise("ACCOUNT_GROUP_NONE") . '
'));
@@ -367,3 +366,169 @@ diff -Nur -x '*.orig' -x '*.rej' e-smith
RECONFIGURE_SUCCEEDED
Reconfiguration request initiated successfully.
+diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/panels/password/cgi-bin/userpassword mezzanine_patched_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-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/panels/password/cgi-bin/userpassword 2005-11-21 05:28:05.000000000 +0100
++++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/panels/password/cgi-bin/userpassword 2008-04-27 18:49:34.000000000 +0200
+@@ -1,11 +1,6 @@
+
+
+
+- FORM_TITLE
+- Change account password
+-
+-
+-
+ DESCRIPTION
+
+
+
+
+- ACCOUNT_NAME
+- Your account:
+-
+-
+-
+- OLD_SYSTEM_PASSWORD
+- Old password:
+-
+-
+-
+- NEW_SYSTEM_PASSWORD
+- New password:
+-
+-
+-
+- NEW_SYSTEM_PASSWORD_VERIFY
+- New password (verify):
+-
+-
+-
+- CHANGE_PASSWORD
+- Change Password
+-
+-
+-
+- PASSWORD_VERIFY_ERROR
+- The passwords you entered did not match.
+-
+-
+-
+- PASSWORD_CHANGE_FAILURE
+- An error occurred while attempting to change your password. Please make sure that the old password entered is correct.
+-
+-
+-
+- PASSWORD_CHANGED
+- Your password has been successfully changed.
+-
+-
+-
+- TAINED_OLDPASS
+- The old password you entered contained invalid characters.
+-
+-
+-
+- TAINED_PASS
+- The password you entered contained invalid characters.
+-
+-
+-
+- TAINED_ACCOUNT
+- The account name you entered contained invalid characters.
+-
+-
+-
+- NO_SUCH_USER
+- The account name entered is invalid.
+-
+
+
+diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword
+--- e-smith-base-4.18.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword 2005-11-21 05:28:10.000000000 +0100
++++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword 2008-04-27 18:51:05.000000000 +0200
+@@ -66,13 +66,13 @@
+ my $acct;
+ unless ($acct = $accountdb->get($acctName))
+ {
+- $q->param(-name => 'status_message', -value => 'NO_SUCH_USER');
++ $q->param(-name => 'status_message', -value => 'YOUR_ACCOUNT_INVALID');
+ return;
+ }
+
+ unless ($acct->prop('type') eq 'user')
+ {
+- $q->param(-name=>'status_message', -value=>"NO_SUCH_USER");
++ $q->param(-name=>'status_message', -value=>"YOUR_ACCOUNT_INVALID");
+ return;
+ }
+
+@@ -82,7 +82,7 @@
+ $pass))
+ {
+ $q->param(-name => 'status_message',
+- -value => 'PASSWORD_CHANGE_FAILURE');
++ -value => 'ERROR_PASSWORD_CHANGE');
+ return;
+ }
+ $acct->set_prop("PasswordSet", "yes");
+@@ -92,7 +92,7 @@
+ or die ("Error occurred while modifying password for $acctName.\n");
+ $accountdb = esmith::AccountsDB->open();
+
+- $q->param(-name => 'status_message', -value => 'PASSWORD_CHANGED');
++ $q->param(-name => 'status_message', -value => 'PASSWORD_CHANGE_SUCCESS');
+ return;
+ }
+
+@@ -103,7 +103,7 @@
+ my $pass1 = $fm->{cgi}->param('pass');
+ unless ($pass1 eq $pass2) {
+ $fm->{cgi}->param( -name => 'wherenext', -value => 'Password' );
+- return "PASSWORD_VERIFY_ERROR";
++ return "PASSWORD_NO_MATCH";
+ }
+ return "OK";
+ }
+@@ -128,23 +128,23 @@
+ }
+
+ __DATA__
+-