Fix the 'Norbert Bug'.

[platal.git] / include / validations / listes.inc.php

diff --git a/include/validations/listes.inc.php b/include/validations/listes.inc.php
index ab60fb1..c44b645 100644 (file)
--- a/include/validations/listes.inc.php
+++ b/include/validations/listes.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -38,11 +38,11 @@ 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(User &$_user, $_asso, $_liste, $_domain, $_desc, $_advertise,
+    public function __construct(User $_user, $_asso, $_liste, $_domain, $_desc, $_advertise,
                                 $_modlevel, $_inslevel, $_owners, $_members, $_stamp=0)
     {
         parent::__construct($_user, false, 'liste', $_stamp);
@@ -125,21 +125,21 @@ class ListeReq extends Validate
 
         if ($this->asso == "alias") {
             $new = $this->liste . '@' . $this->domain;
-            XDB::query('INSERT INTO x4dat.virtual (alias, type) VALUES({?}, "user")', $new);
+            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  x4dat.virtual_redirect (vid, redirect)
+                        "INSERT INTO  virtual_redirect (vid, redirect)
                               SELECT  vid, {?}
-                                FROM  x4dat.virtual
+                                FROM  virtual
                                WHERE  alias = {?}", $user->forlifeEmail(), $new);
                 }
             }
             return 1;
         }
 
-        $list = new MMList(S::user()->id(), S::v('password'), $this->domain);
+        $list = new MMList(S::user(), $this->domain);
         $ret = $list->create_list($this->liste, utf8_decode($this->desc), $this->advertise,
                                   $this->modlevel, $this->inslevel,
                                   $this->owners, $this->members);
@@ -155,12 +155,11 @@ class ListeReq extends Validate
                     $app  = '-' . $app;
                 }
                 $red = $this->domain . '_' . $liste;
-                XDB::execute('INSERT INTO x4dat.virtual (alias, type)
+                XDB::execute('INSERT INTO virtual (alias, type)
                                         VALUES({?}, {?})', $liste . $app . '@' . $this->domain, 'list');
-                XDB::execute('INSERT INTO x4dat.virtual_redirect (vid, redirect)
+                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;