/[smeserver]/rpms/e-smith-ibays/sme7/e-smith-ibays-1.2.0-add2general.patch
ViewVC logotype

Annotation of /rpms/e-smith-ibays/sme7/e-smith-ibays-1.2.0-add2general.patch

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

Revision 1.1 - (hide annotations) (download)
Sun Apr 27 16:14:22 2008 UTC (16 years, 7 months ago) by snetram
Branch: MAIN
CVS Tags: e-smith-ibays-1_2_0-9_el4_sme, e-smith-ibays-1_2_0-10_el4_sme, e-smith-ibays-1_2_0-12_el4_sme, e-smith-ibays-1_2_0-11_el4_sme 
* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-9
- Add common <base> tags to e-smith-formmagick's general (added missing patch)
1 snetram 1.1 diff -Nur -x '*.orig' -x '*.rej' e-smith-ibays-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/ibays mezzanine_patched_e-smith-ibays-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/ibays
2     --- e-smith-ibays-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/ibays 2008-04-27 18:09:02.000000000 +0200
3     +++ mezzanine_patched_e-smith-ibays-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/ibays 2008-04-27 18:04:13.000000000 +0200
4     @@ -44,30 +44,12 @@
5     </trans>
6     </entry>
7     <entry>
8     - <base>NAME</base>
9     - <trans>
10     - Name
11     - </trans>
12     - </entry>
13     - <entry>
14     - <base>DESCRIPTION</base>
15     - <trans>
16     - Description
17     - </trans>
18     - </entry>
19     - <entry>
20     <base>NAME_LABEL</base>
21     <trans>
22     Information bay name
23     </trans>
24     </entry>
25     <entry>
26     - <base>DESCRIPTION_LABEL</base>
27     - <trans>
28     - Brief description
29     - </trans>
30     - </entry>
31     - <entry>
32     <base>USER_ACCESS</base>
33     <trans>
34     User access via file sharing or user ftp
35     @@ -119,10 +101,6 @@
36     </trans>
37     </entry>
38     <entry>
39     - <base>RESET_PASSWORD</base>
40     - <trans>Reset password</trans>
41     - </entry>
42     - <entry>
43     <base>ERROR_WHILE_CREATING_IBAY</base>
44     <trans>
45     An error occurred while creating the i-bay.
46     @@ -141,12 +119,6 @@
47     </trans>
48     </entry>
49     <entry>
50     - <base>DESCRIPTION_ERROR</base>
51     - <trans>
52     - Unexpected characters in description.
53     - </trans>
54     - </entry>
55     - <entry>
56     <base>CANT_FIND_IBAY</base>
57     <trans>
58     Can't find account for {$name} (does it exist?)
59     @@ -191,18 +163,6 @@
60     </trans>
61     </entry>
62     <entry>
63     - <base>NEW_PASSWORD</base>
64     - <trans>
65     - New password
66     - </trans>
67     - </entry>
68     - <entry>
69     - <base>NEW_PASSWORD_VERIFY</base>
70     - <trans>
71     - New password (verify)
72     - </trans>
73     - </entry>
74     - <entry>
75     <base>PASSWORD_DESC</base>
76     <trans>
77     You are about to change the password for the i-bay {$name}.
78     @@ -284,10 +244,6 @@
79     <trans>Entire Internet (password required outside local network)</trans>
80     </entry>
81     <entry>
82     - <base>PASSWORD_VERIFY_ERROR</base>
83     - <trans>The passwords you entered did not match.</trans>
84     - </entry>
85     - <entry>
86     <base>INVALID_IBAY_DESCRIPTION</base>
87     <trans>Error: unexpected or missing characters in i-bay description</trans>
88     </entry>
89     diff -Nur -x '*.orig' -x '*.rej' e-smith-ibays-1.2.0/root/etc/e-smith/web/functions/ibays mezzanine_patched_e-smith-ibays-1.2.0/root/etc/e-smith/web/functions/ibays
90     --- e-smith-ibays-1.2.0/root/etc/e-smith/web/functions/ibays 2005-10-06 23:52:28.000000000 +0200
91     +++ mezzanine_patched_e-smith-ibays-1.2.0/root/etc/e-smith/web/functions/ibays 2008-04-27 18:06:51.000000000 +0200
92     @@ -129,13 +129,13 @@
93     <subroutine src="print_button('REMOVE')" />
94     </page>
95     <page name="Password" pre-event="turn_off_buttons()" post-event="reset_password()">
96     - <title>RESET_PASSWORD</title>
97     + <title>PASSWORD_RESET</title>
98     <description>PASSWORD_DESC</description>
99     <field type="password" id="newPass" validation="nonblank, check_password">
100     - <label>NEW_PASSWORD</label>
101     + <label>PASSWORD_NEW</label>
102     </field>
103     <field type="password" id="newPassVerify" validation="verifyPasswords">
104     - <label>NEW_PASSWORD_VERIFY</label>
105     + <label>PASSWORD_NEW_VERIFY</label>
106     </field>
107     <subroutine src="print_button('SAVE')"/>
108     </page>
109     diff -Nur -x '*.orig' -x '*.rej' e-smith-ibays-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm mezzanine_patched_e-smith-ibays-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm
110     --- e-smith-ibays-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm 2008-04-27 18:09:02.000000000 +0200
111     +++ mezzanine_patched_e-smith-ibays-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm 2008-04-27 18:05:18.000000000 +0200
112     @@ -121,7 +121,7 @@
113     my $description = $self->localise('DESCRIPTION');
114     my $modify = $self->localise('MODIFY');
115     my $remove = $self->localise('REMOVE');
116     - my $resetpw = $self->localise('RESET_PASSWORD');
117     + my $resetpw = $self->localise('PASSWORD_RESET');
118     my $action_h = $self->localise('ACTION');
119     my @ibays = $accountdb->ibays();
120    
121     @@ -617,7 +617,7 @@
122     if (system ("/sbin/e-smith/signal-event", "password-modify",
123     $name) == 0)
124     {
125     - $self->success("SUCCESSFULLY_RESET_PASSWORD");
126     + $self->success("SUCCESSFULLY_PASSWORD_RESET");
127     } else {
128     $self->error("ERROR_WHILE_RESETTING_PASSWORD");
129     }
130     @@ -672,7 +672,7 @@
131     my $pass1 = $self->{cgi}->param('newPass');
132     unless ($pass1 eq $pass2) {
133     $self->{cgi}->param( -name => 'wherenext', -value => 'Password' );
134     - return "PASSWORD_VERIFY_ERROR";
135     + return "PASSWORD_NO_MATCH";
136     }
137     return "OK";
138     }
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed