Update all remaining references to old style axletter (reminder, register, user deletion)

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>

diff --git a/classes/user.php b/classes/user.php
index 8815a38..a0a7b3a 100644 (file)
--- a/classes/user.php
+++ b/classes/user.php
@@ -636,7 +636,7 @@ class User extends PlUser
      * Clears a user.
      *  *always deletes in: account_lost_passwords, register_marketing,
      *      register_pending, register_subs, watch_nonins, watch, watch_promo
-     *  *always keeps in: account_types, accounts, aliases, axletter_ins, carvas,
+     *  *always keeps in: account_types, accounts, aliases, carvas,
      *      group_members, homonyms, newsletter_ins, register_mstats,
      *  *deletes if $clearAll: account_auth_openid, announce_read, contacts,
      *      email_options, email_send_save, emails, forum_innd, forum_profiles,

diff --git a/include/reminder/ax_letter.inc.php b/include/reminder/ax_letter.inc.php
index 228dc30..e742d30 100644 (file)
--- a/include/reminder/ax_letter.inc.php
+++ b/include/reminder/ax_letter.inc.php
@@ -24,8 +24,8 @@ class ReminderAxLetter extends Reminder
     public function HandleAction($action)
     {
         if ($action == 'yes') {
-            Platal::load('axletter', 'axletter.inc.php');
-            AXLetter::subscribe();
+            require_once 'newsletter.inc.php';
+            NewsLetter::forGroup(NewsLetter::GROUP_AX)->subscribe();
             $this->UpdateOnYes();
         }
 
@@ -54,8 +54,8 @@ class ReminderAxLetter extends Reminder
 
     public static function IsCandidate(User &$user, $candidate)
     {
-        Platal::load('axletter', 'axletter.inc.php');
-        $isSubscribed = AXLetter::subscriptionState();
+        require_once 'newsletter.inc.php';
+        $isSubscribed = NewsLetter::forGroup(NewsLetter::GROUP_AX)->subscriptionState();
         if ($isSubscribed) {
             Reminder::MarkCandidateAsAccepted($user->id(), $candidate);
         }

diff --git a/modules/register.php b/modules/register.php
index 936f8c7..0dfd5c3 100644 (file)
--- a/modules/register.php
+++ b/modules/register.php
@@ -370,10 +370,13 @@ class RegisterModule extends PLModule
 
         // Subscribe the user to the services she did request at registration time.
         foreach (explode(',', $services) as $service) {
+            require_once 'newsletter.inc.php';
             switch ($service) {
                 case 'ax_letter':
-                    Platal::load('axletter', 'axletter.inc.php');
-                    AXLetter::subscribe($uid);
+                    NewsLetter::forGroup(NewsLetter::GROUP_AX)->subscribe($user);
+                    break;
+                case 'nl':
+                    NewsLetter::forGroup(NewsLetter::GROUP_XORG)->subscribe($user);
                     break;
                 case 'imap':
                     $storage = new EmailStorage($user, 'imap');
@@ -395,10 +398,6 @@ class RegisterModule extends PLModule
                         }
                     }
                     break;
-                case 'nl':
-                    require_once 'newsletter.inc.php';
-                    NewsLetter::subscribe($uid);
-                    break;
             }
         }
 

diff --git a/templates/admin/index.tpl b/templates/admin/index.tpl
index 3764853..297a4c8 100644 (file)
--- a/templates/admin/index.tpl
+++ b/templates/admin/index.tpl
@@ -182,26 +182,18 @@
     </td>
   </tr>
   <tr class="impair">
-    <td class="titre">AX-Letter</td>
-    <td>
-      <a href="ax/edit">Édition</a>
-      &nbsp;&nbsp;|&nbsp;&nbsp;
-      <a href="admin/axletter">Inscriptions et permissions</a>
-    </td>
-  </tr>
-  <tr class="pair">
     <td class="titre">Wiki</td>
     <td>
       <a href="admin/wiki">Pages et permissions</a>
     </td>
   </tr>
-  <tr class="impair">
+  <tr class="pair">
     <td class="titre">Sondages</td>
     <td>
       <a href="survey/admin">Gestion des sondages</a>
     </td>
   </tr>
-  <tr class="pair">
+  <tr class="impair">
     <td class="titre">Validations</td>
     <td>
       <a href="admin/validate/answers">Réponses automatiques</a>