Modifies database structure for phones

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

diff --git a/include/validations/listes.inc.php b/include/validations/listes.inc.php
index 5732ef8..47471e4 100644 (file)
--- 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-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -24,27 +24,27 @@
 class ListeReq extends Validate
 {
     // {{{ properties
-    
-    var $liste;
-    var $desc;
 
-    var $advertise;
-    var $modlevel;
-    var $inslevel;
+    public $liste;
+    public $desc;
 
-    var $owners;
-    var $members;
+    public $advertise;
+    public $modlevel;
+    public $inslevel;
 
-    var $rules = "Refuser les listes de binets si elles ne sont pas datées (oui : apv2002@, non : apv@).
+    public $owners;
+    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,...)";
     // }}}
     // {{{ constructor
-    
-    function ListeReq($_uid, $_liste, $_desc, $_advertise, $_modlevel,
-                      $_inslevel, $_owners, $_members, $_stamp=0)
+
+    public function __construct($_uid, $_liste, $_desc, $_advertise, $_modlevel,
+                                $_inslevel, $_owners, $_members, $_stamp=0)
     {
-        $this->Validate($_uid, true, 'liste', $_stamp);
-        
+        parent::__construct($_uid, false, 'liste', $_stamp);
+
         $this->liste     = $_liste;
         $this->desc      = $_desc;
         $this->advertise = $_advertise;
@@ -57,13 +57,15 @@ class ListeReq extends Validate
     // }}}
     // {{{ function formu()
 
-    function formu()
-    { return 'include/form.valid.listes.tpl'; }
+    public function formu()
+    {
+        return 'include/form.valid.listes.tpl';
+    }
 
     // }}}
     // {{{ function editor()
 
-    function editor()
+    public function editor()
     {
         return 'include/form.valid.edit-listes.tpl';
     }
@@ -71,7 +73,7 @@ class ListeReq extends Validate
     // }}}
     // {{{ function handle_editor()
 
-    function handle_editor()
+    protected function handle_editor()
     {
         if (Env::has('listname')) {
             $this->liste = trim(Env::v('listname'));
@@ -82,7 +84,7 @@ class ListeReq extends Validate
     // }}}
     // {{{ function _mail_subj
 
-    function _mail_subj()
+    protected function _mail_subj()
     {
         return "[Polytechnique.org/LISTES] Demande de la liste {$this->liste}";
     }
@@ -90,7 +92,7 @@ class ListeReq extends Validate
     // }}}
     // {{{ function _mail_body
 
-    function _mail_body($isok)
+    protected function _mail_body($isok)
     {
         if ($isok) {
             return "  La mailing list {$this->liste} que tu avais demandée vient d'être créée.";
@@ -102,15 +104,15 @@ class ListeReq extends Validate
     // }}}
     // {{{ function commit()
 
-    function commit()
+    public function commit()
     {
         $list = new MMList(S::v('uid'), S::v('password'));
-        $ret = $list->create_list($this->liste, $this->desc, $this->advertise,
+        $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) {
+            foreach(Array($liste, $liste."-owner", $liste."-admin", $liste."-bounces", $liste."-unsubscribe") as $l) {
                 XDB::execute("INSERT INTO aliases (alias,type) VALUES({?}, 'liste')", $l);
             }
         }