Changeset 11634 for branches

Show
Ignore:
Timestamp:
11/11/08 15:54:54 (8 weeks ago)
Author:
javier.amor.garcia@…
Message:

added consolidation models refs #1153

Location:
branches/pop-proxy-branch/mailfilter/src/EBox
Files:
3 added
4 modified
1 copied

Legend:

Unmodified
Added
Removed

  • branches/pop-proxy-branch/mailfilter/src/EBox/MailFilter.pm

    r11624 r11634  
    198198            'EBox::MailFilter::Model::Report::FilterGraph', 
    199199            'EBox::MailFilter::Model::Report::FilterReportOptions', 
     200 
     201            'EBox::MailFilter::Model::Report::POPProxyDetails', 
     202            'EBox::MailFilter::Model::Report::POPProxyGraph', 
     203            'EBox::MailFilter::Model::Report::POPProxyReportOptions', 
    200204           ]; 
    201205} 
    … …  
    219223 
    220224            'EBox::MailFilter::Composite::Report::FilterReport', 
     225            'EBox::MailFilter::Composite::Report::POPProxyReport', 
    221226           ]; 
    222227} 

  • branches/pop-proxy-branch/mailfilter/src/EBox/MailFilter/Composite/Report/Makefile.am

    r11487 r11634  
    33 
    44 
    5 nobase_perl_DATA =  FilterReport.pm 
     5nobase_perl_DATA =  FilterReport.pm POPProxyReport.pm 
    66 
    77DISTCLEANFILES = 

  • branches/pop-proxy-branch/mailfilter/src/EBox/MailFilter/Composite/Report/POPProxyReport.pm

    • Property svn:mergeinfo set to /branches/mailflogs/mailfilter/src/EBox/MailFilter/Composite/Report/FilterReport.pm:11271-11486
    r11487 r11634  
    1414# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    1515 
    16 package EBox::MailFilter::Composite::Report::FilterReport; 
     16package EBox::MailFilter::Composite::Report::POPProxyReport; 
    1717 
    1818use base 'EBox::Model::Composite'; 
    … …  
    6262        { 
    6363         components      => [ 
    64                              '/mailfilter/FilterReportOptions', 
    65                              'FilterGraph', 
    66                              'FilterDetails', 
     64                             '/mailfilter/POPProxyReportOptions', 
     65                             'POPProxyGraph', 
     66                             'POPProxyDetails', 
    6767                            ], 
    6868         layout          => 'top-bottom', 
    6969         name            => __PACKAGE__->nameFromClass(), 
    7070         printableName   => __('Mail filter report'), 
    71          pageTitle   => __('Mail Filter report'), 
    72          compositeDomain => 'MailFilter', 
     71         pageTitle   => __('Transparent POP proxy report'), 
     72         compositeDomain => 'MailPOPProxy', 
    7373#         help            => __(''), 
    7474        }; 

  • branches/pop-proxy-branch/mailfilter/src/EBox/MailFilter/LogHelper.pm

    r11606 r11634  
    172172    elsif ($line =~ m{p3scan\[\d+\]: Session done.*\((.*?)\).* Mails: (.*) Bytes:} ) { 
    173173        my $status = $1; 
     174        my $mails  = $2; 
     175 
    174176        my $event; 
    175177        if ($status eq 'Clean Exit') { 
    … …  
    182184 
    183185 
    184         my $mails = $2; 
     186 
    185187        my $cleanMails = $mails  - $p3scanVirus - $p3scanSpam; 
    186188 

  • branches/pop-proxy-branch/mailfilter/src/EBox/MailFilter/Model/Report/Makefile.am

    r11487 r11634  
    33perldir = @PERLPATH@/EBox/MailFilter/Model/Report 
    44 
    5 nobase_perl_DATA = FilterDetails.pm FilterGraph.pm FilterReportOptions.pm 
     5nobase_perl_DATA = FilterDetails.pm FilterGraph.pm FilterReportOptions.pm \ 
     6 POPProxyDetails.pm POPProxyGraph.pm POPProxyReportOptions.pm 
    67 
    78SOURCES = $(nobase_perl_DATA)