Merge commit 'origin/platal-0.10.0'

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

diff --git a/include/validations/evts.inc.php b/include/validations/evts.inc.php
index f9c2441..41896cb 100644 (file)
--- a/include/validations/evts.inc.php
+++ b/include/validations/evts.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   *
@@ -30,20 +30,20 @@ class EvtReq extends Validate
     public $texte;
     public $pmin;
     public $pmax;
-    public $peremption;    
+    public $peremption;
     public $comment;
 
     public $imgtype;
     public $imgx;
     public $imgy;
     public $img;
-    
+
     // }}}
     // {{{ constructor
 
-    public function __construct($_titre, $_texte, $_pmin, $_pmax, $_peremption, $_comment, $_uid, PlUpload &$upload = null)
+    public function __construct($_titre, $_texte, $_pmin, $_pmax, $_peremption, $_comment, User &$_user, PlUpload &$upload = null)
     {
-        parent::__construct($_uid, false, 'evts');
+        parent::__construct($_user, false, 'evts');
         $this->titre      = $_titre;
         $this->texte      = $_texte;
         $this->pmin       = $_pmin;
@@ -52,7 +52,7 @@ class EvtReq extends Validate
         $this->comment    = $_comment;
         if ($upload) {
             $this->readImage($upload);
-        } 
+        }
     }
 
     // }}}
@@ -94,14 +94,14 @@ class EvtReq extends Validate
         $this->pmax       = Env::i('promo_max');
         $this->peremption = Env::v('peremption');
         if (@$_FILES['image']['tmp_name']) {
-            $upload = PlUpload::get($_FILES['image'], S::v('forlife'), 'event');
+            $upload = PlUpload::get($_FILES['image'], S::user()->login(), 'event');
             if (!$upload) {
-                $this->trig("Impossible de télécharger le fichier");
+                $this->trigError("Impossible de télécharger le fichier");
             } elseif (!$upload->isType('image')) {
-                $page->trig('Le fichier n\'est pas une image valide au format JPEG, GIF ou PNG');
+                $page->trigError('Le fichier n\'est pas une image valide au format JPEG, GIF ou PNG');
                 $upload->rm();
             } elseif (!$upload->resizeImage(200, 300, 100, 100, 32284)) {
-                $page->trig('Impossible de retraiter l\'image');
+                $page->trigError('Impossible de retraiter l\'image');
             } else {
                 $this->readImage($upload);
             }
@@ -111,7 +111,7 @@ class EvtReq extends Validate
 
     // }}}
     // {{{ function _mail_subj
-    
+
     protected function _mail_subj()
     {
         return "[Polytechnique.org/EVENEMENTS] Proposition d'événement";
@@ -136,8 +136,8 @@ class EvtReq extends Validate
     {
         if (XDB::execute("INSERT INTO  evenements
                          SET  user_id = {?}, creation_date=NOW(), titre={?}, texte={?},
-                              peremption={?}, promo_min={?}, promo_max={?}, flags=CONCAT(flags,',valide')",
-                $this->uid, $this->titre, $this->texte,
+                              peremption={?}, promo_min={?}, promo_max={?}, flags=CONCAT(flags,',valide,wiki')",
+                $this->user->id(), $this->titre, $this->texte,
                 $this->peremption, $this->pmin, $this->pmax)) {
             $eid = XDB::insertId();
             if ($this->img) {
@@ -147,18 +147,11 @@ class EvtReq extends Validate
             }
             global $globals;
             if ($globals->banana->event_forum) {
-                require_once 'user.func.inc.php';
-                $forlife = get_user_forlife($this->uid);
                 require_once 'banana/forum.inc.php';
-                $banana = new ForumsBanana($forlife);
-                $text = strip_tags($this->texte, '<p><br><li><ul><ol><a>');
-                $text = preg_replace(',<a href="([^"]+)">(.*?)</a>,', '$1', $text);
-                $text = preg_replace('/<li>/', '* ', $text);
-                $text = preg_replace(',</?.+?>,i', "\n", $text);
-                $text = preg_replace("/\n{2,}/", "\n\n", $text);
+                $banana = new ForumsBanana($this->user);
                 $post = $banana->post($globals->banana->event_forum,
                                       $globals->banana->event_reply,
-                                      $this->titre, pl_entity_decode($text));
+                                      $this->titre, MiniWiki::wikiToText($this->texte, false, 0, 80));
                 if ($post != -1) {
                     XDB::execute("UPDATE  evenements
                                      SET  creation_date = creation_date, post_id = {?}