projects / packages / mailman.git / blame
| Commit | Line | Data |
|---|---|---|
| faa05263 ER |
1 | --- mailman-2.1.9/Mailman/Gui/General.py 2006-08-30 17:54:22.000000000 +0300 |
| 2 | +++ mailman-2.1.9/Mailman/Gui/General.py 2007-09-20 17:45:31.857725007 +0300 | |
| 3 | @@ -409,6 +409,13 @@ | |
| 4 | headers.)""")) | |
| 5 | ) | |
| 6 | ||
| 7 | + # add X-IMAP-Folder header | |
| 8 | + rtn.append( | |
| 9 | + ('x_imap_folder', mm_cfg.String, WIDTH, 0, | |
| 10 | + _('''If filled add to each outgroing email X-IMAP-Folder header | |
| 11 | + with this value.''')) | |
| 12 | + ) | |
| 13 | + | |
| 14 | # Discard held messages after this number of days | |
| 15 | rtn.append( | |
| 16 | ('max_days_to_hold', mm_cfg.Number, 7, 0, | |
| 17 | --- mailman-2.1.9/Mailman/Handlers/CookHeaders.py 2006-02-17 04:42:35.000000000 +0200 | |
| 18 | +++ mailman-2.1.9/Mailman/Handlers/CookHeaders.py 2007-09-20 17:50:50.507634678 +0300 | |
| 19 | @@ -88,6 +88,11 @@ | |
| 20 | # Mark message so we know we've been here, but leave any existing | |
| 21 | # X-BeenThere's intact. | |
| 22 | msg['X-BeenThere'] = mlist.GetListEmail() | |
| 23 | + | |
| 24 | + # X-IMAP-Folder header, used commonly for server side filtering to folders. | |
| 25 | + if mlist.x_imap_folder: | |
| 26 | + msg['X-IMAP-Folder'] = mlist.x_imap_folder | |
| 27 | + | |
| 28 | # Add Precedence: and other useful headers. None of these are standard | |
| 29 | # and finding information on some of them are fairly difficult. Some are | |
| 30 | # just common practice, and we'll add more here as they become necessary. | |
| 31 | @@ -170,6 +175,7 @@ | |
| 32 | add((str(i18ndesc), mlist.GetListEmail())) | |
| 33 | del msg['Cc'] | |
| 34 | msg['Cc'] = COMMASPACE.join([formataddr(pair) for pair in new]) | |
| 35 | + | |
| 36 | # Add list-specific headers as defined in RFC 2369 and RFC 2919, but only | |
| 37 | # if the message is being crafted for a specific list (e.g. not for the | |
| 38 | # password reminders). | |
| 5b934219 ER |
39 | --- mailman-2.1.14/Mailman/MailList.py~ 2010-09-20 21:18:27.000000000 +0300 |
| 40 | +++ mailman-2.1.14/Mailman/MailList.py 2010-09-21 18:33:08.352249806 +0300 | |
| 41 | @@ -363,6 +363,7 @@ | |
| faa05263 ER |
42 | self.available_languages = [] |
| 43 | self.include_rfc2369_headers = 1 | |
| 44 | self.include_list_post_header = 1 | |
| 45 | + self.x_imap_folder = '' | |
| 5b934219 | 46 | self.include_sender_header = 1 |
| faa05263 ER |
47 | self.filter_mime_types = mm_cfg.DEFAULT_FILTER_MIME_TYPES |
| 48 | self.pass_mime_types = mm_cfg.DEFAULT_PASS_MIME_TYPES | |
| faa05263 ER |
49 | --- mailman-2.1.9/Mailman/Version.py 2006-09-13 06:21:03.000000000 +0300 |
| 50 | +++ mailman-2.1.9/Mailman/Version.py 2007-09-20 16:49:33.199894057 +0300 | |
| 51 | @@ -37,7 +37,7 @@ | |
| 52 | (REL_LEVEL << 4) | (REL_SERIAL << 0)) | |
| 53 | ||
| 54 | # config.pck schema version number | |
| 5b934219 ER |
55 | -DATA_FILE_VERSION = 98 |
| 56 | +DATA_FILE_VERSION = 99 | |
| faa05263 ER |
57 | |
| 58 | # qfile/*.db schema version number | |
| 59 | QFILE_SCHEMA_VERSION = 3 | |
| 60 | --- mailman-2.1.9/Mailman/versions.py 2005-12-30 20:50:08.000000000 +0200 | |
| 61 | +++ mailman-2.1.9/Mailman/versions.py 2007-09-20 16:49:02.206553877 +0300 | |
| 62 | @@ -407,6 +407,8 @@ | |
| 63 | add_only_if_missing('collapse_alternatives', | |
| 64 | mm_cfg.DEFAULT_COLLAPSE_ALTERNATIVES) | |
| 65 | ||
| 66 | + add_only_if_missing('x_imap_folder', '') | |
| 67 | + | |
| 68 | ||
| 69 | \f | |
| 70 | def UpdateOldUsers(mlist): |