Changeset 435
- Timestamp:
- 07/22/10 14:26:29 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/email2trac.py.in
r434 r435 173 173 174 174 if self.parameters.spam_level: 175 self. SPAM_LEVEL= int(self.parameters.spam_level)176 else: 177 self. SPAM_LEVEL= 0175 self.parameters.spam_level = int(self.parameters.spam_level) 176 else: 177 self.parameters.spam_level = 0 178 178 179 179 if not self.parameters.spam_header: 180 180 self.parameters.spam_header = 'X-Spam-Score' 181 181 182 if self.parameters.has_key('email_quote'): 183 self.EMAIL_QUOTE = str(self.parameters['email_quote']) 184 else: 185 self.EMAIL_QUOTE = '> ' 182 if not self.parameters.email_quote): 183 self.parameters.email_quote = '> ' 186 184 187 185 if self.parameters.has_key('email_header'): … … 325 323 number = 0 326 324 327 if number >= self. SPAM_LEVEL:325 if number >= self.parameters.spam_level: 328 326 spam = True 329 327 … … 337 335 if self.DROP_SPAM and spam: 338 336 339 self.logger.info('Message is a SPAM. Automatic ticket insertion refused (SPAM level > %d)' % self.SPAM_LEVEL)337 self.logger.info('Message is a SPAM. Automatic ticket insertion refused (SPAM level > %d)' %self.parameters.spam_level) 340 338 return 'drop' 341 339 … … 1678 1676 body = [] 1679 1677 for line in text.splitlines(): 1680 if line.startswith(self. EMAIL_QUOTE):1678 if line.startswith(self.parameters.email_quote): 1681 1679 continue 1682 1680 body.append(line)
Note: See TracChangeset
for help on using the changeset viewer.