2006 => 2007 Happy New Year\!

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

diff --git a/include/validations/listes.inc.php b/include/validations/listes.inc.php
index e292199..356fd98 100644 (file)
--- a/include/validations/listes.inc.php
+++ b/include/validations/listes.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2004 Polytechnique.org                              *
+ *  Copyright (C) 2003-2007 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -35,14 +35,14 @@ class ListeReq extends Validate
     var $owners;
     var $members;
 
-    var $rules = "Refuser les listes de binets si elles ne sont pas datées (apv20002@ et non apv@).
+    var $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,...)";
     // }}}
     // {{{ constructor
     
-    function ListeReq($_uid, $_liste, $_desc, $_advertise, $_modlevel, $_inslevel, $_owners, $_members, $_stamp=0)
+    function ListeReq($_uid, $_liste, $_desc, $_advertise, $_modlevel,
+                      $_inslevel, $_owners, $_members, $_stamp=0)
     {
-        global $globals;
         $this->Validate($_uid, true, 'liste', $_stamp);
         
         $this->liste     = $_liste;
@@ -61,6 +61,25 @@ class ListeReq extends Validate
     { return 'include/form.valid.listes.tpl'; }
 
     // }}}
+    // {{{ function editor()
+
+    function editor()
+    {
+        return 'include/form.valid.edit-listes.tpl';
+    }
+
+    // }}}
+    // {{{ function handle_editor()
+
+    function handle_editor()
+    {
+        if (Env::has('listname')) {
+            $this->liste = trim(Env::v('listname'));
+        }
+        return true;
+    }
+
+    // }}}
     // {{{ function _mail_subj
 
     function _mail_subj()
@@ -82,21 +101,17 @@ class ListeReq extends Validate
 
     // }}}
     // {{{ function commit()
-    
+
     function commit()
     {
-        global $globals;
-        require_once('platal/xmlrpc-client.inc.php');
-        require_once('lists.inc.php');
-
-        $client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password'));
-        $ret = $client->create_list($this->liste, $this->desc,
-            $this->advertise, $this->modlevel, $this->inslevel,
-            $this->owners, $this->members);
+        $list = new MMList(S::v('uid'), S::v('password'));
+        $ret = $list->create_list($this->liste, $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) {
-                $globals->xdb->execute("INSERT INTO aliases (alias,type) VALUES({?}, 'liste')", $l);
+                XDB::execute("INSERT INTO aliases (alias,type) VALUES({?}, 'liste')", $l);
             }
         }
         return $ret;