1 |
filippocarletti |
1.1 |
diff -uNr e-smith-proxy-5.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/proxy e-smith-proxy-5.2.0-blocksmtp/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/proxy |
2 |
|
|
--- e-smith-proxy-5.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/proxy 2008-10-07 19:37:03.000000000 +0200 |
3 |
|
|
+++ e-smith-proxy-5.2.0-blocksmtp/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/proxy 2010-03-25 15:10:21.714309722 +0100 |
4 |
|
|
@@ -64,4 +64,8 @@ |
5 |
|
|
The new proxy settings were applied successfully. |
6 |
|
|
</trans> |
7 |
|
|
</entry> |
8 |
|
|
+ <entry> |
9 |
|
|
+ <base>BLOCKED</base> |
10 |
|
|
+ <trans>Blocked</trans> |
11 |
|
|
+ </entry> |
12 |
|
|
</lexicon> |
13 |
|
|
diff -uNr e-smith-proxy-5.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/proxy.pm e-smith-proxy-5.2.0-blocksmtp/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/proxy.pm |
14 |
|
|
--- e-smith-proxy-5.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/proxy.pm 2005-07-15 00:00:47.000000000 +0200 |
15 |
|
|
+++ e-smith-proxy-5.2.0-blocksmtp/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/proxy.pm 2010-03-25 15:08:01.259288657 +0100 |
16 |
|
|
@@ -117,11 +117,12 @@ |
17 |
|
|
{ |
18 |
|
|
my $self = shift; |
19 |
|
|
my $q = $self->{cgi}; |
20 |
|
|
- my @smtp_proxy_settings = qw(enabled disabled); |
21 |
|
|
+ my @smtp_proxy_settings = qw(enabled disabled blocked); |
22 |
|
|
my $default = $self->get_smtp_proxy_status(); |
23 |
|
|
my %labels = ( |
24 |
|
|
enabled => $self->localise('ENABLED'), |
25 |
|
|
disabled => $self->localise('DISABLED'), |
26 |
|
|
+ blocked => $self->localise('BLOCKED'), |
27 |
|
|
); |
28 |
|
|
|
29 |
|
|
if (system('/bin/rpm -q e-smith-email > /dev/null') == 0) |