--- rpms/e-smith-base/sme8/e-smith-base-5.2.0-checkMaxUsers.patch 2010/06/05 14:35:09 1.1
+++ rpms/e-smith-base/sme8/e-smith-base-5.2.0-checkMaxUsers.patch 2010/11/05 01:56:12 1.3
@@ -1,7 +1,35 @@
-diff -urN e-smith-base-5.2.0.old/root/etc/e-smith/web/functions/useraccounts e-smith-base-5.2.0/root/etc/e-smith/web/functions/useraccounts
---- e-smith-base-5.2.0.old/root/etc/e-smith/web/functions/useraccounts 2010-06-05 08:51:52.000000000 +0100
-+++ e-smith-base-5.2.0/root/etc/e-smith/web/functions/useraccounts 2010-06-05 09:01:29.000000000 +0100
-@@ -169,8 +169,6 @@
+diff -up e-smith-base-5.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts.checkMaxUsers e-smith-base-5.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts
+--- e-smith-base-5.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts.checkMaxUsers 2010-10-08 10:24:28.000000000 -0600
++++ e-smith-base-5.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts 2010-10-08 10:28:51.000000000 -0600
+@@ -11,7 +11,7 @@
+
+ Add
++ href="useraccounts?page=0&page_stack=&Next=Next">Add
+ user account
+
+
+@@ -66,15 +66,6 @@
+ Modify the admin account
+
+
+- MAX_USERS_EXCEEDED
+- ERROR: Unable to add user account. You have reached the
+- maximum number of users for which you have licenses. You
+- need to either delete an existing user account or contact
+- your authorized reseller to purchase
+- additional user licenses.
+-
+-
+-
+ USER_CREATED
+ Successfully created user account.
+
+diff -up e-smith-base-5.2.0/root/etc/e-smith/web/functions/useraccounts.checkMaxUsers e-smith-base-5.2.0/root/etc/e-smith/web/functions/useraccounts
+--- e-smith-base-5.2.0/root/etc/e-smith/web/functions/useraccounts.checkMaxUsers 2010-10-08 10:24:28.000000000 -0600
++++ e-smith-base-5.2.0/root/etc/e-smith/web/functions/useraccounts 2010-10-08 10:24:56.000000000 -0600
+@@ -169,8 +169,6 @@ __DATA__
FIRSTPAGE_DESC
@@ -10,19 +38,19 @@ diff -urN e-smith-base-5.2.0.old/root/et
P2_TITLE
CREATE_MODIFY_DESC
-@@ -249,8 +247,6 @@
+@@ -249,7 +247,7 @@ __DATA__
-
--
++
+
RESET_PASSWORD_TITLE
-
-diff -urN e-smith-base-5.2.0.old/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm
---- e-smith-base-5.2.0.old/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm 2010-06-05 08:51:52.000000000 +0100
-+++ e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm 2010-06-05 09:09:17.000000000 +0100
-@@ -42,7 +42,6 @@
+diff -up e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm.checkMaxUsers e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm
+--- e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm.checkMaxUsers 2010-10-08 10:24:28.000000000 -0600
++++ e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm 2010-10-08 10:26:18.000000000 -0600
+@@ -42,7 +42,6 @@ our @EXPORT = qw(
get_ldap_value
username_clash
pseudonym_clash
@@ -30,16 +58,16 @@ diff -urN e-smith-base-5.2.0.old/root/us
handle_user_accounts
modify_admin
emailforward
-@@ -181,7 +180,7 @@
+@@ -181,7 +180,7 @@ sub print_user_table {
my $password_set = $u->prop('PasswordSet');
my $pagenum = ($username eq "admin") ? $self->get_page_by_name('SystemPasswordDummy')
- : $self->get_page_by_name('CheckMaxUsersUnlock');
-+ : $self->get_page_by_name('ResetPassword');
++ : $self->get_page_by_name('ResetPasswordDummy');
# make normal links
my $lock_url = ($password_set eq 'yes') ?
-@@ -608,34 +607,6 @@
+@@ -608,34 +607,6 @@ sub verifyPasswords {
=head1 CREATING AND MODIFYING USERS