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
-
-
P2_TITLE
CREATE_MODIFY_DESC
@@ -249,7 +247,7 @@ __DATA__
-
+
RESET_PASSWORD_TITLE
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
- checkMaxUsers
handle_user_accounts
modify_admin
emailforward
@@ -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('ResetPasswordDummy');
# make normal links
my $lock_url = ($password_set eq 'yes') ?
@@ -608,34 +607,6 @@ sub verifyPasswords {
=head1 CREATING AND MODIFYING USERS
-=head2 checkMaxUsers()
-
-Returns an error message if the current number of users is greater than or
-equal to the sysconfig|MaxUsers property.
-
-Takes the name of the next page to go to if the test succeeds as an argument.
-
-=cut
-
-sub checkMaxUsers
-{
- my ($self, $next_page) = @_;
-
- # Get value of MaxUsers if it exists.
- my $sysconfig = $configdb->get('sysconfig');
- my $maxUsers = (($sysconfig) ? $sysconfig->prop('MaxUsers') : '') || '';
- my $activeUsers = scalar $accountdb->activeUsers() || 0;
- if ((defined $activeUsers and $maxUsers ne '')
- and ($activeUsers >= $maxUsers))
- {
- $self->error('MAX_USERS_EXCEEDED');
- }
- else
- {
- $self->{cgi}->param(-name => 'wherenext', -value => $next_page);
- }
-}
-
=head2 handle_user_accounts()
This is the routine called by the "Save" button on the create/modify page.