X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists.php;h=6ed325ce01b8312fd54e28e2e61162a08daf8fc2;hb=16594a1ac8d7cbff8a51e422a6a6d9e575129d9c;hp=3ef6ebf9868749dc842f7e3babb535e914c6d9e7;hpb=464427e210964900dfe5523fa3cdd451e91d3e36;p=platal.git

diff --git a/modules/lists.php b/modules/lists.php
index 3ef6ebf..6ed325c 100644
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -205,7 +205,7 @@ class ListsModule extends PLModule
         $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');
@@ -480,6 +480,11 @@ class ListsModule extends PLModule
         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);
@@ -491,7 +496,7 @@ class ListsModule extends PLModule
     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()) {
@@ -500,7 +505,10 @@ class ListsModule extends PLModule
             }
             $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);
+            }
         }
     }
 
@@ -548,7 +556,9 @@ class ListsModule extends PLModule
 
         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) {