projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Amélioration - On peut cliquer sur le texte des checkbox sur le formulaire de recher...
[platal.git]
/
include
/
newsletter.inc.php
diff --git
a/include/newsletter.inc.php
b/include/newsletter.inc.php
index
02e5248
..
9840775
100644
(file)
--- a/
include/newsletter.inc.php
+++ b/
include/newsletter.inc.php
@@
-31,7
+31,7
@@
class NewsLetter extends MassMailer
function __construct($id = null)
{
function __construct($id = null)
{
- parent::__construct('newsletter/nl.tpl', 'nl.css', 'nl/show');
+ parent::__construct('newsletter/nl.tpl', 'nl.css', 'nl/show'
, 'newsletter', 'newsletter_ins'
);
if (isset($id)) {
if ($id == 'last') {
$res = 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'");
@@
-146,11
+146,6
@@
class NewsLetter extends MassMailer
VALUES ({?}, 0)", $user);
}
VALUES ({?}, 0)", $user);
}
- protected function subscriptionTable()
- {
- return 'newsletter_ins';
- }
-
protected function subscriptionWhere()
{
return '1';
protected function subscriptionWhere()
{
return '1';
@@
-231,8
+226,8
@@
class NLArticle
public function toText()
{
$title = '*'.$this->title().'*';
public function toText()
{
$title = '*'.$this->title().'*';
- $body =
enriched_to_text($this->_body,false,
true);
- $app =
enriched_to_text($this->_append,false
,false,4);
+ $body =
MiniWiki::WikiToText($this->_body,
true);
+ $app =
MiniWiki::WikiToText($this->_append
,false,4);
return trim("$title\n\n$body\n\n$app")."\n";
}
return trim("$title\n\n$body\n\n$app")."\n";
}
@@
-242,8
+237,8
@@
class NLArticle
public function toHtml()
{
$title = "<h2 class='xorg_nl'><a id='art{$this->_aid}'></a>".pl_entities($this->title()).'</h2>';
public function toHtml()
{
$title = "<h2 class='xorg_nl'><a id='art{$this->_aid}'></a>".pl_entities($this->title()).'</h2>';
- $body =
enriched_to_text($this->_body,true
);
- $app =
enriched_to_text($this->_append,true
);
+ $body =
MiniWiki::WikiToHTML($this->_body
);
+ $app =
MiniWiki::WikiToHTML($this->_append
);
$art = "$title\n";
$art .= "<div class='art'>\n$body\n";
$art = "$title\n";
$art .= "<div class='art'>\n$body\n";
@@
-260,7
+255,7
@@
class NLArticle
public function check()
{
public function check()
{
- $text =
enriched_to_t
ext($this->_body);
+ $text =
MiniWiki::WikiToT
ext($this->_body);
$arr = explode("\n",wordwrap($text,68));
$c = 0;
foreach ($arr as $line) {
$arr = explode("\n",wordwrap($text,68));
$c = 0;
foreach ($arr as $line) {