projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'xorg/maint'
[platal.git]
/
include
/
newsletter.inc.php
diff --git
a/include/newsletter.inc.php
b/include/newsletter.inc.php
index
5ceabc0
..
313d98d
100644
(file)
--- a/
include/newsletter.inc.php
+++ b/
include/newsletter.inc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-201
3
Polytechnique.org *
+ * Copyright (C) 2003-201
4
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-37,8
+37,6
@@
class NewsLetter
public $cats; // List of all categories for this NL
public $criteria; // PlFlagSet of allowed filters for recipient selection
public $cats; // List of all categories for this NL
public $criteria; // PlFlagSet of allowed filters for recipient selection
- protected $custom_css = false;
-
// Base name to use instead of the group short name for NLs without a custom CSS
const FORMAT_DEFAULT_GROUP = 'default';
// Base name to use instead of the group short name for NLs without a custom CSS
const FORMAT_DEFAULT_GROUP = 'default';
@@
-60,7
+58,7
@@
class NewsLetter
{
// Load NL data
$res = XDB::query('SELECT nls.group_id, g.diminutif AS group_name,
{
// Load NL data
$res = XDB::query('SELECT nls.group_id, g.diminutif AS group_name,
- nls.name AS nl_name, nls.c
ustom_css, nls.c
riteria
+ nls.name AS nl_name, nls.criteria
FROM newsletters AS nls
LEFT JOIN groups AS g ON (nls.group_id = g.id)
WHERE nls.id = {?}',
FROM newsletters AS nls
LEFT JOIN groups AS g ON (nls.group_id = g.id)
WHERE nls.id = {?}',
@@
-74,7
+72,6
@@
class NewsLetter
$this->group_id = $data['group_id'];
$this->group = $data['group_name'];
$this->name = $data['nl_name'];
$this->group_id = $data['group_id'];
$this->group = $data['group_name'];
$this->name = $data['nl_name'];
- $this->custom_css = $data['custom_css'];
$this->criteria = new PlFlagSet($data['criteria']);
// Load the categories
$this->criteria = new PlFlagSet($data['criteria']);
// Load the categories
@@
-109,7
+106,7
@@
class NewsLetter
*/
public static function getAll($sort = 'id', $order = 'ASC')
{
*/
public static function getAll($sort = 'id', $order = 'ASC')
{
- $res = XDB::fetchAllAssoc('SELECT n.id, g.nom AS group_name, n.name, n.c
ustom_css, n.c
riteria, g.diminutif AS group_link
+ $res = XDB::fetchAllAssoc('SELECT n.id, g.nom AS group_name, n.name, n.criteria, g.diminutif AS group_link
FROM newsletters AS n
INNER JOIN groups AS g ON (n.group_id = g.id)
ORDER BY ' . $sort . ' ' . $order);
FROM newsletters AS n
INNER JOIN groups AS g ON (n.group_id = g.id)
ORDER BY ' . $sort . ' ' . $order);
@@
-517,7
+514,7
@@
class NewsLetter
*/
public function cssFile()
{
*/
public function cssFile()
{
- if ($this->
custom_css
) {
+ if ($this->
hasCustomCss()
) {
$base = $this->group;
} else {
$base = self::FORMAT_DEFAULT_GROUP;
$base = $this->group;
} else {
$base = self::FORMAT_DEFAULT_GROUP;
@@
-529,7
+526,7
@@
class NewsLetter
*/
public function tplFile()
{
*/
public function tplFile()
{
- if ($this->
custom_css
) {
+ if ($this->
hasCustomCss()
) {
$base = $this->group;
} else {
$base = self::FORMAT_DEFAULT_GROUP;
$base = $this->group;
} else {
$base = self::FORMAT_DEFAULT_GROUP;
@@
-670,7
+667,16
@@
class NewsLetter
public function hasCustomCss()
{
public function hasCustomCss()
{
- return $this->custom_css;
+ switch ($this->group) {
+ case self::GROUP_XORG:
+ case self::GROUP_COMMUNITY:
+ case self::GROUP_AX:
+ case self::GROUP_EP:
+ case self::GROUP_FX:
+ return true;
+ default:
+ return false;
+ }
}
public function canSyncWithGroup()
}
public function canSyncWithGroup()
@@
-1246,6
+1252,13
@@
class NLIssue
public function sendTo($user, $hash = null)
{
global $globals;
public function sendTo($user, $hash = null)
{
global $globals;
+
+ // Don't send email to users without an address
+ // Note: this would never happen when using sendToAll
+ if (!$user->bestEmail()) {
+ return;
+ }
+
$this->fetchArticles();
if (is_null($hash)) {
$this->fetchArticles();
if (is_null($hash)) {
@@
-1548,5
+1561,5
@@
function format_text($input, $format, $indent = 0, $width = 68)
// }}}
// }}}
-// vim:set et sw=4 sts=4 sws=4 enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4
f
enc=utf-8:
?>
?>