projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into hruid
[platal.git]
/
modules
/
newsletter.php
diff --git
a/modules/newsletter.php
b/modules/newsletter.php
index
42b31b5
..
8390eed
100644
(file)
--- a/
modules/newsletter.php
+++ b/
modules/newsletter.php
@@
-38,7
+38,7
@@
class NewsletterModule extends PLModule
require_once 'newsletter.inc.php';
$page->changeTpl('newsletter/index.tpl');
require_once 'newsletter.inc.php';
$page->changeTpl('newsletter/index.tpl');
- $page->setTitle('
Polytechnique.org -
Lettres mensuelles');
+ $page->setTitle('Lettres mensuelles');
switch ($action) {
case 'out': Newsletter::unsubscribe(); break;
switch ($action) {
case 'out': Newsletter::unsubscribe(); break;
@@
-64,9
+64,9
@@
class NewsletterModule extends PLModule
}
if (Post::has('send')) {
$res = XDB::query("SELECT hash FROM newsletter_ins WHERE user_id = {?}", S::i('uid'));
}
if (Post::has('send')) {
$res = XDB::query("SELECT hash FROM newsletter_ins WHERE user_id = {?}", S::i('uid'));
- $nl->sendTo(S::
v('prenom'), S::v('nom'
),
- S::v('
bestalias'), S::v('femme
'),
- S::v('mail_fmt') != 'texte',
+ $nl->sendTo(S::
user()->login(), S::user()->bestEmail(
),
+ S::v('
prenom'), S::v('nom
'),
+ S::v('
femme'), S::v('
mail_fmt') != 'texte',
$res->fetchOneCell());
}
}
$res->fetchOneCell());
}
}
@@
-76,8
+76,8
@@
class NewsletterModule extends PLModule
$page->changeTpl('newsletter/submit.tpl');
require_once 'newsletter.inc.php';
$page->changeTpl('newsletter/submit.tpl');
require_once 'newsletter.inc.php';
-
require_once 'wiki.inc.php'
;
-
wiki_require_page('Xorg.LettreMensuelle'
);
+
$wp = new PlWikiPage('Xorg.LettreMensuelle')
;
+
$wp->buildCache(
);
if (Post::has('see') || (Post::has('valid') && (!trim(Post::v('title')) || !trim(Post::v('body'))))) {
if (!Post::has('see')) {
if (Post::has('see') || (Post::has('valid') && (!trim(Post::v('title')) || !trim(Post::v('body'))))) {
if (!Post::has('see')) {
@@
-87,7
+87,7
@@
class NewsletterModule extends PLModule
$page->assign('art', $art);
} elseif (Post::has('valid')) {
require_once('validations.inc.php');
$page->assign('art', $art);
} elseif (Post::has('valid')) {
require_once('validations.inc.php');
- $art = new NLReq(S::
v('uid'
), Post::v('title'),
+ $art = new NLReq(S::
user(
), Post::v('title'),
Post::v('body'), Post::v('append'));
$art->submit();
$page->assign('submited', true);
Post::v('body'), Post::v('append'));
$art->submit();
$page->assign('submited', true);
@@
-97,7
+97,7
@@
class NewsletterModule extends PLModule
function handler_admin_nl(&$page, $new = false) {
$page->changeTpl('newsletter/admin.tpl');
function handler_admin_nl(&$page, $new = false) {
$page->changeTpl('newsletter/admin.tpl');
- $page->setTitle('
Polytechnique.org -
Administration - Newsletter : liste');
+ $page->setTitle('Administration - Newsletter : liste');
require_once("newsletter.inc.php");
if($new) {
require_once("newsletter.inc.php");
if($new) {
@@
-111,7
+111,7
@@
class NewsletterModule extends PLModule
function handler_admin_nl_edit(&$page, $nid = 'last', $aid = null, $action = 'edit') {
$page->changeTpl('newsletter/edit.tpl');
$page->addCssLink('nl.css');
function handler_admin_nl_edit(&$page, $nid = 'last', $aid = null, $action = 'edit') {
$page->changeTpl('newsletter/edit.tpl');
$page->addCssLink('nl.css');
- $page->setTitle('
Polytechnique.org -
Administration - Newsletter : Edition');
+ $page->setTitle('Administration - Newsletter : Edition');
require_once("newsletter.inc.php");
$nl = new NewsLetter($nid);
require_once("newsletter.inc.php");
$nl = new NewsLetter($nid);
@@
-157,7
+157,7
@@
class NewsletterModule extends PLModule
}
function handler_admin_nl_cat(&$page, $action = 'list', $id = null) {
}
function handler_admin_nl_cat(&$page, $action = 'list', $id = null) {
- $page->setTitle('
Polytechnique.org -
Administration - Newsletter : Catégories');
+ $page->setTitle('Administration - Newsletter : Catégories');
$page->assign('title', 'Gestion des catégories de la newsletter');
$table_editor = new PLTableEditor('admin/newsletter/categories','newsletter_cat','cid');
$table_editor->describe('titre','intitulé',true);
$page->assign('title', 'Gestion des catégories de la newsletter');
$table_editor = new PLTableEditor('admin/newsletter/categories','newsletter_cat','cid');
$table_editor->describe('titre','intitulé',true);