[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 57d60cfd50239c2d528388cfd3acb260d755fad5

Sylvain Beucler beuc-inria at fusionforge.org
Fri Jun 27 17:05:51 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, Branch_5_3 has been updated
       via  57d60cfd50239c2d528388cfd3acb260d755fad5 (commit)
      from  c9098ac51847df3a084903d12ba2ad63b6c4ed9c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 57d60cfd50239c2d528388cfd3acb260d755fad5
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Jun 27 16:53:33 2014 +0200

    Mailing lists: site-specific conf is meant to be added _after_ the hard-coded conf, so as to override it

diff --git a/src/cronjobs/mail/mailing_lists_create.php b/src/cronjobs/mail/mailing_lists_create.php
index dfcadc0..75a648e 100755
--- a/src/cronjobs/mail/mailing_lists_create.php
+++ b/src/cronjobs/mail/mailing_lists_create.php
@@ -106,8 +106,8 @@ for ($i=0; $i<$rows; $i++) {
 			echo db_error();
 			$tmp = tempnam(forge_get_config('data_path'), "tmp");
 			$fh = fopen($tmp,'w');
-			fwrite($fh, "# -*- coding: iso-8859-1 -*-\n");
-			$listConfig = "description = \"$description\"\n" ;
+			$listConfig = "# -*- coding: iso-8859-1 -*-\n";
+			$listConfig .= "description = \"$description\"\n" ;
 			$listConfig .= "host_name = '".forge_get_config('lists_host')."'\n" ;
 			if (!$public) {
 				$listConfig .= "archive_private = True\n" ;
@@ -146,11 +146,11 @@ for ($i=0; $i<$rows; $i++) {
 			}
 		}
 		$mailingListIds[] = $grouplistid;
-	} elseif ($status == MAIL__MAILING_LIST_IS_CREATED) {
+	} elseif ($status == MAIL__MAILING_LIST_IS_CREATED) {  // created but not configured
 		$tmp = tempnam(forge_get_config('data_path'), "tmp");
 		$fh = fopen($tmp,'w');
-		fwrite($fh, "# -*- coding: iso-8859-1 -*-\n");
-		$listConfig = "description = \"$description\"\n" ;
+		$listConfig = "# -*- coding: iso-8859-1 -*-\n";
+		$listConfig .= "description = \"$description\"\n" ;
 		$listConfig .= "host_name = '".forge_get_config('lists_host')."'\n";
 		if (!$public) {
 			$listConfig .= "archive_private = True\n";
@@ -165,8 +165,8 @@ for ($i=0; $i<$rows; $i++) {
 			$listConfig .= "advertised = True\n";
 			$listConfig .= "subscribe_policy = 1\n";
 		}
-		if (is_readable($custom_file)) fwrite($fh, file_get_contents($custom_file));
 		fwrite($fh, $listConfig);
+		if (is_readable($custom_file)) fwrite($fh, file_get_contents($custom_file));
 		fclose($fh);
 		$config_cmd = escapeshellcmd($path_to_mailman."/bin/config_list -i $tmp $listname");
 		passthru($config_cmd, $failed);

-----------------------------------------------------------------------

Summary of changes:
 src/cronjobs/mail/mailing_lists_create.php |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list