class ListsModule extends PLModule
{
- protected $client;
-
function handlers()
{
return array(
);
}
- function prepare_client($page, $user = null)
+ protected function prepare_client($user = null)
{
- global $globals;
-
- $this->load('lists.inc.php');
if (is_null($user)) {
$user = S::user();
}
- $this->client = new MMList($user);
- return $globals->mail->domain;
+ $domain = $this->get_lists_domain();
+
+ return new MMList($user, $domain);
}
- function get_domain()
+ protected function get_lists_domain()
{
global $globals;
return $globals->mail->domain;
}
- function prepare_list($list, $user=null)
+ /** Prepare a MailingList from its mailbox
+ */
+ protected function prepare_list($mbox, $user=null)
{
+ // Required: modules/xnetlists.php uses it too.
+ Platal::load('lists', 'lists.inc.php');
+
if (is_null($user)) {
$user = S::user();
}
- $this->mlist = new MailingList($list, $this->get_domain(), $user);
+ return new MailingList($mbox, $this->get_lists_domain(), $user);
}
- function is_group_admin($page)
+ /** Ensure the current user is an administrator of the group.
+ */
+ protected function is_group_admin($page)
{
$force_rights = false;
if ($GLOBALS['IS_XNET_SITE']) {
return $force_rights;
}
- function verify_list_owner($page, $liste)
+ /** Ensure the current user owns the given MailingList.
+ */
+ protected function verify_list_owner($page, $mlist)
{
- if (list(, , $owners) = $this->client->get_members($liste)) {
+ if (list(, , $owners) = $mlist->getMembers()) {
if (!(in_array(S::user()->forlifeEmail(), $owners) || S::admin())) {
$page->kill("La liste n'existe pas ou tu n'as pas le droit de l'administrer.");
}
}
}
- function get_pending_ops($domain, $list)
+ /** Fetch pending operations on a MailingList instance.
+ */
+ protected function get_pending_ops($mlist)
{
- list($subs,$mails) = $this->client->get_pending_ops($list);
+ list($subs, $mails) = $mlist->getPendingOps();
$res = XDB::query("SELECT mid
FROM email_list_moderate
WHERE ml = {?} AND domain = {?}",
- $list, $domain);
+ $mlist->mbox, $mlist->domain);
$mids = $res->fetchColumn();
- foreach ($mails as $key=>$mail) {
+ foreach ($mails as $key => $mail) {
if (in_array($mail['id'], $mids)) {
unset($mails[$key]);
}
function handler_lists($page)
{
+
function filter_owner($list)
{
return $list['own'];
return $list['sub'];
}
- $domain = $this->prepare_client($page);
-
$page->changeTpl('lists/index.tpl');
$page->setTitle('Listes de diffusion');
if (Get::has('del')) {
S::assert_xsrf_token();
- $this->client->unsubscribe(Get::v('del'));
+ $mlist = $this->prepare_list(Get::v('del'));
+ $mlist->unsubscribe();
pl_redirect('lists');
}
if (Get::has('add')) {
S::assert_xsrf_token();
- $this->client->subscribe(Get::v('add'));
+ $mlist = $this->prepare_list(Get::v('add'));
+ $mlist->subscribe();
pl_redirect('lists');
}
if (Post::has('promo_add')) {
}
}
- if (!is_null($listes = $this->client->get_lists())) {
+ $client = $this->prepare_client();
+ if (!is_null($listes = $client->get_lists())) {
$owner = array_filter($listes, 'filter_owner');
$listes = array_diff_key($listes, $owner);
$member = array_filter($listes, 'filter_member');
$listes = array_diff_key($listes, $member);
foreach ($owner as $key => $liste) {
- list($subs, $mails) = $this->get_pending_ops($domain, $liste['list']);
+ $mlist = $this->prepare_list($liste['list']);
+ list($subs, $mails) = $this->get_pending_ops($mlist);
$owner[$key]['subscriptions'] = $subs;
$owner[$key]['mails'] = $mails;
}
function handler_ajax($page, $list = null)
{
pl_content_headers("text/html");
- $domain = $this->prepare_client($page);
- $this->prepare_list($list);
$page->changeTpl('lists/liste.inc.tpl', NO_SKIN);
S::assert_xsrf_token();
+ $mlist = $this->prepare_list($list);
if (Get::has('unsubscribe')) {
- $this->mlist->unsubscribe();
+ $mlist->unsubscribe();
}
if (Get::has('subscribe')) {
- $this->mlist->subscribe();
+ $mlist->subscribe();
}
- if (Get::has('sadd')) { /* 4 = SUBSCRIBE */
- $this->client->handle_request($list, Get::v('sadd'), 4, '');
+ if (Get::has('sadd')) {
+ $mlist->handleRequest(MailingList::REQ_SUBSCRIBE, Get::v('sadd'));
}
if (Get::has('mid')) {
- $this->moderate_mail($domain, $list, Get::i('mid'));
+ $this->moderate_mail($mlist, Get::i('mid'));
}
- list($liste, $members, $owners) = $this->mlist->getMembers();
+ list($liste, $members, $owners) = $mlist->getMembers();
if ($liste['own']) {
- list($subs,$mails) = $this->get_pending_ops($domain, $list);
+ list($subs, $mails) = $this->get_pending_ops($mlist);
$liste['subscriptions'] = $subs;
$liste['mails'] = $mails;
}
return PL_NOT_FOUND;
}
- $this->prepare_list($liste);
- $this->prepare_client($page);
+ $mlist = $this->prepare_list($liste);
$this->is_group_admin($page);
$page->changeTpl('lists/members.tpl');
if (Get::has('del')) {
S::assert_xsrf_token();
- $this->mlist->unsubscribe()
- pl_redirect('lists/members/'.$liste);
+ $mlist->unsubscribe();
+ pl_redirect('lists/members/' . $liste);
}
if (Get::has('add')) {
S::assert_xsrf_token();
- $this->mlist->subscribe();
- pl_redirect('lists/members/'.$liste);
+ $mlist->subscribe();
+ pl_redirect('lists/members/' . $liste);
}
- $members = $this->mlist->getMembers();
+ $members = $mlist->getMembers();
$tri_promo = !Env::b('alpha');
if (is_null($liste)) {
return PL_NOT_FOUND;
}
- $this->prepare_client($page);
- $this->prepare_list($liste);
$this->is_group_admin($page);
- $members = $this->mlist->getMembers();
+
+ $mlist = $this->prepare_list($liste);
+ $members = $mlist->getMembers();
$list = list_fetch_basic_info(list_extract_members($members[1]));
pl_cached_content_headers('text/x-csv', 'iso-8859-1', 1);
return PL_NOT_FOUND;
}
- $this->prepare_client($page);
- $this->prepare_list($liste);
$this->is_group_admin($page);
+ $mlist = $this->prepare_list($liste);
+
if (Get::has('del')) {
S::assert_xsrf_token();
- $this->mlist->unsubscribe();
+ $mlist->unsubscribe();
pl_redirect('lists/annu/'.$liste);
}
if (Get::has('add')) {
S::assert_xsrf_token();
- $this->mlist->subscribe();
+ $mlist->subscribe();
pl_redirect('lists/annu/'.$liste);
}
- $owners = $this->mlist->getOwners();
+ $owners = $mlist->getOwners();
if (!is_array($owners)) {
$page->kill("La liste n'existe pas ou tu n'as pas le droit d'en voir les détails.");
}
- list(,$members) = $this->mlist->getMembers();
+ list(,$members) = $mlist->getMembers();
if ($action == 'moderators') {
$users = $owners;
return PL_NOT_FOUND;
}
- $domain = $this->prepare_client($page);
- $this->prepare_list($liste);
$this->is_group_admin($page);
+ $mlist = $this->prepare_list($liste);
+
$page->changeTpl('lists/archives.tpl');
- if (list($det) = $this->mlist->getMembers()) {
+ if (list($det) = $mlist->getMembers()) {
if (substr($liste,0,5) != 'promo' && ($det['ins'] || $det['priv'])
&& !$det['own'] && ($det['sub'] < 2)) {
$page->kill("La liste n'existe pas ou tu n'as pas le droit de la consulter.");
}
- $get = Array('listname' => $liste, 'domain' => $mlist->domain);
+ $get = Array('listname' => $mlist->mbox, 'domain' => $mlist->domain);
if (Post::has('updateall')) {
$get['updateall'] = Post::v('updateall');
}
return PL_FORBIDDEN;
}
- $domain = $this->prepare_client($page, $user);
- $this->prepare_list($liste);
+ $mlist = $this->prepare_list($liste);
- if (list($det) = $this->mlist->getMembers()) {
+ if (list($det) = $mlist->getMembers()) {
if (substr($liste,0,5) != 'promo' && ($det['ins'] || $det['priv'])
&& !$det['own'] && ($det['sub'] < 2)) {
exit;
}
require_once('banana/ml.inc.php');
- $banana = new MLBanana($user, Array('listname' => $liste, 'domain' => $this->mlist->domain, 'action' => 'rss2'));
+ $banana = new MLBanana($user, Array(
+ 'listname' => $mlist->mbox,
+ 'domain' => $mlist->domain,
+ 'action' => 'rss2'));
$banana->run();
}
exit;
}
- function moderate_mail($domain, $liste, $mid)
+ /** Register a moderation decision.
+ * @param $mlist MailingList: the mailing list being moderated
+ * @param $mid int: the message being moderated
+ */
+ protected function moderate_mail($mlist, $mid)
{
if (Env::has('mok')) {
$action = 'accept';
Get::kill('mid');
return XDB::execute("INSERT IGNORE INTO email_list_moderate
VALUES ({?}, {?}, {?}, {?}, {?}, NOW(), {?}, NULL)",
- $liste, $domain, $mid, S::i('uid'), $action, Post::v('reason'));
+ $mlist->mbox, $mlist->domain, $mid, S::i('uid'), $action, Post::v('reason'));
}
function handler_moderate($page, $liste = null)
return PL_NOT_FOUND;
}
- $domain = $this->prepare_client($page);
+ $mlist = $this->prepare_list($liste);
if (!$this->is_group_admin($page)) {
- $this->verify_list_owner($page, $liste);
+ $this->verify_list_owner($page, $mlist);
}
$page->changeTpl('lists/moderate.tpl');
if (Env::has('sadd') || Env::has('sdel')) {
S::assert_xsrf_token();
- if (Env::has('sadd')) { /* 4 = SUBSCRIBE */
- $sub = $this->client->get_pending_sub($liste, Env::v('sadd'));
- $this->client->handle_request($liste,Env::v('sadd'),4,'');
+ if (Env::has('sadd')) {
+ // Ensure the moderated request is still active
+ $sub = $mlist->getPendingSub(Env::v('sadd'));
+
+ $mlist->handleRequest(MailingList::REQ_SUBSCRIBE, Env::v('sadd'));
$info = "validée";
}
- if (Post::has('sdel')) { /* 2 = REJECT */
- $sub = $this->client->get_pending_sub($liste, Env::v('sdel'));
- $this->client->handle_request($liste, Post::v('sdel'), 2, utf8_decode(Post::v('reason')));
+ if (Post::has('sdel')) {
+ // Ensure the moderated request is still active
+ $sub = $mlist->getPendingSub(Env::v('sdel'));
+
+ $mlist->handleRequest(MailingList::REQ_REJECT, Post::v('sdel'), Post::v('reason'));
$info = "refusée";
}
if ($sub) {
$mailer = new PlMailer();
- $mailer->setFrom("$liste-bounces@{$domain}");
- $mailer->addTo("$liste-owner@{$domain}");
- $mailer->addHeader('Reply-To', "$liste-owner@{$domain}");
+ $mailer->setFrom($mlist->getAddress(MailingList::KIND_BOUNCE));
+ $mailer->addTo($mlist->getAddress(MailingList::KIND_OWNER));
+ $mailer->addHeader('Reply-To', $mlist->getAddress(MailingList::KIND_OWNER));
$mailer->setSubject("L'inscription de {$sub['name']} a été $info");
- $text = "L'inscription de {$sub['name']} à la liste $liste@{$domain} a été $info par " . S::user()->fullName(true) . ".\n";
+ $text = "L'inscription de {$sub['name']} à la liste " . $mlist->address ." a été $info par " . S::user()->fullName(true) . ".\n";
if (trim(Post::v('reason'))) {
$text .= "\nLa raison invoquée est :\n" . Post::v('reason');
}
$mails = array_keys(Post::v('select_mails'));
foreach($mails as $mail) {
- $this->moderate_mail($domain, $liste, $mail);
+ $this->moderate_mail($mlist, $mail);
}
} elseif (Env::has('mid')) {
if (Get::has('mid') && !Env::has('mok') && !Env::has('mdel')) {
require_once 'banana/moderate.inc.php';
$page->changeTpl('lists/moderate_mail.tpl');
- $params = array('listname' => $liste, 'domain' => $domain,
- 'artid' => Get::i('mid'), 'part' => Get::v('part'), 'action' => Get::v('action'));
- $params['client'] = $this->client;
+ $params = array(
+ 'listname' => $mlist->mbox,
+ 'domain' => $mlist->domain,
+ 'artid' => Get::i('mid'),
+ 'part' => Get::v('part'),
+ 'action' => Get::v('action'));
+ $params['client'] = $this->prepare_client();
run_banana($page, 'ModerationBanana', $params);
$msg = file_get_contents('/etc/mailman/fr/refuse.txt');
- $msg = str_replace("%(adminaddr)s", "$liste-owner@{$domain}", $msg);
+ $msg = str_replace("%(adminaddr)s", $mlist->getAddress(MailingList::KIND_OWNER), $msg);
$msg = str_replace("%(request)s", "<< SUJET DU MAIL >>", $msg);
$msg = str_replace("%(reason)s", "<< TON EXPLICATION >>", $msg);
$msg = str_replace("%(listname)s", $liste, $msg);
return;
}
- $this->moderate_mail($domain, $liste, Env::i('mid'));
+ $this->moderate_mail($mlist, Env::i('mid'));
} elseif (Env::has('sid')) {
- if (list($subs,$mails) = $this->get_pending_ops($domain, $liste)) {
+ if (list($subs,$mails) = $this->get_pending_ops($mlist)) {
foreach($subs as $user) {
if ($user['id'] == Env::v('sid')) {
$page->changeTpl('lists/moderate_sub.tpl');
}
- if (list($subs,$mails) = $this->get_pending_ops($domain, $liste)) {
+ if (list($subs,$mails) = $this->get_pending_ops($mlist)) {
foreach ($mails as $key=>$mail) {
$mails[$key]['stamp'] = strftime("%Y%m%d%H%M%S", $mail['stamp']);
if ($mail['fromx']) {
return PL_NOT_FOUND;
}
- $domain = $this->prepare_client($page);
+ $mlist = $this->prepare_list($liste);
$this->is_group_admin($page);
if (!$this->is_group_admin($page)) {
- $this->verify_list_owner($page, $liste);
+ $this->verify_list_owner($page, $mlist);
}
$page->changeTpl('lists/admin.tpl');
$from = ($action == 'marketu') ? 'user' : 'staff';
$market = Marketing::get($uids[$key], $mail);
if (!$market) {
- $market = new Marketing($uids[$key], $mail, 'list', "$liste@$domain", $from, S::v('uid'));
+ $market = new Marketing($uids[$key], $mail, 'list', $mlist->address, $from, S::v('uid'));
$market->add();
break;
}
default:
XDB::execute('INSERT IGNORE INTO register_subs (uid, type, sub, domain)
VALUES ({?}, \'list\', {?}, {?})',
- $uids[$key], $liste, $domain);
+ $uids[$key], $mlist->mbox, $mlist->domain);
}
}
}
// emails.
$members = array_values(array_unique($members));
- $arr = $this->client->mass_subscribe($liste, $members);
+ $arr = $mlist->subscribeBulk($members);
$successes = array();
if (is_array($arr)) {
if (strpos(Env::v('del_member'), '@') === false) {
if ($del_member = User::getSilent(Env::t('del_member'))) {
- $this->client->mass_unsubscribe($liste, array($del_member->forlifeEmail()));
+ $mlist->unsubscribeBulk(array($del_member->forlifeEmail()));
}
} else {
- $this->client->mass_unsubscribe($liste, array(Env::v('del_member')));
+ $mlist->unsubscribeBulk(array(Env::v('del_member')));
}
pl_redirect('lists/admin/'.$liste);
}
$owners = User::getBulkForlifeEmails(Env::v('add_owner'), false, array('ListsModule', 'no_login_callback'));
if ($owners) {
- foreach ($owners as $login) {
- if ($this->client->add_owner($liste, $login)) {
+ foreach ($owners as $forlife_email) {
+ if ($mlist->addOwner($forlife_email)) {
$page->trigSuccess($login ." ajouté aux modérateurs.");
}
}
if (strpos(Env::v('del_owner'), '@') === false) {
if ($del_owner = User::getSilent(Env::t('del_owner'))) {
- $this->client->mass_unsubscribe($liste, array($del_owner->forlifeEmail()));
+ $mlist->unsubscribeBulk(array($del_owner->forlifeEmail()));
}
} else {
- $this->client->del_owner($liste, Env::v('del_owner'));
+ $mlist->removeOwner(Env::v('del_owner'));
}
pl_redirect('lists/admin/'.$liste);
}
- if (list($det,$mem,$own) = $this->client->get_members($liste)) {
+ if (list($det,$mem,$own) = $mlist->getMembers()) {
global $list_unregistered;
if ($list_unregistered) {
$page->assign_by_ref('unregistered', $list_unregistered);
return PL_NOT_FOUND;
}
- $this->prepare_client($page);
+ $mlist = $this->prepare_list($liste);
if (!$this->is_group_admin($page)) {
- $this->verify_list_owner($page, $liste);
+ $this->verify_list_owner($page, $mlist);
}
$page->changeTpl('lists/options.tpl');
if ($spamlevel > 3 || $spamlevel < 0 || $unsurelevel < 0 || $unsurelevel > 1) {
$page->trigError("Réglage de l'antispam non valide");
} else {
- $this->client->set_bogo_level($liste, ($spamlevel << 1) + $unsurelevel);
+ $mlist->setBogoLevel(($spamlevel << 1) + $unsurelevel);
}
switch($values['moderate']) {
case '0':
if (isset($values['subject_prefix'])) {
$values['subject_prefix'] = trim($values['subject_prefix']).' ';
}
- $this->client->set_owner_options($liste, $values);
+ $mlist->setOwnerOptions($values);
} elseif (isvalid_email(Post::v('atn_add'))) {
S::assert_xsrf_token();
- $this->client->add_to_wl($liste, Post::v('atn_add'));
+ $mlist->whitelistAdd(Post::v('atn_add'));
} elseif (Get::has('atn_del')) {
S::assert_xsrf_token();
- $this->client->del_from_wl($liste, Get::v('atn_del'));
+ $mlist->whitelistRemove(Post::v('atn_del'));
pl_redirect('lists/options/'.$liste);
}
- if (list($details,$options) = $this->client->get_owner_options($liste)) {
+ if (list($details, $options) = $mlist->getOwnerOptions()) {
$page->assign_by_ref('details', $details);
$page->assign_by_ref('options', $options);
- $bogo_level = intval($this->client->get_bogo_level($liste));
+ $bogo_level = intval($mlist->getBogoLevel());
$page->assign('unsure_level', $bogo_level & 1);
$page->assign('bogo_level', $bogo_level >> 1);
} else {
return PL_NOT_FOUND;
}
- $domain = $this->prepare_client($page);
+ $mlist = $this->prepare_list($liste);
if (!$this->is_group_admin($page)) {
- $this->verify_list_owner($page, $liste);
+ $this->verify_list_owner($page, $mlist);
}
$page->changeTpl('lists/delete.tpl');
if (Post::v('valid') == 'OUI') {
S::assert_xsrf_token();
- if ($this->client->delete_list($liste, Post::b('del_archive'))) {
+ if ($mlist->delete(Post::b('del_archive'))) {
require_once 'emails.inc.php';
- delete_list($liste, $domain);
+ delete_list($mlist->mbox, $mlist->domain);
$page->assign('deleted', true);
$page->trigSuccess('La liste a été détruite !');
} else {
. 'Contact les administrateurs du site pour régler le problème : '
. '<a href="mailto:support@polytechnique.org">support@polytechnique.org</a>.');
}
- } elseif (list($details,$options) = $this->client->get_owner_options($liste)) {
+ } elseif (list($details, $options) = $mlist->getOwnerOptions()) {
if (!$details['own']) {
$page->trigWarning('Tu n\'es pas administrateur de la liste, mais du site.');
}
$page->assign_by_ref('details', $details);
$page->assign_by_ref('options', $options);
- $page->assign('bogo_level', $this->client->get_bogo_level($liste));
+ $page->assign('bogo_level', $mlist->getBogoLevel());
} else {
$page->kill("La liste n'existe pas ou tu n'as pas le droit de l'administrer.");
}
return PL_NOT_FOUND;
}
- $this->prepare_client($page);
+ $mlist = $this->prepare_list($liste);
if (!$this->is_group_admin($page)) {
- $this->verify_list_owner($page, $liste);
+ $this->verify_list_owner($page, $mlist);
}
$page->changeTpl('lists/soptions.tpl');
unset($values['submit']);
$values['advertised'] = empty($values['advertised']) ? false : true;
$values['archive'] = empty($values['archive']) ? false : true;
- $this->client->set_admin_options($liste, $values);
+ $mlist->setAdminOptions($values);
}
- if (list($details,$options) = $this->client->get_admin_options($liste)) {
+ if (list($details, $options) = $mlist->getAdminOptions()) {
$page->assign_by_ref('details', $details);
$page->assign_by_ref('options', $options);
} else {
return PL_NOT_FOUND;
}
- $this->prepare_client($page);
+ $mlist = $this->prepare_list($liste);
if (!$this->is_group_admin($page)) {
- $this->verify_list_owner($page, $liste);
+ $this->verify_list_owner($page, $mlist);
}
$page->changeTpl('lists/check.tpl');
if (Post::has('correct')) {
S::assert_xsrf_token();
- $this->client->check_options($liste, true);
+ $mlist->checkOptions(true);
}
- if (list($details,$options) = $this->client->check_options($liste)) {
+ if (list($details, $options) = $mlist->checkOptions()) {
$page->assign_by_ref('details', $details);
$page->assign_by_ref('options', $options);
} else {
$page->changeTpl('lists/admin_all.tpl');
$page->setTitle('Administration - Mailing lists');
- $this->prepare_client($page);
- $listes = $this->client->get_all_lists();
+ $client = $this->prepare_client();
+ $listes = $client->get_all_lists();
$page->assign_by_ref('listes', $listes);
}
class XnetListsModule extends ListsModule
{
- var $client;
-
function handlers()
{
return array(
);
}
- function prepare_client($page, $user = null)
+ protected function get_lists_domain()
{
global $globals;
- Platal::load('lists', 'lists.inc.php');
-
- if (is_null($user)) {
- $user =& S::user();
- }
- $this->client = new MMList($user, $globals->asso('mail_domain'));
-
- $page->assign('asso', $globals->asso());
- $page->setType($globals->asso('cat'));
-
return $globals->asso('mail_domain');
}
function handler_lists($page, $order_by = null, $order = null)
{
- global $globals;
require_once 'emails.inc.php';
- if (!$globals->asso('mail_domain')) {
+ if (!$this->get_lists_domain()) {
return PL_NOT_FOUND;
}
- $this->prepare_client($page);
$page->changeTpl('xnetlists/index.tpl');
if (Get::has('del')) {
S::assert_xsrf_token();
- $this->client->unsubscribe(Get::v('del'));
+ $mlist = $this->prepare_list(Get::v('del'));
+ $mlist->unsubscribe();
pl_redirect('lists');
}
if (Get::has('add')) {
S::assert_xsrf_token();
- $this->client->subscribe(Get::v('add'));
+ $mlist = $this->prepare_list(Get::v('add'));
+ $mlist->subscribe();
pl_redirect('lists');
}
$alias = Post::t('del_alias');
list($local_part, ) = explode('@', $alias);
- delete_list_alias($local_part, $globals->asso('mail_domain'));
+ delete_list_alias($local_part, $this->get_lists_domain());
$page->trigSuccess($alias . ' supprimé !');
}
- $listes = $this->client->get_lists();
+ $client = $this->prepare_client();
+ $listes = $client->get_lists();
// Default ordering is by ascending names.
if (is_null($order_by) || is_null($order)
|| !in_array($order_by, array('list', 'desc', 'nbsub'))
$page->assign('listes', $listes);
$page->assign('order_by', $order_by);
$page->assign('order', $order);
- $page->assign('aliases', iterate_list_alias($globals->asso('mail_domain')));
+ $page->assign('aliases', iterate_list_alias($this->get_lists_domain()));
$page->assign('may_update', may_update());
if (S::suid()) {
$page->trigWarning("Attention : l'affichage des listes de diffusion ne tient pas compte de l'option « Voir le site comme… ».");
}
+ global $globals;
if (count($listes) > 0 && !$globals->asso('has_ml')) {
XDB::execute("UPDATE groups
SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'has_ml')
function handler_create($page)
{
- global $globals;
-
- if (!$globals->asso('mail_domain')) {
+ if (!$this->get_lists_domain()) {
return PL_NOT_FOUND;
}
- $this->prepare_client($page);
$page->changeTpl('xnetlists/create.tpl');
if (!Post::has('submit')) {
}
require_once 'emails.inc.php';
- if (list_exist($list, $globals->asso('mail_domain'))) {
+ if (list_exist($list, $this->get_lists_domain())) {
$page->trigError('Cet alias est déjà pris.');
return;
}
return;
}
- $success = $this->client->create_list($list, utf8_decode(Post::t('desc')), Post::t('advertise'),
- Post::t('modlevel'), Post::t('inslevel'),
- array(S::user()->forlifeEmail()), array(S::user()->forlifeEmail()));
+ $mlist = $this->prepare_list($list);
+ $success = $mlist->create(Post::t('desc'),
+ Post::t('advertise'), Post::t('modlevel'), Post::t('inslevel'),
+ array(S::user()->forlifeEmail()), array(S::user()->forlifeEmail()));
if (!$success) {
$page->kill("Un problème est survenu, contacter "
."<a href='mailto:support@m4x.org'>support@m4x.org</a>");
return;
}
- create_list($list, $globals->asso('mail_domain'));
+ create_list($mlist->mbox, $mlist->domain);
+ global $globals;
XDB::execute("UPDATE groups
SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'has_ml')
WHERE id = {?}",
function handler_sync($page, $liste = null)
{
- global $globals;
-
- if (!$globals->asso('mail_domain')) {
+ if (!$this->get_lists_domain()) {
+ return PL_NOT_FOUND;
+ }
+ if (!$liste) {
return PL_NOT_FOUND;
}
- $this->prepare_client($page);
+
$page->changeTpl('xnetlists/sync.tpl');
+ $mlist = $this->prepare_list($liste);
+
if (Env::has('add')) {
S::assert_xsrf_token();
- $this->client->mass_subscribe($liste, array_keys(Env::v('add')));
+ $mlist->subscribeBulk(array_keys(Env::v('add')));
}
- list(,$members) = $this->client->get_members($liste);
+ list(,$members) = $mlist->getMembers();
$mails = array_map(create_function('$arr', 'return $arr[1];'), $members);
$subscribers = array_unique($mails);
+ global $globals;
$ann = XDB::fetchColumn('SELECT uid
FROM group_members
WHERE asso_id = {?}', $globals->asso('id'));
function handler_aadmin($page, $lfull = null)
{
- global $globals;
-
- if (!$globals->asso('mail_domain') || is_null($lfull)) {
+ if (!$this->get_lists_domain() || is_null($lfull)) {
return PL_NOT_FOUND;
}
$page->changeTpl('xnetlists/alias-admin.tpl');
require_once 'emails.inc.php';
list($local_part, $domain) = explode('@', $lfull);
- if ($globals->asso('mail_domain') != $domain || !preg_match("/^[a-zA-Z0-9\-\.]*$/", $local_part)) {
+ if ($this->get_lists_domain() != $domain || !preg_match("/^[a-zA-Z0-9\-\.]*$/", $local_part)) {
+ global $globals;
$page->trigErrorRedirect('Le nom de l\'alias est erroné.', $globals->asso('diminutif') . '/lists');
}
function handler_acreate($page)
{
- global $globals;
-
- if (!$globals->asso('mail_domain')) {
+ if (!$this->get_lists_domain()) {
return PL_NOT_FOUND;
}
$page->changeTpl('xnetlists/alias-create.tpl');
}
require_once 'emails.inc.php';
- if (list_exist($list, $globals->asso('mail_domain'))) {
+ $lists_domain = $this->get_lists_domain();
+ if (list_exist($list, $lists_domain)) {
$page->trigError('Cet alias est déjà pris.');
return;
}
- add_to_list_alias(S::i('uid'), $list, $globals->asso('mail_domain'));
- pl_redirect('alias/admin/' . $list . '@' . $globals->asso('mail_domain'));
+ add_to_list_alias(S::i('uid'), $list, $lists_domain);
+ pl_redirect('alias/admin/' . $list . '@' . $lists_domain);
}
function handler_profile($page, $user = null)
projects / platal.git / commitdiff