From 16cd99fb32e14082c9745ba6d1fbc29a6aa5ae51 Mon Sep 17 00:00:00 2001 From: x2003bruneau Date: Thu, 18 Jan 2007 12:51:35 +0000 Subject: [PATCH] Split newsletter.inc.php into 2 files : * MassMailer * Newsletter git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1354 839d8a87-29fc-0310-9880-83ba4fa771e5 --- include/banana/moderate.inc.php | 2 +- include/massmailer.inc.php | 241 +++++++++++++++++++++++++++++++++++ include/newsletter.inc.php | 272 ++++------------------------------------ modules/admin.php | 2 +- 4 files changed, 266 insertions(+), 251 deletions(-) create mode 100644 include/massmailer.inc.php diff --git a/include/banana/moderate.inc.php b/include/banana/moderate.inc.php index 4458662..e6b7709 100644 --- a/include/banana/moderate.inc.php +++ b/include/banana/moderate.inc.php @@ -66,7 +66,7 @@ class ModerationBanana extends Banana Banana::$spool_boxlist = false; Banana::$msgshow_withthread = false; Banana::$withtabs = false; - Banana::$msgshow_externalimages = false; + Banana::$msgshow_externalimages = true; array_push(Banana::$msgparse_headers, 'x-org-id', 'x-org-mail'); parent::__construct($params, 'MLInterface', 'ModerationPage'); } diff --git a/include/massmailer.inc.php b/include/massmailer.inc.php new file mode 100644 index 0000000..e326a31 --- /dev/null +++ b/include/massmailer.inc.php @@ -0,0 +1,241 @@ +_tpl = $tpl; + $this->_css = $css; + $this->_prefix = $prefix; + } + + public function id() + { + return is_null($this->_shortname) ? $this->_id : $this->_shortname; + } + + public function title($mail = false) + { + return $mail ? $this->_title_mail : $this->_title; + } + + 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('', $sexe ? 'Chère' : 'Cher', $head); + $head = str_replace('', $prenom, $head); + $head = str_replace('', $nom, $head); + if ($type == 'text') { + $head = enriched_to_text($head, false, true, 2, 64); + } else { + $head = enriched_to_text($head, true); + } + return $head; + } + } + + public function css(&$page = null) + { + 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); + } + } + + 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); + } + + public function sendTo($prenom, $nom, $login, $sexe, $html) + { + global $globals; + + $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); + } + + 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 ni.last < {?} AND ({$this->subscriptionWhere()}) AND e.email IS NOT NULL + GROUP BY u.user_id + LIMIT 60"; + while (true) { + $res = XDB::iterRow($query, $this->_id); + 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 last = {?} + WHERE " . implode(' OR ', $sent), $this->_id); + sleep(60); + } + } + + abstract protected function assignData(&$smarty); + abstract protected function setSent(); + + abstract protected function subscriptionTable(); + abstract protected function subscriptionWhere(); +} + +// }}} +// {{{ Functions + +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"; + } + return trim($res); +} + +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); + 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)://|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; + } +} + +// }}} + +// vim:set et sw=4 sts=4 sws=4: +?> diff --git a/include/newsletter.inc.php b/include/newsletter.inc.php index 2ab6908..eb0a6a5 100644 --- a/include/newsletter.inc.php +++ b/include/newsletter.inc.php @@ -19,157 +19,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ -// {{{ requires + defines +require_once("massmailer.inc.php"); -require_once("xorg.misc.inc.php"); - -define('FEMME', 1); -define('HOMME', 0); - -// }}} -// {{{ class MassMailer - -abstract class MassMailer -{ - private $_tpl; - private $_css; - private $_prefix; - - public $_id; - public $_shortname; - public $_title; - public $_title_mail; - - public $_head; - - function __construct($tpl, $css, $prefix) - { - $this->_tpl = $tpl; - $this->_css = $css; - $this->_prefix = $prefix; - } - - public function id() - { - return is_null($this->_shortname) ? $this->_id : $this->_shortname; - } - - public function title($mail = false) - { - return $mail ? $this->_title_mail : $this->_title; - } - - 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('', $sexe ? 'Chère' : 'Cher', $head); - $head = str_replace('', $prenom, $head); - $head = str_replace('', $nom, $head); - if ($type == 'text') { - $head = enriched_to_text($head, false, true, 2, 64); - } else { - $head = enriched_to_text($head, true); - } - return $head; - } - } - - public function css(&$page = null) - { - 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); - } - } - - 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); - } - - public function sendTo($prenom, $nom, $login, $sexe, $html) - { - global $globals; - - $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); - } - - 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 @@ -269,41 +120,40 @@ class NewsLetter extends MassMailer protected function setSent() { - XDB::execute("UPDATE newsletter SET bits='sent' WHERE id={?}", $this->_id); - } - - protected function subscriptionTable() - { - return 'newsletter_ins'; - } + XDB::execute("UPDATE newsletter SET bits='sent' WHERE id={?}", $this->_id); + } - protected function subscriptionWhere() + static public function subscriptionState($uid = null) { - return 'ni.last<' . $this->_id; - } - - protected function subscriptionUpdate() + $user = is_null($uid) ? S::v('uid') : $uid; + $res = XDB::query("SELECT 1 + FROM newsletter_ins + WHERE user_id={?}", $user); + return $res->fetchOneCell(); + } + + static public function unsubscribe($uid = null) { - return 'last=' . $this->_id; + $user = is_null($uid) ? S::v('uid') : $uid; + XDB::execute("DELETE FROM newsletter_ins + WHERE user_id={?}", $user); } - static public function subscriptionState($uid = -1) + static public function subscribe($uid = null) { - $user = ($uid == -1) ? S::v('uid') : $uid; - $res = XDB::query('SELECT 1 FROM newsletter_ins WHERE user_id={?}', $user); - return $res->fetchOneCell(); + $user = is_null($uid) ? S::v('uid') : $uid; + XDB::execute("REPLACE INTO newsletter_ins (user_id,last) + VALUES ({?}, 0)", $user); } - static public function unsubscribe($uid = -1) + protected function subscriptionTable() { - $user = ($uid == -1) ? S::v('uid') : $uid; - XDB::execute('DELETE FROM newsletter_ins WHERE user_id={?}', $user); + return 'newsletter_ins'; } - static public function subscribe($uid = -1) + protected function subscriptionWhere() { - $user = ($uid == -1) ? S::v('uid') : $uid; - XDB::execute('REPLACE INTO newsletter_ins (user_id,last) VALUES ({?}, 0)', $user); + return '1'; } static public function create() @@ -425,82 +275,6 @@ class NLArticle } // }}} -// {{{ Functions - -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"; - } - return trim($res); -} - -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); - 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)://|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; - } -} - -// }}} // vim:set et sw=4 sts=4 sws=4: ?> diff --git a/modules/admin.php b/modules/admin.php index 0f348d1..0c5ff0c 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -517,7 +517,7 @@ class AdminModule extends PLModule $mailer->setFrom("webmaster@polytechnique.org"); $mailer->addTo("web@polytechnique.org"); $mailer->setSubject("INTERVENTION de ".S::v('forlife')); - $mailer->setTxtBody("\nUtilisateur $login effacé"); + $mailer->setTxtBody("\nUtilisateur $login désinscrit"); $mailer->send(); break; } -- 2.1.4