X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fnewsletter.inc.php;h=426bc2729a8497fe81964d0bc9ed6e30d44cabfa;hb=0d602b8f5fe4fc8cd42dc61a442d14f32bb19056;hp=63e0b2e53d5da461e25f4968fb8bf28c6b5bbb58;hpb=0337d704b62718d7c77106c0e4c4e26fb02beacf;p=platal.git diff --git a/include/newsletter.inc.php b/include/newsletter.inc.php index 63e0b2e..426bc27 100644 --- a/include/newsletter.inc.php +++ b/include/newsletter.inc.php @@ -1,6 +1,6 @@ addCssLink('css/nl.css'); + $page->addCssLink('nl.css'); } define('FEMME', 1); @@ -39,8 +38,10 @@ class NewsLetter // {{{ properties var $_id; + var $_shortname; var $_date; var $_title; + var $_title_mail; var $_head; var $_cats = Array(); var $_arts = Array(); @@ -50,39 +51,43 @@ class NewsLetter function NewsLetter($id=null) { - global $globals; - - if (isset($id)) { - if ($id == 'last') { - $res = $globals->xdb->query("SELECT MAX(id) FROM newsletter WHERE bits!='new'"); + if (isset($id)) { + if ($id == 'last') { + $res = XDB::query("SELECT MAX(id) FROM newsletter WHERE bits!='new'"); $id = $res->fetchOneCell(); - } - $res = $globals->xdb->query("SELECT * FROM newsletter WHERE id={?}", $id); - } else { - $res = $globals->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 = $globals->xdb->iterRow("SELECT cid,titre FROM newsletter_cat ORDER BY pos"); - while (list($cid, $title) = $res->next()) { - $this->_cats[$cid] = $title; - } - - $res = $globals->xdb->iterRow( + } + $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()) { + insert_new_nl(); + } + $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; + } + + $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); - } + while (list($title, $body, $append, $aid, $cid, $pos) = $res->next()) { + $this->_arts[$cid]["a$aid"] = new NLArticle($title, $body, $append, $aid, $cid, $pos); + } } // }}} @@ -90,8 +95,7 @@ class NewsLetter function setSent() { - global $globals; - $globals->xdb->execute("UPDATE newsletter SET bits='sent' WHERE id={?}", $this->_id); + XDB::execute("UPDATE newsletter SET bits='sent' WHERE id={?}", $this->_id); } // }}} @@ -99,16 +103,27 @@ class NewsLetter function save() { - global $globals; - $globals->xdb->execute('UPDATE newsletter SET date={?},titre={?},head={?} WHERE id={?}', - $this->_date, $this->_title, $this->_head, $this->_id); + 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); + } + + // }}} + // {{{ function id() + + function id() + { + return is_null($this->_shortname) ? $this->_id : $this->_shortname; } // }}} // {{{ function title() - function title() - { return $this->_title; } + function title($mail = false) { + if ($mail) { + return $this->_title_mail; + } + return $this->_title; + } // }}} // {{{ function head() @@ -121,12 +136,12 @@ class NewsLetter 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; } // }}} @@ -134,22 +149,21 @@ class NewsLetter function saveArticle(&$a) { - global $globals; - if ($a->_aid>=0) { - $globals->xdb->execute('REPLACE INTO newsletter_art (id,aid,cid,pos,title,body,append) + 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 { - $globals->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->_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; - } + $this->_arts['a'.$a->_aid] = $a; + } } // }}} @@ -157,11 +171,10 @@ class NewsLetter function delArticle($aid) { - global $globals; - $globals->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('DELETE FROM newsletter_art WHERE id={?} AND aid={?}', $this->_id, $aid); + foreach ($this->_arts as $key=>$art) { + unset($this->_arts[$key]["a$aid"]); + } } // }}} @@ -170,24 +183,24 @@ class NewsLetter function footer($html) { global $globals; - $url = $globals->baseurl; - - if ($html) { - return '
Cette lettre est envoyée à tous les Polytechniciens sur Internet par l\'intermédiaire de Polytechnique.org.
' - . '
' - . "[archives | " - . "écrire dans la NL | " - . "ne plus recevoir]" - . '
'; - } 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/newsletter/]\n" - . "écrire : [$url/newsletter/submit.php]\n" - . "ne plus recevoir: [$url/newsletter/?out=1]\n"; - } + $url = 'https://www.polytechnique.org'; + + if ($html) { + return '
Cette lettre est envoyée à tous les Polytechniciens sur Internet par l\'intermédiaire de Polytechnique.org.
' + . '
' + . "[archives | " + . "écrire dans la NL | " + . "ne plus recevoir]" + . '
'; + } 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"; + } } // }}} @@ -195,108 +208,127 @@ class NewsLetter function toText($prenom,$nom,$sexe) { - $res = "====================================================================\n"; - $res .= ' '.$this->title()."\n"; - $res .= "====================================================================\n\n"; + $res = "====================================================================\n"; + $res .= ' '.$this->title()."\n"; + $res .= "====================================================================\n\n"; - $head = $this->head(); - $head = str_replace('', $sexe ? 'Chère' : 'Cher', $head); - $head = str_replace('', $prenom, $head); - $head = str_replace('', $nom, $head); - $head = enriched_to_text($head,false,true,2,64); + $head = $this->head(); + $head = str_replace('', $sexe ? 'Chère' : 'Cher', $head); + $head = str_replace('', $prenom, $head); + $head = str_replace('', $nom, $head); + $head = enriched_to_text($head,false,true,2,64); - if ($head) { + if ($head) { $res .= "\n$head\n\n\n"; } - $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; + $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; } // }}} // {{{ function toHtml() - function toHtml($prenom,$nom,$sexe,$body=false) + function toHtml($prenom, $nom, $sexe, $body=false, $urlprefix = false) { - $res = '
'.$this->title().'
'; - - $head = $this->head(); - $head = str_replace('', $sexe ? 'Chère' : 'Cher', $head); - $head = str_replace('', $prenom, $head); - $head = str_replace('', $nom, $head); - $head = enriched_to_text($head,true); - - if($head) { + $u = $urlprefix ? 'nl/show/'.$this->id() : ''; + $res = '
'.$this->title().'
'; + + $head = $this->head(); + $head = str_replace('', $sexe ? 'Chère' : 'Cher', $head); + $head = str_replace('', $prenom, $head); + $head = str_replace('', $nom, $head); + $head = enriched_to_text($head, true); + + if($head) { $res .= "
$head
"; } - $i = 1; - foreach ($this->_arts as $cid=>$arts) { - $res .= "
$i. {$this->_cats[$cid]}"; - foreach ($arts as $art) { - $res .= "  - ".htmlentities($art->title()).""; - } - $res .= '
'; - $i ++; - } + $i = 1; + $res .= ""; + foreach ($this->_arts as $cid=>$arts) { + $res .= "
$i. {$this->_cats[$cid]}"; + foreach ($arts as $art) { + $res .= "  - ".htmlentities($art->title()).""; + } + $res .= '
'; + $i ++; + } - foreach ($this->_arts as $cid=>$arts) { - $res .= "

".$this->_cats[$cid].'

'; - foreach($arts as $art) { - $res .= $art->toHtml(); - } - } + foreach ($this->_arts as $cid=>$arts) { + $res .= "

".$this->_cats[$cid].'

'; + foreach($arts as $art) { + $res .= $art->toHtml(); + $res .= "
Revenir au sommaire
"; + } + } - $res .= $this->footer(true); + $res .= $this->footer(true); - if ($body) { - $res = << + if ($body) { + $res = << + + + @@ -307,8 +339,8 @@ class NewsLetter EOF; - } - return $res; + } + return $res; } // }}} @@ -317,23 +349,22 @@ EOF; function sendTo($prenom, $nom, $login, $sex, $html) { 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}>"); + $mailer = new PlMailer(); + $mailer->setFrom($globals->newsletter->from); + $mailer->setSubject($this->title(true)); + $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(); + $mailer->setTxtBody($this->toText($prenom,$nom,$sex)); + if ($html) { + $mailer->setHTMLBody($this->toHtml($prenom,$nom,$sex,true)); + } + $mailer->send(); } // }}} @@ -358,12 +389,12 @@ class NLArticle function NLArticle($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; } // }}} @@ -389,10 +420,10 @@ class NLArticle 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"; } // }}} @@ -400,18 +431,18 @@ class NLArticle function toHtml() { - $title = "

".htmlentities($this->title()).'

'; - $body = enriched_to_text($this->_body,true); - $app = enriched_to_text($this->_append,true); - - $art = "$title\n"; - $art .= "
\n$body\n"; - if ($app) { + $title = "

".htmlentities($this->title()).'

'; + $body = enriched_to_text($this->_body,true); + $app = enriched_to_text($this->_append,true); + + $art = "$title\n"; + $art .= "
\n$body\n"; + if ($app) { $art .= "
$app
"; } - $art .= "
\n"; - - return $art; + $art .= "
\n"; + + return $art; } // }}} @@ -419,15 +450,15 @@ class NLArticle 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; } // }}} @@ -438,85 +469,79 @@ class NLArticle function insert_new_nl() { - global $globals; - $globals->xdb->execute("INSERT INTO newsletter SET bits='new',date=NOW(),titre='to be continued'"); + XDB::execute("INSERT INTO newsletter SET bits='new',date=NOW(),titre='to be continued',titre_mail='to be continued'"); } function get_nl_slist() { - global $globals; - $res = $globals->xdb->query("SELECT id,date,titre FROM newsletter ORDER BY date DESC"); + $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(); } function get_nl_list() { - global $globals; - $res = $globals->xdb->query("SELECT id,date,titre FROM newsletter WHERE bits!='new' ORDER BY date DESC"); + $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(); } function get_nl_state() { - global $globals; - $res = $globals->xdb->query('SELECT 1 FROM newsletter_ins WHERE user_id={?}', Session::getInt('uid')); + $res = XDB::query('SELECT 1 FROM newsletter_ins WHERE user_id={?}', S::v('uid')); return $res->fetchOneCell(); } function unsubscribe_nl() { - global $globals; - $globals->xdb->execute('DELETE FROM newsletter_ins WHERE user_id={?}', Session::getInt('uid')); + XDB::execute('DELETE FROM newsletter_ins WHERE user_id={?}', S::v('uid')); } function subscribe_nl($uid=-1) { - global $globals; - $user = ($uid == -1) ? Session::getInt('uid') : $uid; - $globals->xdb->execute('REPLACE INTO newsletter_ins (user_id,last) - VALUES ({?}, 0)', $user); + $user = ($uid == -1) ? S::v('uid') : $uid; + XDB::execute('REPLACE INTO newsletter_ins (user_id,last) + VALUES ({?}, 0)', $user); } function justify($text,$n) { - $arr = split("\n",wordwrap($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; - } + $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; - } + $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"; + $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); } @@ -525,28 +550,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]','', $text); - $text = str_replace('[/b]','', $text); - $text = str_replace('[i]','', $text); - $text = str_replace('[/i]','', $text); - $text = str_replace('[u]','', $text); - $text = str_replace('[/u]','', $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 ]*)?)!','\2', $text); - return nl2br($text); + $text = htmlspecialchars($text); + $text = str_replace('[b]','', $text); + $text = str_replace('[/b]','', $text); + $text = str_replace('[i]','', $text); + $text = str_replace('[/i]','', $text); + $text = str_replace('[u]','', $text); + $text = str_replace('[/u]','', $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; } }