1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/groups mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/groups |
2 |
|
|
--- e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/groups 2008-03-26 17:49:00.000000000 +0100 |
3 |
|
|
+++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/groups 2008-04-27 12:11:51.000000000 +0200 |
4 |
|
|
@@ -6,18 +6,6 @@ |
5 |
|
|
<trans>Create, modify, or remove user groups</trans> |
6 |
|
|
</entry> |
7 |
|
|
<entry> |
8 |
|
|
- <base>CREATE_TITLE</base> |
9 |
|
|
- <trans>Create user group</trans> |
10 |
|
|
- </entry> |
11 |
|
|
- <entry> |
12 |
|
|
- <base>MODIFY_TITLE</base> |
13 |
|
|
- <trans>Modify user group</trans> |
14 |
|
|
- </entry> |
15 |
|
|
- <entry> |
16 |
|
|
- <base>REMOVE_TITLE</base> |
17 |
|
|
- <trans>Remove user group</trans> |
18 |
|
|
- </entry> |
19 |
|
|
- <entry> |
20 |
|
|
<base>GROUP_TOO_LONG</base> |
21 |
|
|
<trans>Error: group name is too long.The maximum is {$maxLength} |
22 |
|
|
characters.</trans> |
23 |
|
|
@@ -81,10 +69,6 @@ |
24 |
|
|
<trans>Error: That is not an existing group account.</trans> |
25 |
|
|
</entry> |
26 |
|
|
<entry> |
27 |
|
|
- <base>GROUP_NAME</base> |
28 |
|
|
- <trans>Group Name</trans> |
29 |
|
|
- </entry> |
30 |
|
|
- <entry> |
31 |
|
|
<base>GROUP_DESC</base> |
32 |
|
|
<trans>Brief Description/Windows Group Alias</trans> |
33 |
|
|
</entry> |
34 |
|
|
@@ -109,37 +93,13 @@ |
35 |
|
|
]]></trans> |
36 |
|
|
</entry> |
37 |
|
|
<entry> |
38 |
|
|
- <base>USERNAME</base> |
39 |
|
|
- <trans>User Name</trans> |
40 |
|
|
- </entry> |
41 |
|
|
- <entry> |
42 |
|
|
- <base>CLICK_TO_CREATE</base> |
43 |
|
|
- <trans>Add group</trans> |
44 |
|
|
- </entry> |
45 |
|
|
- <entry> |
46 |
|
|
- <base>NO_GROUPS</base> |
47 |
|
|
- <trans>There are no user groups in the system.</trans> |
48 |
|
|
- </entry> |
49 |
|
|
- <entry> |
50 |
|
|
<base>CURRENT_LIST</base> |
51 |
|
|
<trans><![CDATA[<p>Current list of User Groups</p>]]></trans> |
52 |
|
|
</entry> |
53 |
|
|
<entry> |
54 |
|
|
- <base>GROUP_MEMBERS</base> |
55 |
|
|
- <trans>Group Members</trans> |
56 |
|
|
- </entry> |
57 |
|
|
- <entry> |
58 |
|
|
- <base>DESCRIPTION</base> |
59 |
|
|
- <trans>Description</trans> |
60 |
|
|
- </entry> |
61 |
|
|
- <entry> |
62 |
|
|
<base>DELETE_DESCRIPTION</base> |
63 |
|
|
<trans><![CDATA[ |
64 |
|
|
You are about to remove the user group "<b>{$group}</b>." |
65 |
|
|
]]></trans> |
66 |
|
|
</entry> |
67 |
|
|
- <entry> |
68 |
|
|
- <base>Groups</base> |
69 |
|
|
- <trans>Groups</trans> |
70 |
|
|
- </entry> |
71 |
|
|
</lexicon> |
72 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess |
73 |
|
|
--- e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess 2008-03-26 17:49:00.000000000 +0100 |
74 |
|
|
+++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess 2008-04-27 12:19:22.000000000 +0200 |
75 |
|
|
@@ -20,14 +20,6 @@ |
76 |
|
|
<trans>The new remote access settings have been saved.</trans> |
77 |
|
|
</entry> |
78 |
|
|
<entry> |
79 |
|
|
- <base>ERROR_UPDATING</base> |
80 |
|
|
- <trans>Error occurred while updating system configuration.</trans> |
81 |
|
|
- </entry> |
82 |
|
|
- <entry> |
83 |
|
|
- <base>OFF</base> |
84 |
|
|
- <trans>Off</trans> |
85 |
|
|
- </entry> |
86 |
|
|
- <entry> |
87 |
|
|
<base>NO_ACCESS</base> |
88 |
|
|
<trans>No Access</trans> |
89 |
|
|
</entry> |
90 |
|
|
@@ -40,14 +32,6 @@ |
91 |
|
|
<trans>Accept passwords from anywhere</trans> |
92 |
|
|
</entry> |
93 |
|
|
<entry> |
94 |
|
|
- <base>PUBLIC</base> |
95 |
|
|
- <trans>Allow public access (entire Internet)</trans> |
96 |
|
|
- </entry> |
97 |
|
|
- <entry> |
98 |
|
|
- <base>PRIVATE</base> |
99 |
|
|
- <trans>Allow access only from local networks</trans> |
100 |
|
|
- </entry> |
101 |
|
|
- <entry> |
102 |
|
|
<base>LABEL_TELNET_ACCESS</base> |
103 |
|
|
<trans>Telnet access</trans> |
104 |
|
|
</entry> |
105 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts |
106 |
|
|
--- e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts 2008-04-27 12:20:21.000000000 +0200 |
107 |
|
|
+++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts 2008-04-27 12:16:36.000000000 +0200 |
108 |
|
|
@@ -155,22 +155,6 @@ |
109 |
|
|
<trans>Group memberships</trans> |
110 |
|
|
</entry> |
111 |
|
|
<entry> |
112 |
|
|
- <base>USER_NAME</base> |
113 |
|
|
- <trans>User name</trans> |
114 |
|
|
- </entry> |
115 |
|
|
- <entry> |
116 |
|
|
- <base>PASSWORD1</base> |
117 |
|
|
- <trans>New password</trans> |
118 |
|
|
- </entry> |
119 |
|
|
- <entry> |
120 |
|
|
- <base>PASSWORD2</base> |
121 |
|
|
- <trans>New password (verify)</trans> |
122 |
|
|
- </entry> |
123 |
|
|
- <entry> |
124 |
|
|
- <base>PASSWORD_VERIFY_ERROR</base> |
125 |
|
|
- <trans>The passwords you entered did not match.</trans> |
126 |
|
|
- </entry> |
127 |
|
|
- <entry> |
128 |
|
|
<base>RESET_DESC</base> |
129 |
|
|
<trans>You are about to change the password for the user account</trans> |
130 |
|
|
</entry> |
131 |
|
|
@@ -209,10 +193,6 @@ |
132 |
|
|
initials to this field.</trans> |
133 |
|
|
</entry> |
134 |
|
|
<entry> |
135 |
|
|
- <base>RESET_PASSWORD</base> |
136 |
|
|
- <trans>Reset password</trans> |
137 |
|
|
- </entry> |
138 |
|
|
- <entry> |
139 |
|
|
<base>LOCK_ACCOUNT</base> |
140 |
|
|
<trans>Lock account</trans> |
141 |
|
|
</entry> |
142 |
|
|
@@ -268,10 +248,6 @@ |
143 |
|
|
<trans>There are no user accounts on this system.</trans> |
144 |
|
|
</entry> |
145 |
|
|
<entry> |
146 |
|
|
- <base>ACCOUNT_IS_LOCKED</base> |
147 |
|
|
- <trans>Account is locked</trans> |
148 |
|
|
- </entry> |
149 |
|
|
- <entry> |
150 |
|
|
<base>Users</base> |
151 |
|
|
<trans>Users</trans> |
152 |
|
|
</entry> |
153 |
|
|
@@ -313,10 +289,6 @@ |
154 |
|
|
<trans>Member?</trans> |
155 |
|
|
</entry> |
156 |
|
|
<entry> |
157 |
|
|
- <base>DESCRIPTION</base> |
158 |
|
|
- <trans>Description</trans> |
159 |
|
|
- </entry> |
160 |
|
|
- <entry> |
161 |
|
|
<base>VPN_CLIENT_ACCESS</base> |
162 |
|
|
<trans>VPN Client Access</trans> |
163 |
|
|
</entry> |
164 |
|
|
@@ -368,10 +340,6 @@ |
165 |
|
|
<trans>Download digital certificate to IPSec client</trans> |
166 |
|
|
</entry> |
167 |
|
|
<entry> |
168 |
|
|
- <base>BUTTON_IPSECRW_DOWNLOAD</base> |
169 |
|
|
- <trans>Download</trans> |
170 |
|
|
- </entry> |
171 |
|
|
- <entry> |
172 |
|
|
<base>ERR_OCCURRED_DELETING</base> |
173 |
|
|
<trans> |
174 |
|
|
An error occurred while trying to delete the user. |
175 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/web/functions/groups mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/web/functions/groups |
176 |
|
|
--- e-smith-base-4.18.1/root/etc/e-smith/web/functions/groups 2008-03-26 17:49:00.000000000 +0100 |
177 |
|
|
+++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/web/functions/groups 2008-04-27 12:09:25.000000000 +0200 |
178 |
|
|
@@ -3,7 +3,7 @@ |
179 |
|
|
# vim: ft=xml ts=4 sw=4 et: |
180 |
|
|
#---------------------------------------------------------------------- |
181 |
|
|
# heading : Collaboration |
182 |
|
|
-# description : Groups |
183 |
|
|
+# description : GROUPS |
184 |
|
|
# navigation : 2000 2200 |
185 |
|
|
#---------------------------------------------------------------------- |
186 |
|
|
#---------------------------------------------------------------------- |
187 |
|
|
@@ -112,7 +112,7 @@ |
188 |
|
|
</page> |
189 |
|
|
<page name="CreateGroup" pre-event="turn_off_buttons()" |
190 |
|
|
post-event="create_group()"> |
191 |
|
|
- <title>CREATE_TITLE</title> |
192 |
|
|
+ <title>CREATE_GROUP</title> |
193 |
|
|
<description>GROUP_NAMING</description> |
194 |
|
|
<field type="text" id="groupName" |
195 |
|
|
validation="validate_group, validate_group_length, validate_group_naming_conflict"> |
196 |
|
|
@@ -127,7 +127,7 @@ |
197 |
|
|
</page> |
198 |
|
|
<page name="Delete" pre-event="turn_off_buttons()" |
199 |
|
|
post-event="delete_group()"> |
200 |
|
|
- <title>REMOVE_TITLE</title> |
201 |
|
|
+ <title>REMOVE_USER_GROUP</title> |
202 |
|
|
<subroutine src="print_group_delete_desc()"/> |
203 |
|
|
<subroutine src="print_group_members()"/> |
204 |
|
|
<subroutine src="print_ibay_list($acct)"/> |
205 |
|
|
@@ -135,7 +135,7 @@ |
206 |
|
|
</page> |
207 |
|
|
<page name="Modify" pre-event="turn_off_buttons()" |
208 |
|
|
post-event="modify_group()"> |
209 |
|
|
- <title>MODIFY_TITLE</title> |
210 |
|
|
+ <title>MODIFY_USER_GROUP</title> |
211 |
|
|
<field type="literal" id="groupName" value="$q->param('groupName')"> |
212 |
|
|
<label>GROUP_NAME</label> |
213 |
|
|
</field> |
214 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/web/functions/useraccounts mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/web/functions/useraccounts |
215 |
|
|
--- e-smith-base-4.18.1/root/etc/e-smith/web/functions/useraccounts 2008-04-27 12:20:21.000000000 +0200 |
216 |
|
|
+++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/web/functions/useraccounts 2008-04-27 12:14:39.000000000 +0200 |
217 |
|
|
@@ -257,13 +257,13 @@ |
218 |
|
|
<page name="CheckMaxUsersUnlock" post-event="checkMaxUsers('ResetPassword')"> |
219 |
|
|
</page> |
220 |
|
|
<page name="ResetPassword" pre-event="turn_off_buttons()" post-event="reset_password()"> |
221 |
|
|
- <title>RESET_PASSWORD_TITLE</title> |
222 |
|
|
+ <title>PASSWORD_RESET_TITLE</title> |
223 |
|
|
<subroutine src="print_page_description('reset')" /> |
224 |
|
|
<field type="password" id="password1" validation="nonblank, check_password"> |
225 |
|
|
- <label>PASSWORD1</label> |
226 |
|
|
+ <label>PASSWORD_NEW</label> |
227 |
|
|
</field> |
228 |
|
|
<field type="password" id="password2" validation="verifyPasswords"> |
229 |
|
|
- <label>PASSWORD2</label> |
230 |
|
|
+ <label>PASSWORD_VERIFY_NEW</label> |
231 |
|
|
</field> |
232 |
|
|
<subroutine src="print_button('SAVE')" /> |
233 |
|
|
</page> |
234 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/groups.pm mezzanine_patched_e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/groups.pm |
235 |
|
|
--- e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/groups.pm 2008-03-26 17:49:00.000000000 +0100 |
236 |
|
|
+++ mezzanine_patched_e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/groups.pm 2008-04-27 12:08:04.000000000 +0200 |
237 |
|
|
@@ -161,12 +161,12 @@ |
238 |
|
|
|
239 |
|
|
print $q->Tr($q->td( |
240 |
|
|
"<p><a class=\"button-like\" href=\"groups?$params&wherenext=CreateGroup\">" |
241 |
|
|
- . $fm->localise("CLICK_TO_CREATE") |
242 |
|
|
+ . $fm->localise("GROUP_ADD") |
243 |
|
|
. "</a></p>")); |
244 |
|
|
|
245 |
|
|
if ( $numGroups == 0 ) { |
246 |
|
|
print $q->Tr($q->td( |
247 |
|
|
- '<p><b>' . $fm->localise("NO_GROUPS") . '</p></b>')); |
248 |
|
|
+ '<p><b>' . $fm->localise("ACCOUNT_GROUP_NONE") . '</p></b>')); |
249 |
|
|
|
250 |
|
|
} |
251 |
|
|
else { |
252 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/remoteaccess.pm mezzanine_patched_e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/remoteaccess.pm |
253 |
|
|
--- e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/remoteaccess.pm 2008-03-26 17:49:00.000000000 +0100 |
254 |
|
|
+++ mezzanine_patched_e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/remoteaccess.pm 2008-04-27 12:17:51.000000000 +0200 |
255 |
|
|
@@ -268,8 +268,8 @@ |
256 |
|
|
return '' if $mode eq 'off'; |
257 |
|
|
|
258 |
|
|
my %options = ( |
259 |
|
|
- public => $self->localise('PUBLIC'), |
260 |
|
|
- private => $self->localise('PRIVATE'), |
261 |
|
|
+ public => $self->localise('NETWORKS_ALLOW_PUBLIC'), |
262 |
|
|
+ private => $self->localise('NETWORKS_ALLOW_LOCAL'), |
263 |
|
|
off => $self->localise('NO_ACCESS'), |
264 |
|
|
); |
265 |
|
|
|
266 |
snetram |
1.2 |
@@ -306,8 +306,8 @@ |
267 |
slords |
1.1 |
return '' unless $db->get('ftp'); |
268 |
|
|
|
269 |
|
|
my %options = ( |
270 |
|
|
- normal => $self->localise('PUBLIC'), |
271 |
|
|
- private => $self->localise('PRIVATE'), |
272 |
|
|
+ normal => $self->localise('NETWORKS_ALLOW_PUBLIC'), |
273 |
|
|
+ private => $self->localise('NETWORKS_ALLOW_LOCAL'), |
274 |
|
|
off => $self->localise('NO_ACCESS'), |
275 |
|
|
); |
276 |
|
|
|
277 |
|
|
@@ -721,7 +721,7 @@ |
278 |
|
|
|
279 |
|
|
unless ( system( "/sbin/e-smith/signal-event", "remoteaccess-update" ) == 0 ) |
280 |
|
|
{ |
281 |
|
|
- $self->error('ERROR_UPDATING'); |
282 |
|
|
+ $self->error('ERROR_UPDATING_CONFIGURATION'); |
283 |
|
|
return undef; |
284 |
|
|
} |
285 |
|
|
|
286 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm mezzanine_patched_e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm |
287 |
|
|
--- e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm 2008-04-27 12:20:21.000000000 +0200 |
288 |
|
|
+++ mezzanine_patched_e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm 2008-04-27 12:13:38.000000000 +0200 |
289 |
|
|
@@ -142,9 +142,9 @@ |
290 |
|
|
my $acctName = $self->localise('USER_NAME'); |
291 |
|
|
|
292 |
|
|
my $modify = $self->localise('MODIFY'); |
293 |
|
|
- my $resetpw = $self->localise('RESET_PASSWORD'); |
294 |
|
|
+ my $resetpw = $self->localise('PASSWORD_RESET'); |
295 |
|
|
my $lock = $self->localise('LOCK_ACCOUNT'); |
296 |
|
|
- my $account_locked = $self->localise('ACCOUNT_IS_LOCKED'); |
297 |
|
|
+ my $account_locked = $self->localise('ACCOUNT_LOCKED'); |
298 |
|
|
my $remove = $self->localise('REMOVE'); |
299 |
|
|
|
300 |
|
|
my @users = $accountdb->get('admin'); |
301 |
|
|
@@ -605,7 +605,7 @@ |
302 |
|
|
my $pass1 = $self->{cgi}->param('password1'); |
303 |
|
|
unless ($pass1 eq $pass2) { |
304 |
|
|
$self->{cgi}->param( -name => 'wherenext', -value => 'Password' ); |
305 |
|
|
- return "PASSWORD_VERIFY_ERROR"; |
306 |
|
|
+ return "PASSWORD_NO_MATCH"; |
307 |
|
|
} |
308 |
|
|
return "OK"; |
309 |
|
|
} |
310 |
|
|
@@ -1140,7 +1140,7 @@ |
311 |
|
|
my $pass1 = $self->{cgi}->param('pass'); |
312 |
|
|
unless ($pass1 eq $pass2) { |
313 |
|
|
$self->{cgi}->param( -name => 'wherenext', -value => 'Password' ); |
314 |
|
|
- return "SYSTEM_PASSWORD_VERIFY_ERROR"; |
315 |
|
|
+ return "SYSTEM_PASSWORD_NO_MATCH"; |
316 |
|
|
} |
317 |
|
|
return "OK"; |
318 |
|
|
} |
319 |
|
|
@@ -1261,7 +1261,7 @@ |
320 |
|
|
$q->td({-class=>'sme-noborders-content'}, |
321 |
|
|
$q->a({-class=>'button-like', |
322 |
|
|
-href=>"?action=getCert&user=$acct"}, |
323 |
|
|
- $self->localise('BUTTON_IPSECRW_DOWNLOAD')))); |
324 |
|
|
+ $self->localise('DOWNLOAD')))); |
325 |
|
|
} |
326 |
|
|
} |
327 |
|
|
return ''; |
328 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot |
329 |
|
|
--- e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot 2008-03-26 17:49:00.000000000 +0100 |
330 |
|
|
+++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot 2008-04-27 17:49:48.000000000 +0200 |
331 |
|
|
@@ -2,18 +2,10 @@ |
332 |
|
|
--> |
333 |
|
|
<lexicon lang="en-us"> |
334 |
|
|
<entry> |
335 |
|
|
- <base>PERFORM</base> |
336 |
|
|
- <trans>Perform</trans> |
337 |
|
|
- </entry> |
338 |
|
|
- <entry> |
339 |
|
|
<base>FORM_TITLE</base> |
340 |
|
|
<trans>Shutdown or reboot</trans> |
341 |
|
|
</entry> |
342 |
|
|
<entry> |
343 |
|
|
- <base>SHUTDOWN</base> |
344 |
|
|
- <trans>Shutdown</trans> |
345 |
|
|
- </entry> |
346 |
|
|
- <entry> |
347 |
|
|
<base>REBOOT</base> |
348 |
|
|
<trans>Reboot</trans> |
349 |
|
|
</entry> |
350 |
|
|
@@ -26,10 +18,6 @@ |
351 |
|
|
<trans>Your server has initiated the reboot process.</trans> |
352 |
|
|
</entry> |
353 |
|
|
<entry> |
354 |
|
|
- <base>RECONFIGURE</base> |
355 |
|
|
- <trans>Reconfigure</trans> |
356 |
|
|
- </entry> |
357 |
|
|
- <entry> |
358 |
|
|
<base>RECONFIGURE_SUCCEEDED</base> |
359 |
|
|
<trans>Reconfiguration request initiated successfully.</trans> |
360 |
|
|
</entry> |
361 |
|
|
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 |
362 |
|
|
--- 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 |
363 |
|
|
+++ 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 |
364 |
|
|
@@ -1,11 +1,6 @@ |
365 |
|
|
<lexicon lang="en-us"> |
366 |
|
|
|
367 |
|
|
<entry> |
368 |
|
|
- <base>FORM_TITLE</base> |
369 |
|
|
- <trans>Change account password</trans> |
370 |
|
|
- </entry> |
371 |
|
|
- |
372 |
|
|
- <entry> |
373 |
|
|
<base>DESCRIPTION</base> |
374 |
|
|
<trans> |
375 |
|
|
<![CDATA[ |
376 |
|
|
@@ -22,63 +17,5 @@ |
377 |
|
|
</entry> |
378 |
|
|
|
379 |
|
|
<entry> |
380 |
|
|
- <base>ACCOUNT_NAME</base> |
381 |
|
|
- <trans>Your account: </trans> |
382 |
|
|
- </entry> |
383 |
|
|
- |
384 |
|
|
- <entry> |
385 |
|
|
- <base>OLD_SYSTEM_PASSWORD</base> |
386 |
|
|
- <trans>Old password: </trans> |
387 |
|
|
- </entry> |
388 |
|
|
- |
389 |
|
|
- <entry> |
390 |
|
|
- <base>NEW_SYSTEM_PASSWORD</base> |
391 |
|
|
- <trans>New password: </trans> |
392 |
|
|
- </entry> |
393 |
|
|
- |
394 |
|
|
- <entry> |
395 |
|
|
- <base>NEW_SYSTEM_PASSWORD_VERIFY</base> |
396 |
|
|
- <trans>New password (verify): </trans> |
397 |
|
|
- </entry> |
398 |
|
|
- |
399 |
|
|
- <entry> |
400 |
|
|
- <base>CHANGE_PASSWORD</base> |
401 |
|
|
- <trans>Change Password</trans> |
402 |
|
|
- </entry> |
403 |
|
|
- |
404 |
|
|
- <entry> |
405 |
|
|
- <base>PASSWORD_VERIFY_ERROR</base> |
406 |
|
|
- <trans>The passwords you entered did not match.</trans> |
407 |
|
|
- </entry> |
408 |
|
|
- |
409 |
|
|
- <entry> |
410 |
|
|
- <base>PASSWORD_CHANGE_FAILURE</base> |
411 |
|
|
- <trans>An error occurred while attempting to change your password. Please make sure that the old password entered is correct.</trans> |
412 |
|
|
- </entry> |
413 |
|
|
- |
414 |
|
|
- <entry> |
415 |
|
|
- <base>PASSWORD_CHANGED</base> |
416 |
|
|
- <trans>Your password has been successfully changed.</trans> |
417 |
|
|
- </entry> |
418 |
|
|
- |
419 |
|
|
- <entry> |
420 |
|
|
- <base>TAINED_OLDPASS</base> |
421 |
|
|
- <trans>The old password you entered contained invalid characters.</trans> |
422 |
|
|
- </entry> |
423 |
|
|
- |
424 |
|
|
- <entry> |
425 |
|
|
- <base>TAINED_PASS</base> |
426 |
|
|
- <trans>The password you entered contained invalid characters.</trans> |
427 |
|
|
- </entry> |
428 |
|
|
- |
429 |
|
|
- <entry> |
430 |
|
|
- <base>TAINED_ACCOUNT</base> |
431 |
|
|
- <trans>The account name you entered contained invalid characters.</trans> |
432 |
|
|
- </entry> |
433 |
|
|
- |
434 |
|
|
- <entry> |
435 |
|
|
- <base>NO_SUCH_USER</base> |
436 |
|
|
- <trans>The account name entered is invalid.</trans> |
437 |
|
|
- </entry> |
438 |
|
|
|
439 |
|
|
</lexicon> |
440 |
|
|
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 |
441 |
|
|
--- e-smith-base-4.18.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword 2005-11-21 05:28:10.000000000 +0100 |
442 |
|
|
+++ 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 |
443 |
|
|
@@ -66,13 +66,13 @@ |
444 |
|
|
my $acct; |
445 |
|
|
unless ($acct = $accountdb->get($acctName)) |
446 |
|
|
{ |
447 |
|
|
- $q->param(-name => 'status_message', -value => 'NO_SUCH_USER'); |
448 |
|
|
+ $q->param(-name => 'status_message', -value => 'YOUR_ACCOUNT_INVALID'); |
449 |
|
|
return; |
450 |
|
|
} |
451 |
|
|
|
452 |
|
|
unless ($acct->prop('type') eq 'user') |
453 |
|
|
{ |
454 |
|
|
- $q->param(-name=>'status_message', -value=>"NO_SUCH_USER"); |
455 |
|
|
+ $q->param(-name=>'status_message', -value=>"YOUR_ACCOUNT_INVALID"); |
456 |
|
|
return; |
457 |
|
|
} |
458 |
|
|
|
459 |
|
|
@@ -82,7 +82,7 @@ |
460 |
|
|
$pass)) |
461 |
|
|
{ |
462 |
|
|
$q->param(-name => 'status_message', |
463 |
|
|
- -value => 'PASSWORD_CHANGE_FAILURE'); |
464 |
|
|
+ -value => 'ERROR_PASSWORD_CHANGE'); |
465 |
|
|
return; |
466 |
|
|
} |
467 |
|
|
$acct->set_prop("PasswordSet", "yes"); |
468 |
|
|
@@ -92,7 +92,7 @@ |
469 |
|
|
or die ("Error occurred while modifying password for $acctName.\n"); |
470 |
|
|
$accountdb = esmith::AccountsDB->open(); |
471 |
|
|
|
472 |
|
|
- $q->param(-name => 'status_message', -value => 'PASSWORD_CHANGED'); |
473 |
|
|
+ $q->param(-name => 'status_message', -value => 'PASSWORD_CHANGE_SUCCESS'); |
474 |
|
|
return; |
475 |
|
|
} |
476 |
|
|
|
477 |
|
|
@@ -103,7 +103,7 @@ |
478 |
|
|
my $pass1 = $fm->{cgi}->param('pass'); |
479 |
|
|
unless ($pass1 eq $pass2) { |
480 |
|
|
$fm->{cgi}->param( -name => 'wherenext', -value => 'Password' ); |
481 |
|
|
- return "PASSWORD_VERIFY_ERROR"; |
482 |
|
|
+ return "PASSWORD_NO_MATCH"; |
483 |
|
|
} |
484 |
|
|
return "OK"; |
485 |
|
|
} |
486 |
|
|
@@ -128,23 +128,23 @@ |
487 |
|
|
} |
488 |
|
|
|
489 |
|
|
__DATA__ |
490 |
|
|
-<form title="FORM_TITLE" header="/etc/e-smith/web/common/userpassword_head.tmpl" footer="/etc/e-smith/web/common/foot.tmpl"> |
491 |
|
|
+<form title="ACCOUNT_PASSWORD_CHANGE" header="/etc/e-smith/web/common/userpassword_head.tmpl" footer="/etc/e-smith/web/common/foot.tmpl"> |
492 |
|
|
<page name="Password" post-event="change_password" pre-event="turn_off_buttons()" header="/etc/e-smith/web/common/head.tmpl" footer="/etc/e-smith/web/common/foot.tmpl"> |
493 |
|
|
<description>DESCRIPTION</description> |
494 |
|
|
|
495 |
|
|
<field type="text" id="account" validation="nonblank" value=""> |
496 |
|
|
- <label>ACCOUNT_NAME</label> |
497 |
|
|
+ <label>YOUR_ACCOUNT</label> |
498 |
|
|
</field> |
499 |
|
|
<field type="password" id="oldPass" validation="nonblank" value=""> |
500 |
|
|
- <label>OLD_SYSTEM_PASSWORD</label> |
501 |
|
|
+ <label>PASSWORD_OLD</label> |
502 |
|
|
</field> |
503 |
|
|
<field type="password" id="pass" validation="nonblank, check_password" value=""> |
504 |
|
|
- <label>NEW_SYSTEM_PASSWORD</label> |
505 |
|
|
+ <label>PASSWORD_NEW</label> |
506 |
|
|
</field> |
507 |
|
|
<field type="password" id="passVerify" validation="password_compare" value=""> |
508 |
|
|
- <label>NEW_SYSTEM_PASSWORD_VERIFY</label> |
509 |
|
|
+ <label>PASSWORD_NEW_VERIFY</label> |
510 |
|
|
</field> |
511 |
|
|
- <subroutine src="print_button('CHANGE_PASSWORD')" /> |
512 |
|
|
+ <subroutine src="print_button('PASSWORD_CHANGE')" /> |
513 |
|
|
</page> |
514 |
|
|
<page name="Done" pre-event="print_status_message()"> |
515 |
|
|
</page> |