Changeset 1038

Timestamp:

04/18/09 10:50:52 (15 years ago)

Author:

kwon

Message:

Newsletter 3.5.7rc2
closes #139
optimisation des traitements lors de l'envoi des mails du plugin

Location:

plugins/newsletter/trunk

Files:

• _define.php (modified) (1 diff)
• _public.php (modified) (10 diffs)
• changelog.txt (modified) (1 diff)
• default-templates/changemode.html (modified) (1 diff)
• default-templates/changemode.txt (modified) (1 diff)
• default-templates/confirm.html (modified) (1 diff)
• default-templates/confirm.txt (modified) (1 diff)
• default-templates/disable.html (modified) (1 diff)
• default-templates/disable.txt (modified) (1 diff)
• default-templates/enable.html (modified) (1 diff)
• default-templates/enable.txt (modified) (1 diff)
• default-templates/newsletter.html (modified) (1 diff)
• default-templates/newsletter.txt (modified) (1 diff)
• default-templates/resume.html (modified) (1 diff)
• default-templates/resume.txt (modified) (1 diff)
• default-templates/suspend.html (modified) (1 diff)
• default-templates/suspend.txt (modified) (1 diff)
• inc/class.html2text.php (modified) (2 diffs)
• inc/class.newsletter.core.php (modified) (22 diffs)
• inc/class.newsletter.mailing.php (added)
• inc/class.newsletter.tools.php (added)
• inc/class.template.php (modified) (3 diffs)
• index.php (modified) (9 diffs)
• locales/fr/main.lang.php (modified) (3 diffs)
• locales/fr/main.po (modified) (3 diffs)

plugins/newsletter/trunk/_define.php

@@ -15 +15 @@
      /* Description*/    "Manager newsletter",
      /* Author */        "Benoit de Marne",
-     /* Version */       "3.5.6",
+     /* Version */       "3.5.7",
      /* Permissions */   "usage,contentadmin",
      /* Priority */      null
 );
 
-/* Original Author : Olivier Le Bris */
+/* Original Author (3.4.2) : Olivier Le Bris */
 
 ?>

plugins/newsletter/trunk/_public.php

@@ -15 +15 @@
 // chargement des librairies
 require_once dirname(__FILE__).'/inc/class.captcha.php';
+require_once dirname(__FILE__).'/inc/class.newsletter.tools.php';
 require_once dirname(__FILE__).'/inc/class.newsletter.plugin.php';
 require_once dirname(__FILE__).'/inc/class.newsletter.core.php';
@@ -93 +94 @@
                               $msg = __('Account already confirmed.');
                          else {
-                              newsletterCore::sendEnable($rs->subscriber_id);
+                              newsletterCore::send($rs->subscriber_id,'enable');
                               $msg = __('Your subscription is confirmed.').'<br />'.__('You will soon receive an email.');
                          }
@@ -109 +110 @@
                               $msg = __('Account already enabled.');
                          else {
-                              newsletterCore::sendEnable($rs->subscriber_id);
+                              newsletterCore::send($rs->subscriber_id,'enable');
                               $msg = __('Your account is enabled.').'<br />'.__('You will soon receive an email.');
                          }
@@ -125 +126 @@
                               $msg = __('Account already disabled.');
                          else {
-                              newsletterCore::sendDisable($rs->subscriber_id);
+                              newsletterCore::send($rs->subscriber_id,'disable');
                               $msg = __('Your account is disabled.').'<br />'.__('You will soon receive an email.');
                          }
@@ -141 +142 @@
                               $msg = __('Account already suspended.');
                          else {
-                              newsletterCore::sendSuspend($rs->subscriber_id);
+                              newsletterCore::send($rs->subscriber_id,'suspend');
                               $msg = __('Your account is suspended.').'<br />'.__('You will soon receive an email.');
                          }
@@ -155 +156 @@
                               $msg = __('Unable to find you account informations.');
                          else {
-                              newsletterCore::sendChangeMode($rs->subscriber_id);
+                              newsletterCore::send($rs->subscriber_id,'changemode');
                               $msg = __('Your sending format is').$modesend.'<br />'.__('You will soon receive an email.');
                          }
@@ -268 +269 @@
      public static function NewsletterFormRandom()
      {
-          return '<?php  echo "'.newsletterCore::getRandom().'" ?>';
+          return '<?php  echo "'.newsletterTools::getRandom().'" ?>';
      }
 
@@ -450 +451 @@
                     '<form action="'.$link.'" method="post" id="nl_form">'.
                     $core->formNonce().
-                    form::hidden(array('nl_random'),newsletterCore::getRandom()).
+                    form::hidden(array('nl_random'),newsletterTools::getRandom()).
                     '<ul>'.
                     '<li><label for="nl_email">'.__('Email').'</label>&nbsp;:&nbsp;'.
@@ -569 +570 @@
            
                if (isset($params[1]) && !empty($params[1])) {
-                    $email = newsletterCore::base64_url_decode((string)html::clean($params[1]));
+                    $email = newsletterTools::base64_url_decode((string)html::clean($params[1]));
                }
                else 
@@ -580 +581 @@
 
                if (isset($params[3]) && !empty($params[3])) 
-                    $modesend = newsletterCore::base64_url_decode((string)html::clean($params[3]));
+                    $modesend = newsletterTools::base64_url_decode((string)html::clean($params[3]));
                else 
                     $modesend = null;             

plugins/newsletter/trunk/changelog.txt

@@ +1 @@
+Todo :
+=> Ticket #127 : timeout lors de l'envoi des newletters
+=> ajout d'un template avec le nombre d'abonnés actifs
+=> Ticket #117 : ajout des sous catégories lors de la sélection des billets
+=> Ticket #121 : possibilité de modifier le contenu des mails de gestion d'abonnements
+
 Newsletter 3.5.7 - 2009-xx-xx
 ===========================================================
+* correction du Ticket #139 : suppression des balises HTML en mode texte
+* optimisation du code sur l'envoi des mails
 * correction du Ticket #125 : Possibilité de modifier le nom "Lettre d'informations" dans le titre du formulaire côté public. 
 * correction du Ticket #123 : Remplacer la mention "by nom de l'auteur" par "par nom de l'auteur"

plugins/newsletter/trunk/default-templates/changemode.html

@@ -9 +9 @@
 
 <p>
-{$header}<br />
-<a href="{$blogUrl}">{$blogName}</a>
+{$header}&nbsp;<a href="{$blogUrl}">{$blogName}</a>
 </p>
 
 <p>
-{$txtChangingMode}
+{$txtChangingMode}<br /><br />
 </p>
 

plugins/newsletter/trunk/default-templates/changemode.txt

@@ -1 @@
-{$header}
-{$blogName}
-
+{$header} {$blogName}
+{nl}{nl}
 {$txtChangingMode}
-
+{nl}{nl}
 {$footer}

plugins/newsletter/trunk/default-templates/confirm.html

@@ -9 +9 @@
 
 <p>
-{$header}<br />
-<a href="{$blogUrl}">{$blogName}</a>
+{$header}&nbsp;<a href="{$blogUrl}">{$blogName}</a>
 </p>
 
 <p>
 {$txt_intro_confirm} <a href="{$urlConfirm}">{$txtConfirm}</a><br />
-{$txt_intro_disable} <a href="{$urlDisable}">{$txtDisable}</a>
+{$txt_intro_disable} <a href="{$urlDisable}">{$txtDisable}</a><br />
+<br />
 </p>
 

plugins/newsletter/trunk/default-templates/confirm.txt

@@ -1 @@
-{$header}
-{$blogName}
-
+{$header} {$blogName}
+{nl}{nl}
 {$txt_intro_confirm}
 {$txtConfirm}
 {$urlConfirm}
-
+{nl}{nl}
 {$txt_intro_disable}
 {$txtDisable}
 {$urlDisable}
-
+{nl}{nl}
 {$footer}

plugins/newsletter/trunk/default-templates/disable.html

@@ -9 +9 @@
 
 <p>
-{$header}<br />
-<a href="{$blogUrl}">{$blogName}</a>
+{$header}&nbsp;<a href="{$blogUrl}">{$blogName}</a>
 </p>
 
-{$txtDisabled}
+<p>{$txtDisabled}</p>
 
 <p>
-{$txt_intro_enable} <a href="{$urlEnable}">{$txtEnable}</a>
+{$txt_intro_enable} <a href="{$urlEnable}">{$txtEnable}</a><br />
+<br />
 </p>
 

plugins/newsletter/trunk/default-templates/disable.txt

@@ -1 @@
-{$header}
-{$blogName}
-
+{$header} {$blogName}
+{nl}{nl}
 {$txtDisabled}
-
+{nl}{nl}
 {$txt_intro_enable}
 {$txtEnable}
 {$urlEnable}
-
+{nl}{nl}
 {$footer}

plugins/newsletter/trunk/default-templates/enable.html

@@ -12 +12 @@
 </p>
 
-{$txtEnabled}
+<p>{$txtEnabled}</p>
 
 <p>
 {$txt_intro_suspend} <a href="{$urlSuspend}">{$txtSuspend}</a><br />
-{$txt_intro_disable} <a href="{$urlDisable}">{$txtDisable}</a>
+{$txt_intro_disable} <a href="{$urlDisable}">{$txtDisable}</a><br />
+<br />
 </p>
 

plugins/newsletter/trunk/default-templates/enable.txt

@@ -1 @@
-{$header}
-{$blogName}
-
+{$header} {$blogName}
+{nl}{nl}
 {$txtEnabled}
-
+{nl}{nl}
 {$txt_intro_suspend}
 {$txtSuspend}
 {$urlSuspend}
-
+{nl}{nl}
 {$txt_intro_disable}
 {$txtDisable}
 {$urlDisable}
-
+{nl}{nl}
 {$footer}

plugins/newsletter/trunk/default-templates/newsletter.html

@@ -29 +29 @@
 
 <p>
-{$txt_intro_suspend} <a href="{$urlSuspend}">{$txtSuspend}</a>{nl}
-{$txt_intro_disable} <a href="{$urlDisable}">{$txtDisable}</a>
+{$txt_intro_suspend} <a href="{$urlSuspend}">{$txtSuspend}</a><br />
+{$txt_intro_disable} <a href="{$urlDisable}">{$txtDisable}</a><br />
+<br />
 </p>
 

plugins/newsletter/trunk/default-templates/newsletter.txt

@@ -1 +1 @@
 {$header} {$blogName}
 {$blogUrl}
-
+{nl}{nl}
 {$txtIntroductoryMsg}
-
+{nl}{nl}
 {$txtHeading}
-
+{nl}{nl}
 {loop:posts}
-posts.title (posts.date {$txtBy} posts.author)
-posts.url
-posts.content{nl}{nl}
+posts.title (posts.date {$txtBy} posts.author){nl}
+posts.url{nl}
+posts.content{nl}
 {/loop}
-
+{nl}{nl}
 {$txt_intro_suspend}
 {$txtSuspend}
 {$urlSuspend}
-
+{nl}
 {$txt_intro_disable}
 {$txtDisable}
 {$urlDisable}
-
+{nl}{nl}
 {$footer}

plugins/newsletter/trunk/default-templates/resume.html

@@ -18 +18 @@
 
 <p>
-{$urlResume}
+{$urlResume}<br />
+<br />
 </p>
 

plugins/newsletter/trunk/default-templates/resume.txt

@@ -1 @@
-{$header}
-{$blogName}
-
-{$txtResume}
+{$header} {$blogName}
+{nl}{nl}
+{$txtResume}{nl}
 {$txtMode}
-
+{nl}{nl}
 {$urlResume}
-
+{nl}{nl}
 {$footer}
+{nl}{nl}

plugins/newsletter/trunk/default-templates/suspend.html

@@ -9 +9 @@
 
 <p>
-{$header}<br />
-<a href="{$blogUrl}">{$blogName}</a>
+{$header}&nbsp;<a href="{$blogUrl}">{$blogName}</a>
 </p>
 
-{$txtSuspended}
+<p>{$txtSuspended}</p>
 
 <p>
-{$txt_intro_enable} <a href="{$urlEnable}">{$txtEnable}</a>
+{$txt_intro_enable} <a href="{$urlEnable}">{$txtEnable}</a><br />
+<br />
 </p>
 

plugins/newsletter/trunk/default-templates/suspend.txt

@@ -1 @@
-{$header}
-{$blogName}
-
+{$header} {$blogName}
+{nl}{nl}
 {$txtSuspended}
-
+{nl}{nl}
 {$txt_intro_enable}
 {$txtEnable}
 {$urlEnable}
-
+{nl}{nl}
 {$footer}

plugins/newsletter/trunk/inc/class.html2text.php

@@ -126 +126 @@
         '/<p[^>]*>/i',                           // <P>
         '/<br[^>]*>/i',                          // <br>
+        '/<br[^>]*\/>/i',                        // <br />
         '/<b[^>]*>(.+?)<\/b>/ie',                // <b>
         '/<i[^>]*>(.+?)<\/i>/i',                 // <i>
@@ -176 +177 @@
         "\n\n\t",                               // <P>
         "\n",                                   // <br>
+        "\n",                                   // <br />
         'strtoupper("\\1")',                    // <b>
         '_\\1_',                                // <i>

plugins/newsletter/trunk/inc/class.newsletter.core.php

@@ -13 +13 @@
 // chargement des librairies
 require dirname(__FILE__).'/class.template.php';
+require dirname(__FILE__).'/class.newsletter.mailing.php';
 
 // le plugin
@@ -57 +58 @@
      { 
           return newsletterPlugin::isInstalled(); 
-     }
-
-     // Fonction récupérée dans le plugin dCom
-     // Oleksandr Syenchuk, Jean-François Michaud and contributors.
-     public static function cutString($str,$maxlength=false)
-     {
-          if (mb_strlen($str) > $maxlength && $maxlength)
-               return self::myCutString($str,$maxlength).'...';
-          return $str;
-     }
-     
-     // Fonction cutString() de Dotclear écrite par Olivier Meunier
-     // Corrigée pour supporter le UTF-8
-     // https://clearbricks.org/svn/trunk/common/lib.text.php [72]
-     public static function myCutString($str,$l)
-     {
-          $s = preg_split('/([\s]+)/u',$str,-1,PREG_SPLIT_DELIM_CAPTURE);
-          
-          $res = '';
-          $L = 0;
-          
-          if (mb_strlen($s[0]) >= $l) {
-               return mb_substr($s[0],0,$l);
-          }
-          
-          foreach ($s as $v)
-          {
-               $L = $L+strlen($v);
-               
-               if ($L > $l) {
-                    break;
-               } else {
-                    $res .= $v;
-               }
-          }
-          
-          return trim($res);
      }
 
@@ -187 +151 @@
 
      /**
-     * génère un code d'enregistrement
-     */
-     public static function regcode() 
-     {
-          return md5(date('Y-m-d H:i:s', strtotime("now")) ); 
-     }
-
-     /**
-     * encodage en base64 pour une url
-     */
-     public static function base64_url_encode($val)
-     {
-          return strtr(base64_encode($val), '+/=', '-_,');
-     }
-
-     /**
-     * decodage en base64 pour une url
-     */
-     public static function base64_url_decode($val)
-     {
-          return base64_decode(strtr($val, '-_,', '+/='));
-     }
-
-     /**
      * test l'existence d'un abonné par son id
      */
@@ -342 +282 @@
                     // génération des informations manquantes
                     if ($_regcode == null) {
-                         $_regcode = self::regcode();
+                         $_regcode = newsletterTools::regcode();
                     }
 
@@ -372 +312 @@
      }
      
-     /**
-     * implode un tableau associatif (http://www.php.net/manual/fr/function.implode.php)
-     */
-     private static function implode_assoc($glue1, $glue2, $array)
-     {
-          foreach($array as $key => $val) {
-               $array2[] = $key.$glue1.$val;
-          }
-          return implode($glue2, $array2);
-     }
-
      /**
      * met à jour un abonné par son id
@@ -484 +413 @@
                $blogid = $con->escape((string)$blog->id);
 
-               // requète sur les données et renvoi null si erreur
+               // requête sur les données et renvoi null si erreur
                $strReq =
                     'SELECT *'.
@@ -697 +626 @@
      * retourne les billets pour la newsletter:
      */
-     public static function getPosts($dt)
+     public static function getPosts($dt=null)
      {
           global $core;
@@ -719 +648 @@
                // limitation du nombre de billets
                $maxPost = newsletterPlugin::getMaxPosts();
-               if ($maxPost > 0) 
+               if ($maxPost > 0) {
                     $params['limit'] = $maxPost;
+               }
 
                // définition du tris des enregistrements et filtrage dans le temps
@@ -737 +667 @@
                     }
                }
-               
-              $year = dt::dt2str('%Y', $dt);
-              $month = dt::dt2str('%m', $dt);
-              $day = dt::dt2str('%d', $dt);
-              $hours = dt::dt2str('%H', $dt);
-              $minutes = dt::dt2str('%M', $dt);
-              $seconds = dt::dt2str('%S', $dt);
+
+               /*             
+               $year = dt::dt2str('%Y', $dt);
+               $month = dt::dt2str('%m', $dt);
+               $day = dt::dt2str('%d', $dt);
+               $hours = dt::dt2str('%H', $dt);
+               $minutes = dt::dt2str('%M', $dt);
+               $seconds = dt::dt2str('%S', $dt);
 
                // depuis lastsent
-              $params['sql'] .= ' AND '.$con->dateFormat('P.post_dt','%Y-%m-%d %H:%M:%S')."> '$year-$month-$day $hours:$minutes:$seconds'";
+               $params['sql'] .= ' AND '.$con->dateFormat('P.post_dt','%Y-%m-%d %H:%M:%S')."> '$year-$month-$day $hours:$minutes:$seconds'";
+               */
 
                // récupération des billets
                $rs = $blog->getPosts($params, false);
-
+               
                $minPosts = newsletterPlugin::getMinPosts();
                if($rs->count() < $minPosts)
@@ -762 +694 @@
      }
 
+     public static function getNewsletterPosts()
+     {
+          global $core;
+
+          // boucle sur les billets concernés pour l'abonnés
+          $bodies = array();
+          $posts = array();
+
+          $format = '';
+          if (!empty($attr['format'])) {
+               $format = addslashes($attr['format']);
+          }              
+     
+          $posts = self::getPosts();
+          
+          //$posts->core = $core;
+          //$posts->moveStart();
+          while ($posts->fetch())
+          {
+               //$p_ids[] = $posts->post_id;
+
+               // récupération des informations du billet
+               if(newsletterPlugin::getViewContentPost()) {
+                    $bodies[] = array(
+                         'title' => $posts->post_title,
+                         'url' => $posts->getURL(),
+                         'date' => $posts->getDate($format),
+                         'category' => $posts->getCategoryURL(),
+                         'content' => html::escapeHTML(newsletterTools::cutString(html::decodeEntities(html::clean($posts->getContent())),newsletterPlugin::getSizeContentPost())),
+                         'author' => $posts->getAuthorCN(),
+                         'post_dt' => $posts->post_dt
+                         );
+               } else {
+                    $bodies[] = array(
+                         'title' => $posts->post_title,
+                         'url' => $posts->getURL(),
+                         'date' => $posts->getDate($format),
+                         'category' => $posts->getCategoryURL(),
+                         'content' => html::escapeHTML(''),
+                         'author' => $posts->getAuthorCN(),
+                         'post_dt' => $posts->post_dt
+                         );
+               }
+          }
+          return $bodies;
+     }
+
+     public function getUserPosts($posts=array(),$dt=null)
+     {
+          $bodies = array();
+          foreach ($posts as $k => $v) {
+               if($dt < $v['post_dt']) {
+                    $bodies[] = $posts[$k];
+               }
+          }
+          
+          return $bodies;
+     }
+
      /* ==================================================
           emails
@@ -767 +758 @@
 
      /**
-     * convertit le texte en 7 bits
-     */
-     private static function to7bit($text, $from_enc)
+     * renvoi l'url de base de newsletter
+     */
+     public static function url($cmd = '')
      {
           global $core;
           try {
-               return preg_replace(
-                    array('/&szlig;/', '/&(..)lig;/','/&([aouAOU])uml;/', '/&(.)[^;]*;/'),
-                    array('ss', "$1", "$1" . 'e', "$1"),
-                    mb_convert_encoding($text, 'HTML-ENTITIES', $from_enc));
+               $url = &$core->url;
+               $blog = &$core->blog;
+               $blogurl = &$blog->url;
+
+               if ($cmd == '') 
+                    return http::concatURL($blogurl, $url->getBase('newsletter'));
+               else 
+                    return http::concatURL($blogurl, $url->getBase('newsletter')).'/'.$cmd;
           } catch (Exception $e) { 
                $core->error->add($e->getMessage()); 
           }
      }
-
-     /**
-     * envoi de mail
-     */
-     public static function Sendmail($_from, $_name, $_email, $_subject, $_body, $_type = 'text', $_lang = 'fr')
-     {
-          global $core;
-          if (empty($_from) || empty($_email) || empty($_subject) || empty($_body)) {
-               return false;
-          } else {
-               if (empty($_name)) {
-                    $_name = $_from;
-               }
-               
-               try {
-                    $f_check_notification = newsletterPlugin::getCheckNotification();
-                    //$email_from = mail::B64Header($_name.' <'.$_from.'>');
-                    $_name = mail::B64Header($_name);
-                    $email_from = mail::B64Header('<'.$_from.'>');
-                    $email_to = mail::B64Header($_email.' <'.$_email.'>');
-
-                    $headers = array(
-                         'From: "'.$_name.'" '.$email_from,
-                         'Reply-To: '.$email_from,
-                         'Delivered-to: '.$email_to,             
-                         'X-Sender:'.$email_from,
-                         'MIME-Version: 1.0',
-                         (($_type == 'html') ? 'Content-Type: text/html; charset=UTF-8;' : 'Content-Type: text/plain; charset=UTF-8;'),
-                         'X-Mailer: Dotclear '.mail::B64Header(newsletterPlugin::dbVersion()),
-                         'X-Blog-Id: '.mail::B64Header($core->blog->id),
-                         'X-Blog-Name: '.mail::B64Header($core->blog->name),
-                         'X-Blog-Url: '.mail::B64Header($core->blog->url),
-                         'X-Originating-IP: '.http::realIP(),
-                         (($f_check_notification) ? 'Disposition-Notification-To: '.$email_from : '')
-                    );
-                    
-                    $subject = mail::B64Header($_subject);
-                    
-                    return (mail::sendMail($_email, $subject, $_body, $headers));
-               } catch (Exception $e) { 
-                    //$core->error->add($e->getMessage());
-                    return false;
-               }
-          }
-     }
-
-     /**
-     * renvoi l'url de base de newsletter
-     */
-    public static function url($cmd = '')
-    {
-        global $core;
-        try {
-             $url = &$core->url;
-             $blog = &$core->blog;
-             $blogurl = &$blog->url;
-
-            if ($cmd == '') return http::concatURL($blogurl, $url->getBase('newsletter'));
-            else return http::concatURL($blogurl, $url->getBase('newsletter')).'/'.$cmd;
-        } catch (Exception $e) { 
-          $core->error->add($e->getMessage()); 
-        }
-    }
 
      /**
@@ -895 +827 @@
      }
 
-     /**
-     * envoi de la newsletter
-     */
-     public static function sendNewsletter($id = -1)
-     {
-          if (!newsletterPlugin::isActive()) {    // test si le plugin est actif
-               return false;
-          } else if ($id == -1) {                 // test sur la valeur de l'id qui doit être positive ou null
-               return false;
-          } else {                                // envoi des mails aux abonnés
-               global $core;
-               try
-               {
-                    $url = &$core->url;
-                    $blog = &$core->blog;
-                    $blogurl = &$blog->url;
-                   
-                    $format = '';
-                    if (!empty($attr['format'])) {
-                         $format = addslashes($attr['format']);
-                    }                  
+
+
+     /**
+      * Prepare la liste des messages et declenche l'envoi de cette liste.
+      * Retourne les resultats des envois dans un string
+      *
+      * @param:     $id            array
+      * @param:     $action        string
+      *
+      * @return:    string
+      */
+     public function send($id=-1,$action=null)
+     {
+          global $core;
+
+          $url = &$core->url;
+          $blog = &$core->blog;
+          $blogurl = &$blog->url;
+
+          $send = array();
+
+          try {
+               if (!newsletterPlugin::isActive()) {         // test si le plugin est actif
+                    return false;
+               } else if ($id == -1 || $action === null) {  // test sur la valeur de l'id qui doit être positive ou null
+                    return false;
+               } else {                                     // envoi des mails aux abonnés
 
                     // prise en compte du paramètres: liste d'id ou id simple
@@ -924 +862 @@
                          $ids[] = $id; 
                     }
-
-                    // initialisation du moteur de template
-                    $send = array();
-                    self::BeforeSendmailTo(newsletterPlugin::getPresentationMsg(), newsletterPlugin::getConcludingMsg());
-                    $states = array();
-
-                    // initialisation des variables de travail
-                    $blogname = &$blog->name;
-                    $editorName = newsletterPlugin::getEditorName();
-                    $editorEmail = newsletterPlugin::getEditorEmail();
-                    $mode = newsletterPlugin::getSendMode();
-                    //$subject = text::toUTF8(__('Newsletter for').' '.$blogname);
-                    $subject = text::toUTF8(newsletterPlugin::getNewsletterSubject());
-
-                    // boucle sur les ids des abonnés à mailer
-                    foreach ($ids as $subscriber_id)
-                    {
-                         // récupération de l'abonné et extraction des données
-                        $subscriber = self::get($subscriber_id);
-
-                         // récupération des billets en fonction de l'abonné (date de dernier envoi et billets déja envoyés)
-                         $posts = self::getPosts($subscriber->lastsent);
-                         if ($posts == null) {
-                              $send['nothing'][] = $subscriber->email; // rien à envoyer (aucun billet)
-                         } else {
-                              $body = '';
-                              $bodies = array();
-                              $convert = new html2text();
-                              $convert->labelLinks = __('Links:');
-                              $convert->set_base_url($blogurl);
-                              // boucle sur les billets concernés pour l'abonnés
-                              $posts->core = $core;
-                              $posts->moveStart();
-                              while ($posts->fetch())
-                              {
-                                   $p_ids[] = $posts->post_id;
-
-                                   // récupération des informations du billet
-                                   if(newsletterPlugin::getViewContentPost()) {
-                                        $bodies[] = array(
-                                        'title' => $posts->post_title,
-                                        'url' => $posts->getURL(),
-                                        'date' => $posts->getDate($format),
-                                        'category' => $posts->getCategoryURL(),
-                                        'content' => html::escapeHTML(self::cutString(html::decodeEntities(html::clean($posts->getContent())),newsletterPlugin::getSizeContentPost())),
-                                        'author' => $posts->getAuthorCN()
-                                        );
-                                   } else {
-                                        $bodies[] = array(
-                                        'title' => $posts->post_title,
-                                        'url' => $posts->getURL(),
-                                        'date' => $posts->getDate($format),
-                                        'category' => $posts->getCategoryURL(),
-                                        'content' => html::escapeHTML(''),
-                                        'author' => $posts->getAuthorCN()
-                                        );
-                                   }
-                              }
-
-                              // définition du format d'envoi
-                              if (!newsletterPlugin::getUseDefaultFormat() && $subscriber->modesend != null) {
-                                   $mode = $subscriber->modesend;
-                              }
-                              
-                              // intégration dans le template des billets en génération du rendu
-                              if(newsletterPlugin::getCheckUseSuspend()) {
-                                   nlTemplate::assign('urlSuspend', self::url('suspend/'.self::base64_url_encode($subscriber->email)));
-                              } else {
-                                   nlTemplate::assign('urlSuspend', ' ');
-                              }
-                              nlTemplate::assign('urlDisable', self::url('disable/'.self::base64_url_encode($subscriber->email)));
-                              nlTemplate::assign('posts', $bodies);
-                              $body = nlTemplate::render('newsletter', $mode);
-
-                              // envoi du mail et log
-                              if (self::Sendmail($editorEmail, $editorName, $subscriber->email, $subject, $body, $mode)) {
-                                   // prise en compte email envoyé et mise à jour de l'abonné (date de dernier envoi et liste de billets déja envoyés)
-                                   $send['ok'][] = $subscriber->email;
-                                   $states[] = $subscriber->subscriber_id;
-                              } else { 
-                                   // erreur d'envoi de mail
-                                   $send['error'][] = $subscriber->email;
-                              }
-                              
-                         }
-                    }
-
-            if (is_array($states) && count($states) > 0)
-               self::lastsent($states);                               
+          
+                    $newsletter_mailing = new newsletterMailing($core);         
+
+                    // filtrage sur le type de mail
+                    switch ($action) {
+                         case 'newsletter':
+                              self::prepareMessagesNewsletter($ids,$newsletter_mailing);
+                              break;
+                         case 'confirm':
+                              self::prepareMessagesConfirm($ids,$newsletter_mailing);
+                              break;
+                         case 'suspend':
+                              self::prepareMessagesSuspend($ids,$newsletter_mailing);
+                              break;
+                         case 'enable':
+                              self::prepareMessagesEnable($ids,$newsletter_mailing);
+                              break;
+                         case 'disable':
+                              self::prepareMessagesDisable($ids,$newsletter_mailing);
+                              break;
+                         case 'resume':
+                              self::prepareMessagesResume($ids,$newsletter_mailing);
+                              break;
+                         case 'changemode':
+                              self::prepareMessagesChangeMode($ids,$newsletter_mailing);
+                              break;
+                         default:
+                              return false;
+                    }
+
+                    // Envoi des messages
+                    $newsletter_mailing->batchSend();
+                    
+                    $sent_states = $newsletter_mailing->getStates();
+                    $sent_success = $newsletter_mailing->getSuccess();
+                    $sent_errors = $newsletter_mailing->getErrors();
+                    $sent_nothing = $newsletter_mailing->getNothingToSend();
+                    
+                    if (is_array($sent_states) && count($sent_states) > 0) {
+                         // positionnement de l'état des comptes
+                         switch ($action) {
+                              case 'newsletter':
+                                   self::lastsent($sent_states);
+                                   break;
+                              case 'confirm':
+                                   self::confirm($sent_states);
+                                   break;
+                              case 'suspend': 
+                                   self::suspend($sent_states);
+                                   break;
+                              case 'enable': 
+                                   self::enable($sent_states);
+                                   break;
+                              case 'disable': 
+                                   self::disable($sent_states);
+                                   break;
+                              case 'resume':
+                                   break;
+                              case 'changemode':
+                                   break;
+                         }
+                    }         
                 
                     $msg = '';
-                    if (isset($send['ok']) && count($send['ok']) > 0) 
-                         $msg .= __('Successful mail sent for').' '.implode(', ', $send['ok']).'<br />';
-                    if (isset($send['error']) && count($send['error']) > 0) 
-                         $msg .= __('Mail sent error for').' '.implode(', ', $send['error']).'<br />';
-                    if (isset($send['nothing']) &&count($send['nothing']) > 0) 
-                         $msg .= __('Nothing to send for').' '.implode(', ', $send['nothing']).'<br />';
-
+                    
+                    if (isset($sent_success) && count($sent_success) > 0) 
+                         $msg .= __('Successful mail sent for').' '.implode(', ', $sent_success).'<br />';
+
+                    if (isset($sent_errors) && count($sent_errors) > 0) 
+                         $msg .= __('Mail sent error for').' '.implode(', ', $sent_errors).'<br />';
+
+                    if (isset($sent_nothing) &&count($sent_nothing) > 0) 
+                         $msg .= __('Nothing to send for').' '.implode(', ', $sent_nothing).'<br />';
+                    
                     return $msg;
                }
-               catch (Exception $e) { 
-                    $core->error->add($e->getMessage()); 
-               }
-          }
-     }
-
-     /**
-     * envoi automatique de la newsletter
-     */
+          } catch (Exception $e) { 
+               $core->error->add($e->getMessage()); 
+          }
+     }
+
+     /**
+      * Prepare le contenu des messages de type newsletter
+      * Modifie l'objet newsletterMailing fourni en parametre
+      *
+      * @param:     $ids                     array
+      * @param:     $newsletter_mailing      newsletterMailing
+      *
+      * @return:    boolean
+      */
+     private static function prepareMessagesNewsletter($ids=-1,&$newsletter_mailing)
+     {
+          // initialisation des variables de travail
+          $mode = newsletterPlugin::getSendMode();
+          $subject = text::toUTF8(newsletterPlugin::getNewsletterSubject());
+          $minPosts = newsletterPlugin::getMinPosts();
+                    
+          // initialisation du moteur de template
+          self::BeforeSendmailTo(newsletterPlugin::getPresentationMsg(), newsletterPlugin::getConcludingMsg());
+                    
+          // recuperation des billets
+          $newsletter_posts = self::getNewsletterPosts();
+
+          // boucle sur les ids des abonnés
+          foreach ($ids as $subscriber_id)
+          {
+               // récupération de l'abonné et extraction des données
+               $subscriber = self::get($subscriber_id);
+
+               // récupération des billets en fonction de l'abonné (date de dernier envoi)
+               $user_posts = self::getUserPosts($newsletter_posts,$subscriber->lastsent);
+          
+               if(count($user_posts) < $minPosts) {
+                    $newsletter_mailing->addNothingToSend($subscriber_id,$subscriber->email);
+               } else {
+                    $body = '';
+                    /*$convert = new html2text();
+                    $convert->labelLinks = __('Links:');
+                    $convert->set_base_url($blogurl);*/
+                              
+                    // définition du format d'envoi
+                    if (!newsletterPlugin::getUseDefaultFormat() && $subscriber->modesend != null) {
+                         $mode = $subscriber->modesend;
+                    }
+                              
+                    // intégration dans le template des billets en génération du rendu
+                    if(newsletterPlugin::getCheckUseSuspend()) {
+                         nlTemplate::assign('urlSuspend', self::url('suspend/'.newsletterTools::base64_url_encode($subscriber->email)));
+                    } else {
+                         nlTemplate::assign('urlSuspend', ' ');
+                    }
+                    nlTemplate::assign('urlDisable', self::url('disable/'.newsletterTools::base64_url_encode($subscriber->email)));
+                    nlTemplate::assign('posts', $user_posts);
+
+                    $body = nlTemplate::render('newsletter', $mode);
+                              
+                    if($mode == 'text') {
+                         $convert = new html2text();
+                         $convert->set_html($body);
+                         $convert->labelLinks = __('Links:');
+                         $body = $convert->get_text();
+                    }
+                              
+                    // ajoute le message dans la liste d'envoi
+                    $newsletter_mailing->addMessage($subscriber_id,$subscriber->email,$subject,$body,$mode);
+               }
+          }
+          return true;
+     }
+
+     /**
+      * Prepare le contenu des messages de type confirm
+      * Modifie l'objet newsletterMailing fourni en parametre
+      *
+      * @param:     $ids                     array
+      * @param:     $newsletter_mailing      newsletterMailing
+      *
+      * @return:    boolean
+      */
+     private static function prepareMessagesConfirm($ids=-1,&$newsletter_mailing)
+     {
+          // initialisation des variables de travail
+          $mode = newsletterPlugin::getSendMode();
+          $subject = text::toUTF8(newsletterPlugin::getConfirmSubject());
+
+          // initialisation du moteur de template
+          self::BeforeSendmailTo(__('Newsletter subscription confirmation for'), __('Thanks you for subscribing.'));
+
+          // boucle sur les ids des abonnés
+          foreach ($ids as $subscriber_id)
+          {
+               $body = '';
+               // récupération de l'abonné et extraction des données
+               $subscriber = self::get($subscriber_id);
+
+               // définition du format d'envoi
+               if (!newsletterPlugin::getUseDefaultFormat() && $subscriber->modesend != null) {
+                    $mode = $subscriber->modesend;
+               }
+
+               // génération du rendu
+               nlTemplate::assign('urlConfirm', self::url('confirm/'.newsletterTools::base64_url_encode($subscriber->email).'/'.$subscriber->regcode.'/'.newsletterTools::base64_url_encode($subscriber->modesend)));
+               nlTemplate::assign('urlDisable', self::url('disable/'.newsletterTools::base64_url_encode($subscriber->email)));
+
+               $body = nlTemplate::render('confirm', $mode);
+
+               if($mode == 'text') {
+                    $convert = new html2text();
+                    $convert->set_html($body);
+                    $convert->labelLinks = __('Links:');
+                    $body = $convert->get_text();
+               }
+
+               // ajoute le message dans la liste d'envoi
+               $newsletter_mailing->addMessage($subscriber_id,$subscriber->email,$subject,$body,$mode);
+          }
+          return true;
+     }
+
+     /**
+      * Prepare le contenu des messages de type suspend
+      * Modifie l'objet newsletterMailing fourni en parametre
+      *
+      * @param:     $ids                     array
+      * @param:     $newsletter_mailing      newsletterMailing
+      *
+      * @return:    boolean
+      */
+     private static function prepareMessagesSuspend($ids=-1,&$newsletter_mailing)
+     {
+          // initialisation des variables de travail
+          $mode = newsletterPlugin::getSendMode();
+          $subject = text::toUTF8(newsletterPlugin::getSuspendSubject());
+
+          // initialisation du moteur de template
+          self::BeforeSendmailTo(__('Newsletter account suspend for'), __('Have a nice day !'));
+
+          // boucle sur les ids des abonnés
+          foreach ($ids as $subscriber_id)
+          {
+               // récupération de l'abonné et extraction des données
+               $subscriber = self::get($subscriber_id);
+
+               // définition du format d'envoi
+               if (!newsletterPlugin::getUseDefaultFormat() && $subscriber->modesend != null) {
+                    $mode = $subscriber->modesend;
+               }
+
+               // génération du rendu
+               nlTemplate::assign('urlEnable', self::url('enable/'.newsletterTools::base64_url_encode($subscriber->email)));
+
+               $body = nlTemplate::render('suspend', $mode);
+               
+               if($mode == 'text') {
+                    $convert = new html2text();
+                    $convert->set_html($body);
+                    $convert->labelLinks = __('Links:');
+                    $body = $convert->get_text();
+               }
+
+               // ajoute le message dans la liste d'envoi
+               $newsletter_mailing->addMessage($subscriber_id,$subscriber->email,$subject,$body,$mode);
+          }
+          return true;
+     }
+
+     /**
+      * Prepare le contenu des messages de type enable
+      * Modifie l'objet newsletterMailing fourni en parametre
+      *
+      * @param:     $ids                     array
+      * @param:     $newsletter_mailing      newsletterMailing
+      *
+      * @return:    boolean
+      */
+     private static function prepareMessagesEnable($ids=-1,&$newsletter_mailing)
+     {
+          // initialisation des variables de travail
+          $mode = newsletterPlugin::getSendMode();
+          $subject = text::toUTF8(newsletterPlugin::getEnableSubject());
+
+          // initialisation du moteur de template
+          self::BeforeSendmailTo(__('Newsletter account activation for'), __('Thank you for subscribing.'));
+
+          // boucle sur les ids des abonnés
+          foreach ($ids as $subscriber_id)
+          {
+               // récupération de l'abonné et extraction des données
+               $subscriber = self::get($subscriber_id);
+
+               // définition du format d'envoi
+               if (!newsletterPlugin::getUseDefaultFormat() && $subscriber->modesend != null) {
+                    $mode = $subscriber->modesend;
+               }
+
+               // génération du rendu
+               nlTemplate::assign('urlDisable', self::url('disable/'.newsletterTools::base64_url_encode($subscriber->email)));
+                    if(newsletterPlugin::getCheckUseSuspend()) {
+                         nlTemplate::assign('urlSuspend', self::url('suspend/'.newsletterTools::base64_url_encode($subscriber->email)));
+                    } else {
+                         nlTemplate::assign('urlSuspend', ' ');
+                    }
+
+               $body = nlTemplate::render('enable', $mode);
+
+               if($mode == 'text') {
+                    $convert = new html2text();
+                    $convert->set_html($body);
+                    $convert->labelLinks = __('Links:');
+                    $body = $convert->get_text();
+               }
+          
+               // ajoute le message dans la liste d'envoi
+               $newsletter_mailing->addMessage($subscriber_id,$subscriber->email,$subject,$body,$mode);
+          }
+          return true;
+     }
+
+     /**
+      * Prepare le contenu des messages de type disable
+      * Modifie l'objet newsletterMailing fourni en parametre
+      *
+      * @param:     $ids                     array
+      * @param:     $newsletter_mailing      newsletterMailing
+      *
+      * @return:    boolean
+      */
+     private static function prepareMessagesDisable($ids=-1,&$newsletter_mailing)
+     {
+          // initialisation des variables de travail
+          $mode = newsletterPlugin::getSendMode();
+          $subject = text::toUTF8(newsletterPlugin::getDisableSubject());
+
+          // initialisation du moteur de template
+          self::BeforeSendmailTo(__('Newsletter account removal for'), __('Have a nice day !'));
+
+          // boucle sur les ids des abonnés
+          foreach ($ids as $subscriber_id)
+          {
+               // récupération de l'abonné et extraction des données
+               $subscriber = self::get($subscriber_id);
+
+               // définition du format d'envoi
+               if (!newsletterPlugin::getUseDefaultFormat() && $subscriber->modesend != null) {
+                    $mode = $subscriber->modesend;
+               }
+
+               // génération du rendu
+               nlTemplate::assign('urlEnable', self::url('enable/'.newsletterTools::base64_url_encode($subscriber->email)));
+
+               $body = nlTemplate::render('disable', $mode);
+
+               if($mode == 'text') {
+                    $convert = new html2text();
+                    $convert->set_html($body);
+                    $convert->labelLinks = __('Links:');
+                    $body = $convert->get_text();
+               }
+          
+               // ajoute le message dans la liste d'envoi
+               $newsletter_mailing->addMessage($subscriber_id,$subscriber->email,$subject,$body,$mode);
+          }
+          return true;
+     }
+
+     /**
+      * Prepare le contenu des messages de type resume
+      * Modifie l'objet newsletterMailing fourni en parametre
+      *
+      * @param:     $ids                     array
+      * @param:     $newsletter_mailing      newsletterMailing
+      *
+      * @return:    boolean
+      */
+     private static function prepareMessagesResume($ids=-1,&$newsletter_mailing)
+     {
+          // initialisation des variables de travail
+          $mode = newsletterPlugin::getSendMode();
+          $subject = text::toUTF8(newsletterPlugin::getResumeSubject());
+
+          // initialisation du moteur de template
+          self::BeforeSendmailTo(__('Newsletter account resume for'), __('Have a nice day !'));
+
+          // boucle sur les ids des abonnés
+          foreach ($ids as $subscriber_id)
+          {
+               // récupération de l'abonné et extraction des données
+               $subscriber = self::get($subscriber_id);
+
+               $txt_intro_enable = newsletterPlugin::getTxtIntroEnable().', ';
+               $urlEnable = self::url('enable/'.newsletterTools::base64_url_encode($subscriber->email));
+               $txtEnable = newsletterPlugin::getTxtEnable();
+                         
+               $txt_intro_disable = newsletterPlugin::getTxtIntroDisable().', ';
+               $urlDisable = self::url('disable/'.newsletterTools::base64_url_encode($subscriber->email));
+               $txtDisable = newsletterPlugin::getTxtDisable();
+
+               $txt_intro_suspend = newsletterPlugin::getTxtIntroSuspend().', ';
+               $urlSuspend = self::url('suspend/'.newsletterTools::base64_url_encode($subscriber->email));
+               $txtSuspend = newsletterPlugin::getTxtSuspend();
+                         
+               $txt_intro_confirm = newsletterPlugin::getTxtIntroConfirm().', ';
+               $urlConfirm = self::url('confirm/'.newsletterTools::base64_url_encode($subscriber->email).'/'.$subscriber->regcode.'/'.newsletterTools::base64_url_encode($subscriber->modesend));
+               $txtConfirm = newsletterPlugin::getTxtConfirm();
+               
+               $urlResume = '';
+                         
+               switch ($subscriber->state) {
+                    case 'suspended':
+                    {
+                         $urlResume = $txt_intro_enable.' <a href="'.$urlEnable.'">'.$txtEnable.'</a><br />';
+                         $urlResume .= $txt_intro_disable.' <a href="'.$urlDisable.'">'.$txtDisable.'</a>';
+                         nlTemplate::assign('txtResume', __('Your account is suspended.'));
+                         break;
+                    }
+                    case 'disabled':
+                    {
+                         $urlResume = $txt_intro_enable.' <a href="'.$urlEnable.'">'.$txtEnable.'</a><br />';
+                         if(newsletterPlugin::getCheckUseSuspend()) {
+                              $urlResume .= $txt_intro_suspend.' <a href="'.$urlSuspend.'">'.$txtSuspend.'</a>';
+                         }
+                         nlTemplate::assign('txtResume', __('Your account is disabled.'));
+                         break;
+                    }
+                    case 'enabled':
+                    {
+                         $urlResume = $txt_intro_disable.' <a href="'.$urlDisable.'">'.$txtDisable.'</a><br />';
+                         if(newsletterPlugin::getCheckUseSuspend()) {
+                              $urlResume .= $txt_intro_suspend.' <a href="'.$urlSuspend.'">'.$txtSuspend.'</a>';
+                         }
+                         nlTemplate::assign('txtResume', __('Your account is enabled.'));
+                         break;
+                    }
+                    case 'pending':
+                    {
+                         $urlResume = $txt_intro_disable.' <a href="'.$urlDisable.'">'.$txtDisable.'</a><br />';
+                         $urlResume .= $txt_intro_confirm.' <a href="'.$urlConfirm.'">'.$txtConfirm.'</a>';
+                         nlTemplate::assign('txtResume', __('Your account is pending confirmation.'));
+                         break;
+                    }
+                    default:
+                    {
+                    }
+               }
+ 
+               // définition du format d'envoi
+               if (!newsletterPlugin::getUseDefaultFormat() && $subscriber->modesend != null) {
+                    $mode = $subscriber->modesend;
+               }
+
+               nlTemplate::assign('txtMode', __('Your sending mode is'). ' ' .__(''.$mode.''). '.');
+               nlTemplate::assign('urlResume', $urlResume);
+               $body = nlTemplate::render('resume', $mode);
+
+               if($mode == 'text') {
+                    $convert = new html2text();
+                    $convert->set_html($body);
+                    $convert->labelLinks = __('Links:');
+                    $body = $convert->get_text();
+               }
+
+               // ajoute le message dans la liste d'envoi
+               $newsletter_mailing->addMessage($subscriber_id,$subscriber->email,$subject,$body,$mode);
+          }
+          return true;
+     }
+
+     /**
+      * Prepare le contenu des messages de type changemode
+      * Modifie l'objet newsletterMailing fourni en parametre
+      *
+      * @param:     $ids                     array
+      * @param:     $newsletter_mailing      newsletterMailing
+      *
+      * @return:    boolean
+      */
+     private static function prepareMessagesChangeMode($ids=-1,&$newsletter_mailing)
+     {
+          // initialisation des variables de travail
+          $mode = newsletterPlugin::getSendMode();
+          $subject = text::toUTF8(newsletterPlugin::getChangeModeSubject());
+
+          // initialisation du moteur de template
+          self::BeforeSendmailTo(__('Newsletter account change format for'), __('Have a nice day !'));
+
+          // boucle sur les ids des abonnés
+          foreach ($ids as $subscriber_id)
+          {
+               // récupération de l'abonné et extraction des données
+               $subscriber = self::get($subscriber_id);
+
+               // définition du format d'envoi
+               if (!newsletterPlugin::getUseDefaultFormat() && $subscriber->modesend != null) {
+                    $mode = $subscriber->modesend;
+               }                        
+                         
+               // génération du rendu
+               nlTemplate::assign('urlEnable', self::url('enable/'.newsletterTools::base64_url_encode($subscriber->email)));
+
+               $body = nlTemplate::render('changemode', $mode);
+
+               if($mode == 'text') {
+                    $convert = new html2text();
+                    $convert->set_html($body);
+                    $convert->labelLinks = __('Links:');
+                    $body = $convert->get_text();
+               }
+
+               // ajoute le message dans la liste d'envoi
+               $newsletter_mailing->addMessage($subscriber_id,$subscriber->email,$subject,$body,$mode);
+          }
+          return true;
+     }
+
+     /**
+      * Envoi automatique de la newsletter pour tous les abonnés actifs
+      *
+      * @return:    boolean
+      */
      public static function autosendNewsletter()
      {
@@ -1045 +1373 @@
           } else {
                $datas = self::getlist(true);
-          if (!is_object($datas)) {
-               return;
-          } else {
-                    global $core;
-                    try {
-                         $datas->moveStart();
-                         while ($datas->fetch()) { 
-                              self::sendNewsletter($datas->subscriber_id); 
-                         }
-                    } catch (Exception $e) { 
-                         $core->error->add($e->getMessage()); 
-                         
-                    }
+               if (!is_object($datas)) {
+                    return;
+               } else {
+                    $ids = array();
+                    $datas->moveStart();
+                    while ($datas->fetch()) { 
+                         $ids[] = $datas->subscriber_id;
+                    }
+                    self::send($ids,'newsletter');
                }              
           }    
@@ -1063 +1387 @@
 
      /**
-     * envoi automatique de la newsletter par la tâche planifiée
-     */
+      * Envoi par tâche planifiée de la newsletter pour tous les abonnés actifs
+      *
+      * @return:    boolean
+      */
      public static function cronSendNewsletter()
      {
@@ -1080 +1406 @@
                     return;
                } else {
-                    global $core;
-                    try {
-                         $datas->moveStart();
-                         while ($datas->fetch()) { 
-                              $msg = self::sendNewsletter($datas->subscriber_id); 
-                         }
-                    } catch (Exception $e) { 
-                         $core->error->add($e->getMessage()); 
-                    }
-               }
-          }
-     }
-     
-     /**
-     * envoi de la confirmation
-     */
-     public static function sendConfirm($id = -1)
-     {
-          // test si le plugin est actif
-          if (!newsletterPlugin::isActive()) return false;
-
-          // test sur la valeur de l'id qui doit être positive ou null
-          else if ($id == -1) return false;
-
-          // envoi des mails aux abonnés
-          else
-          {
-               global $core;
-               try
-               {
-                   $url = &$core->url;
-                   $blog = &$core->blog;
-                   $blogurl = &$blog->url;
-
-                    // prise en compte du paramètres: liste d'id ou id simple
-                    if (is_array($id)) {
-                         $ids = $id;
-                    } else { 
-                         $ids = array(); $ids[] = $id; 
-                    }
-
-                    // initialisation du moteur de template
-                    $send_ok = array();
-                    $send_error = array();
-                    $states = array();
-                    self::BeforeSendmailTo(__('Newsletter subscription confirmation for'), __('Thanks you for subscribing.'));
-
-                    // initialisation des variables de travail
-                    $blogname = &$blog->name;
-                    $editorName = newsletterPlugin::getEditorName();
-                    $editorEmail = newsletterPlugin::getEditorEmail();
-                    $mode = newsletterPlugin::getSendMode();
-                    $subject = text::toUTF8(newsletterPlugin::getConfirmSubject());
-
-                    // boucle sur les ids des abonnés à mailer
-                    foreach ($ids as $subscriber_id)
-                    {
-                         // récupération de l'abonné et extraction des données
-                         $subscriber = self::get($subscriber_id);
-
-                         // définition du format d'envoi
-                         if (!newsletterPlugin::getUseDefaultFormat() && $subscriber->modesend != null) {
-                              $mode = $subscriber->modesend;
-                         }
-
-                         // génération du rendu
-                         //*
-                         nlTemplate::assign('urlConfirm', self::url('confirm/'.self::base64_url_encode($subscriber->email).'/'.$subscriber->regcode.'/'.self::base64_url_encode($subscriber->modesend)));
-                         nlTemplate::assign('urlDisable', self::url('disable/'.self::base64_url_encode($subscriber->email)));
-                         //*/
-                         /*
-                         nlTemplate::assign('urlConfirm', self::url('confirm/'.str_replace('=','',base64_encode($subscriber->email).'/'.$subscriber->regcode.'/'.base64_encode($subscriber->modesend))));
-                         nlTemplate::assign('urlDisable', self::url('disable/'.str_replace('=','',base64_encode($subscriber->email))));
-                         //*/
-                         $body = nlTemplate::render('confirm', $mode);
-
-                         // envoi du mail et log
-                         if (self::Sendmail($editorEmail, $editorName, $subscriber->email, $subject, $body, $mode))
-                         {
-                              $send_ok[] = $subscriber->email;
-                              $states[] = $subscriber_id;
-                         }
-                         else 
-                              $send_error[] = $subscriber->email;
-                    }
-
-                if (is_array($states) && count($states) > 0)
-                    self::confirm($states);
-                
-                    $msg = '';
-                    if (count($send_ok) > 0) $msg .= __('Successful mail sent for').' '.implode(', ', $send_ok);
-                    if (count($send_ok) > 0 && count($send_error) > 0) $msg .= '<br />';
-                    if (count($send_error) > 0) $msg .= __('Mail sent error for').' '.implode(', ', $send_error);
-
-                    return $msg;
-               }
-               catch (Exception $e) { $core->error->add($e->getMessage()); }
-          }
-     }
-
-     /**
-     * envoi de la notification de suspension
-     */
-     public static function sendSuspend($id = -1)
-     {
-          if (!newsletterPlugin::isActive()) { // test si le plugin est actif
-               return false;
-          
-          } else if ($id == -1) { // test sur la valeur de l'id qui doit être positive ou null
-               return false;
-          } else {  
-               // envoi des mails aux abonnés
-               global $core;
-               try
-               {
-                   $url = &$core->url;
-                   $blog = &$core->blog;
-                   $blogurl = &$blog->url;
-
-                    // prise en compte du paramètres: liste d'id ou id simple
-                    if (is_array($id)) 
-                         $ids = $id;
-                    else { 
-                         $ids = array(); 
-                         $ids[] = $id; 
-                    }
-
-                    // initialisation du moteur de template
-                    $send_ok = array();
-                    $send_error = array();
-                    $states = array();
-                    self::BeforeSendmailTo(__('Newsletter account suspend for'), __('Have a nice day !'));
-
-                    // initialisation des variables de travail
-                    $blogname = &$blog->name;
-                    $editorName = newsletterPlugin::getEditorName();
-                    $editorEmail = newsletterPlugin::getEditorEmail();
-                    $mode = newsletterPlugin::getSendMode();
-                    $subject = text::toUTF8(newsletterPlugin::getSuspendSubject());
-
-                    // boucle sur les ids des abonnés à mailer
-                    foreach ($ids as $subscriber_id)
-                    {
-                         // récupération de l'abonné et extraction des données
-                        $subscriber = self::get($subscriber_id);
-
-                         // définition du format d'envoi
-                         if (!newsletterPlugin::getUseDefaultFormat() && $subscriber->modesend != null) {
-                              $mode = $subscriber->modesend;
-                         }
-
-                         // génération du rendu
-                         //*
-                         nlTemplate::assign('urlEnable', self::url('enable/'.self::base64_url_encode($subscriber->email)));
-                         //*/
-                         /*
-                         nlTemplate::assign('urlEnable', self::url('enable/'.str_replace('=','',base64_encode($subscriber->email))));
-                         //*/
-                         $body = nlTemplate::render('suspend', $mode);
-
-                         // envoi du mail et log
-                         if (self::Sendmail($editorEmail, $editorName, $subscriber->email, $subject, $body, $mode))
-                         {
-                              $send_ok[] = $subscriber->email;
-                              $states[] = $subscriber_id;
-                         }
-                         else 
-                              $send_error[] = $subscriber->email;
-                    }
-               
-                    // positionnement de l'état des comptes sur 'compte suspendu'
-                if (is_array($states) && count($states) > 0)
-                    self::suspend($states);
-
-                    $msg = '';
-                    if (count($send_ok) > 0) $msg .= __('Successful mail sent for').' '.implode(', ', $send_ok);
-                    if (count($send_ok) > 0 && count($send_error) > 0) $msg .= '<br />';
-                    if (count($send_error) > 0) $msg .= __('Mail sent error for').' '.implode(', ', $send_error);
-
-                    return $msg;
-               }
-               catch (Exception $e) { $core->error->add($e->getMessage()); }
-          }
-     }
-
-     /**
-     * envoi de la notification d'activation
-     */
-     static function sendEnable($id = -1)
-     {
-          // test si le plugin est actif
-          if (!newsletterPlugin::isActive()) return false;
-
-          // test sur la valeur de l'id qui doit être positive ou null
-          else if ($id == -1) return false;
-
-          // envoi des mails aux abonnés
-          else
-          {
-               global $core;
-               try
-               {
-                   $url = &$core->url;
-                   $blog = &$core->blog;
-                   $blogurl = &$blog->url;
-
-                    // prise en compte du paramètres: liste d'id ou id simple
-                if (is_array($id)) $ids = $id;
-                else { $ids = array(); $ids[] = $id; }
-
-                    // initialisation du moteur de template
-                    $send_ok = array();
-                    $send_error = array();
-                    $states = array();
-                    self::BeforeSendmailTo(__('Newsletter account activation for'), __('Thank you for subscribing.'));
-
-                    // initialisation des variables de travail
-                    $blogname = &$blog->name;
-                    $editorName = newsletterPlugin::getEditorName();
-                    $editorEmail = newsletterPlugin::getEditorEmail();
-                    $mode = newsletterPlugin::getSendMode();
-                    $subject = text::toUTF8(newsletterPlugin::getEnableSubject());
-
-                    // boucle sur les ids des abonnés à mailer
-                    foreach ($ids as $subscriber_id)
-                    {
-                         // récupération de l'abonné et extraction des données
-                         $subscriber = self::get($subscriber_id);
-
-                         // définition du format d'envoi
-                         if (!newsletterPlugin::getUseDefaultFormat() && $subscriber->modesend != null) {
-                              $mode = $subscriber->modesend;
-                         }
-
-                         // génération du rendu
-                         //*
-                         nlTemplate::assign('urlDisable', self::url('disable/'.self::base64_url_encode($subscriber->email)));
-                         nlTemplate::assign('urlSuspend', self::url('suspend/'.self::base64_url_encode($subscriber->email)));
-                         //*/
-                         /*
-                         nlTemplate::assign('urlDisable', self::url('disable/'.str_replace('=','',base64_encode($subscriber->email))));
-                         nlTemplate::assign('urlSuspend', self::url('suspend/'.str_replace('=','',base64_encode($subscriber->email))));
-                         //*/
-                         $body = nlTemplate::render('enable', $mode);
-
-                         // envoi du mail et log
-                         if (self::Sendmail($editorEmail, $editorName, $subscriber->email, $subject, $body, $mode))
-                         {
-                              $send_ok[] = $subscriber->email;
-                              $states[] = $subscriber_id;
-                         }
-                         else 
-                              $send_error[] = $subscriber->email;
-                    }
-
-                    // positionnement de l'état des comptes sur 'compte validé'
-                if (is_array($states) && count($states) > 0)
-                    self::enable($states);
-
-                    $msg = '';
-                    if (count($send_ok) > 0) $msg .= __('Successful mail sent for').' '.implode(', ', $send_ok);
-                    if (count($send_ok) > 0 && count($send_error) > 0) $msg .= '<br />';
-                    if (count($send_error) > 0) $msg .= __('Mail sent error for').' '.implode(', ', $send_error);
-
-                    return $msg;
-               }
-               catch (Exception $e) { $core->error->add($e->getMessage()); }
-          }
-     }
-
-     /**
-     * envoi de la notification de désactivation de compte
-     */
-     static function sendDisable($id = -1)
-     {
-          // test si le plugin est actif
-          if (!newsletterPlugin::isActive()) return false;
-
-          // test sur la valeur de l'id qui doit être positive ou null
-          else if ($id == -1) return false;
-
-          // envoi des mails aux abonnés
-          else
-          {
-               global $core;
-               try
-               {
-                   $url = &$core->url;
-                   $blog = &$core->blog;
-                   $blogurl = &$blog->url;
-
-                    // prise en compte du paramètres: liste d'id ou id simple
-                if (is_array($id)) $ids = $id;
-                else { $ids = array(); $ids[] = $id; }
-
-                    // initialisation du moteur de template
-                    $send_ok = array();
-                    $send_error = array();
-                    $states = array();
-                    self::BeforeSendmailTo(__('Newsletter account removal for'), __('Have a nice day !'));
-
-                    // initialisation des variables de travail
-                    $blogname = &$blog->name;
-                    $editorName = newsletterPlugin::getEditorName();
-                    $editorEmail = newsletterPlugin::getEditorEmail();
-                    $mode = newsletterPlugin::getSendMode();
-                    $subject = text::toUTF8(newsletterPlugin::getDisableSubject());
-
-                    // boucle sur les ids des abonnés à mailer
-                    foreach ($ids as $subscriber_id)
-                    {
-                         // récupération de l'abonné et extraction des données
-                        $subscriber = self::get($subscriber_id);
-
-                         // définition du format d'envoi
-                         if (!newsletterPlugin::getUseDefaultFormat() && $subscriber->modesend != null) {
-                              $mode = $subscriber->modesend;
-                         }
-
-                         // génération du rendu
-                         //*
-                         nlTemplate::assign('urlEnable', self::url('enable/'.self::base64_url_encode($subscriber->email)));
-                         //*/
-                         /*
-                         nlTemplate::assign('urlEnable', self::url('enable/'.str_replace('=','',base64_encode($subscriber->email))));
-                         //*/
-                         $body = nlTemplate::render('disable', $mode);
-
-                         // envoi du mail et log
-                         if (self::Sendmail($editorEmail, $editorName, $subscriber->email, $subject, $body, $mode))
-                         {
-                              $send_ok[] = $subscriber->email;
-                              $states[] = $subscriber_id;
-                         }
-                         else $send_error[] = $subscriber->email;
-                    }
-
-                    // positionnement de l'état des comptes sur 'compte désactivés'
-                if (is_array($states) && count($states) > 0)
-                    self::disable($states);
-
-                    $msg = '';
-                    if (count($send_ok) > 0) $msg .= __('Successful mail sent for').' '.implode(', ', $send_ok);
-                    if (count($send_ok) > 0 && count($send_error) > 0) $msg .= '<br />';
-                    if (count($send_error) > 0) $msg .= __('Mail sent error for').' '.implode(', ', $send_error);
-
-                    return $msg;
-               }
-               catch (Exception $e) { $core->error->add($e->getMessage()); }
-          }
-     }
-
-     /**
-     * envoi d'un resumé du compte
-     */
-     public static function sendResume($id = -1)
-     {
-          if (!newsletterPlugin::isActive()) { // test si le plugin est actif
-               return false;
-          } else if ($id == -1) { // test sur la valeur de l'id qui doit être positive ou null
-               return false;
-          } else {  
-               // envoi des mails aux abonnés
-               global $core;
-               try
-               {
-                   $url = &$core->url;
-                   $blog = &$core->blog;
-                   $blogurl = &$blog->url;
-
-                    // prise en compte du paramètres: liste d'id ou id simple
-                    if (is_array($id)) 
-                         $ids = $id;
-                    else { 
-                         $ids = array(); 
-                         $ids[] = $id; 
-                    }
-
-                    // initialisation du moteur de template
-                    $send_ok = array();
-                    $send_error = array();
-                    $states = array();
-                    self::BeforeSendmailTo(__('Newsletter account resume for'), __('Have a nice day !'));
-
-                    // initialisation des variables de travail
-                    $blogname = &$blog->name;
-                    $editorName = newsletterPlugin::getEditorName();
-                    $editorEmail = newsletterPlugin::getEditorEmail();
-                    $mode = newsletterPlugin::getSendMode();
-                    $subject = text::toUTF8(newsletterPlugin::getResumeSubject());
-
-                    // boucle sur les ids des abonnés à mailer
-                    foreach ($ids as $subscriber_id)
-                    {
-                         // récupération de l'abonné et extraction des données
-                         $subscriber = self::get($subscriber_id);
-
-                         $txt_intro_enable = newsletterPlugin::getTxtIntroEnable().', ';
-                         /*
-                         $urlEnable = self::url('enable/'.str_replace('=','',base64_encode($subscriber->email)));
-                         //*/
-                         $urlEnable = self::url('enable/'.self::base64_url_encode($subscriber->email));
-                         $txtEnable = newsletterPlugin::getTxtEnable();
-                         
-                         $txt_intro_disable = newsletterPlugin::getTxtIntroDisable().', ';
-                         /*
-                         $urlDisable = self::url('disable/'.str_replace('=','',base64_encode($subscriber->email)));
-                         //*/
-                         $urlDisable = self::url('disable/'.self::base64_url_encode($subscriber->email));
-                         $txtDisable = newsletterPlugin::getTxtDisable();
-
-                         
-                         if(newsletterPlugin::getCheckUseSuspend()) {
-                              $txt_intro_suspend = newsletterPlugin::getTxtIntroSuspend().', ';
-                              /*
-                              $urlSuspend = self::url('suspend/'.str_replace('=','',base64_encode($subscriber->email)));
-                              //*/
-                              $urlSuspend = self::url('suspend/'.self::base64_url_encode($subscriber->email));
-                              $txtSuspend = newsletterPlugin::getTxtSuspend();
-                         } else {
-                              $txt_intro_suspend = ' ';
-                              $urlSuspend = ' ';
-                              $txtSuspend = ' ';
-                         }
-                         
-
-                         $txt_intro_confirm = newsletterPlugin::getTxtIntroConfirm().', ';
-                         /*
-                         $urlConfirm = self::url('confirm/'.str_replace('=','',base64_encode($subscriber->email).'/'.$subscriber->regcode.'/'.base64_encode($subscriber->modesend)));
-                         //*/
-                         $urlConfirm = self::url('confirm/'.self::base64_url_encode($subscriber->email).'/'.$subscriber->regcode.'/'.self::base64_url_encode($subscriber->modesend));
-                         $txtConfirm = newsletterPlugin::getTxtConfirm();
-               
-                         $urlResume = '';
-                         
-                         switch ($subscriber->state) {
-                              case 'suspended':
-                              {
-                                   $urlResume = $txt_intro_enable.' <a href="'.$urlEnable.'">'.$txtEnable.'</a><br />';
-                                   $urlResume .= $txt_intro_disable.' <a href="'.$urlDisable.'">'.$txtDisable.'</a>';
-                                   nlTemplate::assign('txtResume', __('Your account is suspended.'));
-                                   break;
-                              }
-                              case 'disabled':
-                              {
-                                   $urlResume = $txt_intro_enable.' <a href="'.$urlEnable.'">'.$txtEnable.'</a><br />';
-                                   $urlResume .= $txt_intro_suspend.' <a href="'.$urlSuspend.'">'.$txtSuspend.'</a>';
-                                   nlTemplate::assign('txtResume', __('Your account is disabled.'));
-                                   break;
-                              }
-                              case 'enabled':
-                              {
-                                   $urlResume = $txt_intro_disable.' <a href="'.$urlDisable.'">'.$txtDisable.'</a><br />';
-                                   $urlResume .= $txt_intro_suspend.' <a href="'.$urlSuspend.'">'.$txtSuspend.'</a>';
-                                   nlTemplate::assign('txtResume', __('Your account is enabled.'));
-                                   break;
-                              }
-                              case 'pending':
-                              {
-                                   $urlResume = $txt_intro_disable.' <a href="'.$urlDisable.'">'.$txtDisable.'</a><br />';
-                                   $urlResume .= $txt_intro_confirm.' <a href="'.$urlConfirm.'">'.$txtConfirm.'</a>';
-                                   nlTemplate::assign('txtResume', __('Your account is pending confirmation.'));
-                                   break;
-                              }
-                              default:
-                              {
-                              }
-                         }
- 
-                         // définition du format d'envoi
-                         if (!newsletterPlugin::getUseDefaultFormat() && $subscriber->modesend != null) {
-                              $mode = $subscriber->modesend;
-                         }
-
-                         if($mode == 'text') {
-                              $convert = new html2text();
-                              $convert->set_html($urlResume);
-                              $urlResume = $convert->get_text();
-                         } 
-                         
-                         nlTemplate::assign('txtMode', __('Your sending mode is'). ' ' .__(''.$mode.''). '.');
-                         nlTemplate::assign('urlResume', $urlResume);
-                         $body = nlTemplate::render('resume', $mode);
-                         
-                         // envoi du mail et log
-                         if (self::Sendmail($editorEmail, $editorName, $subscriber->email, $subject, $body, $mode))
-                         {
-                              $send_ok[] = $subscriber->email;
-                              $states[] = $subscriber_id;
-                         }
-                         else $send_error[] = $subscriber->email;
-                    }
-               
-                    if (count($send_ok) > 0) $msg .= __('Successful mail sent for').' '.implode(', ', $send_ok);
-                    if (count($send_ok) > 0 && count($send_error) > 0) $msg .= '<br />';
-                    if (count($send_error) > 0) $msg .= __('Mail sent error for').' '.implode(', ', $send_error);
-
-                    return $msg;
-               }
-               catch (Exception $e) { 
-                    $core->error->add($e->getMessage()); 
-               }
-          }
-     }
-
-     /**
-     * envoi de la notification de changement de format
-     */
-     static function sendChangeMode($id = -1)
-     {
-          // test si le plugin est actif
-          if (!newsletterPlugin::isActive()) 
-               return false;
-
-          // test sur la valeur de l'id qui doit être positive ou null
-          else if ($id == -1) 
-               return false;
-
-          // envoi des mails aux abonnés
-          else
-          {
-               global $core;
-               try
-               {
-                    $url = &$core->url;
-                    $blog = &$core->blog;
-                    $blogurl = &$blog->url;
-
-                    // prise en compte du paramètres: liste d'id ou id simple
-                    if (is_array($id)) 
-                         $ids = $id;
-                    else { 
-                         $ids = array(); $ids[] = $id; 
-                    }
-
-                    // initialisation du moteur de template
-                    $send_ok = array();
-                    $send_error = array();
-                    $states = array();
-                    self::BeforeSendmailTo(__('Newsletter account change format for'), __('Have a nice day !'));
-
-                    // initialisation des variables de travail
-                    $blogname = &$blog->name;
-                    $editorName = newsletterPlugin::getEditorName();
-                    $editorEmail = newsletterPlugin::getEditorEmail();
-                    $mode = newsletterPlugin::getSendMode();
-                    $subject = text::toUTF8(newsletterPlugin::getChangeModeSubject());
-
-                    // boucle sur les ids des abonnés à mailer
-                    foreach ($ids as $subscriber_id)
-                    {
-                         // récupération de l'abonné et extraction des données
-                         $subscriber = self::get($subscriber_id);
-
-                         // définition du format d'envoi
-                         if (!newsletterPlugin::getUseDefaultFormat() && $subscriber->modesend != null) {
-                              $mode = $subscriber->modesend;
-                         }                        
-                         
-                         // génération du rendu
-                         /*
-                         nlTemplate::assign('urlEnable', self::url('enable/'.str_replace('=','',base64_encode($subscriber->email))));
-                         //*/
-                         nlTemplate::assign('urlEnable', self::url('enable/'.self::base64_url_encode($subscriber->email)));
-
-                         $body = nlTemplate::render('changemode', $mode);
-
-                         // envoi du mail et log
-                         if (self::Sendmail($editorEmail, $editorName, $subscriber->email, $subject, $body, $mode))
-                         {
-                              $send_ok[] = $subscriber->email;
-                              $states[] = $subscriber_id;
-                         }
-                         else 
-                              $send_error[] = $subscriber->email;
-                    }
-
-                    $msg = '';
-                    if (count($send_ok) > 0) $msg .= __('Successful mail sent for').' '.implode(', ', $send_ok);
-                    if (count($send_ok) > 0 && count($send_error) > 0) $msg .= '<br />';
-                    if (count($send_error) > 0) $msg .= __('Mail sent error for').' '.implode(', ', $send_error);
-
-                    return $msg;
-               }
-               catch (Exception $e) { $core->error->add($e->getMessage()); }
+                    $ids = array();
+                    $datas->moveStart();
+                    while ($datas->fetch()) { 
+                         $ids[] = $datas->subscriber_id;
+                    }
+                    self::send($ids,'newsletter');
+               }
           }
      }
@@ -1675 +1423 @@
      * création du compte
      */
-     static function accountCreate($email = null, $regcode = null, $modesend = null)
-     {
-          
-          if (!newsletterPlugin::isActive()) {    // test si le plugin est actif
-               return __('Newsletter is disabled.');
-          } else if ($email == null) {            // l'email doit être renseigné
-               return __('Bad email !');
-          } else {                                // création du compte
-               global $core;
-               try {
-                  if (self::getemail($email) != null) {
-                    return __('Email already exist !');
-                  } else if (!self::add($email, null, null, $modesend)) {
-                    return __('Error creating account !');
-                  } else {
-                       $subscriber = self::getemail($email);
-                       return self::sendConfirm($subscriber->subscriber_id);
-                    }
-               } catch (Exception $e) { 
-                    $core->error->add($e->getMessage()); 
-               }
+     public static function accountCreate($email = null, $regcode = null, $modesend = null)
+     {
+          global $core;
+          try {          
+               if ($email == null) {              // l'email doit être renseigné
+                    return __('Bad email !');
+               } else {                           // création du compte
+                    if (self::getemail($email) != null) {
+                         return __('Email already exist !');
+                    } else if (!self::add($email, null, null, $modesend)) {
+                         return __('Error creating account !');
+                    } else {
+                         $subscriber = self::getemail($email);
+                         $msg = self::send($subscriber->subscriber_id,'confirm');
+                         return $msg;
+                    }
+               }
+          } catch (Exception $e) { 
+               $core->error->add($e->getMessage()); 
           }
      }
@@ -1702 +1448 @@
      * suppression du compte
      */
-     static function accountDelete($email = null)
-     {
-          // test si le plugin est actif
-          if (!newsletterPlugin::isActive()) 
-               return __('Newsletter is disabled.');
-          // l'email doit être renseigné
-          else if ($email == null) 
-               return __('Bad email !');
-          // création du compte
-          else {
-               global $core;
-               try {
+     public static function accountDelete($email = null)
+     {
+          global $core;
+          try {          
+               if ($email == null) {              // l'email doit être renseigné
+                    return __('Bad email !');
+               } else {                           // suppression du compte
                     $subscriber = self::getemail($email);
                     $msg = null;
@@ -1719 +1460 @@
                          return __('Email don\'t exist !');
                     else {
-                         $msg = self::sendDisable($subscriber->subscriber_id);
+                         $msg = self::send($subscriber->subscriber_id,'disable');
                          self::delete($subscriber->subscriber_id);
                          return $msg;
                     }
-               } catch (Exception $e) { 
-                    $core->error->add($e->getMessage()); 
-               }
+               }
+          } catch (Exception $e) { 
+               $core->error->add($e->getMessage()); 
           }
      }
@@ -1734 +1475 @@
      static function accountSuspend($email = null)
      {
-          if (!newsletterPlugin::isActive()) { // test si le plugin est actif
-               return __('Newsletter is disabled.');
-          } else if ($email == null) { // l'email doit être renseigné
-               return __('Bad email !');
-          } else { // suspension du compte
-               global $core;
-               try {
+          global $core;
+          try {
+
+               if ($email == null) {              // l'email doit être renseigné
+                    return __('Bad email !');
+               } else {                           // suspension du compte
                     $subscriber = self::getemail($email);
-                         $msg = null;
+                    $msg = '';
                     if (!$subscriber || $subscriber->subscriber_id == null) 
                          return __('Email don\'t exist !');
                     else {
-                         $msg = self::sendSuspend($subscriber->subscriber_id);
+                         $msg = self::send($subscriber->subscriber_id,'suspend');                        
                          self::suspend($subscriber->subscriber_id);
                          return $msg;
                     }
-               } catch (Exception $e) { 
-                    $core->error->add($e->getMessage()); 
-               }
+               }
+          } catch (Exception $e) { 
+               $core->error->add($e->getMessage()); 
           }
      }
@@ -1759 +1499 @@
      * information sur le compte
      */
-     static function accountResume($email = null)
-     {
-          if (!newsletterPlugin::isActive()) { // test si le plugin est actif
-               return __('Newsletter is disabled.');
-          } else if ($email == null) { // l'email doit être renseigné
-               return __('Bad email !');
-          } else { // information sur le compte
-               global $core;
-               try {
+     public static function accountResume($email = null)
+     {
+          global $core;
+          try {          
+               if ($email == null) {              // l'email doit être renseigné
+                    return __('Bad email !');
+               } else {                           // information sur le compte
                     $subscriber = self::getemail($email);
-                         $msg = null;
+                    $msg = '';
                     if (!$subscriber || $subscriber->subscriber_id == null) 
                          return __('Email don\'t exist !');
                     else {
-                         $msg = self::sendResume($subscriber->subscriber_id);
+                         $msg = self::send($subscriber->subscriber_id,'resume');                         
                          //self::resume($subscriber->subscriber_id);
                          return $msg;
                     }
-               } catch (Exception $e) { 
-                    $core->error->add($e->getMessage()); 
-               }
-          }
+               }
+          } catch (Exception $e) { 
+               $core->error->add($e->getMessage()); 
+          }         
      }
 
@@ -1786 +1524 @@
      * changement du format sur le compte
      */
-     static function accountChangeMode($email = null, $modesend = null)
-     {
-          if (!newsletterPlugin::isActive()) { // test si le plugin est actif
-               return __('Newsletter is disabled.');
-          } else if ($email == null) { // l'email doit être renseigné
-               return __('Bad email !');
-          } else { // information sur le compte
-               global $core;
-               try {
+     public static function accountChangeMode($email = null, $modesend = null)
+     {
+          global $core;
+          try {
+               if ($email == null) {              // l'email doit être renseigné
+                    return __('Bad email !');
+               } else {                           // information sur le compte
                     $subscriber = self::getemail($email);
-                         $msg = null;
+                    $msg = '';
                     if (!$subscriber || $subscriber->subscriber_id == null) 
                          return __('Email don\'t exist !');
                     else {
-                         $msg = self::sendChangeMode($subscriber->subscriber_id);
+                         $msg = self::send($subscriber->subscriber_id,'changemode');                     
                          self::changeMode($subscriber->subscriber_id, $modesend);
                          return $msg;
                     }
-               } catch (Exception $e) { 
-                    $core->error->add($e->getMessage()); 
-               }
-          }
-     }
-
-     // use by : NewsletterFormRandom
-     public static function getRandom()
-     {
-          list($usec, $sec) = explode(' ', microtime());
-          $seed = (float) $sec + ((float) $usec * 100000);
-          mt_srand($seed);
-          return mt_rand();
+               }
+          } catch (Exception $e) { 
+               $core->error->add($e->getMessage()); 
+          }
      }
 

plugins/newsletter/trunk/inc/class.template.php

@@ -22 +22 @@
      * répertoire des templates
      */
-     //public static function folder() { return newsletterPlugin::folder().'templates/'; }
      public static function folder() { 
           return newsletterPlugin::folder().'../default-templates/'; 
@@ -74 +73 @@
                     break;
                
-               default: return false;
+               default: 
+                    return false;
           }
      
@@ -158 +158 @@
 
                          if ($mode == 'text') 
-                              $content = str_replace("{nl}", "\n", $content);
+                              $content = str_replace("{nl}", "<br />", $content);
+                              //$content = str_replace("{nl}", "\n", $content);
                          else if ($mode == 'html') 
                               $content = str_replace("{nl}", "<br />", $content);              
-                         }              
+                         
                     }
+               }
                
-                    // boucle sur la liste des méta champs pour en remplacer les valeurs
-                    foreach (self::$metas as $k => $v)
-                    {
-                         if (!is_array($v)) {
-                              $tag = '{$'.$k.'}';
-                              $content = str_replace($tag, $v, $content);
-                         }
+               // boucle sur la liste des méta champs pour en remplacer les valeurs
+               foreach (self::$metas as $k => $v)
+               {
+                    if (!is_array($v)) {
+                         $tag = '{$'.$k.'}';
+                         $content = str_replace($tag, $v, $content);
+                         
+                         if ($mode == 'text') 
+                              $content = str_replace("{nl}", "<br />", $content);
+                              //$content = str_replace("{nl}", "\n", $content);
+                         else if ($mode == 'html') 
+                              $content = str_replace("{nl}", "<br />", $content);                             
+                         
                     }
+               }
                
-                    // renvoi le contenu transformé
-                    return $content;
+               // renvoi le contenu transformé
+               return $content;
           
           } catch (Exception $e) { 

plugins/newsletter/trunk/index.php

@@ -19 +19 @@
 require_once dirname(__FILE__).'/inc/class.newsletter.admin.php';
 require_once dirname(__FILE__).'/inc/class.newsletter.cron.php';
+require_once dirname(__FILE__).'/inc/class.newsletter.tools.php';
+//require_once dirname(__FILE__).'/inc/class.newsletter.mailing.php';
+
 
 // paramétrage des variables
@@ -615 +618 @@
                     $ids[] = $id; 
                }
-               $msg = newsletterCore::sendNewsletter($ids);
-               //$msg .= ' subscribers count = '.sizeof($ids);
+               $msg = newsletterCore::send($ids,'newsletter');
           } catch (Exception $e) { 
                $core->error->add($e->getMessage());
@@ -637 +639 @@
          {
                $msg = __('No account changed.');
-               if (is_array($_POST['subscriber']))
-               {
+               if (is_array($_POST['subscriber'])) {
                     $ids = array();
-                    foreach (array_keys($_POST['subscriber']) as $id) { $ids[] = $id; }
-                    {
+                    foreach (array_keys($_POST['subscriber']) as $id) { $ids[] = $id; }
+                    {
                          if (newsletterCore::lastsent($ids, 'clear')) 
                               $msg = __('Account(s) successfully changed.');
@@ -696 +697 @@
           $plugin_tab = 'tab_listblog';
 
-         try
-         {
-             $ids = array();
-             foreach (array_keys($_POST['subscriber']) as $id) { $ids[] = $id; }
-             $msg = newsletterCore::sendConfirm($ids);
-          }
-         catch (Exception $e) { $core->error->add($e->getMessage()); }
+          try {
+               $ids = array();
+               foreach (array_keys($_POST['subscriber']) as $id) 
+               { 
+                    $ids[] = $id; 
+               }
+               $msg = newsletterCore::send($ids,'confirm');
+          } catch (Exception $e) { 
+               $core->error->add($e->getMessage()); 
+          }
      }
      break;
@@ -711 +715 @@
           $plugin_tab = 'tab_listblog';
 
-         try
-         {
-             $ids = array();
-             foreach (array_keys($_POST['subscriber']) as $id) { $ids[] = $id; }
-             $msg = newsletterCore::sendSuspend($ids);
-          }
-         catch (Exception $e) { $core->error->add($e->getMessage()); }
+          try {
+               $ids = array();
+               foreach (array_keys($_POST['subscriber']) as $id) 
+               { 
+                    $ids[] = $id; 
+               }
+               $msg = newsletterCore::send($ids,'suspend');
+          } catch (Exception $e) { 
+               $core->error->add($e->getMessage()); 
+          }
      }
      break;
@@ -726 +733 @@
           $plugin_tab = 'tab_listblog';
 
-         try
-         {
-             $ids = array();
-             foreach (array_keys($_POST['subscriber']) as $id) { $ids[] = $id; }
-             $msg = newsletterCore::sendDisable($ids);
-          }
-         catch (Exception $e) { $core->error->add($e->getMessage()); }
+          try {
+               $ids = array();
+               foreach (array_keys($_POST['subscriber']) as $id) 
+               { 
+                    $ids[] = $id; 
+               }
+               $msg = newsletterCore::send($ids,'disable');
+          } catch (Exception $e) { 
+               $core->error->add($e->getMessage()); 
+          }
      }
      break;
@@ -741 +751 @@
           $plugin_tab = 'tab_listblog';
 
-         try
-         {
-             $ids = array();
-             foreach (array_keys($_POST['subscriber']) as $id) { $ids[] = $id; }
-             $msg = newsletterCore::sendEnable($ids);
-          }
-         catch (Exception $e) { $core->error->add($e->getMessage()); }
+          try {
+               $ids = array();
+               foreach (array_keys($_POST['subscriber']) as $id) 
+               { 
+                    $ids[] = $id; 
+               }
+               $msg = newsletterCore::send($ids,'enable');
+          } catch (Exception $e) { 
+               $core->error->add($e->getMessage()); 
+          }
      }
      break;
@@ -803 +816 @@
                $msg = __('No template adapted.');
                if (!empty($_POST['fthemes'])) {
-                    if (newsletterAdmin::Adapt($_POST['fthemes'])) $msg = __('Template successfully adapted.');
+                    if (newsletterAdmin::Adapt($_POST['fthemes'])) 
+                         $msg = __('Template successfully adapted.');
                }
           } catch (Exception $e) { 
@@ -816 +830 @@
           $plugin_tab = 'tab_maintenance';
           try {
-          
                newsletterAdmin::Uninstall();
                $msg = __('Erasing complete.');

plugins/newsletter/trunk/locales/fr/main.lang.php

@@ -4 +4 @@
 
 # _install.php:40
-# index.php:45
+# index.php:48
 $GLOBALS['__l10n']['Unable to install Newsletter.']='Impossible d\'installer Newsletter';
 
-# _public.php:71
+# _public.php:75
 $GLOBALS['__l10n']['Test display template.']='Test d\'affichage du template.';
 
-# _public.php:75
+# _public.php:79
 $GLOBALS['__l10n']['About Newsletter ...']='A propos de Newsletter ...';
 
-# _public.php:76
+# _public.php:80
 $GLOBALS['__l10n']['About']='A propos';
 
-# _public.php:78
+# _public.php:82
 $GLOBALS['__l10n']['Authors']='Auteurs';
 
-# _public.php:84
-# _public.php:100
-# _public.php:116
-# _public.php:132
-# _public.php:148
-$GLOBALS['__l10n']['Missing informations. ']='Informations manquantes.';
-
 # _public.php:88
-$GLOBALS['__l10n']['Your subscription code is invalid.']='Votre code d\'inscription est invalide.';
-
-# _public.php:90
-$GLOBALS['__l10n']['Account already confirmed.']='Abonnement déja confirmé.';
-
-# _public.php:93
-$GLOBALS['__l10n']['Your subscription is confirmed.']='Votre inscription est confirmée.';
-
-# _public.php:93
-# _public.php:109
-# _public.php:125
-# _public.php:141
-# _public.php:155
-$GLOBALS['__l10n']['You will soon receive an email.']='Vous allez bientôt recevoir un email.';
-
 # _public.php:104
 # _public.php:120
 # _public.php:136
 # _public.php:152
+$GLOBALS['__l10n']['Missing informations. ']='Informations manquantes.';
+
+# _public.php:92
+$GLOBALS['__l10n']['Your subscription code is invalid.']='Votre code d\'inscription est invalide.';
+
+# _public.php:94
+$GLOBALS['__l10n']['Account already confirmed.']='Abonnement déja confirmé.';
+
+# _public.php:97
+$GLOBALS['__l10n']['Your subscription is confirmed.']='Votre inscription est confirmée.';
+
+# _public.php:97
+# _public.php:113
+# _public.php:129
+# _public.php:145
+# _public.php:159
+$GLOBALS['__l10n']['You will soon receive an email.']='Vous allez bientôt recevoir un email.';
+
+# _public.php:108
+# _public.php:124
+# _public.php:140
+# _public.php:156
 $GLOBALS['__l10n']['Unable to find you account informations.']='Impossible de trouver les informations de votre compte.';
 
-# _public.php:106
+# _public.php:110
 $GLOBALS['__l10n']['Account already enabled.']='Abonnement déja activé.';
 
-# _public.php:109
-# inc/class.newsletter.core.php:1536
+# _public.php:113
+# inc/class.newsletter.core.php:1245
 $GLOBALS['__l10n']['Your account is enabled.']='Votre abonnement est activé.';
 
-# _public.php:122
+# _public.php:126
 $GLOBALS['__l10n']['Account already disabled.']='Abonnement déja désactivé.';
 
-# _public.php:125
-# inc/class.newsletter.core.php:1529
+# _public.php:129
+# inc/class.newsletter.core.php:1238
 $GLOBALS['__l10n']['Your account is disabled.']='Votre abonnement est désactivé.';
 
-# _public.php:138
+# _public.php:142
 $GLOBALS['__l10n']['Account already suspended.']='Abonnement déja suspendu.';
 
-# _public.php:141
-# inc/class.newsletter.core.php:1522
+# _public.php:145
+# inc/class.newsletter.core.php:1231
 $GLOBALS['__l10n']['Your account is suspended.']='Votre abonnement est suspendu.';
 
-# _public.php:155
+# _public.php:159
 $GLOBALS['__l10n']['Your sending format is']='Votre format d\'envoi est';
 
-# _public.php:178
+# _public.php:182
 $GLOBALS['__l10n']['Bad captcha code.']='Mauvais code de vérification.';
 
-# _public.php:201
+# _public.php:205
 $GLOBALS['__l10n']['Error in formular.']='Erreur dans le formulaire.';
 
-# _public.php:219
-# _public.php:436
+# _public.php:223
+# _public.php:440
 # _widgets.php:25
 # _widgets.php:27
-# inc/class.newsletter.admin.php:925
-# index.php:23
+# inc/class.newsletter.admin.php:930
+# inc/class.newsletter.plugin.php:776
+# index.php:26
 $GLOBALS['__l10n']['Newsletter']='Lettre d\'informations';
 
-# _public.php:272
-# _public.php:494
-# _public.php:495
-# inc/class.newsletter.admin.php:499
+# _public.php:276
+# _public.php:498
+# _public.php:499
+# inc/class.newsletter.admin.php:504
 $GLOBALS['__l10n']['Captcha']='Code visuel';
 
-# _public.php:298
+# _public.php:302
+# _public.php:387
+# _public.php:472
+# _public.php:477
+# inc/class.newsletter.admin.php:923
+$GLOBALS['__l10n']['Suspend']='Suspendre';
+
+# _public.php:306
+# _public.php:390
+# _public.php:478
+$GLOBALS['__l10n']['Resume']='Résumé';
+
+# _public.php:325
+# _public.php:368
+# _public.php:461
+# inc/class.newsletter.admin.php:341
+# inc/class.newsletter.admin.php:942
+# inc/class.newsletter.admin.php:994
+$GLOBALS['__l10n']['text']='texte';
+
+# _public.php:332
 # _public.php:383
 # _public.php:468
-# _public.php:473
-# inc/class.newsletter.admin.php:918
-$GLOBALS['__l10n']['Suspend']='Suspendre';
-
-# _public.php:302
-# _public.php:386
-# _public.php:474
-$GLOBALS['__l10n']['Resume']='Résumé';
-
-# _public.php:321
-# _public.php:364
-# _public.php:457
-# inc/class.newsletter.admin.php:341
-# inc/class.newsletter.admin.php:937
-# inc/class.newsletter.admin.php:989
-$GLOBALS['__l10n']['text']='texte';
-
-# _public.php:328
-# _public.php:379
-# _public.php:464
 $GLOBALS['__l10n']['Change format']='Changer le format';
 
-# _public.php:361
-# _public.php:454
+# _public.php:365
+# _public.php:458
 $GLOBALS['__l10n']['Format']='Format';
 
-# _public.php:363
-# _public.php:456
+# _public.php:367
+# _public.php:460
 # inc/class.newsletter.admin.php:342
-# inc/class.newsletter.admin.php:936
-# inc/class.newsletter.admin.php:990
+# inc/class.newsletter.admin.php:941
+# inc/class.newsletter.admin.php:995
 $GLOBALS['__l10n']['html']='html';
 
-# _public.php:388
-# _public.php:476
-# _public.php:481
+# _public.php:392
+# _public.php:480
+# _public.php:485
 $GLOBALS['__l10n']['Unsubscribe']='Se désabonner';
 
-# _public.php:439
+# _public.php:443
 # _widgets.php:32
 $GLOBALS['__l10n']['Subscription link']='S\'abonner';
 
-# _public.php:451
+# _public.php:455
 $GLOBALS['__l10n']['Email']='Courriel';
 
-# _public.php:459
-# _public.php:479
+# _public.php:463
+# _public.php:483
 $GLOBALS['__l10n']['Actions']='Actions';
 
@@ -175 +176 @@
 $GLOBALS['__l10n']['Unable to write file.']='Impossible d\'écrire le fichier.';
 
-# inc/class.newsletter.admin.php:394
-# index.php:856
+# inc/class.newsletter.admin.php:395
+# index.php:886
 $GLOBALS['__l10n']['Settings']='Paramètres';
 
-# inc/class.newsletter.admin.php:406
+# inc/class.newsletter.admin.php:407
 $GLOBALS['__l10n']['Editor name']='Nom de l\'éditeur';
 
-# inc/class.newsletter.admin.php:410
+# inc/class.newsletter.admin.php:411
 $GLOBALS['__l10n']['Editor email']='Email de l\'éditeur';
 
-# inc/class.newsletter.admin.php:414
+# inc/class.newsletter.admin.php:415
 $GLOBALS['__l10n']['Message presentation']='Message de présentation';
 
-# inc/class.newsletter.admin.php:418
+# inc/class.newsletter.admin.php:419
 $GLOBALS['__l10n']['Presentation message for posts']='Message de présentation pour les billets';
 
-# inc/class.newsletter.admin.php:422
+# inc/class.newsletter.admin.php:423
 $GLOBALS['__l10n']['Introductory confirm message']='Introduction au lien de confirmation';
 
-# inc/class.newsletter.admin.php:426
+# inc/class.newsletter.admin.php:427
 $GLOBALS['__l10n']['Title confirmation link']='Titre du lien de confirmation';
 
-# inc/class.newsletter.admin.php:430
+# inc/class.newsletter.admin.php:431
 $GLOBALS['__l10n']['Subject of the mail Confirm']='Sujet du mail de confirmation';
 
-# inc/class.newsletter.admin.php:434
+# inc/class.newsletter.admin.php:435
 $GLOBALS['__l10n']['Introductory disable message']='Introduction au lien de désactivation';
 
-# inc/class.newsletter.admin.php:438
+# inc/class.newsletter.admin.php:439
 $GLOBALS['__l10n']['Title disable link']='Titre du lien de désactivation';
 
-# inc/class.newsletter.admin.php:442
+# inc/class.newsletter.admin.php:443
 $GLOBALS['__l10n']['Subject of the mail Disable']='Sujet du mail de désactivation';
 
-# inc/class.newsletter.admin.php:446
+# inc/class.newsletter.admin.php:447
 $GLOBALS['__l10n']['Introductory enable message']='Introduction au lien d\'activation';
 
-# inc/class.newsletter.admin.php:450
+# inc/class.newsletter.admin.php:451
 $GLOBALS['__l10n']['Title enable link']='Titre du lien d\'activation';
 
-# inc/class.newsletter.admin.php:454
+# inc/class.newsletter.admin.php:455
 $GLOBALS['__l10n']['Subject of the mail Enable']='Sujet du mail d\'activation';
 
-# inc/class.newsletter.admin.php:458
+# inc/class.newsletter.admin.php:459
 $GLOBALS['__l10n']['Introductory suspend message']='Introduction au lien de suspension';
 
-# inc/class.newsletter.admin.php:462
+# inc/class.newsletter.admin.php:463
 $GLOBALS['__l10n']['Title suspend link']='Titre du lien de suspension';
 
-# inc/class.newsletter.admin.php:466
+# inc/class.newsletter.admin.php:467
 $GLOBALS['__l10n']['Subject of the mail Suspend']='Sujet du mail de suspension';
 
-# inc/class.newsletter.admin.php:470
+# inc/class.newsletter.admin.php:471
 $GLOBALS['__l10n']['Subject of the mail Resume']='Sujet du mail de résumé';
 
-# inc/class.newsletter.admin.php:474
+# inc/class.newsletter.admin.php:475
 $GLOBALS['__l10n']['Subject of the mail Changing mode']='Sujet du mail de changement de mode';
 
-# inc/class.newsletter.admin.php:478
+# inc/class.newsletter.admin.php:479
 $GLOBALS['__l10n']['Subject of the Newsletter']='Sujet de la Newsletter';
 
-# inc/class.newsletter.admin.php:484
+# inc/class.newsletter.admin.php:483
+$GLOBALS['__l10n']['Title page of the subscribe form']='Titre de la page du formulaire d\'abonnement';
+
+# inc/class.newsletter.admin.php:489
 $GLOBALS['__l10n']['Introductory message']='Message d\'introduction';
 
-# inc/class.newsletter.admin.php:487
+# inc/class.newsletter.admin.php:492
 $GLOBALS['__l10n']['Concluding message']='Message de conclusion';
 
-# inc/class.newsletter.admin.php:490
+# inc/class.newsletter.admin.php:495
 $GLOBALS['__l10n']['Message presentation form']='Message de présentation du formulaire';
 
-# inc/class.newsletter.admin.php:496
+# inc/class.newsletter.admin.php:501
 $GLOBALS['__l10n']['Advanced Settings']='Paramètres avancés';
 
-# inc/class.newsletter.admin.php:500
+# inc/class.newsletter.admin.php:505
 $GLOBALS['__l10n']['Default format for sending']='Format par défaut pour l\'envoi';
 
-# inc/class.newsletter.admin.php:505
+# inc/class.newsletter.admin.php:510
 $GLOBALS['__l10n']['Use default format for sending']='Utiliser le format par défaut pour l\'envoi';
 
-# inc/class.newsletter.admin.php:509
+# inc/class.newsletter.admin.php:514
 $GLOBALS['__l10n']['Automatic send']='Envoi automatique';
 
-# inc/class.newsletter.admin.php:513
+# inc/class.newsletter.admin.php:518
 $GLOBALS['__l10n']['Notification sending']='Accusé de réception';
 
-# inc/class.newsletter.admin.php:515
+# inc/class.newsletter.admin.php:520
 $GLOBALS['__l10n']['Minimum posts']='Nombre minimum de billets';
 
-# inc/class.newsletter.admin.php:518
+# inc/class.newsletter.admin.php:523
 $GLOBALS['__l10n']['Maximum posts']='Nombre maximal de billets';
 
-# inc/class.newsletter.admin.php:523
+# inc/class.newsletter.admin.php:528
 $GLOBALS['__l10n']['View contents posts']='Affiche le contenu des billets';
 
-# inc/class.newsletter.admin.php:525
+# inc/class.newsletter.admin.php:530
 $GLOBALS['__l10n']['Size contents posts']='Taille maximale du contenu des billets';
 
-# inc/class.newsletter.admin.php:533
+# inc/class.newsletter.admin.php:538
 $GLOBALS['__l10n']['Use suspend option']='Utiliser l\'option Suspendre';
 
-# inc/class.newsletter.admin.php:541
+# inc/class.newsletter.admin.php:546
 $GLOBALS['__l10n']['Defaults']='Défauts';
 
-# inc/class.newsletter.admin.php:551
-# inc/class.newsletter.admin.php:683
-# inc/class.newsletter.admin.php:838
-# inc/class.newsletter.admin.php:963
-# inc/class.newsletter.admin.php:1079
+# inc/class.newsletter.admin.php:556
+# inc/class.newsletter.admin.php:688
+# inc/class.newsletter.admin.php:843
+# inc/class.newsletter.admin.php:968
+# inc/class.newsletter.admin.php:1084
 $GLOBALS['__l10n']['Activate the plugin in the Maintenance tab to view all options']='Activer le plugin dans l\'onglet maintenance pour afficher toutes les options';
 
-# inc/class.newsletter.admin.php:591
-# inc/class.newsletter.admin.php:673
+# inc/class.newsletter.admin.php:596
+# inc/class.newsletter.admin.php:678
 $GLOBALS['__l10n']['Planning newsletter']='Planification de la newsletter';
 
-# inc/class.newsletter.admin.php:594
+# inc/class.newsletter.admin.php:599
 $GLOBALS['__l10n']['Interval time in seconds between 2 runs']='Intervalle de temps en secondes entre 2 exécutions';
 
-# inc/class.newsletter.admin.php:598
+# inc/class.newsletter.admin.php:603
 $GLOBALS['__l10n']['samples']='exemples';
 
-# inc/class.newsletter.admin.php:598
+# inc/class.newsletter.admin.php:603
 $GLOBALS['__l10n']['day']='jour';
 
-# inc/class.newsletter.admin.php:598
+# inc/class.newsletter.admin.php:603
 $GLOBALS['__l10n']['week']='semaine';
 
-# inc/class.newsletter.admin.php:601
+# inc/class.newsletter.admin.php:606
 $GLOBALS['__l10n']['Date for the first run']='Date de la première exécution';
 
-# inc/class.newsletter.admin.php:607
+# inc/class.newsletter.admin.php:612
 $GLOBALS['__l10n']['Unschedule']='Déplanifier';
 
-# inc/class.newsletter.admin.php:607
+# inc/class.newsletter.admin.php:612
 $GLOBALS['__l10n']['Schedule']='Planifier';
 
-# inc/class.newsletter.admin.php:623
+# inc/class.newsletter.admin.php:628
 $GLOBALS['__l10n']['Scheduled task']='Tâche planifiée';
 
-# inc/class.newsletter.admin.php:633
+# inc/class.newsletter.admin.php:638
 $GLOBALS['__l10n']['State']='Etat';
 
-# inc/class.newsletter.admin.php:637
+# inc/class.newsletter.admin.php:642
 $GLOBALS['__l10n']['Interval']='Intervalle';
 
-# inc/class.newsletter.admin.php:641
+# inc/class.newsletter.admin.php:646
 $GLOBALS['__l10n']['Last run']='Dernière exécution';
 
-# inc/class.newsletter.admin.php:645
+# inc/class.newsletter.admin.php:650
 $GLOBALS['__l10n']['Next run']='Prochaine exécution';
 
-# inc/class.newsletter.admin.php:649
+# inc/class.newsletter.admin.php:654
 $GLOBALS['__l10n']['Remaining Time']='Temps restant';
 
-# inc/class.newsletter.admin.php:659
-# inc/class.newsletter.admin.php:920
+# inc/class.newsletter.admin.php:664
+# inc/class.newsletter.admin.php:925
 $GLOBALS['__l10n']['Disable']='Désactiver';
 
-# inc/class.newsletter.admin.php:659
-# inc/class.newsletter.admin.php:921
+# inc/class.newsletter.admin.php:664
+# inc/class.newsletter.admin.php:926
 $GLOBALS['__l10n']['Enable']='Activer';
 
-# inc/class.newsletter.admin.php:674
+# inc/class.newsletter.admin.php:679
 $GLOBALS['__l10n']['Install the plugin dcCron for using planning']='Installez l\'extension dcCron pour utiliser la planification';
 
-# inc/class.newsletter.admin.php:736
+# inc/class.newsletter.admin.php:741
 $GLOBALS['__l10n']['Plugin state']='Etat de l\'extension';
 
-# inc/class.newsletter.admin.php:739
+# inc/class.newsletter.admin.php:744
 $GLOBALS['__l10n']['Activate plugin']='Activer l\'extension';
 
-# inc/class.newsletter.admin.php:757
+# inc/class.newsletter.admin.php:762
 $GLOBALS['__l10n']['Import/Export subscribers list']='Import/Export de la liste des abonnés';
 
-# inc/class.newsletter.admin.php:760
+# inc/class.newsletter.admin.php:765
 $GLOBALS['__l10n']['This blog only']='Ce blog seulement';
 
-# inc/class.newsletter.admin.php:764
+# inc/class.newsletter.admin.php:769
 $GLOBALS['__l10n']['All datas']='Toutes les données';
 
-# inc/class.newsletter.admin.php:781
+# inc/class.newsletter.admin.php:786
 $GLOBALS['__l10n']['Adapt the template for the theme']='Adapter le template pour le thème';
 
-# inc/class.newsletter.admin.php:782
+# inc/class.newsletter.admin.php:787
 $GLOBALS['__l10n']['Theme name']='Nom du thème';
 
-# inc/class.newsletter.admin.php:786
+# inc/class.newsletter.admin.php:791
 $GLOBALS['__l10n']['Adapt']='Adapter';
 
-# inc/class.newsletter.admin.php:792
+# inc/class.newsletter.admin.php:797
 $GLOBALS['__l10n']['Clic here to test the template.']='Cliquez ici pour tester le template.';
 
-# inc/class.newsletter.admin.php:804
+# inc/class.newsletter.admin.php:809
 $GLOBALS['__l10n']['Check for plugin update']='Vérifier les mises à jour';
 
-# inc/class.newsletter.admin.php:811
+# inc/class.newsletter.admin.php:816
 $GLOBALS['__l10n']['Check']='Vérifier';
 
-# inc/class.newsletter.admin.php:821
+# inc/class.newsletter.admin.php:826
 $GLOBALS['__l10n']['Erasing all informations about newsletter in database']='Suppression de toutes les informations concernant newsletter dans votre base de données';
 
-# inc/class.newsletter.admin.php:822
+# inc/class.newsletter.admin.php:827
 $GLOBALS['__l10n']['Be careful, please backup your database before erasing']='Attention, vous êtes priés de sauvegarder votre base de données avant de lancer la suppression';
 
-# inc/class.newsletter.admin.php:825
+# inc/class.newsletter.admin.php:830
 $GLOBALS['__l10n']['Erasing']='Suppression';
 
-# inc/class.newsletter.admin.php:863
+# inc/class.newsletter.admin.php:868
 $GLOBALS['__l10n']['No subscriber for this blog.']='Pas d\'abonnés pour ce blog.';
 
-# inc/class.newsletter.admin.php:878
+# inc/class.newsletter.admin.php:883
 $GLOBALS['__l10n']['Subscriber']='Abonné';
 
-# inc/class.newsletter.admin.php:879
+# inc/class.newsletter.admin.php:884
 $GLOBALS['__l10n']['Subscribed']='Inscription';
 
-# inc/class.newsletter.admin.php:881
-# inc/class.newsletter.admin.php:922
+# inc/class.newsletter.admin.php:886
+# inc/class.newsletter.admin.php:927
 $GLOBALS['__l10n']['Last sent']='Dernier envoi';
 
-# inc/class.newsletter.admin.php:882
-# inc/class.newsletter.admin.php:1028
+# inc/class.newsletter.admin.php:887
+# inc/class.newsletter.admin.php:1033
 $GLOBALS['__l10n']['Mode send']='Mode d\'envoi';
 
-# inc/class.newsletter.admin.php:883
-# index.php:853
+# inc/class.newsletter.admin.php:888
+# index.php:883
 $GLOBALS['__l10n']['Edit']='Modifier';
 
-# inc/class.newsletter.admin.php:891
-# inc/class.newsletter.admin.php:891
+# inc/class.newsletter.admin.php:896
+# inc/class.newsletter.admin.php:896
 $GLOBALS['__l10n']['Edit subscriber']='Modifier l\'abonné';
 
-# inc/class.newsletter.admin.php:896
 # inc/class.newsletter.admin.php:901
-# inc/class.newsletter.admin.php:1016
+# inc/class.newsletter.admin.php:906
 # inc/class.newsletter.admin.php:1021
+# inc/class.newsletter.admin.php:1026
 # inc/class.newsletter.cron.php:142
 $GLOBALS['__l10n']['Never']='Jamais';
 
-# inc/class.newsletter.admin.php:926
+# inc/class.newsletter.admin.php:931
 $GLOBALS['__l10n']['Confirmation']='Confirmation';
 
-# inc/class.newsletter.admin.php:928
+# inc/class.newsletter.admin.php:933
 $GLOBALS['__l10n']['Suspension']='Suspension';
 
-# inc/class.newsletter.admin.php:930
+# inc/class.newsletter.admin.php:935
 $GLOBALS['__l10n']['Deactivation']='Désactivation';
 
-# inc/class.newsletter.admin.php:931
+# inc/class.newsletter.admin.php:936
 $GLOBALS['__l10n']['Activation']='Activation';
 
-# inc/class.newsletter.admin.php:932
+# inc/class.newsletter.admin.php:937
 $GLOBALS['__l10n']['Changing format']='Changer de format';
 
-# inc/class.newsletter.admin.php:943
+# inc/class.newsletter.admin.php:948
 $GLOBALS['__l10n']['refresh']='actualiser';
 
-# inc/class.newsletter.admin.php:944
+# inc/class.newsletter.admin.php:949
 $GLOBALS['__l10n']['check all']='sélectionner tout';
 
-# inc/class.newsletter.admin.php:945
+# inc/class.newsletter.admin.php:950
 $GLOBALS['__l10n']['uncheck all']='désélectionner tout';
 
-# inc/class.newsletter.admin.php:946
+# inc/class.newsletter.admin.php:951
 $GLOBALS['__l10n']['toggle check all']='inverser la sélection';
 
-# inc/class.newsletter.admin.php:950
+# inc/class.newsletter.admin.php:955
 $GLOBALS['__l10n']['Set state']='Modifier l\'état';
 
-# inc/class.newsletter.admin.php:951
+# inc/class.newsletter.admin.php:956
 $GLOBALS['__l10n']['Set']='Modifier';
 
-# inc/class.newsletter.admin.php:952
+# inc/class.newsletter.admin.php:957
 $GLOBALS['__l10n']['Mail to send']='Courrier à envoyer';
 
-# inc/class.newsletter.admin.php:955
+# inc/class.newsletter.admin.php:960
 $GLOBALS['__l10n']['Set format']='Modifier le format';
 
-# inc/class.newsletter.admin.php:956
+# inc/class.newsletter.admin.php:961
 $GLOBALS['__l10n']['Change']='Changer';
 
-# inc/class.newsletter.admin.php:1008
+# inc/class.newsletter.admin.php:1013
 $GLOBALS['__l10n']['Edit a subscriber']='Modifier un abonné';
 
-# inc/class.newsletter.admin.php:1010
+# inc/class.newsletter.admin.php:1015
 $GLOBALS['__l10n']['Update']='Mettre à jour';
 
-# inc/class.newsletter.admin.php:1024
+# inc/class.newsletter.admin.php:1029
 $GLOBALS['__l10n']['Subscribed:']='Inscrit:';
 
-# inc/class.newsletter.admin.php:1026
+# inc/class.newsletter.admin.php:1031
 $GLOBALS['__l10n']['Last sent:']='Dernier envoi:';
 
-# inc/class.newsletter.admin.php:1030
+# inc/class.newsletter.admin.php:1035
 $GLOBALS['__l10n']['Registration code:']='Code d\'inscription:';
 
-# inc/class.newsletter.admin.php:1034
+# inc/class.newsletter.admin.php:1039
 $GLOBALS['__l10n']['enabled']='actif';
 
-# inc/class.newsletter.admin.php:1035
+# inc/class.newsletter.admin.php:1040
 $GLOBALS['__l10n']['suspended']='suspendu';
 
-# inc/class.newsletter.admin.php:1036
+# inc/class.newsletter.admin.php:1041
 $GLOBALS['__l10n']['disabled']='désactivé';
 
-# inc/class.newsletter.admin.php:1046
+# inc/class.newsletter.admin.php:1051
 $GLOBALS['__l10n']['Add a subscriber']='Ajouter un abonné';
 
-# inc/class.newsletter.admin.php:1054
+# inc/class.newsletter.admin.php:1059
 $GLOBALS['__l10n']['Not allowed.']='Interdit.';
 
-# inc/class.newsletter.core.php:880
+# inc/class.newsletter.core.php:812
 $GLOBALS['__l10n']['Your account has been suspended.']='Votre compte a été suspendu.';
 
-# inc/class.newsletter.core.php:887
+# inc/class.newsletter.core.php:819
 $GLOBALS['__l10n']['Thank you for your subscription.']='Merci pour votre inscription !';
 
-# inc/class.newsletter.core.php:888
+# inc/class.newsletter.core.php:820
 $GLOBALS['__l10n']['Your account has been canceled.']='Votre compte a été supprimé.';
 
-# inc/class.newsletter.core.php:889
+# inc/class.newsletter.core.php:821
 $GLOBALS['__l10n']['Your account has been validated.']='Votre compte a été validé.';
 
-# inc/class.newsletter.core.php:890
+# inc/class.newsletter.core.php:822
 $GLOBALS['__l10n']['Your sending format has been updated.']='Votre format d\'envoi a été mis à jour.';
 
-# inc/class.newsletter.core.php:937
-# inc/class.newsletter.plugin.php:590
-$GLOBALS['__l10n']['Newsletter for']='Lettre d\'information pour';
-
-# inc/class.newsletter.core.php:954
+# inc/class.newsletter.core.php:823
+$GLOBALS['__l10n'][', by']=', par';
+
+# inc/class.newsletter.core.php:930
+$GLOBALS['__l10n']['Successful mail sent for']='Courriel envoyé avec succès pour';
+
+# inc/class.newsletter.core.php:933
+$GLOBALS['__l10n']['Mail sent error for']='Echec de l\'envoi du courriel pour';
+
+# inc/class.newsletter.core.php:936
+$GLOBALS['__l10n']['Nothing to send for']='Rien à envoyer pour';
+
+# inc/class.newsletter.core.php:981
 $GLOBALS['__l10n']['Links:']='Liens:';
 
-# inc/class.newsletter.core.php:1018
-# inc/class.newsletter.core.php:1172
-# inc/class.newsletter.core.php:1257
-# inc/class.newsletter.core.php:1342
-# inc/class.newsletter.core.php:1424
-# inc/class.newsletter.core.php:1575
-# inc/class.newsletter.core.php:1660
-$GLOBALS['__l10n']['Successful mail sent for']='Courriel envoyé avec succès pour';
-
-# inc/class.newsletter.core.php:1020
-# inc/class.newsletter.core.php:1174
-# inc/class.newsletter.core.php:1259
-# inc/class.newsletter.core.php:1344
-# inc/class.newsletter.core.php:1426
-# inc/class.newsletter.core.php:1577
-# inc/class.newsletter.core.php:1662
-$GLOBALS['__l10n']['Mail sent error for']='Echec de l\'envoi du courriel pour';
-
-# inc/class.newsletter.core.php:1022
-$GLOBALS['__l10n']['Nothing to send for']='Rien à envoyer pour';
-
-# inc/class.newsletter.core.php:1127
+# inc/class.newsletter.core.php:1032
 # inc/class.newsletter.plugin.php:610
 $GLOBALS['__l10n']['Newsletter subscription confirmation for']='Confirmation d\'inscription pour';
 
-# inc/class.newsletter.core.php:1127
+# inc/class.newsletter.core.php:1032
 $GLOBALS['__l10n']['Thanks you for subscribing.']='Merci pour votre inscription.';
 
-# inc/class.newsletter.core.php:1213
+# inc/class.newsletter.core.php:1073
 # inc/class.newsletter.plugin.php:630
 $GLOBALS['__l10n']['Newsletter account suspend for']='Suspension d\'abonnement à la lettre d\'information pour';
 
-# inc/class.newsletter.core.php:1213
-# inc/class.newsletter.core.php:1381
-# inc/class.newsletter.core.php:1464
-# inc/class.newsletter.core.php:1621
+# inc/class.newsletter.core.php:1073
+# inc/class.newsletter.core.php:1154
+# inc/class.newsletter.core.php:1194
+# inc/class.newsletter.core.php:1297
 $GLOBALS['__l10n']['Have a nice day !']='Passez une bonne journée !';
 
-# inc/class.newsletter.core.php:1296
+# inc/class.newsletter.core.php:1113
 # inc/class.newsletter.plugin.php:650
 $GLOBALS['__l10n']['Newsletter account activation for']='Activation d\'abonnement à la lettre d\'information pour';
 
-# inc/class.newsletter.core.php:1296
+# inc/class.newsletter.core.php:1113
 $GLOBALS['__l10n']['Thank you for subscribing.']='Merci pour votre inscription.';
 
-# inc/class.newsletter.core.php:1381
+# inc/class.newsletter.core.php:1154
 # inc/class.newsletter.plugin.php:670
 $GLOBALS['__l10n']['Newsletter account removal for']='Suppression d\'abonnement à la lettre d\'information pour';
 
-# inc/class.newsletter.core.php:1464
+# inc/class.newsletter.core.php:1194
 # inc/class.newsletter.plugin.php:690
 $GLOBALS['__l10n']['Newsletter account resume for']='Information sur l\'abonnement à la lettre d\'information pour';
 
-# inc/class.newsletter.core.php:1543
+# inc/class.newsletter.core.php:1252
 $GLOBALS['__l10n']['Your account is pending confirmation.']='Votre abonnement est en attente de confirmation.';
 
-# inc/class.newsletter.core.php:1562
+# inc/class.newsletter.core.php:1271
 $GLOBALS['__l10n']['Your sending mode is']='Votre format est';
 
-# inc/class.newsletter.core.php:1621
+# inc/class.newsletter.core.php:1297
 # inc/class.newsletter.plugin.php:710
 $GLOBALS['__l10n']['Newsletter account change format for']='Changement du format sur l\'abonnement à la lettre d\'information pour';
 
-# inc/class.newsletter.core.php:1681
-# inc/class.newsletter.core.php:1708
-# inc/class.newsletter.core.php:1737
-# inc/class.newsletter.core.php:1764
-# inc/class.newsletter.core.php:1791
-$GLOBALS['__l10n']['Newsletter is disabled.']='Newsletter est désactivé.';
-
-# inc/class.newsletter.core.php:1683
-# inc/class.newsletter.core.php:1711
-# inc/class.newsletter.core.php:1739
-# inc/class.newsletter.core.php:1766
-# inc/class.newsletter.core.php:1793
+# inc/class.newsletter.core.php:1393
+# inc/class.newsletter.core.php:1418
+# inc/class.newsletter.core.php:1444
+# inc/class.newsletter.core.php:1469
+# inc/class.newsletter.core.php:1494
 $GLOBALS['__l10n']['Bad email !']='Mauvais email ou format incorrect !';
 
-# inc/class.newsletter.core.php:1688
+# inc/class.newsletter.core.php:1396
 $GLOBALS['__l10n']['Email already exist !']='Email déja existant !';
 
-# inc/class.newsletter.core.php:1690
+# inc/class.newsletter.core.php:1398
 $GLOBALS['__l10n']['Error creating account !']='Erreur lors de la création du compte !';
 
@@ -617 +601 @@
 $GLOBALS['__l10n']['To suspend your account']='Pour suspendre votre abonnement';
 
-# inc/class.newsletter.plugin.php:1433
+# inc/class.newsletter.plugin.php:590
+$GLOBALS['__l10n']['Newsletter for']='Lettre d\'information pour';
+
+# inc/class.newsletter.plugin.php:1459
 $GLOBALS['__l10n']['No new version available.']='Pas de nouvelle version.';
 
-# inc/class.newsletter.plugin.php:1435
+# inc/class.newsletter.plugin.php:1461
 $GLOBALS['__l10n']['New version available:']='Nouvelle version disponible:';
 
-# inc/class.newsletter.plugin.php:1441
+# inc/class.newsletter.plugin.php:1467
 $GLOBALS['__l10n']['Read the post.']='Lire le billet.';
 
-# inc/class.newsletter.plugin.php:1441
+# inc/class.newsletter.plugin.php:1467
 $GLOBALS['__l10n']['post']='billet';
 
-# inc/class.newsletter.plugin.php:1443
+# inc/class.newsletter.plugin.php:1469
 $GLOBALS['__l10n']['Installer.']='Installeur.';
 
-# inc/class.newsletter.plugin.php:1443
+# inc/class.newsletter.plugin.php:1469
 $GLOBALS['__l10n']['pkg.gz']='pkg.gz';
 
-# inc/class.newsletter.plugin.php:1445
+# inc/class.newsletter.plugin.php:1471
 $GLOBALS['__l10n']['Archive.']='Archive.';
 
-# inc/class.newsletter.plugin.php:1445
+# inc/class.newsletter.plugin.php:1471
 $GLOBALS['__l10n']['tar.gz']='tar.gz';
 
-# index.php:69
-# index.php:286
-# index.php:299
+# index.php:72
+# index.php:295
+# index.php:308
 $GLOBALS['__l10n']['Settings updated.']='Paramètres mis à jour.';
 
-# index.php:84
-# index.php:85
+# index.php:87
+# index.php:88
 $GLOBALS['__l10n']['You must input a valid email !']='Vous devez saisir un email valide !';
 
-# index.php:318
-# index.php:357
-# index.php:382
-# index.php:408
+# index.php:327
+# index.php:366
+# index.php:391
+# index.php:417
 $GLOBALS['__l10n']['Planning updated.']='Planning mis à jour.';
 
-# index.php:326
+# index.php:335
 $GLOBALS['__l10n']['Error during create planning task.']='Erreur pendant la création de la tâche planifiée.';
 
-# index.php:444
-# index.php:495
+# index.php:453
+# index.php:504
 $GLOBALS['__l10n']['Missing informations.']='Informations manquantes.';
 
-# index.php:447
+# index.php:456
 $GLOBALS['__l10n']['Error adding subscriber.']='Erreur lors de l\'ajout d\'un abonné.';
 
-# index.php:449
+# index.php:458
 $GLOBALS['__l10n']['Subscriber added.']='Abonné ajouté.';
 
-# index.php:502
+# index.php:511
 $GLOBALS['__l10n']['Error updating subscriber.']='Erreur lors de la mise à jour d\'un abonné.';
 
-# index.php:504
+# index.php:513
 $GLOBALS['__l10n']['Subscriber updated.']='Abonné mis à jour.';
 
-# index.php:518
+# index.php:527
 $GLOBALS['__l10n']['No account removed.']='Pas de compte supprimé.';
 
-# index.php:526
+# index.php:535
 $GLOBALS['__l10n']['Account(s) successfully removed.']='Compte(s) supprimé(s) avec succès.';
 
-# index.php:540
+# index.php:549
 $GLOBALS['__l10n']['No account suspended.']='Pas de compte suspendu.';
 
-# index.php:548
+# index.php:557
 $GLOBALS['__l10n']['Account(s) successfully suspended.']='Compte(s) suspendu(s) avec succès.';
 
-# index.php:562
+# index.php:571
 $GLOBALS['__l10n']['No account enabled.']='Pas de compte activé.';
 
-# index.php:570
+# index.php:579
 $GLOBALS['__l10n']['Account(s) successfully enabled.']='Compte(s) activé(s) avec succés.';
 
-# index.php:584
+# index.php:593
 $GLOBALS['__l10n']['No account disabled.']='Pas de compte désactivé.';
 
-# index.php:592
+# index.php:601
 $GLOBALS['__l10n']['Account(s) successfully disabled.']='Compte(s) désactivé(s) avec succès.';
 
-# index.php:625
+# index.php:640
 $GLOBALS['__l10n']['No account changed.']='Pas de compte modifié.';
 
-# index.php:630
+# index.php:646
 $GLOBALS['__l10n']['Account(s) successfully changed.']='Compte(s) modifié(s) avec succès.';
 
-# index.php:649
+# index.php:667
 $GLOBALS['__l10n']['Datas exported.']='Données exportées.';
 
-# index.php:669
+# index.php:687
 $GLOBALS['__l10n']['Datas imported.']='Données importées.';
 
-# index.php:742
-# index.php:764
+# index.php:772
+# index.php:794
 $GLOBALS['__l10n']['No account(s) updated.']='Pas de compte(s) mis à jour.';
 
-# index.php:750
+# index.php:780
 $GLOBALS['__l10n']['Format sending for account(s) successfully updated to html.']='Format d\'envoi pour le(s) abonné(s) mis à jour au format html.';
 
-# index.php:772
+# index.php:802
 $GLOBALS['__l10n']['Format sending for account(s) successfully updated to text.']='Format d\'envoi pour le(s) abonné(s) mis à jour au format text.';
 
-# index.php:786
+# index.php:816
 $GLOBALS['__l10n']['No template adapted.']='Pas de template adapté.';
 
-# index.php:788
+# index.php:819
 $GLOBALS['__l10n']['Template successfully adapted.']='Template adapté avec succès.';
 
-# index.php:803
+# index.php:833
 $GLOBALS['__l10n']['Erasing complete.']='Nettoyage terminé.';
 
-# index.php:839
+# index.php:869
 $GLOBALS['__l10n']['Are you sure you want to delete all informations about newsletter in database ?']='Etes-vous sûr de vouloir supprimer toutes les informations de newsletter dans la base de données ?';
 
-# index.php:850
+# index.php:880
 $GLOBALS['__l10n']['Subscribers']='Abonnés';
 
-# index.php:859
+# index.php:889
 $GLOBALS['__l10n']['Planning']='Planification';
 
+$GLOBALS['__l10n']['Newsletter is disabled.']='Newsletter est désactivé.';
+
 $GLOBALS['__l10n']['Presentation message']='Message de présentation';
 

plugins/newsletter/trunk/locales/fr/main.po

@@ -6 +6 @@
 
 #: _install.php:40
-#: index.php:45
+#: index.php:48
 msgid "Unable to install Newsletter."
 msgstr "Impossible d'installer Newsletter"
 
-#: _public.php:71
+#: _public.php:75
 msgid "Test display template."
 msgstr "Test d'affichage du template."
 
-#: _public.php:75
+#: _public.php:79
 msgid "About Newsletter ..."
 msgstr "A propos de Newsletter ..."
 
-#: _public.php:76
+#: _public.php:80
 msgid "About"
 msgstr "A propos"
 
-#: _public.php:78
+#: _public.php:82
 msgid "Authors"
 msgstr "Auteurs"
 
-#: _public.php:84
-#: _public.php:100
-#: _public.php:116
-#: _public.php:132
-#: _public.php:148
-msgid "Missing informations. "
-msgstr "Informations manquantes."
-
 #: _public.php:88
-msgid "Your subscription code is invalid."
-msgstr "Votre code d'inscription est invalide."
-
-#: _public.php:90
-msgid "Account already confirmed."
-msgstr "Abonnement déja confirmé."
-
-#: _public.php:93
-msgid "Your subscription is confirmed."
-msgstr "Votre inscription est confirmée."
-
-#: _public.php:93
-#: _public.php:109
-#: _public.php:125
-#: _public.php:141
-#: _public.php:155
-msgid "You will soon receive an email."
-msgstr "Vous allez bientôt recevoir un email."
-
 #: _public.php:104
 #: _public.php:120
 #: _public.php:136
 #: _public.php:152
+msgid "Missing informations. "
+msgstr "Informations manquantes."
+
+#: _public.php:92
+msgid "Your subscription code is invalid."
+msgstr "Votre code d'inscription est invalide."
+
+#: _public.php:94
+msgid "Account already confirmed."
+msgstr "Abonnement déja confirmé."
+
+#: _public.php:97
+msgid "Your subscription is confirmed."
+msgstr "Votre inscription est confirmée."
+
+#: _public.php:97
+#: _public.php:113
+#: _public.php:129
+#: _public.php:145
+#: _public.php:159
+msgid "You will soon receive an email."
+msgstr "Vous allez bientôt recevoir un email."
+
+#: _public.php:108
+#: _public.php:124
+#: _public.php:140
+#: _public.php:156
 msgid "Unable to find you account informations."
 msgstr "Impossible de trouver les informations de votre compte."
 
-#: _public.php:106
+#: _public.php:110
 msgid "Account already enabled."
 msgstr "Abonnement déja activé."
 
-#: _public.php:109
-#: inc/class.newsletter.core.php:1536
+#: _public.php:113
+#: inc/class.newsletter.core.php:1245
 msgid "Your account is enabled."
 msgstr "Votre abonnement est activé."
 
-#: _public.php:122
+#: _public.php:126
 msgid "Account already disabled."
 msgstr "Abonnement déja désactivé."
 
-#: _public.php:125
-#: inc/class.newsletter.core.php:1529
+#: _public.php:129
+#: inc/class.newsletter.core.php:1238
 msgid "Your account is disabled."
 msgstr "Votre abonnement est désactivé."
 
-#: _public.php:138
+#: _public.php:142
 msgid "Account already suspended."
 msgstr "Abonnement déja suspendu."
 
-#: _public.php:141
-#: inc/class.newsletter.core.php:1522
+#: _public.php:145
+#: inc/class.newsletter.core.php:1231
 msgid "Your account is suspended."
 msgstr "Votre abonnement est suspendu."
 
-#: _public.php:155
+#: _public.php:159
 msgid "Your sending format is"
 msgstr "Votre format d'envoi est"
 
-#: _public.php:178
+#: _public.php:182
 msgid "Bad captcha code."
 msgstr "Mauvais code de vérification."
 
-#: _public.php:201
+#: _public.php:205
 msgid "Error in formular."
 msgstr "Erreur dans le formulaire."
 
-#: _public.php:219
-#: _public.php:436
+#: _public.php:223
+#: _public.php:440
 #: _widgets.php:25
 #: _widgets.php:27
-#: inc/class.newsletter.admin.php:925
-#: index.php:23
+#: inc/class.newsletter.admin.php:930
+#: inc/class.newsletter.plugin.php:776
+#: index.php:26
 msgid "Newsletter"
 msgstr "Lettre d'informations"
 
-#: _public.php:272
-#: _public.php:494
-#: _public.php:495
-#: inc/class.newsletter.admin.php:499
+#: _public.php:276
+#: _public.php:498
+#: _public.php:499
+#: inc/class.newsletter.admin.php:504
 msgid "Captcha"
 msgstr "Code visuel"
 
-#: _public.php:298
+#: _public.php:302
+#: _public.php:387
+#: _public.php:472
+#: _public.php:477
+#: inc/class.newsletter.admin.php:923
+msgid "Suspend"
+msgstr "Suspendre"
+
+#: _public.php:306
+#: _public.php:390
+#: _public.php:478
+msgid "Resume"
+msgstr "Résumé"
+
+#: _public.php:325
+#: _public.php:368
+#: _public.php:461
+#: inc/class.newsletter.admin.php:341
+#: inc/class.newsletter.admin.php:942
+#: inc/class.newsletter.admin.php:994
+msgid "text"
+msgstr "texte"
+
+#: _public.php:332
 #: _public.php:383
 #: _public.php:468
-#: _public.php:473
-#: inc/class.newsletter.admin.php:918
-msgid "Suspend"
-msgstr "Suspendre"
-
-#: _public.php:302
-#: _public.php:386
-#: _public.php:474
-msgid "Resume"
-msgstr "Résumé"
-
-#: _public.php:321
-#: _public.php:364
-#: _public.php:457
-#: inc/class.newsletter.admin.php:341
-#: inc/class.newsletter.admin.php:937
-#: inc/class.newsletter.admin.php:989
-msgid "text"
-msgstr "texte"
-
-#: _public.php:328
-#: _public.php:379
-#: _public.php:464
 msgid "Change format"
 msgstr "Changer le format"
 
-#: _public.php:361
-#: _public.php:454
+#: _public.php:365
+#: _public.php:458
 msgid "Format"
 msgstr "Format"
 
-#: _public.php:363
-#: _public.php:456
+#: _public.php:367
+#: _public.php:460
 #: inc/class.newsletter.admin.php:342
-#: inc/class.newsletter.admin.php:936
-#: inc/class.newsletter.admin.php:990
+#: inc/class.newsletter.admin.php:941
+#: inc/class.newsletter.admin.php:995
 msgid "html"
 msgstr "html"
 
-#: _public.php:388
-#: _public.php:476
-#: _public.php:481
+#: _public.php:392
+#: _public.php:480
+#: _public.php:485
 msgid "Unsubscribe"
 msgstr "Se désabonner"
 
-#: _public.php:439
+#: _public.php:443
 #: _widgets.php:32
 msgid "Subscription link"
 msgstr "S'abonner"
 
-#: _public.php:451
+#: _public.php:455
 msgid "Email"
 msgstr "Courriel"
 
-#: _public.php:459
-#: _public.php:479
+#: _public.php:463
+#: _public.php:483
 msgid "Actions"
 msgstr "Actions"
@@ -219 +220 @@
 msgstr "Impossible d'écrire le fichier."
 
-#: inc/class.newsletter.admin.php:394
-#: index.php:856
+#: inc/class.newsletter.admin.php:395
+#: index.php:886
 msgid "Settings"
 msgstr "Paramètres"
 
-#: inc/class.newsletter.admin.php:406
+#: inc/class.newsletter.admin.php:407
 msgid "Editor name"
 msgstr "Nom de l'éditeur"
 
-#: inc/class.newsletter.admin.php:410
+#: inc/class.newsletter.admin.php:411
 msgid "Editor email"
 msgstr "Email de l'éditeur"
 
-#: inc/class.newsletter.admin.php:414
+#: inc/class.newsletter.admin.php:415
 msgid "Message presentation"
 msgstr "Message de présentation"
 
-#: inc/class.newsletter.admin.php:418
+#: inc/class.newsletter.admin.php:419
 msgid "Presentation message for posts"
 msgstr "Message de présentation pour les billets"
 
-#: inc/class.newsletter.admin.php:422
+#: inc/class.newsletter.admin.php:423
 msgid "Introductory confirm message"
 msgstr "Introduction au lien de confirmation"
 
-#: inc/class.newsletter.admin.php:426
+#: inc/class.newsletter.admin.php:427
 msgid "Title confirmation link"
 msgstr "Titre du lien de confirmation"
 
-#: inc/class.newsletter.admin.php:430
+#: inc/class.newsletter.admin.php:431
 msgid "Subject of the mail Confirm"
 msgstr "Sujet du mail de confirmation"
 
-#: inc/class.newsletter.admin.php:434
+#: inc/class.newsletter.admin.php:435
 msgid "Introductory disable message"
 msgstr "Introduction au lien de désactivation"
 
-#: inc/class.newsletter.admin.php:438
+#: inc/class.newsletter.admin.php:439
 msgid "Title disable link"
 msgstr "Titre du lien de désactivation"
 
-#: inc/class.newsletter.admin.php:442
+#: inc/class.newsletter.admin.php:443
 msgid "Subject of the mail Disable"
 msgstr "Sujet du mail de désactivation"
 
-#: inc/class.newsletter.admin.php:446
+#: inc/class.newsletter.admin.php:447
 msgid "Introductory enable message"
 msgstr "Introduction au lien d'activation"
 
-#: inc/class.newsletter.admin.php:450
+#: inc/class.newsletter.admin.php:451
 msgid "Title enable link"
 msgstr "Titre du lien d'activation"
 
-#: inc/class.newsletter.admin.php:454
+#: inc/class.newsletter.admin.php:455
 msgid "Subject of the mail Enable"
 msgstr "Sujet du mail d'activation"
 
-#: inc/class.newsletter.admin.php:458
+#: inc/class.newsletter.admin.php:459
 msgid "Introductory suspend message"
 msgstr "Introduction au lien de suspension"
 
-#: inc/class.newsletter.admin.php:462
+#: inc/class.newsletter.admin.php:463
 msgid "Title suspend link"
 msgstr "Titre du lien de suspension"
 
-#: inc/class.newsletter.admin.php:466
+#: inc/class.newsletter.admin.php:467
 msgid "Subject of the mail Suspend"
 msgstr "Sujet du mail de suspension"
 
-#: inc/class.newsletter.admin.php:470
+#: inc/class.newsletter.admin.php:471
 msgid "Subject of the mail Resume"
 msgstr "Sujet du mail de résumé"
 
-#: inc/class.newsletter.admin.php:474
+#: inc/class.newsletter.admin.php:475
 msgid "Subject of the mail Changing mode"
 msgstr "Sujet du mail de changement de mode"
 
-#: inc/class.newsletter.admin.php:478
+#: inc/class.newsletter.admin.php:479
 msgid "Subject of the Newsletter"
 msgstr "Sujet de la Newsletter"
 
-#: inc/class.newsletter.admin.php:484
+#: inc/class.newsletter.admin.php:483
+msgid "Title page of the subscribe form"
+msgstr "Titre de la page du formulaire d'abonnement"
+
+#: inc/class.newsletter.admin.php:489
 msgid "Introductory message"
 msgstr "Message d'introduction"
 
-#: inc/class.newsletter.admin.php:487
+#: inc/class.newsletter.admin.php:492
 msgid "Concluding message"
 msgstr "Message de conclusion"
 
-#: inc/class.newsletter.admin.php:490
+#: inc/class.newsletter.admin.php:495
 msgid "Message presentation form"
 msgstr "Message de présentation du formulaire"
 
-#: inc/class.newsletter.admin.php:496
+#: inc/class.newsletter.admin.php:501
 msgid "Advanced Settings"
 msgstr "Paramètres avancés"
 
-#: inc/class.newsletter.admin.php:500
+#: inc/class.newsletter.admin.php:505
 msgid "Default format for sending"
 msgstr "Format par défaut pour l'envoi"
 
-#: inc/class.newsletter.admin.php:505
+#: inc/class.newsletter.admin.php:510
 msgid "Use default format for sending"
 msgstr "Utiliser le format par défaut pour l'envoi"
 
-#: inc/class.newsletter.admin.php:509
+#: inc/class.newsletter.admin.php:514
 msgid "Automatic send"
 msgstr "Envoi automatique"
 
-#: inc/class.newsletter.admin.php:513
+#: inc/class.newsletter.admin.php:518
 msgid "Notification sending"
 msgstr "Accusé de réception"
 
-#: inc/class.newsletter.admin.php:515
+#: inc/class.newsletter.admin.php:520
 msgid "Minimum posts"
 msgstr "Nombre minimum de billets"
 
-#: inc/class.newsletter.admin.php:518
+#: inc/class.newsletter.admin.php:523
 msgid "Maximum posts"
 msgstr "Nombre maximal de billets"
 
-#: inc/class.newsletter.admin.php:523
+#: inc/class.newsletter.admin.php:528
 msgid "View contents posts"
 msgstr "Affiche le contenu des billets"
 
-#: inc/class.newsletter.admin.php:525
+#: inc/class.newsletter.admin.php:530
 msgid "Size contents posts"
 msgstr "Taille maximale du contenu des billets"
 
-#: inc/class.newsletter.admin.php:533
+#: inc/class.newsletter.admin.php:538
 msgid "Use suspend option"
 msgstr "Utiliser l'option Suspendre"
 
-#: inc/class.newsletter.admin.php:541
+#: inc/class.newsletter.admin.php:546
 msgid "Defaults"
 msgstr "Défauts"
 
-#: inc/class.newsletter.admin.php:551
-#: inc/class.newsletter.admin.php:683
-#: inc/class.newsletter.admin.php:838
-#: inc/class.newsletter.admin.php:963
-#: inc/class.newsletter.admin.php:1079
+#: inc/class.newsletter.admin.php:556
+#: inc/class.newsletter.admin.php:688
+#: inc/class.newsletter.admin.php:843
+#: inc/class.newsletter.admin.php:968
+#: inc/class.newsletter.admin.php:1084
 msgid "Activate the plugin in the Maintenance tab to view all options"
 msgstr "Activer le plugin dans l'onglet maintenance pour afficher toutes les options"
 
-#: inc/class.newsletter.admin.php:591
-#: inc/class.newsletter.admin.php:673
+#: inc/class.newsletter.admin.php:596
+#: inc/class.newsletter.admin.php:678
 msgid "Planning newsletter"
 msgstr "Planification de la newsletter"
 
-#: inc/class.newsletter.admin.php:594
+#: inc/class.newsletter.admin.php:599
 msgid "Interval time in seconds between 2 runs"
 msgstr "Intervalle de temps en secondes entre 2 exécutions"
 
-#: inc/class.newsletter.admin.php:598
+#: inc/class.newsletter.admin.php:603
 msgid "samples"
 msgstr "exemples"
 
-#: inc/class.newsletter.admin.php:598
+#: inc/class.newsletter.admin.php:603
 msgid "day"
 msgstr "jour"
 
-#: inc/class.newsletter.admin.php:598
+#: inc/class.newsletter.admin.php:603
 msgid "week"
 msgstr "semaine"
 
-#: inc/class.newsletter.admin.php:601
+#: inc/class.newsletter.admin.php:606
 msgid "Date for the first run"
 msgstr "Date de la première exécution"
 
-#: inc/class.newsletter.admin.php:607
+#: inc/class.newsletter.admin.php:612
 msgid "Unschedule"
 msgstr "Déplanifier"
 
-#: inc/class.newsletter.admin.php:607
+#: inc/class.newsletter.admin.php:612
 msgid "Schedule"
 msgstr "Planifier"
 
-#: inc/class.newsletter.admin.php:623
+#: inc/class.newsletter.admin.php:628
 msgid "Scheduled task"
 msgstr "Tâche planifiée"
 
-#: inc/class.newsletter.admin.php:633
+#: inc/class.newsletter.admin.php:638
 msgid "State"
 msgstr "Etat"
 
-#: inc/class.newsletter.admin.php:637
+#: inc/class.newsletter.admin.php:642
 msgid "Interval"
 msgstr "Intervalle"
 
-#: inc/class.newsletter.admin.php:641
+#: inc/class.newsletter.admin.php:646
 msgid "Last run"
 msgstr "Dernière exécution"
 
-#: inc/class.newsletter.admin.php:645
+#: inc/class.newsletter.admin.php:650
 msgid "Next run"
 msgstr "Prochaine exécution"
 
-#: inc/class.newsletter.admin.php:649
+#: inc/class.newsletter.admin.php:654
 msgid "Remaining Time"
 msgstr "Temps restant"
 
-#: inc/class.newsletter.admin.php:659
-#: inc/class.newsletter.admin.php:920
+#: inc/class.newsletter.admin.php:664
+#: inc/class.newsletter.admin.php:925
 msgid "Disable"
 msgstr "Désactiver"
 
-#: inc/class.newsletter.admin.php:659
-#: inc/class.newsletter.admin.php:921
+#: inc/class.newsletter.admin.php:664
+#: inc/class.newsletter.admin.php:926
 msgid "Enable"
 msgstr "Activer"
 
-#: inc/class.newsletter.admin.php:674
+#: inc/class.newsletter.admin.php:679
 msgid "Install the plugin dcCron for using planning"
 msgstr "Installez l'extension dcCron pour utiliser la planification"
 
-#: inc/class.newsletter.admin.php:736
+#: inc/class.newsletter.admin.php:741
 msgid "Plugin state"
 msgstr "Etat de l'extension"
 
-#: inc/class.newsletter.admin.php:739
+#: inc/class.newsletter.admin.php:744
 msgid "Activate plugin"
 msgstr "Activer l'extension"
 
-#: inc/class.newsletter.admin.php:757
+#: inc/class.newsletter.admin.php:762
 msgid "Import/Export subscribers list"
 msgstr "Import/Export de la liste des abonnés"
 
-#: inc/class.newsletter.admin.php:760
+#: inc/class.newsletter.admin.php:765
 msgid "This blog only"
 msgstr "Ce blog seulement"
 
-#: inc/class.newsletter.admin.php:764
+#: inc/class.newsletter.admin.php:769
 msgid "All datas"
 msgstr "Toutes les données"
 
-#: inc/class.newsletter.admin.php:781
+#: inc/class.newsletter.admin.php:786
 msgid "Adapt the template for the theme"
 msgstr "Adapter le template pour le thème"
 
-#: inc/class.newsletter.admin.php:782
+#: inc/class.newsletter.admin.php:787
 msgid "Theme name"
 msgstr "Nom du thème"
 
-#: inc/class.newsletter.admin.php:786
+#: inc/class.newsletter.admin.php:791
 msgid "Adapt"
 msgstr "Adapter"
 
-#: inc/class.newsletter.admin.php:792
+#: inc/class.newsletter.admin.php:797
 msgid "Clic here to test the template."
 msgstr "Cliquez ici pour tester le template."
 
-#: inc/class.newsletter.admin.php:804
+#: inc/class.newsletter.admin.php:809
 msgid "Check for plugin update"
 msgstr "Vérifier les mises à jour"
 
-#: inc/class.newsletter.admin.php:811
+#: inc/class.newsletter.admin.php:816
 msgid "Check"
 msgstr "Vérifier"
 
-#: inc/class.newsletter.admin.php:821
+#: inc/class.newsletter.admin.php:826
 msgid "Erasing all informations about newsletter in database"
 msgstr "Suppression de toutes les informations concernant newsletter dans votre base de données"
 
-#: inc/class.newsletter.admin.php:822
+#: inc/class.newsletter.admin.php:827
 msgid "Be careful, please backup your database before erasing"
 msgstr "Attention, vous êtes priés de sauvegarder votre base de données avant de lancer la suppression"
 
-#: inc/class.newsletter.admin.php:825
+#: inc/class.newsletter.admin.php:830
 msgid "Erasing"
 msgstr "Suppression"
 
-#: inc/class.newsletter.admin.php:863
+#: inc/class.newsletter.admin.php:868
 msgid "No subscriber for this blog."
 msgstr "Pas d'abonnés pour ce blog."
 
-#: inc/class.newsletter.admin.php:878
+#: inc/class.newsletter.admin.php:883
 msgid "Subscriber"
 msgstr "Abonné"
 
-#: inc/class.newsletter.admin.php:879
+#: inc/class.newsletter.admin.php:884
 msgid "Subscribed"
 msgstr "Inscription"
 
-#: inc/class.newsletter.admin.php:881
-#: inc/class.newsletter.admin.php:922
+#: inc/class.newsletter.admin.php:886
+#: inc/class.newsletter.admin.php:927
 msgid "Last sent"
 msgstr "Dernier envoi"
 
-#: inc/class.newsletter.admin.php:882
-#: inc/class.newsletter.admin.php:1028
+#: inc/class.newsletter.admin.php:887
+#: inc/class.newsletter.admin.php:1033
 msgid "Mode send"
 msgstr "Mode d'envoi"
 
-#: inc/class.newsletter.admin.php:883
-#: index.php:853
+#: inc/class.newsletter.admin.php:888
+#: index.php:883
 msgid "Edit"
 msgstr "Modifier"
 
-#: inc/class.newsletter.admin.php:891
-#: inc/class.newsletter.admin.php:891
+#: inc/class.newsletter.admin.php:896
+#: inc/class.newsletter.admin.php:896
 msgid "Edit subscriber"
 msgstr "Modifier l'abonné"
 
-#: inc/class.newsletter.admin.php:896
 #: inc/class.newsletter.admin.php:901
-#: inc/class.newsletter.admin.php:1016
+#: inc/class.newsletter.admin.php:906
 #: inc/class.newsletter.admin.php:1021
+#: inc/class.newsletter.admin.php:1026
 #: inc/class.newsletter.cron.php:142
 msgid "Never"
 msgstr "Jamais"
 
-#: inc/class.newsletter.admin.php:926
+#: inc/class.newsletter.admin.php:931
 msgid "Confirmation"
 msgstr "Confirmation"
 
-#: inc/class.newsletter.admin.php:928
+#: inc/class.newsletter.admin.php:933
 msgid "Suspension"
 msgstr "Suspension"
 
-#: inc/class.newsletter.admin.php:930
+#: inc/class.newsletter.admin.php:935
 msgid "Deactivation"
 msgstr "Désactivation"
 
-#: inc/class.newsletter.admin.php:931
+#: inc/class.newsletter.admin.php:936
 msgid "Activation"
 msgstr "Activation"
 
-#: inc/class.newsletter.admin.php:932
+#: inc/class.newsletter.admin.php:937
 msgid "Changing format"
 msgstr "Changer de format"
 
-#: inc/class.newsletter.admin.php:943
+#: inc/class.newsletter.admin.php:948
 msgid "refresh"
 msgstr "actualiser"
 
-#: inc/class.newsletter.admin.php:944
+#: inc/class.newsletter.admin.php:949
 msgid "check all"
 msgstr "sélectionner tout"
 
-#: inc/class.newsletter.admin.php:945
+#: inc/class.newsletter.admin.php:950
 msgid "uncheck all"
 msgstr "désélectionner tout"
 
-#: inc/class.newsletter.admin.php:946
+#: inc/class.newsletter.admin.php:951
 msgid "toggle check all"
 msgstr "inverser la sélection"
 
-#: inc/class.newsletter.admin.php:950
+#: inc/class.newsletter.admin.php:955
 msgid "Set state"
 msgstr "Modifier l'état"
 
-#: inc/class.newsletter.admin.php:951
+#: inc/class.newsletter.admin.php:956
 msgid "Set"
 msgstr "Modifier"
 
-#: inc/class.newsletter.admin.php:952
+#: inc/class.newsletter.admin.php:957
 msgid "Mail to send"
 msgstr "Courrier à envoyer"
 
-#: inc/class.newsletter.admin.php:955
+#: inc/class.newsletter.admin.php:960
 msgid "Set format"
 msgstr "Modifier le format"
 
-#: inc/class.newsletter.admin.php:956
+#: inc/class.newsletter.admin.php:961
 msgid "Change"
 msgstr "Changer"
 
-#: inc/class.newsletter.admin.php:1008
+#: inc/class.newsletter.admin.php:1013
 msgid "Edit a subscriber"
 msgstr "Modifier un abonné"
 
-#: inc/class.newsletter.admin.php:1010
+#: inc/class.newsletter.admin.php:1015
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: inc/class.newsletter.admin.php:1024
+#: inc/class.newsletter.admin.php:1029
 msgid "Subscribed:"
 msgstr "Inscrit:"
 
-#: inc/class.newsletter.admin.php:1026
+#: inc/class.newsletter.admin.php:1031
 msgid "Last sent:"
 msgstr "Dernier envoi:"
 
-#: inc/class.newsletter.admin.php:1030
+#: inc/class.newsletter.admin.php:1035
 msgid "Registration code:"
 msgstr "Code d'inscription:"
 
-#: inc/class.newsletter.admin.php:1034
+#: inc/class.newsletter.admin.php:1039
 msgid "enabled"
 msgstr "actif"
 
-#: inc/class.newsletter.admin.php:1035
+#: inc/class.newsletter.admin.php:1040
 msgid "suspended"
 msgstr "suspendu"
 
-#: inc/class.newsletter.admin.php:1036
+#: inc/class.newsletter.admin.php:1041
 msgid "disabled"
 msgstr "désactivé"
 
-#: inc/class.newsletter.admin.php:1046
+#: inc/class.newsletter.admin.php:1051
 msgid "Add a subscriber"
 msgstr "Ajouter un abonné"
 
-#: inc/class.newsletter.admin.php:1054
+#: inc/class.newsletter.admin.php:1059
 msgid "Not allowed."
 msgstr "Interdit."
 
-#: inc/class.newsletter.core.php:880
+#: inc/class.newsletter.core.php:812
 msgid "Your account has been suspended."
 msgstr "Votre compte a été suspendu."
 
-#: inc/class.newsletter.core.php:887
+#: inc/class.newsletter.core.php:819
 msgid "Thank you for your subscription."
 msgstr "Merci pour votre inscription !"
 
-#: inc/class.newsletter.core.php:888
+#: inc/class.newsletter.core.php:820
 msgid "Your account has been canceled."
 msgstr "Votre compte a été supprimé."
 
-#: inc/class.newsletter.core.php:889
+#: inc/class.newsletter.core.php:821
 msgid "Your account has been validated."
 msgstr "Votre compte a été validé."
 
-#: inc/class.newsletter.core.php:890
+#: inc/class.newsletter.core.php:822
 msgid "Your sending format has been updated."
 msgstr "Votre format d'envoi a été mis à jour."
 
-#: inc/class.newsletter.core.php:937
-#: inc/class.newsletter.plugin.php:590
-msgid "Newsletter for"
-msgstr "Lettre d'information pour"
-
-#: inc/class.newsletter.core.php:954
+#: inc/class.newsletter.core.php:823
+msgid ", by"
+msgstr ", par"
+
+#: inc/class.newsletter.core.php:930
+msgid "Successful mail sent for"
+msgstr "Courriel envoyé avec succès pour"
+
+#: inc/class.newsletter.core.php:933
+msgid "Mail sent error for"
+msgstr "Echec de l'envoi du courriel pour"
+
+#: inc/class.newsletter.core.php:936
+msgid "Nothing to send for"
+msgstr "Rien à envoyer pour"
+
+#: inc/class.newsletter.core.php:981
 msgid "Links:"
 msgstr "Liens:"
 
-#: inc/class.newsletter.core.php:1018
-#: inc/class.newsletter.core.php:1172
-#: inc/class.newsletter.core.php:1257
-#: inc/class.newsletter.core.php:1342
-#: inc/class.newsletter.core.php:1424
-#: inc/class.newsletter.core.php:1575
-#: inc/class.newsletter.core.php:1660
-msgid "Successful mail sent for"
-msgstr "Courriel envoyé avec succès pour"
-
-#: inc/class.newsletter.core.php:1020
-#: inc/class.newsletter.core.php:1174
-#: inc/class.newsletter.core.php:1259
-#: inc/class.newsletter.core.php:1344
-#: inc/class.newsletter.core.php:1426
-#: inc/class.newsletter.core.php:1577
-#: inc/class.newsletter.core.php:1662
-msgid "Mail sent error for"
-msgstr "Echec de l'envoi du courriel pour"
-
-#: inc/class.newsletter.core.php:1022
-msgid "Nothing to send for"
-msgstr "Rien à envoyer pour"
-
-#: inc/class.newsletter.core.php:1127
+#: inc/class.newsletter.core.php:1032
 #: inc/class.newsletter.plugin.php:610
 msgid "Newsletter subscription confirmation for"
 msgstr "Confirmation d'inscription pour"
 
-#: inc/class.newsletter.core.php:1127
+#: inc/class.newsletter.core.php:1032
 msgid "Thanks you for subscribing."
 msgstr "Merci pour votre inscription."
 
-#: inc/class.newsletter.core.php:1213
+#: inc/class.newsletter.core.php:1073
 #: inc/class.newsletter.plugin.php:630
 msgid "Newsletter account suspend for"
 msgstr "Suspension d'abonnement à la lettre d'information pour"
 
-#: inc/class.newsletter.core.php:1213
-#: inc/class.newsletter.core.php:1381
-#: inc/class.newsletter.core.php:1464
-#: inc/class.newsletter.core.php:1621
+#: inc/class.newsletter.core.php:1073
+#: inc/class.newsletter.core.php:1154
+#: inc/class.newsletter.core.php:1194
+#: inc/class.newsletter.core.php:1297
 msgid "Have a nice day !"
 msgstr "Passez une bonne journée !"
 
-#: inc/class.newsletter.core.php:1296
+#: inc/class.newsletter.core.php:1113
 #: inc/class.newsletter.plugin.php:650
 msgid "Newsletter account activation for"
 msgstr "Activation d'abonnement à la lettre d'information pour"
 
-#: inc/class.newsletter.core.php:1296
+#: inc/class.newsletter.core.php:1113
 msgid "Thank you for subscribing."
 msgstr "Merci pour votre inscription."
 
-#: inc/class.newsletter.core.php:1381
+#: inc/class.newsletter.core.php:1154
 #: inc/class.newsletter.plugin.php:670
 msgid "Newsletter account removal for"
 msgstr "Suppression d'abonnement à la lettre d'information pour"
 
-#: inc/class.newsletter.core.php:1464
+#: inc/class.newsletter.core.php:1194
 #: inc/class.newsletter.plugin.php:690
 msgid "Newsletter account resume for"
 msgstr "Information sur l'abonnement à la lettre d'information pour"
 
-#: inc/class.newsletter.core.php:1543
+#: inc/class.newsletter.core.php:1252
 msgid "Your account is pending confirmation."
 msgstr "Votre abonnement est en attente de confirmation."
 
-#: inc/class.newsletter.core.php:1562
+#: inc/class.newsletter.core.php:1271
 msgid "Your sending mode is"
 msgstr "Votre format est"
 
-#: inc/class.newsletter.core.php:1621
+#: inc/class.newsletter.core.php:1297
 #: inc/class.newsletter.plugin.php:710
 msgid "Newsletter account change format for"
 msgstr "Changement du format sur l'abonnement à la lettre d'information pour"
 
-#: inc/class.newsletter.core.php:1681
-#: inc/class.newsletter.core.php:1708
-#: inc/class.newsletter.core.php:1737
-#: inc/class.newsletter.core.php:1764
-#: inc/class.newsletter.core.php:1791
-msgid "Newsletter is disabled."
-msgstr "Newsletter est désactivé."
-
-#: inc/class.newsletter.core.php:1683
-#: inc/class.newsletter.core.php:1711
-#: inc/class.newsletter.core.php:1739
-#: inc/class.newsletter.core.php:1766
-#: inc/class.newsletter.core.php:1793
+#: inc/class.newsletter.core.php:1393
+#: inc/class.newsletter.core.php:1418
+#: inc/class.newsletter.core.php:1444
+#: inc/class.newsletter.core.php:1469
+#: inc/class.newsletter.core.php:1494
 msgid "Bad email !"
 msgstr "Mauvais email ou format incorrect !"
 
-#: inc/class.newsletter.core.php:1688
+#: inc/class.newsletter.core.php:1396
 msgid "Email already exist !"
 msgstr "Email déja existant !"
 
-#: inc/class.newsletter.core.php:1690
+#: inc/class.newsletter.core.php:1398
 msgid "Error creating account !"
 msgstr "Erreur lors de la création du compte !"
@@ -792 +776 @@
 msgstr "Pour suspendre votre abonnement"
 
-#: inc/class.newsletter.plugin.php:1433
+#: inc/class.newsletter.plugin.php:590
+msgid "Newsletter for"
+msgstr "Lettre d'information pour"
+
+#: inc/class.newsletter.plugin.php:1459
 msgid "No new version available."
 msgstr "Pas de nouvelle version."
 
-#: inc/class.newsletter.plugin.php:1435
+#: inc/class.newsletter.plugin.php:1461
 msgid "New version available:"
 msgstr "Nouvelle version disponible:"
 
-#: inc/class.newsletter.plugin.php:1441
+#: inc/class.newsletter.plugin.php:1467
 msgid "Read the post."
 msgstr "Lire le billet."
 
-#: inc/class.newsletter.plugin.php:1441
+#: inc/class.newsletter.plugin.php:1467
 msgid "post"
 msgstr "billet"
 
-#: inc/class.newsletter.plugin.php:1443
+#: inc/class.newsletter.plugin.php:1469
 msgid "Installer."
 msgstr "Installeur."
 
-#: inc/class.newsletter.plugin.php:1443
+#: inc/class.newsletter.plugin.php:1469
 msgid "pkg.gz"
 msgstr "pkg.gz"
 
-#: inc/class.newsletter.plugin.php:1445
+#: inc/class.newsletter.plugin.php:1471
 msgid "Archive."
 msgstr "Archive."
 
-#: inc/class.newsletter.plugin.php:1445
+#: inc/class.newsletter.plugin.php:1471
 msgid "tar.gz"
 msgstr "tar.gz"
 
-#: index.php:69
-#: index.php:286
-#: index.php:299
+#: index.php:72
+#: index.php:295
+#: index.php:308
 msgid "Settings updated."
 msgstr "Paramètres mis à jour."
 
-#: index.php:84
-#: index.php:85
+#: index.php:87
+#: index.php:88
 msgid "You must input a valid email !"
 msgstr "Vous devez saisir un email valide !"
 
-#: index.php:318
-#: index.php:357
-#: index.php:382
-#: index.php:408
+#: index.php:327
+#: index.php:366
+#: index.php:391
+#: index.php:417
 msgid "Planning updated."
 msgstr "Planning mis à jour."
 
-#: index.php:326
+#: index.php:335
 msgid "Error during create planning task."
 msgstr "Erreur pendant la création de la tâche planifiée."
 
-#: index.php:444
-#: index.php:495
+#: index.php:453
+#: index.php:504
 msgid "Missing informations."
 msgstr "Informations manquantes."
 
-#: index.php:447
+#: index.php:456
 msgid "Error adding subscriber."
 msgstr "Erreur lors de l'ajout d'un abonné."
 
-#: index.php:449
+#: index.php:458
 msgid "Subscriber added."
 msgstr "Abonné ajouté."
 
-#: index.php:502
+#: index.php:511
 msgid "Error updating subscriber."
 msgstr "Erreur lors de la mise à jour d'un abonné."
 
-#: index.php:504
+#: index.php:513
 msgid "Subscriber updated."
 msgstr "Abonné mis à jour."
 
-#: index.php:518
+#: index.php:527
 msgid "No account removed."
 msgstr "Pas de compte supprimé."
 
-#: index.php:526
+#: index.php:535
 msgid "Account(s) successfully removed."
 msgstr "Compte(s) supprimé(s) avec succès."
 
-#: index.php:540
+#: index.php:549
 msgid "No account suspended."
 msgstr "Pas de compte suspendu."
 
-#: index.php:548
+#: index.php:557
 msgid "Account(s) successfully suspended."
 msgstr "Compte(s) suspendu(s) avec succès."
 
-#: index.php:562
+#: index.php:571
 msgid "No account enabled."
 msgstr "Pas de compte activé."
 
-#: index.php:570
+#: index.php:579
 msgid "Account(s) successfully enabled."
 msgstr "Compte(s) activé(s) avec succés."
 
-#: index.php:584
+#: index.php:593
 msgid "No account disabled."
 msgstr "Pas de compte désactivé."
 
-#: index.php:592
+#: index.php:601
 msgid "Account(s) successfully disabled."
 msgstr "Compte(s) désactivé(s) avec succès."
 
-#: index.php:625
+#: index.php:640
 msgid "No account changed."
 msgstr "Pas de compte modifié."
 
-#: index.php:630
+#: index.php:646
 msgid "Account(s) successfully changed."
 msgstr "Compte(s) modifié(s) avec succès."
 
-#: index.php:649
+#: index.php:667
 msgid "Datas exported."
 msgstr "Données exportées."
 
-#: index.php:669
+#: index.php:687
 msgid "Datas imported."
 msgstr "Données importées."
 
-#: index.php:742
-#: index.php:764
+#: index.php:772
+#: index.php:794
 msgid "No account(s) updated."
 msgstr "Pas de compte(s) mis à jour."
 
-#: index.php:750
+#: index.php:780
 msgid "Format sending for account(s) successfully updated to html."
 msgstr "Format d'envoi pour le(s) abonné(s) mis à jour au format html."
 
-#: index.php:772
+#: index.php:802
 msgid "Format sending for account(s) successfully updated to text."
 msgstr "Format d'envoi pour le(s) abonné(s) mis à jour au format text."
 
-#: index.php:786
+#: index.php:816
 msgid "No template adapted."
 msgstr "Pas de template adapté."
 
-#: index.php:788
+#: index.php:819
 msgid "Template successfully adapted."
 msgstr "Template adapté avec succès."
 
-#: index.php:803
+#: index.php:833
 msgid "Erasing complete."
 msgstr "Nettoyage terminé."
 
-#: index.php:839
+#: index.php:869
 msgid "Are you sure you want to delete all informations about newsletter in database ?"
 msgstr "Etes-vous sûr de vouloir supprimer toutes les informations de newsletter dans la base de données ?"
 
-#: index.php:850
+#: index.php:880
 msgid "Subscribers"
 msgstr "Abonnés"
 
-#: index.php:859
+#: index.php:889
 msgid "Planning"
 msgstr "Planification"
 
+msgid "Newsletter is disabled."
+msgstr "Newsletter est désactivé."
+
 msgid "Presentation message"
 msgstr "Message de présentation"