[Fusionforge-commits] FusionForge branch Branch_5_3 updated. b26ab21d23f1163a912893b9fe78d21fa94b07fc
Sylvain Beucler
beuc-inria at fusionforge.org
Fri Jun 27 15:56:07 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 b26ab21d23f1163a912893b9fe78d21fa94b07fc (commit)
from 2bd7ceb7274d4597b1b49e46c3fe364dd7504927 (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 b26ab21d23f1163a912893b9fe78d21fa94b07fc
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date: Fri Jun 27 15:54:43 2014 +0200
Mailing lists: handle accents in description (aka my users are the best %@#! beta-testers in the world)
diff --git a/src/CHANGES b/src/CHANGES
index 2a1863b..053f791 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -4,7 +4,7 @@ Fusionforge-5.3.2:
* Stats: handle bad encoding when gathering Git stats, remove spurious warning when SVN repository isn't created yet (Inria)
* Admin: fix edit table themes, fix frs_processor sequence [#691] (TrivialDev)
* User SSH keys (ssh_create.php): fix harmless warning when user removes all her keys (Inria)
-* Mailing lists: handle quotes in description
+* Mailing lists: handle quotes and accents in description (Inria)
* Plugin mediawiki: fix paths in import/export scripts (Inria)
* Plugin fckeditor: dropped in favor of ckeditor
diff --git a/src/cronjobs/mail/mailing_lists_create.php b/src/cronjobs/mail/mailing_lists_create.php
index db95d11..dfe5dcf 100755
--- a/src/cronjobs/mail/mailing_lists_create.php
+++ b/src/cronjobs/mail/mailing_lists_create.php
@@ -77,7 +77,7 @@ for ($i=0; $i<$rows; $i++) {
$public = db_result($res,$i,'is_public');
$status = db_result($res,$i,'status');
$description = db_result($res, $i, 'description');
- $description = str_replace('"', '\"', $description);
+ $description = str_replace('"', '\"', utf8_decode($description));
$listname = trim($listname);
if (!$listname) {
@@ -106,7 +106,8 @@ for ($i=0; $i<$rows; $i++) {
echo db_error();
$tmp = tempnam(forge_get_config('data_path'), "tmp");
$fh = fopen($tmp,'w');
- $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" ;
@@ -148,7 +149,8 @@ for ($i=0; $i<$rows; $i++) {
} elseif ($status == MAIL__MAILING_LIST_IS_CREATED) {
$tmp = tempnam(forge_get_config('data_path'), "tmp");
$fh = fopen($tmp,'w');
- $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";
@@ -183,7 +185,8 @@ for ($i=0; $i<$rows; $i++) {
$tmp = tempnam(forge_get_config('data_path'), "tmp");
$tmp = tempnam(forge_get_config('data_path'), "tmp");
$fh = fopen($tmp,'w');
- $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" ;
@@ -235,7 +238,8 @@ for ($i=0; $i<$rows; $i++) {
$err .= "Privatizing ".$listname."\n";
$tmp = tempnam(forge_get_config('data_path'), "tmp");
$fh = fopen($tmp,'w');
- $listConfig = "description = \"$description\"\n" ;
+ $listConfig = "# -*- coding: iso-8859-1 -*-\n";
+ $listConfig .= "description = \"$description\"\n" ;
$listConfig .= "host_name = '".forge_get_config('lists_host')."'\n" ;
$listConfig .= "archive_private = True\n" ;
$listConfig .= "advertised = False\n" ;
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 2 +-
src/cronjobs/mail/mailing_lists_create.php | 14 +++++++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list