comparison MoinMoin/config/multiconfig.py @ 3746:510db268574b

make mail settings group
author Johannes Berg <johannes AT sipsolutions DOT net>
date Sun, 22 Jun 2008 00:10:31 +0200
parents 1eabe89b773b
children c280acec2aaa
comparison
equal deleted inserted replaced
3745:08dd5b1a1f1c 3746:510db268574b
734 ('logo_string', None, None), 734 ('logo_string', None, None),
735 735
736 ('log_reverse_dns_lookups', True, None), 736 ('log_reverse_dns_lookups', True, None),
737 ('log_timing', False, None), 737 ('log_timing', False, None),
738 738
739 ('mail_from', None, None),
740 ('mail_login', None, None),
741 ('mail_smarthost', None, None),
742 ('mail_sendmail', None, None),
743
744 ('mail_import_secret', "", None),
745 ('mail_import_subpage_template', u"$from-$date-$subject", None),
746 ('mail_import_pagename_search', ['subject', 'to', ], None),
747 ('mail_import_pagename_envelope', u"%s", None),
748 ('mail_import_pagename_regex', r'\[\[([^\]]*)\]\]', None),
749 ('mail_import_wiki_addrs', [], None),
750
751 # some dangerous mimetypes (we don't use "content-disposition: inline" for them when a user 739 # some dangerous mimetypes (we don't use "content-disposition: inline" for them when a user
752 # downloads such attachments, because the browser might execute e.g. Javascript contained 740 # downloads such attachments, because the browser might execute e.g. Javascript contained
753 # in the HTML and steal your moin session cookie or do other nasty stuff) 741 # in the HTML and steal your moin session cookie or do other nasty stuff)
754 ('mimetypes_xss_protect', 742 ('mimetypes_xss_protect',
755 [ 743 [
1069 ( 1057 (
1070 ('enabled', False, None), 1058 ('enabled', False, None),
1071 ('restricted_users_group', None, None), 1059 ('restricted_users_group', None, None),
1072 ('enable_user', False, None), 1060 ('enable_user', False, None),
1073 )), 1061 )),
1062
1063 'mail': ('Mail settings',
1064 'These settings control outgoing and incoming email from and to the wiki.',
1065 (
1066 ('from', None, None),
1067 ('login', None, None),
1068 ('smarthost', None, None),
1069 ('sendmail', None, None),
1070
1071 ('import_secret', "", None),
1072 ('import_subpage_template', u"$from-$date-$subject", None),
1073 ('import_pagename_search', ['subject', 'to', ], None),
1074 ('import_pagename_envelope', u"%s", None),
1075 ('import_pagename_regex', r'\[\[([^\]]*)\]\]', None),
1076 ('import_wiki_addrs', [], None),
1077 )),
1074 } 1078 }
1075 1079
1076 def _add_options_to_defconfig(opts, addgroup=True): 1080 def _add_options_to_defconfig(opts, addgroup=True):
1077 for groupname in opts: 1081 for groupname in opts:
1078 group_short, group_doc, group_opts = opts[groupname] 1082 group_short, group_doc, group_opts = opts[groupname]