Commit 629c2fd2 authored by david.verdin's avatar david.verdin
Browse files

[svn] Retrieving latest bug fixes from the Sympa-6.0 branch.


git-svn-id: https://subversion.renater.fr/sympa/trunk@6190 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 83545fbb
......@@ -47,6 +47,9 @@ installconfig: installdir
export PERL5LIB=$(DESTDIR)$(modulesdir); \
if [ ! -f $(DESTDIR)$(confdir)/sympa.conf ]; then \
echo "This looks like your first Sympa installation. The following wizard will assist you to create your first Sympa configuration.";\
if [ ! -d $(DESTDIR)$(confdir) ]; then \
$(INSTALL) -d -m 755 $(DESTDIR)$(confdir); \
fi; \
$(DESTDIR)$(sbindir)/sympa_wizard.pl \
--create sympa.conf \
--target $(DESTDIR)$(confdir)/sympa.conf \
......
......@@ -48,8 +48,7 @@ localstatedir=/var
lockdir=$localstatedir/lock/subsys
modulesdir=$prefix/bin
scriptdir=$prefix/bin
datadir=$prefix/default
defaultdir=$datadir
defaultdir=$prefix/default
mailtemplatedir=$defaultdir/mail_tt2
webtemplatedir=$defaultdir/web_tt2
execcgidir=$prefix/bin
......@@ -58,7 +57,6 @@ spooldir=$prefix/spool
staticdir=$prefix/static_content
arcdir=$prefix/arc
bouncedir=$prefix/bounce
localedir=$prefix/locale
confdir=/etc
## If installer wants to use the FHS standard, change
......@@ -71,7 +69,7 @@ AC_ARG_ENABLE(
[
if test $enableval = 'yes';then
initdir=$sysconfdir/rc.d/init.d
piddir=$localstatedir/run
piddir=$localstatedir/run/sympa
lockdir=$localstatedir/lock/subsys
modulesdir=$datadir/sympa/lib
scriptdir=$datadir/sympa/bin
......@@ -84,7 +82,6 @@ AC_ARG_ENABLE(
spooldir=$localstatedir/spool/sympa
arcdir=$localstatedir/lib/sympa/arc
bouncedir=$localstatedir/lib/sympa/bounce
localedir=$datadir/sympa/locale
confdir=$sysconfdir
fi
],
......
......@@ -538,16 +538,6 @@ sub verify {
$context->{'execution_date'} = time unless ( defined ($context->{'execution_date'}) );
if (defined ($context->{'msg'})) {
my $header = $context->{'msg'}->head;
unless (($header->get('to') && ($header->get('to') =~ /$context->{'listname'}/i)) ||
($header->get('cc') && ($header->get('cc') =~ /$context->{'listname'}/i))) {
$context->{'is_bcc'} = 1;
}else{
$context->{'is_bcc'} = 0;
}
}
my $list;
if ($context->{'listname'} && ! defined $context->{'list_object'}) {
unless ( $context->{'list_object'} = new List ($context->{'listname'}, $robot) ){
......@@ -563,6 +553,16 @@ sub verify {
$context->{'host'} = $list->{'admin'}{'host'};
}
if (defined ($context->{'msg'})) {
my $header = $context->{'msg'}->head;
unless (($header->get('to') && ($header->get('to') =~ /$context->{'listname'}/i)) ||
($header->get('cc') && ($header->get('cc') =~ /$context->{'listname'}/i))) {
$context->{'is_bcc'} = 1;
}else{
$context->{'is_bcc'} = 0;
}
}
unless ($condition =~ /(\!)?\s*(true|is_listmaster|verify_netmask|is_editor|is_owner|is_subscriber|less_than|match|equal|message|older|newer|all|search|customcondition\:\:\w+)\s*\(\s*(.*)\s*\)\s*/i) {
&do_log('err', "error rule syntaxe: unknown condition $condition");
return undef;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment