Changeset 4031

Show
Ignore:
Timestamp:
07/17/08 16:03:09 (4 months ago)
Author:
doki_pen
Message:

fixes ticket #3274

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • announcerplugin/0.11/announcerplugin/distributors/email_distributor.py

    r3107 r4031  
    106106        If no prefix is desired, then specifying an empty option  
    107107        will disable it.(''since 0.10.1'').""") 
     108    smtp_to = Option('announcer', 'smtp_to', None, 'Default To: field') 
    108109     
    109110    use_threaded_delivery = BoolOption('announcer', 'use_threaded_delivery', False,  
    …… 
    128129         
    129130    def distribute(self, transport, recipients, event): 
     131        public_cc = self.config.getbool('announcer', 'use_public_cc') 
     132        to = self.config.get('announcer', 'smtp_to') 
    130133        if transport == self.get_distribution_transport(): 
    131134            formats = {} 
    …… 
    188191                        ) 
    189192                    ) 
    190                     self._do_send(transport, event, format, messages[format], formats[format]) 
     193                    self._do_send(transport, event, format, messages[format], formats[format], None, to, public_cc) 
    191194                     
    192195    def _get_default_format(self): 
    …… 
    216219            return self._get_default_format() 
    217220             
    218     def _do_send(self, transport, event, format, recipients, formatter, backup=None): 
     221    def _do_send(self, transport, event, format, recipients, formatter, backup=None, to=None, public_cc=False): 
    219222        output = formatter.format(transport, event.realm, format, event) 
    220223        subject = formatter.format_subject(transport, event.realm, format, event) 
    …… 
    243246        rootMessage['Subject'] = subject 
    244247        rootMessage['From'] = self.smtp_from 
    245         rootMessage['To'] = self.env.project_name 
     248        if to: 
     249            rootMessage['To'] = '"%s"'%(to) 
     250        if public_cc: 
     251            rootMessage['Cc'] = ', '.join([x[2] for x in recipients if x]) 
    246252        rootMessage['Reply-To'] = self.smtp_replyto 
    247253        rootMessage.preamble = 'This is a multi-part message in MIME format.'