[Fusionforge-commits] FusionForge branch master updated. 4f0ea5ad227dfcd253cdccdcf505bda97e0265ed

Sylvain Beucler beuc-inria at fusionforge.org
Tue Apr 8 13:56:40 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, master has been updated
       via  4f0ea5ad227dfcd253cdccdcf505bda97e0265ed (commit)
       via  62e3a774b4778d95842deaf030ddb1e690fcc6ea (commit)
       via  a4b8a784fd8aaeca96130f91ee1cc44aaa3fc268 (commit)
       via  c3a93e3f938f722468b3dda99a4f56a66de605c7 (commit)
      from  82813f2989b269c7f881ac7c41f9cfd29ba99926 (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 4f0ea5ad227dfcd253cdccdcf505bda97e0265ed
Merge: c3a93e3 62e3a77
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Apr 8 13:55:40 2014 +0200

    Merge branch 'Branch_5_3'


commit 62e3a774b4778d95842deaf030ddb1e690fcc6ea
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Apr 8 13:54:39 2014 +0200

    Allow site-specific mailing list config additions

diff --git a/src/cronjobs/mail/mailing_lists_create.php b/src/cronjobs/mail/mailing_lists_create.php
index f8d137b..5f41317 100755
--- a/src/cronjobs/mail/mailing_lists_create.php
+++ b/src/cronjobs/mail/mailing_lists_create.php
@@ -47,6 +47,8 @@ if (is_dir(forge_get_config('mailman_path'))) {
 	exit;
 }
 
+$custom_file = forge_get_config('custom_path').'/mailman-config_list.conf';
+
 $res = db_query_params('SELECT users.user_name,email,mail_group_list.list_name,
 			mail_group_list.password,mail_group_list.status,
 			mail_group_list.group_list_id,mail_group_list.is_public,
@@ -118,6 +120,7 @@ for ($i=0; $i<$rows; $i++) {
 				$listConfig .= "subscribe_policy = 1\n" ;
 			}
 			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);
@@ -158,6 +161,7 @@ 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);
 		fclose($fh);
 		$config_cmd = escapeshellcmd($path_to_mailman."/bin/config_list -i $tmp $listname");

commit a4b8a784fd8aaeca96130f91ee1cc44aaa3fc268
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Apr 7 18:55:46 2014 +0200

    Drop dead code ($public can't be true since we're in a if(!$public){} block already

diff --git a/src/cronjobs/mail/mailing_lists_create.php b/src/cronjobs/mail/mailing_lists_create.php
index 9fa8de0..f8d137b 100755
--- a/src/cronjobs/mail/mailing_lists_create.php
+++ b/src/cronjobs/mail/mailing_lists_create.php
@@ -231,19 +231,13 @@ for ($i=0; $i<$rows; $i++) {
 			$fh = fopen($tmp,'w');
 			$listConfig = "description = \"$description\"\n" ;
 			$listConfig .= "host_name = '".forge_get_config('lists_host')."'\n" ;
-			if (!$public) {
-				$listConfig .= "archive_private = True\n" ;
-				$listConfig .= "advertised = False\n" ;
-				$listConfig .= "subscribe_policy = 3\n" ;
-				## Reject mails sent by non-members
-				$listConfig .= "generic_nonmember_action = 2\n";
-				## Do not forward auto discard message
-				$listConfig .= "forward_auto_discards = 0\n";
-			} else {
-				$listConfig .= "archive_private = False\n" ;
-				$listConfig .= "advertised = True\n" ;
-				$listConfig .= "subscribe_policy = 1\n" ;
-			}
+			$listConfig .= "archive_private = True\n" ;
+			$listConfig .= "advertised = False\n" ;
+			$listConfig .= "subscribe_policy = 3\n" ;
+			## Reject mails sent by non-members
+			$listConfig .= "generic_nonmember_action = 2\n";
+			## Do not forward auto discard message
+			$listConfig .= "forward_auto_discards = 0\n";
 			fwrite($fh, $listConfig);
 			fclose($fh);
 			$privatize_cmd = escapeshellcmd($path_to_mailman."/bin/config_list -i $tmp $listname");

commit c3a93e3f938f722468b3dda99a4f56a66de605c7
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Apr 8 13:54:39 2014 +0200

    Allow site-specific mailing list config additions

diff --git a/src/cronjobs/mail/mailing_lists_create.php b/src/cronjobs/mail/mailing_lists_create.php
index f8d137b..5f41317 100755
--- a/src/cronjobs/mail/mailing_lists_create.php
+++ b/src/cronjobs/mail/mailing_lists_create.php
@@ -47,6 +47,8 @@ if (is_dir(forge_get_config('mailman_path'))) {
 	exit;
 }
 
+$custom_file = forge_get_config('custom_path').'/mailman-config_list.conf';
+
 $res = db_query_params('SELECT users.user_name,email,mail_group_list.list_name,
 			mail_group_list.password,mail_group_list.status,
 			mail_group_list.group_list_id,mail_group_list.is_public,
@@ -118,6 +120,7 @@ for ($i=0; $i<$rows; $i++) {
 				$listConfig .= "subscribe_policy = 1\n" ;
 			}
 			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);
@@ -158,6 +161,7 @@ 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);
 		fclose($fh);
 		$config_cmd = escapeshellcmd($path_to_mailman."/bin/config_list -i $tmp $listname");

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

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


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list