Changeset 2505

Timestamp:

07/23/10 16:23:58 (13 years ago)

Author:

kwon

Message:

Newsletter : Closes #521

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) (4 diffs)
• inc/class.newsletter.core.php (modified) (1 diff)
• inc/class.newsletter.tools.php (modified) (2 diffs)
• inc/class.template.php (modified) (1 diff)
• index.php (modified) (2 diffs)

plugins/newsletter/trunk/_define.php

@@ -16 +16 @@
      /* Description*/    "Manage your newsletters in Dotclear 2",
      /* Author */        "Benoit de Marne",
-     /* Version */       "3.7.5",
+     /* Version */       "3.7.6rc1",
      /* Permissions */   "usage,contentadmin",
      /* Priority */      null

plugins/newsletter/trunk/_public.php

@@ -420 +420 @@
           if (version_compare(DC_VERSION,'2.2-alpha','>=')) {
                $blog_settings =& $core->blog->settings->newsletter;
-               $system_settings = $core->blog->settings->system;
+               $system_settings =& $core->blog->settings->system;
           } else {
                $blog_settings =& $core->blog->settings;

plugins/newsletter/trunk/changelog.txt

@@ +1 @@
+Newsletter 3.7.6 - 2010-07-xx
+===========================================================
+* Ticket #521 : correction sur l'ouverture du fichier CSS
+
 Newsletter 3.7.5 - 2010-07-23
 ===========================================================

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

@@ -825 +825 @@
                $blog = &$core->blog;
 
-
-
-                    $letter_css = new newsletterCSS($core);
-                    $f_name = $letter_css->getFilenameCSS();
-                    $f_content = $letter_css->getLetterCSS();
-                    $f_editable = $letter_css->isEditable();
-                    
-                    $default_folder = path::real(newsletterPlugin::folder().'..');
-                    
-                    if ($default_folder == $letter_css->getPathCSS())
-                         $f_editable = false;
-                    
-                    // gestion des paramètres du plugin
-                    echo 
+               $letter_css = new newsletterCSS($core);
+               $f_name = $letter_css->getFilenameCSS();
+               $f_content = $letter_css->getLetterCSS();
+               $f_editable = $letter_css->isEditable();
+                    
+               $default_folder = path::real(newsletterPlugin::folder().'..');
+                    
+               if ($default_folder == $letter_css->getPathCSS())
+                    $f_editable = false;
+                    
+               // gestion des paramètres du plugin
+               echo 
                     '<form action="plugin.php" method="post" id="file-form">'.
 
@@ -849 +847 @@
 
                          if(!$f_editable)
-                                   echo '<p>'.__('This file is not writable. Please check your theme files permissions.').'</p>';
+                              echo '<p>'.__('This file is not writable. Please check your theme files permissions.').'<p>'.
+                                   '<p>NB: '.__('If you want edit the file CSS, please copy the default file style_letter.css in your current theme folder.').'</p>';
                          else {
                          echo
@@ -862 +861 @@
                          '</fieldset>'.
                     '</form>'.
-                    '';
+               '';
                               
 
@@ -996 +995 @@
           if (version_compare(DC_VERSION,'2.2-alpha','>=')) {
                $blog_settings =& $core->blog->settings->newsletter;
-               $system_settings = $core->blog->settings->system;
+               $system_settings =& $core->blog->settings->system;
           } else {
                $blog_settings =& $core->blog->settings;

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

@@ -1448 +1448 @@
           if (version_compare(DC_VERSION,'2.2-alpha','>=')) {
                $blog_settings =& $core->blog->settings->newsletter;
-               $system_settings = $core->blog->settings->system;
+               $system_settings =& $core->blog->settings->system;
           } else {
                $blog_settings =& $core->blog->settings;

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

@@ -84 +84 @@
           # Settings compatibility test
           if (version_compare(DC_VERSION,'2.2-alpha','>=')) {
-               $system_settings = $core->blog->settings->system;
+               $system_settings =& $core->blog->settings->system;
           } else {
                $system_settings->system_settings =& $core->blog->settings;
           }                   
-          
+
           if (file_exists(path::real($core->blog->themes_path.'/'.$system_settings->theme).'/tpl/'.$filename))
                $folder = path::real($core->blog->themes_path.'/'.$system_settings->theme).'/tpl/';
           else
-               $folder =  path::real(newsletterPlugin::folder().'..').'/default-templates/';
+               $folder =  path::real(newsletterPlugin::folder().'..').'/default-templates/';        
           return $folder;
      }
@@ -101 +101 @@
           # Settings compatibility test
           if (version_compare(DC_VERSION,'2.2-alpha','>=')) {
-               $blog_settings =& $core->blog->settings->newsletter;
-               $system_settings = $core->blog->settings->system;
+               $system_settings =& $core->blog->settings->system;
           } else {
-               $blog_settings =& $core->blog->settings;
                $system_settings =& $core->blog->settings;
           }         
           
-          if (file_exists(path::real($system_settings->themes_path.'/'.$blog_settings->theme).'/'.$filename))
-               $folder = path::real($system_settings->themes_path.'/'.$blog_settings->theme);
+          if (file_exists(path::real($core->blog->themes_path.'/'.$system_settings->theme.'/'.$filename)))
+               $folder = path::real($core->blog->themes_path.'/'.$system_settings->theme);
           else
                $folder =  path::real(newsletterPlugin::folder().'..');

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

@@ -89 +89 @@
           try {
                $blog = $core->blog;
-               $settings = $blog->settings;
                $templates = self::templates();
                
                $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

@@ -18 +18 @@
 if (version_compare(DC_VERSION,'2.2-alpha','>=')) {
      $blog_settings =& $core->blog->settings->newsletter;
-     $system_settings = $core->blog->settings->system;
+     $system_settings =& $core->blog->settings->system;
 } else {
      $blog_settings =& $core->blog->settings;
@@ -642 +642 @@
           
           if (!empty($_POST['fthemes'])) {
-               
                if (newsletterAdmin::adapt($_POST['fthemes'])) {
                     $msg = __('Template successfully adapted.');
                } else {
                     throw new Exception(__('Error to adapt template'));
-                    
                }
           } else {