Merge branch 'xorg/maint' into xorg/master

[platal.git] / configs / platal.ini

diff --git a/configs/platal.ini b/configs/platal.ini
index 7459807..ebdb03a 100644 (file)
--- a/configs/platal.ini
+++ b/configs/platal.ini
@@ -1,5 +1,5 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;  Copyright (C) 2003-2010 Polytechnique.org                               ;
+;  Copyright (C) 2003-2011 Polytechnique.org                               ;
 ;  http://opensource.polytechnique.org/                                    ;
 ;                                                                          ;
 ;  This program is free software; you can redistribute it and/or modify    ;
@@ -104,6 +104,9 @@ secure_domain = ""
 ; command line. The value is computed automatically when php serves a web page.
 baseurl = "https://www.example.org/"
 
+; The base url of the url shortener.
+baseurl_shortener = ""
+
 ; $globals->sitename
 ; The name of the site
 ;
@@ -205,6 +208,15 @@ event_forum = ""
 event_reply = ""
 
 
+; The deltaten section contains parameters used to handle the "N N-10"
+; operation.
+[Deltaten]
+
+; $globals->deltaten->first_promo_young
+; First promo to take part to the "N N-10" operation as the "young" promo
+first_promo_young = 2007
+
+
 ; The geocoder section contains parameters used to perform the geocoding 
 ; and the formatting of user addresses.
 [Geocoder]
@@ -256,6 +268,10 @@ vhost_sep = "_"
 ; Maximum number of mails an instance of the moderation cron accepts to deliver.
 max_mail_per_min = 400
 
+; $globals->lists->redirect_domain
+; Domain where mailing list emails are redirected.
+redirect_domain = ""
+
 
 ; The mail section contains parameters used to interacts with email routing
 [Mail]
@@ -284,6 +300,9 @@ blacklist_host_resolution_limit =
 ; domain is blacklisted by a spam filter.
 domain_whitelist = ""
 
+; $globals->mail->antispam
+; Default antispam level.
+antispam = ""
 
 ; The mailstorage section contains parameters describing the availability of email storage services
 [MailStorage]
@@ -413,6 +432,27 @@ auth_baseurl = ""
 ; of an event are created.
 evts_domain  = ""
 
+; $globals->xnet->participant_list
+; Mailing list suffix used to contact event participants.
+participant_list = ""
+
+; $globals->xnet->absent_list
+; Mailing list suffix used to contact users who notified they won't attend to the event.
+absent_list = ""
+
+; $globals->xnet->unpayed_list
+; Mailing list suffix used to contact event participants who did not pay.
+unpayed_list = ""
+
+; $globals->xnet->payed_list
+; Mailing list suffix used to contact event participants who paid.
+payed_list = ""
+
+; $globals->xnet->
+; Event mailing lists suffixes. It must contain the 4 suffixes above, separated by a coma.
+event_lists = ""
+
+
 ; The merge section contains parameters about the merge's state.
 [Merge]