X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fnewsletter.inc.php;h=2ab69083cb360146da292fdcc36584e8991ab777;hb=5ddeb07cc787dd1dc3630a31f1528f5cc7c4d9b9;hp=712573ea75f4cb39f3053ddd37b0031cd452a58c;hpb=f1ca33de3bce194c10cfa9b7fbc588fbf6b3014d;p=platal.git

diff --git a/include/newsletter.inc.php b/include/newsletter.inc.php
index 712573e..2ab6908 100644
--- a/include/newsletter.inc.php
+++ b/include/newsletter.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2007 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -23,315 +23,311 @@
 
 require_once("xorg.misc.inc.php");
 
-if (isset($page)) {
-    $page->addCssLink('nl.css');
-}
-
 define('FEMME', 1);
 define('HOMME', 0);
 
 // }}}
-// {{{ class NewsLetter
+// {{{ class MassMailer
 
-class NewsLetter
+abstract class MassMailer
 {
-    // {{{ properties
-    
-    var $_id;
-    var $_date;
-    var $_title;
-    var $_head;
-    var $_cats = Array();
-    var $_arts = Array();
+    private $_tpl;
+    private $_css;
+    private $_prefix;
 
-    // }}}
-    // {{{ constructor
-    
-    function NewsLetter($id=null)
+    public $_id;
+    public $_shortname;
+    public $_title;
+    public $_title_mail;
+
+    public $_head;
+
+    function __construct($tpl, $css, $prefix)
     {
-	if (isset($id)) {
-	    if ($id == 'last') {
-		$res = XDB::query("SELECT MAX(id) FROM newsletter WHERE bits!='new'");
-                $id  = $res->fetchOneCell();
-	    }
-	    $res = XDB::query("SELECT * FROM newsletter WHERE id={?}", $id);
-	} else {
-	    $res = XDB::query("SELECT * FROM newsletter WHERE bits='new'");
-	}
-	$nl = $res->fetchOneAssoc();
-
-	$this->_id    = $nl['id'];
-	$this->_date  = $nl['date'];
-	$this->_title = $nl['titre'];
-	$this->_head  = $nl['head'];
-
-	$res = XDB::iterRow("SELECT cid,titre FROM newsletter_cat ORDER BY pos");
-	while (list($cid, $title) = $res->next()) {
-	    $this->_cats[$cid] = $title;
-	}
-	
-	$res = XDB::iterRow(
-                "SELECT  a.title,a.body,a.append,a.aid,a.cid,a.pos
-                   FROM  newsletter_art AS a
-             INNER JOIN  newsletter     AS n USING(id)
-             LEFT  JOIN  newsletter_cat AS c ON(a.cid=c.cid)
-                  WHERE  a.id={?}
-               ORDER BY  c.pos,a.pos", $this->_id);
-	while (list($title, $body, $append, $aid, $cid, $pos) = $res->next()) {
-	    $this->_arts[$cid]["a$aid"] = new NLArticle($title, $body, $append, $aid, $cid, $pos);
-	}
+        $this->_tpl    = $tpl;
+        $this->_css    = $css;
+        $this->_prefix = $prefix;
     }
 
-    // }}}
-    // {{{ function setSent()
+    public function id()
+    {
+        return is_null($this->_shortname) ? $this->_id : $this->_shortname;
+    }
 
-    function setSent()
+    public function title($mail = false)
     {
-	XDB::execute("UPDATE  newsletter SET bits='sent' WHERE id={?}", $this->_id);
+        return $mail ? $this->_title_mail : $this->_title;
     }
 
-    // }}}
-    // {{{ function save()
+    public function head($prenom = null, $nom = null, $sexe = null, $type = 'text')
+    {
+        if (is_null($prenom)) {
+            return $this->_head; 
+        } else {
+            $head = $this->_head;
+            $head = str_replace('<cher>',   $sexe ? 'Chère' : 'Cher', $head);
+            $head = str_replace('<prenom>', $prenom, $head);
+            $head = str_replace('<nom>',    $nom,    $head);
+            if ($type == 'text') {
+                $head = enriched_to_text($head, false, true, 2, 64);
+            } else {
+                $head = enriched_to_text($head, true);
+            }
+            return $head;
+        }
+    }
 
-    function save()
+    public function css(&$page = null)
     {
-	XDB::execute('UPDATE newsletter SET date={?},titre={?},head={?} WHERE id={?}',
-                     $this->_date, $this->_title, $this->_head, $this->_id);
+        if (!is_null($page)) {
+            $page->addCssLink($this->_css);
+            return true;
+        } else {
+            $css = file_get_contents(dirname(__FILE__) . '/../htdocs/css/' . $this->_css);
+            return preg_replace('@/\*.*?\*/@s', '', $css);
+        }
     }
 
-    // }}}
-    // {{{ function title()
+    public function toText(&$page, $prenom, $nom, $sexe)
+    {
+        $this->css($page);
+        $page->assign('is_mail', false);
+        $page->assign('html_version', false);
+        $page->assign('prenom', $prenom);
+        $page->assign('nom', $nom);
+        $page->assign('sexe', $sexe);
+        $this->assignData($page);
+    }
+
+    public function toHtml(&$page, $prenom, $nom, $sexe)
+    {
+        $this->css($page);
+        $page->assign('prefix', $this->_prefix . '/' . $this->id());
+        $page->assign('is_mail', false);
+        $page->assign('html_version', true);
+        $page->assign('prenom', $prenom);
+        $page->assign('nom', $nom);
+        $page->assign('sexe', $sexe);
+        $this->assignData($page);
+    }
 
-    function title()
-    { return $this->_title; }
+    public function sendTo($prenom, $nom, $login, $sexe, $html)
+    {
+        global $globals;
 
-    // }}}
-    // {{{ function head()
-    
-    function head()
-    { return $this->_head; }
+        $mailer = new PlMailer($this->_tpl);
+        $this->assignData($mailer);
+        $mailer->assign('is_mail', true);
+        $mailer->assign('prenom',  $prenom);
+        $mailer->assign('nom',     $nom);
+        $mailer->assign('sexe',    $sexe);
+        $mailer->assign('prefix',  null);
+        $mailer->addTo("\"$prenom $nom\" <$login@{$globals->mail->domain}>");
+        $mailer->send($html);
+    }
 
-    // }}}
-    // {{{ function getArt()
+    public function sendToAll()
+    {
+        $this->setSent();
+        $query = "SELECT  u.user_id, a.alias,
+                          u.prenom, IF(u.nom_usage='', u.nom, u.nom_usage),
+                          FIND_IN_SET('femme', u.flags),
+                          q.core_mail_fmt AS pref
+                    FROM  {$this->subscriptionTable()}  AS ni
+              INNER JOIN  auth_user_md5   AS u  USING(user_id)
+              INNER JOIN  auth_user_quick AS q  ON(q.user_id = u.user_id)
+              INNER JOIN  aliases         AS a  ON(u.user_id=a.id AND FIND_IN_SET('bestalias',a.flags))
+               LEFT JOIN  emails          AS e  ON(e.uid=u.user_id AND e.flags='active')
+                   WHERE  ({$this->subscriptionWhere()}) AND e.email IS NOT NULL
+                GROUP BY  u.user_id
+                   LIMIT  60";
+        while (true) {
+            $res = XDB::iterRow($query);
+            if (!$res->total()) {
+                exit;
+            }
+            $sent = array();
+            while (list($uid, $bestalias, $prenom, $nom, $sexe, $fmt) = $res->next()) {
+                $sent[] = "user_id='$uid'";
+                $this->sendTo($prenom, $nom, $bestalias, $sexe, $fmt=='html');
+            }
+            XDB::execute("UPDATE  {$this->subscriptionTable()}
+                             SET  {$this->subscriptionUpdate()}
+                           WHERE " . implode(' OR ', $sent));
+            sleep(60);
+        }
+    }
+
+    abstract protected function assignData(&$smarty);
+    abstract protected function setSent();
+    abstract static public function subscribe($uid = -1);
+    abstract static public function unsubscribe($uid = -1);
+    abstract static public function subscriptionState($uid = -1);
+
+    abstract protected function subscriptionTable();
+    abstract protected function subscriptionWhere();
+    abstract protected function subscriptionUpdate(); 
+}
+
+// }}}
+// {{{ class NewsLetter
+
+class NewsLetter extends MassMailer
+{
+    public $_date;
+    public $_cats = Array();
+    public $_arts = Array();
+
+    function __construct($id = null)
+    {
+        parent::__construct('newsletter/nl.tpl', 'nl.css', 'nl/show');
+        if (isset($id)) {
+            if ($id == 'last') {
+                $res = XDB::query("SELECT MAX(id) FROM newsletter WHERE bits!='new'");
+                $id  = $res->fetchOneCell();
+            }
+            $res = XDB::query("SELECT * FROM newsletter WHERE id={?} OR short_name={?} LIMIT 1", $id, $id);
+        } else {
+            $res = XDB::query("SELECT * FROM newsletter WHERE bits='new'");
+            if (!$res->numRows()) {
+                Newsletter::create();
+            }
+            $res = XDB::query("SELECT * FROM newsletter WHERE bits='new'");
+        }
+        $nl = $res->fetchOneAssoc();
+
+        $this->_id        = $nl['id'];
+        $this->_shortname = $nl['short_name'];
+        $this->_date      = $nl['date'];
+        $this->_title     = $nl['titre'];
+        $this->_title_mail = $nl['titre_mail'];
+        $this->_head      = $nl['head'];
+
+        $res = XDB::iterRow("SELECT cid,titre FROM newsletter_cat ORDER BY pos");
+        while (list($cid, $title) = $res->next()) {
+            $this->_cats[$cid] = $title;
+        }
     
-    function getArt($aid)
+        $res = XDB::iterRow(
+                "SELECT  a.title,a.body,a.append,a.aid,a.cid,a.pos
+                   FROM  newsletter_art AS a
+             INNER JOIN  newsletter     AS n USING(id)
+             LEFT  JOIN  newsletter_cat AS c ON(a.cid=c.cid)
+                  WHERE  a.id={?}
+               ORDER BY  c.pos,a.pos", $this->_id);
+        while (list($title, $body, $append, $aid, $cid, $pos) = $res->next()) {
+            $this->_arts[$cid]["a$aid"] = new NLArticle($title, $body, $append, $aid, $cid, $pos);
+        }
+    }
+
+    public function save()
+    {
+        XDB::execute('UPDATE newsletter SET date={?},titre={?},titre_mail={?},head={?},short_name={?} WHERE id={?}',
+                     $this->_date, $this->_title, $this->_title_mail, $this->_head, $this->_shortname,$this->_id);
+    }
+  
+    public function getArt($aid)
     {
-	foreach ($this->_arts as $key=>$artlist) {
-	    if (isset($artlist["a$aid"])) {
+        foreach ($this->_arts as $key=>$artlist) {
+            if (isset($artlist["a$aid"])) {
                 return $artlist["a$aid"];
             }
-	}
-	return null;
+        }
+        return null;
     }
 
-    // }}}
-    // {{{ function saveArticle()
+    public function saveArticle(&$a)
+    {
+        if ($a->_aid>=0) {
+            XDB::execute('REPLACE INTO  newsletter_art (id,aid,cid,pos,title,body,append)
+                                VALUES  ({?},{?},{?},{?},{?},{?},{?})',
+                          $this->_id, $a->_aid, $a->_cid, $a->_pos,
+                          $a->_title, $a->_body, $a->_append);
+                          $this->_arts['a'.$a->_aid] = $a;
+        } else {
+            XDB::execute('INSERT INTO  newsletter_art
+                               SELECT  {?},MAX(aid)+1,{?},'.($a->_pos ? intval($a->_pos) : 'MAX(pos)+1').',{?},{?},{?}
+                                 FROM  newsletter_art AS a
+                                WHERE  a.id={?}',
+                         $this->_id, $a->_cid, $a->_title, $a->_body, $a->_append, $this->_id);
+                         $this->_arts['a'.$a->_aid] = $a;
+        }
+    }
+   
+    public function delArticle($aid)
+    {
+        XDB::execute('DELETE FROM newsletter_art WHERE id={?} AND aid={?}', $this->_id, $aid);
+        foreach ($this->_arts as $key=>$art) {
+            unset($this->_arts[$key]["a$aid"]);
+        }
+    }
 
-    function saveArticle(&$a)
+    protected function assignData(&$smarty)
     {
-	if ($a->_aid>=0) {
-	    XDB::execute('REPLACE INTO  newsletter_art (id,aid,cid,pos,title,body,append)
-                                          VALUES  ({?},{?},{?},{?},{?},{?},{?})',
-                                          $this->_id, $a->_aid, $a->_cid, $a->_pos,
-                                          $a->_title, $a->_body, $a->_append);
-	    $this->_arts['a'.$a->_aid] = $a;
-	} else {
-	    XDB::execute(
-		'INSERT INTO  newsletter_art
-		      SELECT  {?},MAX(aid)+1,{?},'.($a->_pos ? intval($a->_pos) : 'MAX(pos)+1').',{?},{?},{?}
-			FROM  newsletter_art AS a
-		       WHERE  a.id={?}',
-                       $this->_id, $a->_cid, $a->_title, $a->_body, $a->_append, $this->_id);
-	    $this->_arts['a'.$a->_aid] = $a;
-	}
+        $smarty->assign_by_ref('nl', $this);
     }
 
-    // }}}
-    // {{{ function delArticle()
-    
-    function delArticle($aid)
+    protected function setSent()
     {
-	XDB::execute('DELETE FROM newsletter_art WHERE id={?} AND aid={?}', $this->_id, $aid);
-	foreach ($this->_arts as $key=>$art) {
-	    unset($this->_arts[$key]["a$aid"]);
-	}
+        XDB::execute("UPDATE  newsletter SET bits='sent' WHERE id={?}", $this->_id);
     }
 
-    // }}}
-    // {{{ function footer
+    protected function subscriptionTable()
+    {
+        return 'newsletter_ins';
+    }
 
-    function footer($html)
+    protected function subscriptionWhere()
     {
-        global $globals;
-        $url = $globals->baseurl;
-
-	if ($html) {
-	    return '<div class="foot">Cette lettre est envoyée à tous les Polytechniciens sur Internet par l\'intermédiaire de Polytechnique.org.</div>'
-	    .  '<div class="foot">'
-	    .  "[<a href=\"$url/nl\">archives</a>&nbsp;|&nbsp;"
-	    .  "<a href=\"$url/nl/submit\">écrire dans la NL</a>&nbsp;|&nbsp;"
-	    .  "<a href=\"$url/nl/out\">ne plus recevoir</a>]"
-	    .  '</div>';
-	} else {
-	    return "\n\n--------------------------------------------------------------------\n"
-	         . "Cette lettre est envoyée à tous les Polytechniciens sur Internet par\n"
-	         . "l'intermédiaire de Polytechnique.org.\n"
-		 . "\n"
-		 . "archives : [$url/nl]\n"
-		 . "écrire   : [$url/nl/submit]\n"
-		 . "ne plus recevoir: [$url/nl/out]\n";
-	}
+        return 'ni.last<' . $this->_id;
     }
 
-    // }}}
-    // {{{ function toText()
+    protected function subscriptionUpdate()
+    {
+        return 'last=' . $this->_id;
+    }
 
-    function toText($prenom,$nom,$sexe)
+    static public function subscriptionState($uid = -1)
     {
-	$res  = "====================================================================\n";
-	$res .= ' '.$this->title()."\n";
-	$res .= "====================================================================\n\n";
-
-	$head = $this->head();
-	$head = str_replace('<cher>',   $sexe ? 'Chère' : 'Cher', $head);
-	$head = str_replace('<prenom>', $prenom, $head);
-	$head = str_replace('<nom>',    $nom,    $head);
-	$head = enriched_to_text($head,false,true,2,64);
-
-	if ($head) {
-            $res .= "\n$head\n\n\n";
-        }
+        $user = ($uid == -1) ? S::v('uid') : $uid;
+        $res = XDB::query('SELECT 1 FROM newsletter_ins WHERE user_id={?}', $user);
+        return $res->fetchOneCell();
+    }
 
-	$i = 1;
-	foreach ($this->_arts as $cid=>$arts) {
-	    $res .= "\n$i *{$this->_cats[$cid]}*\n";
-	    foreach ($arts as $art) {
-		$res .= '- '.$art->title()."\n";
-	    }
-	    $i ++;
-	}
-	$res .= "\n\n";
-	    
-	foreach ($this->_arts as $cid=>$arts) {
-	    $res .= "--------------------------------------------------------------------\n";
-	    $res .= "*{$this->_cats[$cid]}*\n";
-	    $res .= "--------------------------------------------------------------------\n\n";
-	    foreach ($arts as $art) {
-		$res .= $art->toText();
-		$res .= "\n\n";
-	    }
-	}
-	
-	$res .= $this->footer(false);
-	
-	return $res;
+    static public function unsubscribe($uid = -1)
+    {
+        $user = ($uid == -1) ? S::v('uid') : $uid;
+        XDB::execute('DELETE FROM newsletter_ins WHERE user_id={?}', $user);
     }
 
-    // }}}
-    // {{{ function toHtml()
-    
-    function toHtml($prenom,$nom,$sexe,$body=false)
+    static public function subscribe($uid = -1)
     {
-	$res  = '<div class="title">'.$this->title().'</div>';
-	
-	$head = $this->head();
-	$head = str_replace('<cher>',   $sexe ? 'Chère' : 'Cher', $head);
-	$head = str_replace('<prenom>', $prenom, $head);
-	$head = str_replace('<nom>',    $nom,    $head);
-	$head = enriched_to_text($head,true);
-
-	if($head) {
-            $res .= "<div class='intro'>$head</div>";
-        }
+        $user = ($uid == -1) ? S::v('uid') : $uid;
+        XDB::execute('REPLACE INTO  newsletter_ins (user_id,last) VALUES  ({?}, 0)', $user);
+    }
 
-	$i = 1;
-	$res .= "<a id='top_lnk'></a>";
-	foreach ($this->_arts as $cid=>$arts) {
-	    $res .= "<div class='lnk'><a href='#cat$cid'><strong>$i. {$this->_cats[$cid]}</strong></a>";
-	    foreach ($arts as $art) {
-		$res .= "<a href='#art{$art->_aid}'>&nbsp;&nbsp;- ".htmlentities($art->title())."</a>";
-	    }
-	    $res .= '</div>';
-	    $i ++;
-	}
-
-	foreach ($this->_arts as $cid=>$arts) {
-	    $res .= "<h1><a id='cat$cid'></a><span>".$this->_cats[$cid].'</span></h1>';
-	    foreach($arts as $art) {
-    		$res .= $art->toHtml();
-    		$res .= "<p><a href='#top_lnk'>Revenir au sommaire</a></p>";
-	    }
-	}
-
-	$res .= $this->footer(true);
-
-	if ($body) {
-	    $res = <<<EOF
-<html>
-  <head>
-    <style type="text/css">
-    <!--
-      div.nl    { margin: auto; font-family: "Georgia","times new roman",serif; width: 60ex; text-align: justify; font-size: 10pt; }
-      div.title { margin: 2ex 0ex 2ex 0ex; padding: 1ex; width: 100%; font-size: 140%; text-align: center;
-		  font-weight: bold; border-bottom: 3px red solid; border-top: 3px red solid; }
-      
-      a[href]       { text-decoration: none; }
-      a[href]:hover { text-decoration: underline; }
-      
-      div.lnk   { margin: 2ex 0ex 2ex 0ex; padding: 0ex 2ex 0ex 2ex; }
-      div.lnk a { display: block; }
-      
-      h1 { margin: 6ex 0ex 4ex 0ex; padding: 2px 4ex 2px 0ex; width: 60ex; font-size: 100%;
-	    border-bottom: 3px red solid; border-top: 3px red solid; }
-      h2 { width: 100%; margin: 0ex 1ex 0ex 1ex; padding: 2px 0px 2px 0px; font-weight: bold; font-style: italic; font-size: 95%; }
-      h1 span { font-size: 140%; padding: 2px 1ex 2px 1ex; border-bottom: 3px red solid; }
-      h2 span { padding: 2px 4px 2px 4px; border-bottom: 2px yellow solid; }
-      
-      div.art   { padding: 2ex; margin: 0ex 1ex 2ex 1ex; width: 58ex; border-top: 2px yellow solid; }
-      div.app   { padding: 2ex 3ex 0ex 3ex; width: 100%; margin: 0ex; text-align: left; font-size: 95%; }
-      div.intro { padding: 2ex; }
-      div.foot  { border-top: 1px #808080 dashed; font-size: 95%; padding: 1ex; color: #808080; background: inherit;
-		  text-align: center; width: 100% }
-    -->
-    </style>
-  </head>
-  <body>
-    <div class='nl'>
-    $res
-    </div>
-  </body>
-</html>
-EOF;
-	}
-	return $res;
+    static public function create()
+    {
+        XDB::execute("INSERT INTO newsletter
+                              SET bits='new',date=NOW(),titre='to be continued',titre_mail='to be continued'");
     }
 
-    // }}}
-    // {{{ function sendTo()
-    
-    function sendTo($prenom, $nom, $login, $sex, $html)
+    static public function listSent()
     {
-        global $globals;
-	require_once('diogenes/diogenes.hermes.inc.php');
-
-	$mailer = new HermesMailer();
-	$mailer->setFrom($globals->newsletter->from);
-	$mailer->setSubject($this->title());
-	$mailer->addTo("\"$prenom $nom\" <$login@{$globals->mail->domain}>");
-        if (!empty($globals->newsletter->replyto)) {
-            $mailer->addHeader('Reply-To',$globals->newsletter->replyto);
-        }
-        if (!empty($globals->newsletter->retpath)) {
-            $mailer->addHeader('Return-Path',$globals->newsletter->retpath);
-        }
-	$mailer->setTxtBody($this->toText($prenom,$nom,$sex));
-	if ($html) {
-	    $mailer->setHTMLBody($this->toHtml($prenom,$nom,$sex,true));
-	}
-	$mailer->send();
+        $res = XDB::query("SELECT  IF(short_name IS NULL, id,short_name) as id,date,titre_mail AS titre
+                             FROM  newsletter
+                            WHERE  bits!='new'
+                            ORDER  BY date DESC");
+        return $res->fetchAllAssoc();
     }
 
-    // }}}
+    static public function listAll()
+    {
+        $res = XDB::query("SELECT  IF(short_name IS NULL, id,short_name) as id,date,titre_mail AS titre
+                             FROM  newsletter
+                         ORDER BY  date DESC");
+        return $res->fetchAllAssoc();
+    }
 }
 
 // }}}
@@ -351,78 +347,78 @@ class NLArticle
     // }}}
     // {{{ constructor
     
-    function NLArticle($title='', $body='', $append='', $aid=-1, $cid=0, $pos=0)
+    function __construct($title='', $body='', $append='', $aid=-1, $cid=0, $pos=0)
     {
-	$this->_body   = $body;
-	$this->_title  = $title;
-	$this->_append = $append;
-	$this->_aid    = $aid;
-	$this->_cid    = $cid;
-	$this->_pos    = $pos;
+        $this->_body   = $body;
+        $this->_title  = $title;
+        $this->_append = $append;
+        $this->_aid    = $aid;
+        $this->_cid    = $cid;
+        $this->_pos    = $pos;
     }
 
     // }}}
     // {{{ function title()
 
-    function title()
+    public function title()
     { return trim($this->_title); }
 
     // }}}
     // {{{ function body()
     
-    function body()
+    public function body()
     { return trim($this->_body); }
     
     // }}}
     // {{{ function append()
     
-    function append()
+    public function append()
     { return trim($this->_append); }
 
     // }}}
     // {{{ function toText()
 
-    function toText()
+    public function toText()
     {
-	$title = '*'.$this->title().'*';
-	$body  = enriched_to_text($this->_body,false,true);
-	$app   = enriched_to_text($this->_append,false,false,4);
-	return trim("$title\n\n$body\n\n$app")."\n";
+        $title = '*'.$this->title().'*';
+        $body  = enriched_to_text($this->_body,false,true);
+        $app   = enriched_to_text($this->_append,false,false,4);
+        return trim("$title\n\n$body\n\n$app")."\n";
     }
 
     // }}}
     // {{{ function toHtml()
 
-    function toHtml()
+    public function toHtml()
     {
-	$title = "<h2><a id='art{$this->_aid}'></a><span>".htmlentities($this->title()).'</span></h2>';
-	$body  = enriched_to_text($this->_body,true);
-	$app   = enriched_to_text($this->_append,true);
-	
-	$art   = "$title\n";
-	$art  .= "<div class='art'>\n$body\n";
-	if ($app) {
+        $title = "<h2 class='xorg_nl'><a id='art{$this->_aid}'></a>".htmlentities($this->title()).'</h2>';
+        $body  = enriched_to_text($this->_body,true);
+        $app   = enriched_to_text($this->_append,true);
+    
+        $art   = "$title\n";
+        $art  .= "<div class='art'>\n$body\n";
+        if ($app) {
             $art .= "<div class='app'>$app</div>";
         }
-	$art  .= "</div>\n";
-	
-	return $art;
+        $art  .= "</div>\n";
+    
+        return $art;
     }
 
     // }}}
     // {{{ function check()
 
-    function check()
+    public function check()
     {
-	$text = enriched_to_text($this->_body);
-	$arr  = explode("\n",wordwrap($text,68));
-	$c    = 0;
-	foreach ($arr as $line) {
+        $text = enriched_to_text($this->_body);
+        $arr  = explode("\n",wordwrap($text,68));
+        $c    = 0;
+        foreach ($arr as $line) {
             if (trim($line)) {
                 $c++;
             }
         }
-	return $c<9;
+        return $c<9;
     }
 
     // }}}
@@ -431,81 +427,46 @@ class NLArticle
 // }}}
 // {{{ Functions
 
-function insert_new_nl()
-{
-    XDB::execute("INSERT INTO newsletter SET bits='new',date=NOW(),titre='to be continued'");
-}
-
-function get_nl_slist()
-{
-    $res = XDB::query("SELECT id,date,titre FROM newsletter ORDER BY date DESC");
-    return $res->fetchAllAssoc();
-}
-
-function get_nl_list()
-{
-    $res = XDB::query("SELECT id,date,titre FROM newsletter WHERE bits!='new' ORDER BY date DESC");
-    return $res->fetchAllAssoc();
-}
-
-function get_nl_state()
-{
-    $res = XDB::query('SELECT 1 FROM newsletter_ins WHERE user_id={?}', S::v('uid'));
-    return $res->fetchOneCell();
-}
- 
-function unsubscribe_nl()
-{
-    XDB::execute('DELETE FROM newsletter_ins WHERE user_id={?}', S::v('uid'));
-}
- 
-function subscribe_nl($uid=-1)
-{
-    $user = ($uid == -1) ? S::v('uid') : $uid;
-    XDB::execute('REPLACE INTO  newsletter_ins (user_id,last)
-                        VALUES  ({?}, 0)', $user);
-}
- 
 function justify($text,$n)
 {
     $arr = explode("\n",wordwrap($text,$n));
     $arr = array_map('trim',$arr);
     $res = '';
     foreach ($arr as $key => $line) {
-	$nxl       = isset($arr[$key+1]) ? trim($arr[$key+1]) : '';
-	$nxl_split = preg_split('! +!',$nxl);
-	$nxw_len   = count($nxl_split) ? strlen($nxl_split[0]) : 0;
-	$line      = trim($line);
-
-	if (strlen($line)+1+$nxw_len < $n) {
-	    $res .= "$line\n";
-	    continue;
-	}
-	
-	if (preg_match('![.:;]$!',$line)) {
-	    $res .= "$line\n";
-	    continue;
-	}
-
-	$tmp   = preg_split('! +!',trim($line));
-	$words = count($tmp);
-	if ($words <= 1) {
-	    $res .= "$line\n";
-	    continue;
-	}
-
-	$len   = array_sum(array_map('strlen',$tmp));
-	$empty = $n - $len;
-	$sw    = floatval($empty) / floatval($words-1);
-	
-	$cur = 0;
-	$l   = '';
-	foreach ($tmp as $word) {
-	    $l   .= $word;
-	    $cur += $sw + strlen($word);
-	    $l    = str_pad($l,intval($cur+0.5));
-	}
-	$res .= trim($l)."\n";
+    $nxl       = isset($arr[$key+1]) ? trim($arr[$key+1]) : '';
+    $nxl_split = preg_split('! +!',$nxl);
+    $nxw_len   = count($nxl_split) ? strlen($nxl_split[0]) : 0;
+    $line      = trim($line);
+
+    if (strlen($line)+1+$nxw_len < $n) {
+        $res .= "$line\n";
+        continue;
+    }
+    
+    if (preg_match('![.:;]$!',$line)) {
+        $res .= "$line\n";
+        continue;
+    }
+
+    $tmp   = preg_split('! +!',trim($line));
+    $words = count($tmp);
+    if ($words <= 1) {
+        $res .= "$line\n";
+        continue;
+    }
+
+    $len   = array_sum(array_map('strlen',$tmp));
+    $empty = $n - $len;
+    $sw    = floatval($empty) / floatval($words-1);
+    
+    $cur = 0;
+    $l   = '';
+    foreach ($tmp as $word) {
+        $l   .= $word;
+        $cur += $sw + strlen($word);
+        $l    = str_pad($l,intval($cur+0.5));
+    }
+    $res .= trim($l)."\n";
     }
     return trim($res);
 }
@@ -514,28 +475,28 @@ function enriched_to_text($input,$html=false,$just=false,$indent=0,$width=68)
 {
     $text = trim($input);
     if ($html) {
-	$text = htmlspecialchars($text);
-	$text = str_replace('[b]','<strong>', $text);
-	$text = str_replace('[/b]','</strong>', $text);
-	$text = str_replace('[i]','<em>', $text);
-	$text = str_replace('[/i]','</em>', $text);
-	$text = str_replace('[u]','<span style="text-decoration: underline">', $text);
-	$text = str_replace('[/u]','</span>', $text);
-	$text = preg_replace('!((https?|ftp)://[^\r\n\t ]*)!','<a href="\1">\1</a>', $text);
-	$text = preg_replace('!(([a-zA-Z0-9\-_+.]*@[a-zA-Z0-9\-_+.]*)(?:\?[^\r\n\t ]*)?)!','<a href="mailto:\1">\2</a>', $text);
-	return nl2br($text);
+        $text = htmlspecialchars($text);
+        $text = str_replace('[b]','<strong>', $text);
+        $text = str_replace('[/b]','</strong>', $text);
+        $text = str_replace('[i]','<em>', $text);
+        $text = str_replace('[/i]','</em>', $text);
+        $text = str_replace('[u]','<span style="text-decoration: underline">', $text);
+        $text = str_replace('[/u]','</span>', $text);
+        require_once('url_catcher.inc.php');
+        $text = url_catcher($text);
+        return nl2br($text);
     } else {
-	$text = preg_replace('!\[\/?b\]!','*',$text);
-	$text = preg_replace('!\[\/?u\]!','_',$text);
-	$text = preg_replace('!\[\/?i\]!','/',$text);
-	$text = preg_replace('!((https?|ftp)://[^\r\n\t ]*)!','[\1]', $text);
-	$text = preg_replace('!(([a-zA-Z0-9\-_+.]*@[a-zA-Z0-9\-_+.]*)(?:\?[^\r\n\t ]*)?)!','[mailto:\1]', $text);
-	$text = $just ? justify($text,$width-$indent) : wordwrap($text,$width-$indent);
-	if($indent) {
-	    $ind = str_pad('',$indent);
-	    $text = $ind.str_replace("\n","\n$ind",$text);
-	}
-	return $text;
+        $text = preg_replace('!\[\/?b\]!','*',$text);
+        $text = preg_replace('!\[\/?u\]!','_',$text);
+        $text = preg_replace('!\[\/?i\]!','/',$text);
+        $text = preg_replace('!(((https?|ftp)://|www\.)[^\r\n\t ]*)!','[\1]', $text);
+        $text = preg_replace('!(([a-zA-Z0-9\-_+.]*@[a-zA-Z0-9\-_+.]*)(?:\?[^\r\n\t ]*)?)!','[mailto:\1]', $text);
+        $text = $just ? justify($text,$width-$indent) : wordwrap($text,$width-$indent);
+        if($indent) {
+            $ind = str_pad('',$indent);
+            $text = $ind.str_replace("\n","\n$ind",$text);
+        }
+        return $text;
     }
 }