X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fvalidations%2Flistes.inc.php;h=07003d822dfb0d4e073cedd65bbe27e3f52d6577;hb=ee71865181e96e7b0754ef9e7da4b3cb26f4c1d7;hp=6710d4adbad852f069839c2d59b872c4e4287662;hpb=92144f3e3b3399da3acbb7c80c096a0966870a69;p=platal.git

diff --git a/include/validations/listes.inc.php b/include/validations/listes.inc.php
index 6710d4a..07003d8 100644
--- a/include/validations/listes.inc.php
+++ b/include/validations/listes.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -27,6 +27,8 @@ class ListeReq extends Validate
 
     public $liste;
     public $desc;
+    public $asso;
+    public $domain;
 
     public $advertise;
     public $modlevel;
@@ -36,16 +38,18 @@ class ListeReq extends Validate
     public $members;
 
     public $rules = "Refuser les listes de binets si elles ne sont pas datées (oui : apv2002@, non : apv@).
-        Refuser également des listes qui pourraient nous servir (admin, postmaster,...)";
+        Refuser également des listes qui pourraient nous servir (admin, postmaster&hellip;)";
     // }}}
     // {{{ constructor
 
-    public function __construct($_uid, $_liste, $_desc, $_advertise, $_modlevel,
-                                $_inslevel, $_owners, $_members, $_stamp=0)
+    public function __construct(User &$_user, $_asso, $_liste, $_domain, $_desc, $_advertise,
+                                $_modlevel, $_inslevel, $_owners, $_members, $_stamp=0)
     {
-        parent::__construct($_uid, true, 'liste', $_stamp);
+        parent::__construct($_user, false, 'liste', $_stamp);
 
+        $this->asso      = $_asso;
         $this->liste     = $_liste;
+        $this->domain    = $_domain;
         $this->desc      = $_desc;
         $this->advertise = $_advertise;
         $this->modlevel  = $_modlevel;
@@ -75,9 +79,20 @@ class ListeReq extends Validate
 
     protected function handle_editor()
     {
+        global $globals;
+
         if (Env::has('listname')) {
             $this->liste = trim(Env::v('listname'));
         }
+        if (Env::has('domainname')) {
+            $this->domain = trim(Env::v('domainname'));
+        }
+        if (Env::has('assotype')) {
+            $this->asso = trim(Env::v('assotype'));
+        }
+        if (!$this->asso) {
+            $this->domain = $globals->mail->domain;
+        }
         return true;
     }
 
@@ -86,7 +101,7 @@ class ListeReq extends Validate
 
     protected function _mail_subj()
     {
-        return "[Polytechnique.org/LISTES] Demande de la liste {$this->liste}";
+        return "[Polytechnique.org/LISTES] Demande de la liste {$this->liste}@{$this->domain}";
     }
 
     // }}}
@@ -95,9 +110,9 @@ class ListeReq extends Validate
     protected function _mail_body($isok)
     {
         if ($isok) {
-            return "  La mailing list {$this->liste} que tu avais demandée vient d'être créée.";
+            return "  Suite à ta demande de création de liste de diffusion, nous avons créé l'adresse {$this->liste}@{$this->domain}, qui est maintenant à ta disposition.";
         } else {
-            return "  La demande que tu avais faite pour la mailing list {$this->liste} a été refusée.";
+            return "  La demande que tu avais faite pour la liste de diffusion {$this->liste}@{$this->domain} a été refusée.";
         }
     }
 
@@ -106,14 +121,46 @@ class ListeReq extends Validate
 
     public function commit()
     {
-        $list = new MMList(S::v('uid'), S::v('password'));
+        global $globals;
+
+        if ($this->asso == "alias") {
+            $new = $this->liste . '@' . $this->domain;
+            XDB::query('INSERT INTO virtual (alias, type) VALUES({?}, "user")', $new);
+            foreach ($this->members as $member) {
+                $user = User::get($member);
+                if ($user != null) {
+                    XDB::query(
+                        "INSERT INTO  virtual_redirect (vid, redirect)
+                              SELECT  vid, {?}
+                                FROM  virtual
+                               WHERE  alias = {?}", $user->forlifeEmail(), $new);
+                }
+            }
+            return 1;
+        }
+
+        $list = new MMList(S::user()->id(), S::v('password'), $this->domain);
         $ret = $list->create_list($this->liste, utf8_decode($this->desc), $this->advertise,
                                   $this->modlevel, $this->inslevel,
                                   $this->owners, $this->members);
         $liste = strtolower($this->liste);
-        if ($ret) {
-            foreach(Array($liste, $liste."-owner", $liste."-admin", $liste."-bounces") as $l) {
-                XDB::execute("INSERT INTO aliases (alias,type) VALUES({?}, 'liste')", $l);
+        if ($ret && !$this->asso) {
+            foreach(Array($liste, $liste . "-owner", $liste . "-admin", $liste . "-bounces", $liste . "-unsubscribe") as $l) {
+                XDB::execute("INSERT INTO aliases (alias, type) VALUES({?}, 'liste')", $l);
+            }
+        } elseif ($ret) {
+            foreach (Array('', 'owner', 'admin', 'bounces', 'unsubscribe') as $app) {
+                $mdir = $app == '' ? '+post' : '+' . $app;
+                if (!empty($app)) {
+                    $app  = '-' . $app;
+                }
+                $red = $this->domain . '_' . $liste;
+                XDB::execute('INSERT INTO virtual (alias, type)
+                                        VALUES({?}, {?})', $liste . $app . '@' . $this->domain, 'list');
+                XDB::execute('INSERT INTO virtual_redirect (vid, redirect)
+                                        VALUES ({?}, {?})', XDB::insertId(),
+                                       $red . $mdir . '@listes.polytechnique.org');
+                $list->mass_subscribe($liste, join(' ', $this->members));
             }
         }
         return $ret;