| 1 |
--- smeserver-userpanels-1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelPassword.pm.add2general 2006-03-26 00:01:56.000000000 +0100 |
| 2 |
+++ smeserver-userpanels-1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelPassword.pm 2008-04-26 21:40:06.000000000 +0200 |
| 3 |
@@ -36,7 +36,7 @@ |
| 4 |
my $pass1 = $fm->{cgi}->param('pass'); |
| 5 |
unless ($pass1 eq $pass2) |
| 6 |
{ |
| 7 |
- $fm->error('PASSWORD_VERIFY_ERROR'); |
| 8 |
+ $fm->error('PASSWORD_NO_MATCH'); |
| 9 |
return undef; |
| 10 |
} |
| 11 |
return "OK"; |
| 12 |
@@ -51,7 +51,7 @@ |
| 13 |
my $UserName = $ENV{'REMOTE_USER'} ||''; |
| 14 |
unless (($UserName) = ($UserName =~ /^([a-z][\-\_\.a-z0-9]*)$/ )) |
| 15 |
{ |
| 16 |
- $fm->error('TAINTED_ACCOUNT'); |
| 17 |
+ $fm->error('YOUR_ACCOUNT_INVALID_CHARS'); |
| 18 |
return undef; |
| 19 |
} |
| 20 |
|
| 21 |
@@ -60,26 +60,26 @@ |
| 22 |
|
| 23 |
unless (($oldPass) = ($oldPass =~ /^(\S+)$/ )) |
| 24 |
{ |
| 25 |
- $fm->error('TAINTED_OLDPASS'); |
| 26 |
+ $fm->error('PASSWORD_OLD_INVALID_CHARS'); |
| 27 |
return undef; |
| 28 |
} |
| 29 |
|
| 30 |
unless (($pass) = ($pass =~ /^([ -~]+)$/ )) |
| 31 |
{ |
| 32 |
- $fm->error('TAINTED_PASS'); |
| 33 |
+ $fm->error('PASSWORD_INVALID_CHARS'); |
| 34 |
return undef; |
| 35 |
} |
| 36 |
|
| 37 |
my $acct; |
| 38 |
unless ($acct = $accountdb->get($UserName)) |
| 39 |
{ |
| 40 |
- $fm->error('NO_SUCH_USER'); |
| 41 |
+ $fm->error('YOUR_ACCOUNT_INVALID'); |
| 42 |
return undef; |
| 43 |
} |
| 44 |
|
| 45 |
unless ($acct->prop('type') eq 'user') |
| 46 |
{ |
| 47 |
- $fm->error('NO_SUCH_USER'); |
| 48 |
+ $fm->error('YOUR_ACCOUNT_INVALID'); |
| 49 |
return undef; |
| 50 |
} |
| 51 |
|
| 52 |
@@ -88,7 +88,7 @@ |
| 53 |
$oldPass, |
| 54 |
$pass)) |
| 55 |
{ |
| 56 |
- $fm->error('PASSWORD_CHANGE_FAILURE'); |
| 57 |
+ $fm->error('ERROR_PASSWORD_CHANGE'); |
| 58 |
return undef; |
| 59 |
} |
| 60 |
|
| 61 |
@@ -101,7 +101,7 @@ |
| 62 |
return undef; |
| 63 |
} |
| 64 |
|
| 65 |
- $fm->success('PASSWORD_CHANGED', 'Done'); |
| 66 |
+ $fm->success('PASSWORD_CHANGE_SUCCESS', 'Done'); |
| 67 |
} |
| 68 |
|
| 69 |
|
| 70 |
--- smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-password.add2general 2008-04-26 21:37:56.000000000 +0200 |
| 71 |
+++ smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-password 2008-04-26 21:45:35.000000000 +0200 |
| 72 |
@@ -1,9 +1,5 @@ |
| 73 |
<lexicon lang="en-us"> |
| 74 |
<entry> |
| 75 |
- <base>Change Password</base> |
| 76 |
- <trans>Change Password</trans> |
| 77 |
- </entry> |
| 78 |
- <entry> |
| 79 |
<base>FORM_TITLE</base> |
| 80 |
<trans>Change account password</trans> |
| 81 |
</entry> |
| 82 |
@@ -22,48 +18,4 @@ |
| 83 |
]]> |
| 84 |
</trans> |
| 85 |
</entry> |
| 86 |
- <entry> |
| 87 |
- <base>ACCOUNT_NAME</base> |
| 88 |
- <trans>Your account: </trans> |
| 89 |
- </entry> |
| 90 |
- <entry> |
| 91 |
- <base>OLD_SYSTEM_PASSWORD</base> |
| 92 |
- <trans>Old password: </trans> |
| 93 |
- </entry> |
| 94 |
- <entry> |
| 95 |
- <base>NEW_SYSTEM_PASSWORD</base> |
| 96 |
- <trans>New password: </trans> |
| 97 |
- </entry> |
| 98 |
- <entry> |
| 99 |
- <base>NEW_SYSTEM_PASSWORD_VERIFY</base> |
| 100 |
- <trans>New password (verify): </trans> |
| 101 |
- </entry> |
| 102 |
- <entry> |
| 103 |
- <base>PASSWORD_VERIFY_ERROR</base> |
| 104 |
- <trans>The passwords you entered did not match.</trans> |
| 105 |
- </entry> |
| 106 |
- <entry> |
| 107 |
- <base>PASSWORD_CHANGE_FAILURE</base> |
| 108 |
- <trans>An error occurred while attempting to change your password. Please make sure that the old password entered is correct.</trans> |
| 109 |
- </entry> |
| 110 |
- <entry> |
| 111 |
- <base>PASSWORD_CHANGED</base> |
| 112 |
- <trans>Your password has been successfully changed.</trans> |
| 113 |
- </entry> |
| 114 |
- <entry> |
| 115 |
- <base>TAINED_OLDPASS</base> |
| 116 |
- <trans>The old password you entered contained invalid characters.</trans> |
| 117 |
- </entry> |
| 118 |
- <entry> |
| 119 |
- <base>TAINED_PASS</base> |
| 120 |
- <trans>The password you entered contained invalid characters.</trans> |
| 121 |
- </entry> |
| 122 |
- <entry> |
| 123 |
- <base>TAINED_ACCOUNT</base> |
| 124 |
- <trans>The account name you entered contained invalid characters.</trans> |
| 125 |
- </entry> |
| 126 |
- <entry> |
| 127 |
- <base>NO_SUCH_USER</base> |
| 128 |
- <trans>The account name entered is invalid.</trans> |
| 129 |
- </entry> |
| 130 |
</lexicon> |
| 131 |
--- smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-forwarding.add2general 2008-04-26 21:37:56.000000000 +0200 |
| 132 |
+++ smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-forwarding 2008-04-26 21:50:33.000000000 +0200 |
| 133 |
@@ -18,10 +18,6 @@ |
| 134 |
</trans> |
| 135 |
</entry> |
| 136 |
<entry> |
| 137 |
- <base>ACCOUNT_NAME</base> |
| 138 |
- <trans>Your account: </trans> |
| 139 |
- </entry> |
| 140 |
- <entry> |
| 141 |
<base>LOCAL</base> |
| 142 |
<trans>Deliver email locally</trans> |
| 143 |
</entry> |
| 144 |
@@ -34,10 +30,6 @@ |
| 145 |
<trans>Both deliver locally and forward</trans> |
| 146 |
</entry> |
| 147 |
<entry> |
| 148 |
- <base>OK</base> |
| 149 |
- <trans>OK</trans> |
| 150 |
- </entry> |
| 151 |
- <entry> |
| 152 |
<base>UNACCEPTABLE_CHARS</base> |
| 153 |
<trans>Unacceptable characters, or Domain name missing.</trans> |
| 154 |
</entry> |
| 155 |
@@ -57,4 +49,4 @@ |
| 156 |
<base>SUCCESS</base> |
| 157 |
<trans>Your settings have been saved.</trans> |
| 158 |
</entry> |
| 159 |
-</lexicon> |
| 160 |
\ No newline at end of file |
| 161 |
+</lexicon> |
| 162 |
--- smeserver-userpanels-1.0/root/etc/e-smith/web/functions/userpanel-password.add2general 2006-03-16 13:36:29.000000000 +0100 |
| 163 |
+++ smeserver-userpanels-1.0/root/etc/e-smith/web/functions/userpanel-password 2008-04-26 21:42:48.000000000 +0200 |
| 164 |
@@ -2,7 +2,7 @@ |
| 165 |
|
| 166 |
#---------------------------------------------------------------------- |
| 167 |
# heading : Your Settings |
| 168 |
-# description : Change Password |
| 169 |
+# description : PASSWORD_CHANGE |
| 170 |
# longdesc : change your password |
| 171 |
# navigation : 100 100 |
| 172 |
|
| 173 |
@@ -35,13 +35,13 @@ |
| 174 |
<description>DESCRIPTION</description> |
| 175 |
|
| 176 |
<field type="password" id="oldPass" validation="nonblank" value=""> |
| 177 |
- <label>OLD_SYSTEM_PASSWORD</label> |
| 178 |
+ <label>PASSWORD_OLD</label> |
| 179 |
</field> |
| 180 |
<field type="password" id="pass" validation="nonblank, check_password" value=""> |
| 181 |
- <label>NEW_SYSTEM_PASSWORD</label> |
| 182 |
+ <label>PASSWORD_NEW</label> |
| 183 |
</field> |
| 184 |
<field type="password" id="passVerify" validation="password_compare" value=""> |
| 185 |
- <label>NEW_SYSTEM_PASSWORD_VERIFY</label> |
| 186 |
+ <label>PASSWORD_VERIFY_NEW</label> |
| 187 |
</field> |
| 188 |
<subroutine src="print_button('CHANGE_PASSWORD')" /> |
| 189 |
</page> |
Parent Directory
| 
Revision Log
| 
Revision Graph
