Changeset 1538 for plugins/newsletter/trunk

Timestamp:

10/02/09 16:13:38 (14 years ago)

Author:

kwon

Message:

Newsletter 3.6.0rc4 :

• corrige le choix du template pour la newsletter
• corrige la selection des abonnes lors de l'envoi de la newsletter

Location:

plugins/newsletter/trunk

Files:

• _define.php (modified) (1 diff)
• _public.php (modified) (1 diff)
• changelog.txt (modified) (1 diff)
• inc/class.newsletter.admin.php (modified) (6 diffs)
• inc/class.newsletter.tools.php (modified) (1 diff)
• inc/class.template.php (modified) (2 diffs)
• index.php (modified) (1 diff)

plugins/newsletter/trunk/_define.php

@@ -15 +15 @@
      /* Description*/    "Manager newsletter",
      /* Author */        "Benoit de Marne",
-     /* Version */       "3.6.0rc2",
+     /* Version */       "3.6.0rc4",
      /* Permissions */   "usage,contentadmin",
      /* Priority */      null

plugins/newsletter/trunk/_public.php

@@ -633 +633 @@
                $GLOBALS['newsletter']['modesend'] = $modesend;
 
-               // préparation de l'utilisation du moteur de template
+               // Affichage du formulaire
                $tpl->setPath($tpl->getPath(), dirname(__FILE__).'/default-templates');
                $file = $tpl->getFilePath('subscribe.newsletter.html');
-
-               // utilise le moteur de template pour générer la page pour le navigateur
-               files::touch($file);
 
                header('Pragma: no-cache');

plugins/newsletter/trunk/changelog.txt

@@ -15 +15 @@
 * mise à niveau de l'aide en ligne
 * Correction du Ticket #251 : planification impossible pour profil admin en multi-blog
+* Validation des droits en tant qu'admin ou superadmin
+* Prise en compte des fichiers templates du thème pour l'envoi des mails (par exemple newsletter.html)
 
 Newsletter 3.5.13 - 2009-09-18

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

@@ -389 +389 @@
           try {
                $blog = &$core->blog;
-               $auth = &$core->auth;
                     
                $mode_combo = array(__('text') => 'text',
@@ -397 +396 @@
                                    __('publication date') => 'post_upddt'
                                    );
-
-               $sadmin = (($auth->isSuperAdmin()) ? true : false);
 
                if (newsletterPlugin::isActive()) {
@@ -527 +524 @@
           try {
                $blog = &$core->blog;
-               $auth = &$core->auth;
-
-               $sadmin = (($auth->isSuperAdmin()) ? true : false);
 
                if (newsletterPlugin::isActive()) {
@@ -827 +821 @@
           try {
                $blog = &$core->blog;
-               $auth = &$core->auth;
 
                if (newsletterPlugin::isActive()) {
@@ -1071 +1064 @@
                     '';
                     
-                    echo
-                    // adaptation du template
+                    if ($sadmin) {
+                         echo
+                         // adaptation du template
                          '<fieldset>'.
                          '<legend>'.__('Adapt the template for the theme').'</legend>'.
@@ -1090 +1084 @@
                               '</form>'.
                          '</fieldset>'.
-                    '';
-
-                    echo
-                    // Nettoyage de la base
-                    '<fieldset>'.
-                    '<legend>'.__('Erasing all informations about newsletter in database').'</legend>'.
-                         '<form action="plugin.php" method="post" id="erasingnewsletter">'.
-                              '<p>'.__('Be careful, please backup your database before erasing').
-                              '</p>'.
-                              '<p>'.
-                              //'<input type="submit" value="'.__('Erasing').'" name="delete" class="delete" onclick="erasingnewsletterConfirm(); return false" />'.
-                              '<input type="submit" value="'.__('Erasing').'" name="delete" class="delete"/>'.
-                              '</p>'.
-                              form::hidden(array('p'),newsletterPlugin::pname()).
-                              form::hidden(array('op'),'erasingnewsletter').
-                              $core->formNonce().
-                         '</form>'.
-                    '</fieldset>'.
-                    '';
+                         '';
+                    }
+
+                    if ($sadmin) {
+                         echo
+                         // Nettoyage de la base
+                         '<fieldset>'.
+                         '<legend>'.__('Erasing all informations about newsletter in database').'</legend>'.
+                              '<form action="plugin.php" method="post" id="erasingnewsletter">'.
+                                   '<p>'.__('Be careful, please backup your database before erasing').
+                                   '</p>'.
+                                   '<p>'.
+                                   //'<input type="submit" value="'.__('Erasing').'" name="delete" class="delete" onclick="erasingnewsletterConfirm(); return false" />'.
+                                   '<input type="submit" value="'.__('Erasing').'" name="delete" class="delete"/>'.
+                                   '</p>'.
+                                   form::hidden(array('p'),newsletterPlugin::pname()).
+                                   form::hidden(array('op'),'erasingnewsletter').
+                                   $core->formNonce().
+                              '</form>'.
+                         '</fieldset>'.
+                         '';
+                    }
 
                } else {

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

@@ -79 +79 @@
      }
      
+     // recherche si le template existe dans le theme
+     public static function requestTemplate(dcCore $core, $filename) 
+     {    
+          if (file_exists(path::real($core->blog->themes_path.'/'.$core->blog->settings->theme).'/tpl/'.$filename))
+               $folder = path::real($core->blog->themes_path.'/'.$core->blog->settings->theme).'/tpl/';
+          else
+               $folder =  path::real(newsletterPlugin::folder().'..').'/default-templates/';
+          return $folder;
+     }
 }
 

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

@@ -18 +18 @@
      // variables
      protected static $metas = null;
-
-     /**
-     * répertoire des templates
-     */
-     public static function folder() { 
-          return newsletterPlugin::folder().'../default-templates/'; 
-     }
 
      /**
@@ -94 +87 @@
           
           try {
-               $blog = &$core->blog;
-               $settings = &$blog->settings;
+               $blog = $core->blog;
+               $settings = $blog->settings;
                $templates = self::templates();
-               $filename = self::folder().$templates[$template][$mode];
+               
+               $filename = newsletterTools::requestTemplate($core,$templates[$template][$mode]).$templates[$template][$mode];
+               //$core->blog->dcNewsletter->addError('file='.$filename.' && file='.$templates[$template][$mode]);
                
                // test d'existence du fichier de droits en lecture

plugins/newsletter/trunk/index.php

@@ -432 +432 @@
      case 'send':
      {
-
-          if (is_array($_POST['subscriber'])) {
-               $ids = array();
-               foreach ($_POST['subscriber'] as $k => $v) {
-                    $ids[$k] = (integer) $v;
-               }
-               
+          if (is_array($_POST['subscriber'])) {
+               $ids = array();
+               foreach ($_POST['subscriber'] as $k => $v) {
+                    // on verifie que les utilisateurs sont enabled
+                    if ($subscriber = newsletterCore::get((integer) $v)){
+                         if ($subscriber->state == 'enabled') {
+                              $ids[$k] = (integer) $v;
+                         }
+                    }
+               }
                $msg = newsletterCore::send($ids,'newsletter');
-               
-          }
-
+          }
           newsletterTools::redirection($m,$msg);
      }