Merge remote branch 'origin/platal-1.0.1'

[platal.git] / modules / newsletter.php

diff --git a/modules/newsletter.php b/modules/newsletter.php
index 86c1557..ec52264 100644 (file)
--- a/modules/newsletter.php
+++ b/modules/newsletter.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -41,13 +41,13 @@ class NewsletterModule extends PLModule
         $page->setTitle('Lettres mensuelles');
 
         switch ($action) {
-          case 'out': Newsletter::unsubscribe(); break;
-          case 'in':  Newsletter::subscribe(); break;
+          case 'out': NewsLetter::unsubscribe(); break;
+          case 'in':  NewsLetter::subscribe(); break;
           default: ;
         }
 
-        $page->assign('nls', Newsletter::subscriptionState());
-        $page->assign('nl_list', Newsletter::listSent());
+        $page->assign('nls', NewsLetter::subscriptionState());
+        $page->assign('nl_list', NewsLetter::listSent());
     }
 
     function handler_nl_show(&$page, $nid = 'last')
@@ -87,7 +87,6 @@ class NewsletterModule extends PLModule
             $art = new NLArticle(Post::v('title'), Post::v('body'), Post::v('append'));
             $page->assign('art', $art);
         } elseif (Post::has('valid')) {
-            require_once('validations.inc.php');
             $art = new NLReq(S::user(), Post::v('title'),
                              Post::v('body'), Post::v('append'));
             $art->submit();
@@ -102,11 +101,11 @@ class NewsletterModule extends PLModule
         require_once("newsletter.inc.php");
 
         if($new) {
-            Newsletter::create();
+            NewsLetter::create();
             pl_redirect("admin/newsletter");
         }
 
-        $page->assign('nl_list', Newsletter::listAll());
+        $page->assign('nl_list', NewsLetter::listAll());
     }
 
     function handler_admin_nl_edit(&$page, $nid = 'last', $aid = null, $action = 'edit') {
@@ -158,12 +157,13 @@ class NewsletterModule extends PLModule
         }
 
         if ($aid == 'blacklist_check') {
+            global $globals;
             $ips_to_check = array();
-            $gethostbyname_count = 0;
+            $blacklist_host_resolution_count = 0;
 
             foreach ($nl->_arts as $key => $articles) {
                 foreach ($articles as $article) {
-                    $article_ips = $article->getLinkIps($gethostbyname_count);
+                    $article_ips = $article->getLinkIps($blacklist_host_resolution_count);
                     if (!empty($article_ips)) {
                         $ips_to_check[$article->title()] = $article_ips;
                     }
@@ -171,8 +171,8 @@ class NewsletterModule extends PLModule
             }
 
             $page->assign('ips_to_check', $ips_to_check);
-            if ($gethostbyname_count >= $globals->mail->blacklist_host_resolution_limit) {
-                $page-trigError("Toutes les url et adresses emails de la lettre"
+            if ($blacklist_host_resolution_count >= $globals->mail->blacklist_host_resolution_limit) {
+                $page->trigError("Toutes les url et adresses emails de la lettre"
                                 . " n'ont pas été prises en compte car la"
                                 . " limite du nombre de résolutions DNS"
                                 . " autorisée a été atteinte.");