/[cvs]/nfo/perl/libs/Mail/Audit/Dispatch.pm
ViewVC logotype

Diff of /nfo/perl/libs/Mail/Audit/Dispatch.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.5 by root, Thu Jan 30 23:20:21 2003 UTC revision 1.6 by root, Sun Mar 23 21:12:20 2003 UTC
# Line 9  Line 9 
9  #  #
10  # ============================================================  # ============================================================
11  #  $Log$  #  $Log$
12    #  Revision 1.6  2003/03/23 21:12:20  root
13    #  + sub jerror and related modifications
14    #
15  #  Revision 1.5  2003/01/30 23:20:21  root  #  Revision 1.5  2003/01/30 23:20:21  root
16  #  + fixed and enhanced  #  + fixed and enhanced
17  #  #
# Line 148  sub _recieve { Line 151  sub _recieve {
151       # check if $self->{settings}->{HOME} exists       # check if $self->{settings}->{HOME} exists
152       if (! -e $self->{settings}->{MAILDIR}) {       if (! -e $self->{settings}->{MAILDIR}) {
153         my $msg = "ERROR: Delivery failed, base directory '$self->{settings}->{MAILDIR}' does not exist.";         my $msg = "ERROR: Delivery failed, base directory '$self->{settings}->{MAILDIR}' does not exist.";
154         $self->report($msg);         $self->jerror($msg);
        $self->forward_delivery();  
155       }       }
156    
157    # 1. include rules or fallback    # 1. include rules or fallback
158      # check if $self->{settings}->{RULESFILE} exists      # check if $self->{settings}->{RULESFILE} exists
159      if (-f $self->{settings}->{RULESFILE}) {      if (-f $self->{settings}->{RULESFILE}) {
160        $self->report("RULES:  Loading from \"$self->{settings}->{RULESFILE}\".");        $self->report("RULES:  Loading from \"$self->{settings}->{RULESFILE}\".");
161        require $self->{settings}->{RULESFILE};        my $evalstr = "require '$self->{settings}->{RULESFILE}';";
162          eval($evalstr);
163          if ($@) {
164            my $msg = "ERROR:  Delivery failed, '$self->{settings}->{RULESFILE}' had syntax errors:\n$@";
165            $self->jerror($msg);
166          }
167      } else {      } else {
168        #die("$self->{settings}->{RULESFILE} doesn't exist");        #die("$self->{settings}->{RULESFILE} doesn't exist");
169        $self->report("Configured rulesfile \"$self->{settings}->{RULESFILE}\" doesn't exist.");        $self->jerror("Configured rulesfile \"$self->{settings}->{RULESFILE}\" doesn't exist.");
       $self->forward_delivery();  
170      }      }
171    
172    # 2. export required stuff to rules namespace    # 2. export required stuff to rules namespace
# Line 185  sub _recieve { Line 191  sub _recieve {
191    
192  }  }
193    
194    sub jerror {
195      my $self = shift;
196      my $msg = shift;
197      $self->report("ERROR: $msg");
198      $self->forward_delivery();
199    }
200    
201  sub _mail2news {  sub _mail2news {
202    my $self = shift;    my $self = shift;
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6
MailToCvsAdmin">MailToCvsAdmin
 ViewVC Help
Powered by ViewVC 1.1.26 RSS 2.0 feed