X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists.php;h=de95560ebc28abb0941f17e7987f14e9c393249e;hb=a7d35093a40837b3a17d7fbac0259995f084812c;hp=16c5016e333d24ff744ffff535b53e8c094679d8;hpb=9ed396c06e661970436bcd81ecc4d758fa647ce0;p=platal.git

diff --git a/modules/lists.php b/modules/lists.php
index 16c5016..de95560 100644
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 
 class ListsModule extends PLModule
 {
-    var $client;
+    protected $client;
 
     function handlers()
     {
@@ -31,9 +31,9 @@ class ListsModule extends PLModule
             'lists/create'    => $this->make_hook('create',    AUTH_MDP),
 
             'lists/members'   => $this->make_hook('members',   AUTH_COOKIE),
-            'lists/trombi'    => $this->make_hook('trombi',    AUTH_COOKIE),
+            'lists/annu'      => $this->make_hook('annu',      AUTH_COOKIE),
             'lists/archives'  => $this->make_hook('archives',  AUTH_COOKIE),
-            'lists/archives/rss' => $this->make_hook('rss',    AUTH_PUBLIC),
+            'lists/archives/rss' => $this->make_hook('rss',    AUTH_PUBLIC, 'user', NO_HTTPS),
 
             'lists/moderate'  => $this->make_hook('moderate',  AUTH_MDP),
             'lists/admin'     => $this->make_hook('admin',     AUTH_MDP),
@@ -62,6 +62,22 @@ class ListsModule extends PLModule
         return $globals->mail->domain;
     }
 
+    function get_pending_ops($domain, $list)
+    {
+        list($subs,$mails) = $this->client->get_pending_ops($list);
+        $res = XDB::query("SELECT  mid
+                             FROM  ml_moderate
+                            WHERE  ml = {?} AND domain = {?}",
+                          $list, $domain);
+        $mids = $res->fetchColumn();
+        foreach ($mails as $key=>$mail) {
+            if (in_array($mail['id'], $mids)) {
+                unset($mails[$key]);
+            }
+        }
+        return array($subs, $mails);
+    }
+
     function handler_lists(&$page)
     {
         function filter_owner($list)
@@ -74,7 +90,7 @@ class ListsModule extends PLModule
             return $list['sub'];
         }
 
-        $this->prepare_client($page);
+        $domain = $this->prepare_client($page);
 
         $page->changeTpl('lists/index.tpl');
         $page->addJsLink('ajax.js');
@@ -94,7 +110,7 @@ class ListsModule extends PLModule
             if ($promo >= 1900 and $promo < 2100) {
                 $this->client->subscribe("promo$promo");
             } else {
-                $page->trig("promo incorrecte, il faut une promo sur 4 chiffres.");
+                $page->trigSuccess("promo incorrecte, il faut une promo sur 4 chiffres.");
             }
         }
         $listes = $this->client->get_lists();
@@ -103,7 +119,7 @@ class ListsModule extends PLModule
         $member = array_filter($listes, 'filter_member');
         $listes = array_diff_key($listes, $member);
         foreach ($owner as $key=>$liste) {
-            list($subs,$mails) = $this->client->get_pending_ops($liste['list']);
+            list($subs,$mails) = $this->get_pending_ops($domain, $liste['list']);
             $owner[$key]['subscriptions'] = $subs;
             $owner[$key]['mails'] = $mails;
         }
@@ -133,7 +149,7 @@ class ListsModule extends PLModule
 
         list($liste, $members, $owners) = $this->client->get_members($list);
         if ($liste['own']) {
-            list($subs,$mails) = $this->client->get_pending_ops($list);
+            list($subs,$mails) = $this->get_pending_ops($domain, $list);
             $liste['subscriptions'] = $subs;
             $liste['mails'] = $mails;
         }
@@ -189,29 +205,29 @@ class ListsModule extends PLModule
         $liste = Post::v('liste');
 
         if (empty($liste)) {
-            $page->trig('champs «addresse souhaitée» vide');
+            $page->trigError('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');
+            $page->trigError('le nom de la liste ne doit contenir que des lettres non accentuées, chiffres et tirets');
         }
 
         $res = XDB::query("SELECT COUNT(*) FROM aliases WHERE alias={?}", $liste);
         $n   = $res->fetchOneCell();
 
         if ($n) {
-            $page->trig('cet alias est déjà pris');
+            $page->trigError('cet alias est déjà pris');
         }
 
-        if (!Post::v(desc)) {
-            $page->trig('le sujet est vide');
+        if (!Post::v('desc')) {
+            $page->trigError('le sujet est vide');
         }
 
         if (!count($owners)) {
-            $page->trig('pas de gestionnaire');
+            $page->trigError('pas de gestionnaire');
         }
 
         if (count($members)<4) {
-            $page->trig('pas assez de membres');
+            $page->trigError('pas assez de membres');
         }
 
         if (!$page->nb_errs()) {
@@ -225,16 +241,6 @@ class ListsModule extends PLModule
         }
     }
 
-    function changeTpl($tpl)
-    {
-        if (!empty($GLOBALS['IS_XNET_SITE'])) {
-            new_group_open_page($tpl);
-        } else {
-            global $page;
-            $page->changeTpl($tpl);
-        }
-    }
-
     function handler_members(&$page, $liste = null)
     {
         if (is_null($liste)) {
@@ -243,7 +249,7 @@ class ListsModule extends PLModule
 
         $this->prepare_client($page);
 
-        $this->changeTpl('lists/members.tpl');
+        $page->changeTpl('lists/members.tpl');
 
         if (Get::has('del')) {
             $this->client->unsubscribe($liste);
@@ -272,42 +278,7 @@ class ListsModule extends PLModule
         }
     }
 
-    function compare($a, $b)
-    {
-        if ($a['promo'] == $b['promo']) {
-            if ($a['nom'] == $b['nom']) {
-                return strcmp($a['prenom'], $b['prenom']);
-            }
-            return strcmp($a['nom'], $b['nom']);
-        }
-        return $a['promo'] - $b['promo'];
-    }
-
-    function _get_list($offset, $limit)
-    {
-        global $platal;
-        list($total, $members) = $this->client->get_members_limit($platal->argv[1], $offset, $limit);
-
-        $membres = Array();
-        foreach ($members as $member) {
-            list($m) = explode('@',$member[1]);
-            $res = XDB::query("SELECT  prenom,if (nom_usage='', nom, nom_usage) AS nom,
-                                                 promo, a.alias AS forlife
-                                           FROM  auth_user_md5 AS u
-                                     INNER JOIN  aliases AS a ON u.user_id = a.id
-                                     INNER JOIN  photo AS p ON p.uid = u.user_id
-                                          WHERE  a.alias = {?}", $m);
-            if ($tmp = $res->fetchOneAssoc()) {
-                $membres[$tmp['nom']] = $tmp;
-            } else {
-                $total--;
-            }
-        }
-        uasort($membres, array($this, 'compare'));
-        return array($total, $membres);
-    }
-
-    function handler_trombi(&$page, $liste = null)
+    function handler_annu(&$page, $liste = null, $action = null, $subaction = null)
     {
         if (is_null($liste)) {
             return PL_NOT_FOUND;
@@ -315,30 +286,42 @@ class ListsModule extends PLModule
 
         $this->prepare_client($page);
 
-        $this->changeTpl('lists/trombi.tpl');
-
         if (Get::has('del')) {
             $this->client->unsubscribe($liste);
-            pl_redirect('lists/trombi/'.$liste);
+            pl_redirect('lists/annu/'.$liste);
         }
         if (Get::has('add')) {
             $this->client->subscribe($liste);
-            pl_redirect('lists/trombi/'.$liste);
+            pl_redirect('lists/annu/'.$liste);
         }
 
         $owners = $this->client->get_owners($liste);
-
-        if (is_array($owners)) {
-            $moderos = list_sort_owners($owners[1]);
-
-            $page->assign_by_ref('details', $owners[0]);
-            $page->assign_by_ref('owners',  $moderos);
-
-            $trombi = new Trombi(array(&$this, '_get_list'));
-            $page->assign('trombi', $trombi);
-        } else {
+        if (!is_array($owners)) {
             $page->kill("La liste n'existe pas ou tu n'as pas le droit d'en voir les détails");
         }
+
+        global $platal;
+        list(,$members) = $this->client->get_members($liste);
+        $users = array();
+        foreach ($members as $m) {
+            $users[] = $m[1];
+        }
+        require_once 'userset.inc.php';
+        $view = new ArraySet($users);
+        $view->addMod('trombi', 'Trombinoscope', true, array('with_promo' => true));
+        if (empty($GLOBALS['IS_XNET_SITE'])) {
+            $view->addMod('minifiche', 'Minifiches', false);
+        }
+        $view->addMod('geoloc', 'Planisphère');
+        $view->apply("lists/annu/$liste", $page, $action, $subaction);
+        if ($action == 'geoloc' && $subaction) {
+            return;
+        }
+
+        $page->changeTpl('lists/annu.tpl');
+        $moderos = list_sort_owners($owners[1]);
+        $page->assign_by_ref('details', $owners[0]);
+        $page->assign_by_ref('owners',  $moderos);
     }
 
     function handler_archives(&$page, $liste = null, $action = null, $artid = null)
@@ -351,12 +334,12 @@ class ListsModule extends PLModule
 
         $domain = $this->prepare_client($page);
 
-        $this->changeTpl('lists/archives.tpl');
+        $page->changeTpl('lists/archives.tpl');
 
         if (list($det) = $this->client->get_members($liste)) {
             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");
+                $page->kill("La liste n'existe pas ou tu n'as pas le droit de la consulter.");
             }
             $get = Array('listname' => $liste, 'domain' => $domain);
             if (Post::has('updateall')) {
@@ -366,7 +349,7 @@ class ListsModule extends PLModule
             get_banana_params($get, null, $action, $artid);
             run_banana($page, 'MLBanana', $get);
         } else {
-            $page->kill("La liste n'existe pas ou tu n'as pas le droit de la consulter");
+            $page->kill("La liste n'existe pas ou tu n'as pas le droit de la consulter.");
         }
     }
 
@@ -389,10 +372,10 @@ class ListsModule extends PLModule
         if (list($det) = $this->client->get_members($liste)) {
             if (substr($liste,0,5) != 'promo' && ($det['ins'] || $det['priv'])
                     && !$det['own'] && ($det['sub'] < 2)) {
-                exit;  
+                exit;
             }
             require_once('banana/ml.inc.php');
-            $banana = new MLBanana(Array('listname' => $liste, 'domain' => $domain, 'action' => 'rss2'));
+            $banana = new MLBanana(S::v('forlife'), Array('listname' => $liste, 'domain' => $domain, 'action' => 'rss2'));
             $banana->run();
         }
         exit;
@@ -400,67 +383,61 @@ class ListsModule extends PLModule
 
     function moderate_mail($domain, $liste, $mid)
     {
-        $mail   = $this->client->get_pending_mail($liste, $mid);
-        $reason = '';
-
-        $prenom = S::v('prenom');
-        $nom    = S::v('nom');
-
         if (Env::has('mok')) {
-            $action  = 1; /** 2 = ACCEPT **/
-            $subject = "Message accepté";
-            $append .= "a été accepté par $prenom $nom.\n";
+            $action = 'accept';
         } elseif (Env::has('mno')) {
-            $action  = 2; /** 2 = REJECT **/
-            $subject = "Message refusé";
-            $reason  = Post::v('reason');
-            $append  = "a été refusé par $prenom $nom avec la raison :\n\n"
-                        .  $reason;
+            $action = 'refuse';
         } elseif (Env::has('mdel')) {
-            $action  = 3; /** 3 = DISCARD **/
-            $subject = "Message supprimé";
-            $append  = "a été supprimé par $prenom $nom.\n\n"
-                        .  "Rappel: il ne faut utiliser cette opération "
-                        .  "que dans le cas de spams ou de virus !\n";
-        }
-
-        if (isset($action) && $this->client->handle_request($liste, $mid, $action, $reason)) {
-            $texte = "le message suivant :\n\n"
-                        ."    Auteur: {$mail['sender']}\n"
-                        ."    Sujet : « {$mail['subj']} »\n"
-                        ."    Date  : ".strftime("le %d %b %Y à %H:%M:%S", (int)$mail['stamp'])."\n\n"
-                        .$append;
-            $mailer = new PlMailer();
-            $mailer->addTo("$liste-owner@{$domain}");
-            $mailer->setFrom("$liste-bounces@{$domain}");
-            $mailer->addHeader('Reply-To', "$liste-owner@{$domain}");
-            $mailer->setSubject($subject);
-            $mailer->setTxtBody(wordwrap($texte,72));
-            $mailer->send();
-            Get::kill('mid');
-        }
-
-        return $mail;
+            $action = 'delete';
+        } else {
+            return false;
+        }
+        Get::kill('mid');
+        return XDB::execute("INSERT IGNORE INTO  ml_moderate
+                                         VALUES  ({?}, {?}, {?}, {?}, {?}, NOW(), {?}, NULL)",
+                            $liste, $domain, $mid, S::i('uid'), $action, Post::v('reason'));
     }
 
     function handler_moderate(&$page, $liste = null)
     {
         if (is_null($liste)) {
-            return PL_NOT_FOUND;
+             return PL_NOT_FOUND;
         }
 
         $domain = $this->prepare_client($page);
 
-        $this->changeTpl('lists/moderate.tpl');
+        $page->changeTpl('lists/moderate.tpl');
 
         $page->register_modifier('hdc', 'list_header_decode');
 
-        if (Env::has('sadd')) { /* 4 = SUBSCRIBE */
-            $this->client->handle_request($liste,Env::v('sadd'),4,'');
-            pl_redirect('lists/moderate/'.$liste);
-        }
-        if (Post::has('sdel')) { /* 2 = REJECT */
-            $this->client->handle_request($liste,Post::v('sdel'),2,Post::v('reason'));
+        if (Env::has('sadd') || Env::has('sdel')) {
+            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,'');
+                $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')));
+                $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->setSubject("L'inscription de {$sub['name']} a été $info");
+                $text = "L'inscription de {$sub['name']} à la liste $liste@{$domain} a été $info par " . S::v('prenom')  . ' '
+                      . S::v('nom') . '(' . S::v('promo') . ")\n";
+                if (trim(Post::v('reason'))) {
+                    $text .= "\nLa raison invoquée est :\n" . Post::v('reason');
+                }
+                $mailer->setTxtBody(wordwrap($text, 72));
+                $mailer->send();
+            }
+            if (Env::has('sadd')) {
+                pl_redirect('lists/moderate/'.$liste);
+            }
         }
 
         if (Post::has('moderate_mails') && Post::has('select_mails')) {
@@ -488,10 +465,10 @@ class ListsModule extends PLModule
 
             $mail = $this->moderate_mail($domain, $liste, Env::i('mid'));
         } elseif (Env::has('sid')) {
-            if (list($subs,$mails) = $this->client->get_pending_ops($liste)) {
+            if (list($subs,$mails) = $this->get_pending_ops($domain, $liste)) {
                 foreach($subs as $user) {
                     if ($user['id'] == Env::v('sid')) {
-                        $this->changeTpl('lists/moderate_sub.tpl');
+                        $page->changeTpl('lists/moderate_sub.tpl');
                         $page->assign('del_user', $user);
                         return;
                     }
@@ -500,9 +477,14 @@ class ListsModule extends PLModule
 
         }
 
-        if (list($subs,$mails) = $this->client->get_pending_ops($liste)) {
+        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);
@@ -511,6 +493,25 @@ class ListsModule extends PLModule
         }
     }
 
+    static public function no_login_callback($login)
+    {
+        require_once 'user.func.inc.php';
+        global $list_unregistered, $globals;
+
+        $users = get_not_registered_user($login, true);
+        if ($users && $users->total()) {
+            if (!isset($list_unregistered)) {
+                $list_unregistered = array();
+            }
+            $list_unregistered[$login] = $users;
+        } else {
+            list($name, $dom) = @explode('@', $login);
+            if ($dom == $globals->mail->domain || $dom == $globals->mail->domain2) {
+                _default_user_callback($login);
+            }
+        }
+    }
+
     function handler_admin(&$page, $liste = null)
     {
         global $globals;
@@ -519,17 +520,49 @@ class ListsModule extends PLModule
             return PL_NOT_FOUND;
         }
 
-        $this->prepare_client($page);
+        $domain = $this->prepare_client($page);
+
+        $page->changeTpl('lists/admin.tpl');
 
-        $this->changeTpl('lists/admin.tpl');
+        if (Env::has('send_mark')) {
+            $actions = Env::v('mk_action');
+            $uids    = Env::v('mk_uid');
+            $mails   = Env::v('mk_email');
+            foreach ($actions as $key=>$action) {
+                switch ($action) {
+                  case 'none':
+                    break;
+
+                  case 'marketu': case 'markets':
+                    require_once 'emails.inc.php';
+                    $mail = valide_email($mails[$key]);
+                    if (isvalid_email_redirection($mail)) {
+                        $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->add();
+                            break;
+                        }
+                    }
+
+                  default:
+                    XDB::execute('INSERT IGNORE INTO  register_subs (uid, type, sub, domain)
+                                              VALUES  ({?}, \'list\', {?}, {?})',
+                                  $uids[$key], $liste, $domain);
+                }
+            }
+        }
 
         if (Env::has('add_member')) {
             require_once('user.func.inc.php');
-            $members = get_users_forlife_list(Env::v('add_member'));
+            $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) {
-                    $page->trig("{$addr[0]} inscrit.");
+                    $page->trigSuccess("{$addr[0]} inscrit.");
                 }
             }
         }
@@ -546,11 +579,11 @@ class ListsModule extends PLModule
 
         if (Env::has('add_owner')) {
             require_once('user.func.inc.php');
-            $owners = get_users_forlife_list(Env::v('add_owner'));
+            $owners = get_users_forlife_list(Env::v('add_owner'), false, array('ListsModule', 'no_login_callback'));
             if ($owners) {
                 foreach ($owners as $login) {
                     if ($this->client->add_owner($liste, $login)) {
-                        $page->trig($alias." ajouté aux modérateurs.");
+                        $page->trigSuccess($alias." ajouté aux modérateurs.");
                     }
                 }
             }
@@ -566,6 +599,10 @@ class ListsModule extends PLModule
         }
 
         if (list($det,$mem,$own) = $this->client->get_members($liste)) {
+            global $list_unregistered;
+            if ($list_unregistered) {
+                $page->assign_by_ref('unregistered', $list_unregistered);
+            }
             $membres = list_sort_members($mem, @$tri_promo);
             $moderos = list_sort_owners($own, @$tri_promo);
 
@@ -589,7 +626,7 @@ class ListsModule extends PLModule
 
         $this->prepare_client($page);
 
-        $this->changeTpl('lists/options.tpl');
+        $page->changeTpl('lists/options.tpl');
 
         if (Post::has('submit')) {
             $values = $_POST;
@@ -651,10 +688,10 @@ class ListsModule extends PLModule
             $type   = 'list';
         }
 
-        $this->changeTpl('lists/delete.tpl');
+        $page->changeTpl('lists/delete.tpl');
         if (Post::v('valid') == 'OUI') {
             if ($this->client->delete_list($liste, Post::b('del_archive'))) {
-                foreach (array('', '-owner', '-admin', '-bounces') as $app) {
+                foreach (array('', '-owner', '-admin', '-bounces', '-unsubscribe') as $app) {
                     XDB::execute("DELETE FROM  $table
                                         WHERE  type={?} AND alias={?}",
                                  $type, $liste.$app.$domain);
@@ -682,7 +719,7 @@ class ListsModule extends PLModule
 
         $this->prepare_client($page);
 
-        $this->changeTpl('lists/soptions.tpl');
+        $page->changeTpl('lists/soptions.tpl');
 
         if (Post::has('submit')) {
             $values = $_POST;
@@ -709,7 +746,7 @@ class ListsModule extends PLModule
 
         $this->prepare_client($page);
 
-        $this->changeTpl('lists/check.tpl');
+        $page->changeTpl('lists/check.tpl');
 
         if (Post::has('correct')) {
             $this->client->check_options($liste, true);
@@ -724,7 +761,7 @@ class ListsModule extends PLModule
     }
 
     function handler_admin_all(&$page) {
-        $this->changeTpl('lists/admin_all.tpl');
+        $page->changeTpl('lists/admin_all.tpl');
         $page->assign('xorg_title','Polytechnique.org - Administration - Mailing lists');
 
         $client = new MMList(S::v('uid'), S::v('password'));