X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fvalidations%2Fevts.inc.php;h=7dcbce07e98f81ba548117edc63076a5914c9cdb;hb=3ae529c954030ebfa22c49513746a940d3c0c84f;hp=41896cb74e22835ed8ddf2636fdeef829c870503;hpb=8d84c630f353ef0534e02325507ed35cc2f0d28f;p=platal.git

diff --git a/include/validations/evts.inc.php b/include/validations/evts.inc.php
index 41896cb..7dcbce0 100644
--- a/include/validations/evts.inc.php
+++ b/include/validations/evts.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   *
@@ -30,7 +30,7 @@ class EvtReq extends Validate
     public $texte;
     public $pmin;
     public $pmax;
-    public $peremption;
+    public $expiration;
     public $comment;
 
     public $imgtype;
@@ -41,14 +41,14 @@ class EvtReq extends Validate
     // }}}
     // {{{ constructor
 
-    public function __construct($_titre, $_texte, $_pmin, $_pmax, $_peremption, $_comment, User &$_user, PlUpload &$upload = null)
+    public function __construct($_titre, $_texte, $_pmin, $_pmax, $_expiration, $_comment, User $_user, PlUpload $upload = null)
     {
         parent::__construct($_user, false, 'evts');
         $this->titre      = $_titre;
         $this->texte      = $_texte;
         $this->pmin       = $_pmin;
         $this->pmax       = $_pmax;
-        $this->peremption = $_peremption;
+        $this->expiration = $_expiration;
         $this->comment    = $_comment;
         if ($upload) {
             $this->readImage($upload);
@@ -58,7 +58,7 @@ class EvtReq extends Validate
     // }}}
     // {{{ function readImage()
 
-    private function readImage(PlUpload &$upload)
+    private function readImage(PlUpload $upload)
     {
         if ($upload->exists() && $upload->isType('image')) {
             list($this->imgx, $this->imgy, $this->imgtype) = $upload->imageInfo();
@@ -92,7 +92,7 @@ class EvtReq extends Validate
         $this->texte      = Env::v('texte');
         $this->pmin       = Env::i('promo_min');
         $this->pmax       = Env::i('promo_max');
-        $this->peremption = Env::v('peremption');
+        $this->expiration = Env::v('expiration');
         if (@$_FILES['image']['tmp_name']) {
             $upload = PlUpload::get($_FILES['image'], S::user()->login(), 'event');
             if (!$upload) {
@@ -122,10 +122,11 @@ class EvtReq extends Validate
 
     protected function _mail_body($isok)
     {
+        $you_have = ($this->formal ? 'vous aviez' : 'tu avais');
         if ($isok) {
-            return "  L'annonce que tu avais proposée ({$this->titre}) vient d'être validée.";
+            return "  L'annonce que $you_have proposée ({$this->titre}) vient d'être validée.";
         } else {
-            return "  L'annonce que tu avais proposée ({$this->titre}) a été refusée.";
+            return "  L'annonce que $you_have proposée ({$this->titre}) a été refusée.";
         }
     }
 
@@ -134,14 +135,15 @@ class EvtReq extends Validate
 
     public function commit()
     {
-        if (XDB::execute("INSERT INTO  evenements
-                         SET  user_id = {?}, creation_date=NOW(), titre={?}, texte={?},
-                              peremption={?}, promo_min={?}, promo_max={?}, flags=CONCAT(flags,',valide,wiki')",
+        /* TODO: refines this filter on promotions by using userfilter. */
+        if (XDB::execute("INSERT INTO  announces
+                         SET  uid = {?}, creation_date=NOW(), titre={?}, texte={?},
+                              expiration={?}, promo_min={?}, promo_max={?}, flags=CONCAT(flags,',valide,wiki')",
                 $this->user->id(), $this->titre, $this->texte,
-                $this->peremption, $this->pmin, $this->pmax)) {
+                $this->expiration, $this->pmin, $this->pmax)) {
             $eid = XDB::insertId();
             if ($this->img) {
-                XDB::execute("INSERT INTO evenements_photo
+                XDB::execute("INSERT INTO announce_photos
                                       SET eid = {?}, attachmime = {?}, x = {?}, y = {?}, attach = {?}",
                              XDB::insertId(), $this->imgtype, $this->imgx, $this->imgy, $this->img);
             }
@@ -153,7 +155,7 @@ class EvtReq extends Validate
                                       $globals->banana->event_reply,
                                       $this->titre, MiniWiki::wikiToText($this->texte, false, 0, 80));
                 if ($post != -1) {
-                    XDB::execute("UPDATE  evenements
+                    XDB::execute("UPDATE  announces
                                      SET  creation_date = creation_date, post_id = {?}
                                    WHERE  id = {?}", $post, $eid);
                 }