$liste = Post::v('liste');
if (empty($liste)) {
- $page->trig('champs «addresse souhaitée» vide');
+ $page->trig('champs «adresse souhaitée» vide');
}
if (!preg_match("/^[a-zA-Z0-9\-]*$/", $liste)) {
$page->trig('le nom de la liste ne doit contenir que des lettres non accentuées, chiffres et tirets');
if (list($subs,$mails) = $this->get_pending_ops($domain, $liste)) {
foreach ($mails as $key=>$mail) {
$mails[$key]['stamp'] = strftime("%Y%m%d%H%M%S", $mail['stamp']);
+ if ($mail['fromx']) {
+ $page->assign('with_fromx', true);
+ } else {
+ $page->assign('with_nonfromx', true);
+ }
}
$page->assign_by_ref('subs', $subs);
$page->assign_by_ref('mails', $mails);
static public function no_login_callback($login)
{
require_once 'user.func.inc.php';
- global $list_unregistered;
+ global $list_unregistered, $globals;
$users = get_not_registered_user($login, true);
if ($users && $users->total()) {
}
$list_unregistered[$login] = $users;
} else {
- _default_user_callback($login);
+ list($name, $dom) = @explode('@', $login);
+ if ($dom == $globals->mail->domain || $dom == $globals->mail->domain2) {
+ _default_user_callback($login);
+ }
}
}
if (Env::has('add_member')) {
require_once('user.func.inc.php');
- $members = get_users_forlife_list(Env::v('add_member'), false, array('ListsModule', 'no_login_callback'));
+ $members = get_users_forlife_list(Env::v('add_member'),
+ false,
+ array('ListsModule', 'no_login_callback'));
$arr = $this->client->mass_subscribe($liste, $members);
if (is_array($arr)) {
foreach($arr as $addr) {