| 1 |
diff -Nur smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-forwarding smeserver-userpanels-1.0_mod/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-forwarding |
| 2 |
--- smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-forwarding 2012-09-07 17:42:33.855470957 +0200 |
| 3 |
+++ smeserver-userpanels-1.0_mod/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-forwarding 2012-09-07 17:53:57.295054399 +0200 |
| 4 |
@@ -34,6 +34,10 @@ |
| 5 |
<trans>Unacceptable characters, or Domain name missing.</trans> |
| 6 |
</entry> |
| 7 |
<entry> |
| 8 |
+ <base>VALID_EMAIL_NEEDED</base> |
| 9 |
+ <trans>A valid email address is needed</trans> |
| 10 |
+ </entry> |
| 11 |
+ <entry> |
| 12 |
<base>EMAIL_DELIVERY</base> |
| 13 |
<trans>Email Delivery</trans> |
| 14 |
</entry> |
| 15 |
diff -Nur smeserver-userpanels-1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelForwarding.pm smeserver-userpanels-1.0_mod/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelForwarding.pm |
| 16 |
--- smeserver-userpanels-1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelForwarding.pm 2006-03-26 00:00:58.000000000 +0100 |
| 17 |
+++ smeserver-userpanels-1.0_mod/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelForwarding.pm 2012-09-07 17:54:08.479507450 +0200 |
| 18 |
@@ -34,16 +34,22 @@ |
| 19 |
my $fm = shift; |
| 20 |
my $q = $fm->{cgi}; |
| 21 |
|
| 22 |
+ my $Forward = $q->param('EmailForward'); |
| 23 |
my $ForwardAddress = $q->param('ForwardAddress') || ''; |
| 24 |
$ForwardAddress =~ s/^\s+|\s+$//g; |
| 25 |
|
| 26 |
my $response = $fm->email_simple($ForwardAddress); |
| 27 |
- if (($response eq 'OK') or ($ForwardAddress eq '')) |
| 28 |
- { |
| 29 |
+ if ($response eq 'OK') |
| 30 |
+ { |
| 31 |
return 'OK'; |
| 32 |
} |
| 33 |
+ elsif ($ForwardAddress eq '') |
| 34 |
+ { |
| 35 |
+ return 'OK' if ($Forward eq 'local'); |
| 36 |
+ return 'VALID_EMAIL_NEEDED'; |
| 37 |
+ } |
| 38 |
else |
| 39 |
- { |
| 40 |
+ { |
| 41 |
return 'UNACCEPTABLE_CHARS'; |
| 42 |
} |
| 43 |
} |
| 44 |
@@ -65,4 +71,4 @@ |
| 45 |
$fm->success('SUCCESS'); |
| 46 |
} |
| 47 |
|
| 48 |
-1; |
| 49 |
\ Pas de fin de ligne à la fin du fichier. |
| 50 |
+1; |
Parent Directory
| 
Revision Log
| 
Revision Graph
