Changeset 2729

Timestamp:

11/05/10 14:49:20 (13 years ago)

Author:

kwon

Message:

Newsletter :

' closes #578 : conformite rfc2822
' closes #583 : export contact list as a csv file or a txt file
' closes #595 : La recherche des billets ne fonctionne plus avec PostgreSQL

Location:

plugins/newsletter/trunk

Files:

• _define.php (modified) (1 diff)
• changelog.txt (modified) (1 diff)
• inc/class.newsletter.admin.php (modified) (7 diffs)
• inc/class.newsletter.core.php (modified) (3 diffs)
• inc/class.newsletter.mail.php (modified) (3 diffs)
• index.php (modified) (1 diff)

plugins/newsletter/trunk/_define.php

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

plugins/newsletter/trunk/changelog.txt

@@ -2 +2 @@
 ===========================================================
 --- TODO 3.7.11 ----
-Ticket #578 : conformité rfc2822
-Ticket #583 : export contact list as a csv file or a txt file
 Ticket #588 : ajouter la possibilité de définir les permissions
-Ticket #595 : La recherche des billets ne fonctionne plus avec PostgreSQL
 -------------
-
+* Ticket #578 : conformité rfc2822
+* Ticket #583 : export contact list as a csv file or a txt file
+* Ticket #595 : La recherche des billets ne fonctionne plus avec PostgreSQL
 * Suppression de l'utilisation du fichier newsletter.txt au profit de newsletter.html
 * Uniformise les mots-clés de la newsletter

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

@@ -39 +39 @@
      * export the schema content
      */
-     public static function exportToBackupFile($onlyblog = true, $outfile = null)
+     public static function exportToBackupFile($onlyblog = true, $format = 'dat', $outfile = null)
      {
           global $core;
@@ -50 +50 @@
                     $filename = $outfile;
                } else {
-                    if ($onlyblog) 
-                         $filename = $core->blog->public_path.'/'.$blogid.'-'.newsletterPlugin::pname().'.dat';
+                    if ($onlyblog)
+                         $filename = $core->blog->public_path.'/'.$blogid.'-'.newsletterPlugin::pname().'.'.$format;
                     else 
-                         $filename = $core->blog->public_path.'/'.newsletterPlugin::pname().'.dat';
+                         $filename = $core->blog->public_path.'/'.newsletterPlugin::pname().'.'.$format;
                }
 
@@ -60 +60 @@
                if (is_object($datas) !== FALSE) {
                     $datas->moveStart();
-                    while ($datas->fetch())
-                    {
-                         $elems = array();
-
-                         // generate component
-                         $elems[] = $datas->subscriber_id;
-                         $elems[] = base64_encode($datas->blog_id);
-                         $elems[] = base64_encode($datas->email);
-                         $elems[] = base64_encode($datas->regcode);
-                         $elems[] = base64_encode($datas->state);
-                         $elems[] = base64_encode($datas->subscribed);
-                         $elems[] = base64_encode($datas->lastsent);
-                         $elems[] = base64_encode($datas->modesend);
-
-                         // génération de la ligne de données exportées(séparateur -> ;)
-                         $line = implode(";", $elems);
-                         $content .= "$line\n";
+                    
+                    if($format == 'txt') {
+                         while ($datas->fetch())
+                         {
+                              $elems = array();
+     
+                              // generate component
+                              $elems[] = $datas->subscriber_id;
+                              $elems[] = $datas->blog_id;
+                              $elems[] = $datas->email;
+                              $elems[] = $datas->regcode;
+                              $elems[] = $datas->state;
+                              $elems[] = $datas->subscribed;
+                              $elems[] = $datas->lastsent;
+                              $elems[] = $datas->modesend;
+     
+                              $line = implode(";", $elems);
+                         $content .= "$line\n";
+                         }
+                    } else {
+                         while ($datas->fetch())
+                         {
+                              $elems = array();
+     
+                              // generate component
+                              $elems[] = $datas->subscriber_id;
+                              $elems[] = base64_encode($datas->blog_id);
+                              $elems[] = base64_encode($datas->email);
+                              $elems[] = base64_encode($datas->regcode);
+                              $elems[] = base64_encode($datas->state);
+                              $elems[] = base64_encode($datas->subscribed);
+                              $elems[] = base64_encode($datas->lastsent);
+                              $elems[] = base64_encode($datas->modesend);
+     
+                              $line = implode(";", $elems);
+                         $content .= "$line\n";
+                         }
                     }
                }
@@ -1061 +1081 @@
                $blogurl = &$blog->url;
                $urlBase = http::concatURL($blogurl, $url->getBase('newsletter'));              
+               
+               $export_format_combo = array(__('text file') => 'txt',
+                    __('data file') => 'dat');
+               $f_export_format = 'dat';
+               
                $core->themes = new dcThemes($core);
                $core->themes->loadModules($core->blog->themes_path,null);
-
                $bthemes = array();
                foreach ($core->themes->getModules() as $k => $v)
@@ -1073 +1097 @@
 
                $sadmin = (($auth->isSuperAdmin()) ? true : false);
-          
+
                echo
                '<fieldset>'.
-                    '<legend>'.__('Plugin state').'</legend>'.             
+                    '<legend>'.__('Plugin state').'</legend>'.
                     '<form action="plugin.php" method="post" id="state">'.
                          '<p class="field">'.
@@ -1099 +1123 @@
                     '<legend>'.__('Import/Export subscribers list').'</legend>'.
                          '<form action="plugin.php" method="post" id="export" name="export">'.
+                              '<p class="field">'.
+                                   '<label for="f_export_format" class="classic">'.__('Export format').'</label>'.
+                                   form::combo('f_export_format',$export_format_combo,$f_export_format).
+                              '</p>'.                            
                               '<p>'.
                               '<label class="classic">'.
@@ -1107 +1135 @@
                               form::radio(array('type'),'all',($sadmin) ? true : false,'','',(!$sadmin) ? true : false).__('All datas').
                               '</label>'.
-                              '</p>'.
                               '<p>'.
                               '<input type="submit" value="'.__('Export').'" />'.

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

@@ -389 +389 @@
 
           $strReq .=
-          "WHERE N.blog_id = '".$blogid."' ";
+          'WHERE N.blog_id = \''.$blogid.'\' ';
 
           if (!empty($params['state'])) {
-               $strReq .= "AND N.state = '".$con->escape($params['state'])."' ";
+               $strReq .= 'AND N.state = \''.$con->escape($params['state']).'\' ';
           }
 
@@ -699 +699 @@
                               $now = date('Y-m-j H:i:s',time());
                          }
-                              
+
+                         /*
                          $params['sql'] = ' AND P.'.$newsletter_settings->getOrderDate().' BETWEEN "'.$date_previous_send.'" AND "'.$now.'" ';
                          if($debug) {
                               $core->blog->dcNewsletter->addMessage(' P.'.$newsletter_settings->getOrderDate().' BETWEEN "'.$date_previous_send.'" AND "'.$now.'" ');
                          }
+                         //*/
+                         $params['sql'] = ' AND P.'.$newsletter_settings->getOrderDate().' BETWEEN \''.$date_previous_send.'\' AND \''.$now.'\' ';
                     }
                }
@@ -725 +728 @@
                          $rs = $con->select(
                               'SELECT cat_lft, cat_rgt FROM '.$core->prefix.'category '.
-                              "WHERE blog_id = '".$con->escape($blog->id)."' ".
+                              'WHERE blog_id = \''.$con->escape($blog->id).'\' '.
                               'AND cat_id='.(integer)$category
                          );

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

@@ -22 +22 @@
      protected $x_blog_url;
      protected $x_originating_ip;
+     protected $date;
 
      protected $email_from;
@@ -64 +65 @@
           //$this->x_originating_ip = http::realIP();
           $this->x_originating_ip = (isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : null);
+
+          if (version_compare(DC_VERSION,'2.2-alpha','>=')) {
+               $system_settings =& $core->blog->settings->system;
+          } else {
+               $system_settings =& $core->blog->settings;
+          }              
+          $this->date = date('r', time() + dt::getTimeOffset($system_settings->blog_timezone));
           
           $this->state = false;
@@ -154 +162 @@
                          'X-Blog-Url: '.$this->x_blog_url,
                          'X-Originating-IP: '.$this->x_originating_ip,
+                         'Date:'.$this->date,
                          (($f_check_notification) ? 'Disposition-Notification-To: '.$this->email_from : '')
                     );

plugins/newsletter/trunk/index.php

@@ -612 +612 @@
           $m = 'maintenance';
 
-          $type = (!empty($_POST['type'])) ? $_POST['type'] : 'blog';
-          $msg = newsletterAdmin::exportToBackupFile( ($type=='blog') ? true : false );
+          $export_format = (!empty($_POST['f_export_format']) ? $_POST['f_export_format'] : 'dat');
+          $type = (!empty($_POST['type']) ? $_POST['type'] : 'blog');
+          $msg = newsletterAdmin::exportToBackupFile((($type=='blog') ? true : false), $export_format);
 
           newsletterTools::redirection($m,$msg);