[evolvis-commits] r18430: handle possibly different forum eMail senders

mirabilos at evolvis.org mirabilos at evolvis.org
Thu May 24 10:35:10 CEST 2012


Author: mirabilos
Date: 2012-05-24 10:35:09 +0200 (Thu, 24 May 2012)
New Revision: 18430

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/deb-specific/create-mailing-lists.pl
   trunk/gforge_base/evolvisforge-5.1/src/utils/include.pl
Log:
handle possibly different forum eMail senders

normally: forum_return_domain = "$core/web_host"
but if it isn’t…

Modified: trunk/gforge_base/evolvisforge-5.1/src/deb-specific/create-mailing-lists.pl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/deb-specific/create-mailing-lists.pl	2012-05-24 08:35:04 UTC (rev 18429)
+++ trunk/gforge_base/evolvisforge-5.1/src/deb-specific/create-mailing-lists.pl	2012-05-24 08:35:09 UTC (rev 18430)
@@ -80,7 +80,14 @@
 	}
 	if ($listname =~ /-discuss$/) {
 		# Accept mails from Tasks and Tracker areas by default
-		print CONFIG "accept_these_nonmembers = ['^.+\@$sys_default_domain']\n";
+		my $s = "accept_these_nonmembers = ['^.+\@$sys_default_domain'";
+
+		# Also accept mails from Forum areas by default
+		$s .= ", '^.+\@$sys_return_domain'" if (($sys_return_domain) &&
+		    ($sys_return_domain ne $sys_default_domain));
+
+		$s .= "]\n";
+		print CONFIG $s;
 	}
 	print CONFIG "archive = True\n" ;
 	if (!$is_public) {

Modified: trunk/gforge_base/evolvisforge-5.1/src/utils/include.pl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/utils/include.pl	2012-05-24 08:35:04 UTC (rev 18429)
+++ trunk/gforge_base/evolvisforge-5.1/src/utils/include.pl	2012-05-24 08:35:09 UTC (rev 18430)
@@ -37,6 +37,7 @@
 }
 
 $sys_default_domain = &forge_get_config ('web_host') ;
+$sys_return_domain = &forge_get_config ('forum_return_domain') ;
 $sys_scm_host = &forge_get_config ('web_host') ;
 $domain_name = &forge_get_config ('web_host') ;
 $sys_users_host = &forge_get_config ('users_host') ;



More information about the evolvis-commits mailing list