/[smeserver]/rpms/e-smith-base/sme8/e-smith-base-5.2.0-checkMaxUsers.patch
ViewVC logotype

Diff of /rpms/e-smith-base/sme8/e-smith-base-5.2.0-checkMaxUsers.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by wellsi, Sat Jun 5 14:35:09 2010 UTC Revision 1.4 by slords, Fri Nov 5 03:56:15 2010 UTC
# Line 1  Line 1 
1  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  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
2  --- 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/locale/en-us/etc/e-smith/web/functions/useraccounts.checkMaxUsers       2010-10-08 10:24:28.000000000 -0600
3  +++ e-smith-base-5.2.0/root/etc/e-smith/web/functions/useraccounts      2010-06-05 09:01:29.000000000 +0100  +++ 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
4  @@ -169,8 +169,6 @@  @@ -11,7 +11,7 @@
5                 <![CDATA[
6                 <p>
7                     <a class="button-like"
8    -                    href="useraccounts?page=1&page_stack=&Next=Next">Add
9    +                    href="useraccounts?page=0&page_stack=&Next=Next">Add
10                         user account</a>
11                 </p>
12                 <p>
13    @@ -66,15 +66,6 @@
14             <trans>Modify the admin account</trans>
15         </entry>
16         <entry>
17    -        <base>MAX_USERS_EXCEEDED</base>
18    -        <trans>ERROR: Unable to add user account. You have reached the
19    -            maximum number of users for which you have licenses. You
20    -            need to either delete an existing user account or contact
21    -            your authorized reseller to purchase
22    -            additional user licenses.
23    -        </trans>
24    -    </entry>
25    -    <entry>
26             <base>USER_CREATED</base>
27             <trans>Successfully created user account. </trans>
28         </entry>
29    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
30    --- e-smith-base-5.2.0/root/etc/e-smith/web/functions/useraccounts.checkMaxUsers        2010-10-08 10:24:28.000000000 -0600
31    +++ e-smith-base-5.2.0/root/etc/e-smith/web/functions/useraccounts      2010-10-08 10:24:56.000000000 -0600
32    @@ -169,8 +169,6 @@ __DATA__
33           <description>FIRSTPAGE_DESC</description>           <description>FIRSTPAGE_DESC</description>
34           <subroutine src="print_user_table()" />           <subroutine src="print_user_table()" />
35       </page>       </page>
# Line 10  diff -urN e-smith-base-5.2.0.old/root/et Line 38  diff -urN e-smith-base-5.2.0.old/root/et
38       <page name="CreateModify" pre-event="turn_off_buttons()" post-event="handle_user_accounts()">       <page name="CreateModify" pre-event="turn_off_buttons()" post-event="handle_user_accounts()">
39           <title>P2_TITLE</title>           <title>P2_TITLE</title>
40           <description>CREATE_MODIFY_DESC</description>           <description>CREATE_MODIFY_DESC</description>
41  @@ -249,8 +247,6 @@  @@ -249,7 +247,7 @@ __DATA__
42           <subroutine src="print_ipsec_client_section()" />           <subroutine src="print_ipsec_client_section()" />
43           <subroutine src="print_button('SAVE')" />           <subroutine src="print_button('SAVE')" />
44       </page>       </page>
45  -    <page name="CheckMaxUsersUnlock" post-event="checkMaxUsers('ResetPassword')">  -    <page name="CheckMaxUsersUnlock" post-event="checkMaxUsers('ResetPassword')">
46  -    </page>  +    <page name="ResetPasswordDummy">
47         </page>
48       <page name="ResetPassword" pre-event="turn_off_buttons()" post-event="reset_password()">       <page name="ResetPassword" pre-event="turn_off_buttons()" post-event="reset_password()">
49           <title>RESET_PASSWORD_TITLE</title>           <title>RESET_PASSWORD_TITLE</title>
50           <subroutine src="print_page_description('reset')" />  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
51  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/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm.checkMaxUsers       2010-10-08 10:24:28.000000000 -0600
52  --- 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-10-08 10:26:18.000000000 -0600
53  +++ 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 @@ our @EXPORT = qw(
 @@ -42,7 +42,6 @@  
54       get_ldap_value       get_ldap_value
55       username_clash       username_clash
56       pseudonym_clash       pseudonym_clash
# Line 30  diff -urN e-smith-base-5.2.0.old/root/us Line 58  diff -urN e-smith-base-5.2.0.old/root/us
58       handle_user_accounts       handle_user_accounts
59       modify_admin       modify_admin
60       emailforward       emailforward
61  @@ -181,7 +180,7 @@  @@ -181,7 +180,7 @@ sub print_user_table {
62           my $password_set = $u->prop('PasswordSet');           my $password_set = $u->prop('PasswordSet');
63    
64           my $pagenum = ($username eq "admin") ? $self->get_page_by_name('SystemPasswordDummy')           my $pagenum = ($username eq "admin") ? $self->get_page_by_name('SystemPasswordDummy')
65  -        : $self->get_page_by_name('CheckMaxUsersUnlock');  -        : $self->get_page_by_name('CheckMaxUsersUnlock');
66  +        : $self->get_page_by_name('ResetPassword');  +        : $self->get_page_by_name('ResetPasswordDummy');
67    
68           # make normal links           # make normal links
69           my $lock_url = ($password_set eq 'yes') ?           my $lock_url = ($password_set eq 'yes') ?
70  @@ -608,34 +607,6 @@  @@ -608,34 +607,6 @@ sub verifyPasswords {
71    
72   =head1 CREATING AND MODIFYING USERS   =head1 CREATING AND MODIFYING USERS
73    

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed