From 38a7da7d9e1328f6dc4fb365de8bbd0953a93150 Mon Sep 17 00:00:00 2001
From: Nicolas Iooss <nicolas.iooss_git@polytechnique.org>
Date: Sun, 29 Dec 2013 11:56:55 +0100
Subject: [PATCH] Add EP and FX letters to the registration page

Group these letters in a "community letters" item
---
 modules/register.php                               | 9 +++++++--
 templates/register/step3.tpl                       | 4 ++--
 upgrade/1.1.11/01_register_pending_com_letters.sql | 7 +++++++
 3 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 upgrade/1.1.11/01_register_pending_com_letters.sql

diff --git a/modules/register.php b/modules/register.php
index cc94e80..4fd6188 100644
--- a/modules/register.php
+++ b/modules/register.php
@@ -193,7 +193,7 @@ class RegisterModule extends PLModule
 
                     // Register the optional services requested by the user.
                     $services = array();
-                    foreach (array('ax_letter', 'imap', 'ml_promo', 'nl') as $service) {
+                    foreach (array('com_letters', 'imap', 'ml_promo', 'nl') as $service) {
                         if (Post::b($service)) {
                             $services[] = $service;
                         }
@@ -408,9 +408,14 @@ class RegisterModule extends PLModule
         require_once 'newsletter.inc.php';
         foreach (explode(',', $services) as $service) {
             switch ($service) {
-                case 'ax_letter':
+                case 'ax_letter': /* This option is deprecated by 'com_letters' */
                     NewsLetter::forGroup(NewsLetter::GROUP_AX)->subscribe($user);
                     break;
+                case 'com_letters':
+                    NewsLetter::forGroup(NewsLetter::GROUP_AX)->subscribe($user);
+                    NewsLetter::forGroup(NewsLetter::GROUP_EP)->subscribe($user);
+                    NewsLetter::forGroup(NewsLetter::GROUP_FX)->subscribe($user);
+                    break;
                 case 'nl':
                     NewsLetter::forGroup(NewsLetter::GROUP_XORG)->subscribe($user);
                     break;
diff --git a/templates/register/step3.tpl b/templates/register/step3.tpl
index 8f48927..b04dfe3 100644
--- a/templates/register/step3.tpl
+++ b/templates/register/step3.tpl
@@ -111,9 +111,9 @@
           <dd>
             de recevoir chaque mois la lettre mensuelle de Polytechnique.org contenant les activités et nouvelles de la communauté des X.
           </dd>
-          <dt><label><input type="checkbox" checked="checked" name="ax_letter" /> envois de l'AX</label></dt>
+          <dt><label><input type="checkbox" checked="checked" name="com_letters" /> lettres de la communauté</label></dt>
           <dd>
-            de recevoir les informations importantes de l'AX.
+            de recevoir les informations importantes de l'École, de l'AX et de la FX.
           </dd>
           {if $smarty.session.subState.edu_type eq #Profile::DEGREE_X#}
           <dt><label><input type="checkbox" checked="checked" name="ml_promo" /> ta promotion</label></dt>
diff --git a/upgrade/1.1.11/01_register_pending_com_letters.sql b/upgrade/1.1.11/01_register_pending_com_letters.sql
new file mode 100644
index 0000000..98aeed6
--- /dev/null
+++ b/upgrade/1.1.11/01_register_pending_com_letters.sql
@@ -0,0 +1,7 @@
+--
+-- Add a field for every community letters
+-- ax_letter is deprecated but keep it for now
+--
+ALTER TABLE register_pending CHANGE COLUMN services services SET('ax_letter', 'com_letters', 'imap', 'ml_promo', 'nl') NOT NULL DEFAULT '';
+
+-- vim:set syntax=mysql:
-- 
2.1.4