} else {
$data{mailcallout} = "";
}
+
+ $data{mailcontentinspectionaction} ||= 'reject';
$data{email} = CGI::escapeHTML(join(", ", @{$entry->{emailforward}}));
. '>male<option value="2"'
. ($data{gender} == 2 ? ' selected' : '')
. '>female</select>';
+ my $mailcontentselect = '<select name="mailcontentinspection">'
+ . '<option value="blackhole"'
+ . ($data{mailcontentinspectionaction} eq 'blackhole' ? ' selected' : '')
+ . '>blackhole'
+ . '<option value="markup"'
+ . ($data{mailcontentinspectionaction} eq 'markup' ? ' selected' : '')
+ . '>markup'
+ . '<option value="reject"'
+ . ($data{mailcontentinspectionaction} eq 'reject' ? ' selected' : '')
+ . '>reject';
+
my $confirmstring = '';
my $sudopassword = '';
for my $e(@{$entry->{'sudopassword'}}) {
while (<F>) {
s/~(.+?)~/$data{$1}/g;
s/<\?genderselect>/$genderselect/;
+ s/<\?mailcontentselect>/$mailcontentselect/;
s/<\?sudopassword>/$sudopassword/;
s/<\?sudopasswordhosts>/$sudopasswordhosts/;
s/<\?confirmstring>/$confirmstring/;
my ($lat, $long);
($lat, $long) = &Util::CheckLatLong($query->param('latitude'),
$query->param('longitude'));
- my ($greylisting, $callout);
+ my ($greylisting, $callout, $mailcontentinspection);
$greylisting = $query->param('mailgreylisting');
if (!$greylisting or $greylisting ne "TRUE") {
$callout = "FALSE";
}
+ $mailcontentinspection = $query->param('mailcontentinspection');
+ if (!$mailcontentinspection or ($mailcontentinspection ne "blackhole" and $mailcontentinspection ne "markup")) {
+ $mailcontentinspection = "reject";
+ }
+
my $newsudo;
my $newsudo_hosts;
if ($query->param('newsudopass') && $query->param('newsudopassvrfy')) {
&Util::LDAPUpdate($ldap, $editdn, 'birthDate', $query->param('birthdate')) if $bd_ok;
&Util::LDAPUpdate($ldap, $editdn, 'mailDisableMessage', $query->param('maildisablemessage'));
&Util::LDAPUpdate($ldap, $editdn, 'mailCallout', $callout);
+ &Util::LDAPUpdate($ldap, $editdn, 'mailContentInspectionAction', $mailcontentinspection);
&Util::LDAPUpdate($ldap, $editdn, 'mailGreylisting', $greylisting);
&Util::LDAPUpdate($ldap, $editdn, 'sudoPassword', \@keepsudo);