X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fvalidations%2Forange.inc.php;h=802d3d7bb4451b2c20c5e679b215e7ec1f51673b;hb=2553b7686e0678b8e27858a7c377e73ecb410aec;hp=1f82930af561681874cd958a7480ba372ce48ac5;hpb=a7de4ef724d1a3b0bf978a50ce7cc9d23412c7a0;p=platal.git

diff --git a/include/validations/orange.inc.php b/include/validations/orange.inc.php
index 1f82930..802d3d7 100644
--- a/include/validations/orange.inc.php
+++ b/include/validations/orange.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   *
@@ -25,44 +25,44 @@ class OrangeReq extends Validate
 {
     // {{{ properties
 
-    var $unique = true;
+    public $unique = true;
 
-    var $promo;
-    var $promo_sortie;
-    
-    var $rules = "A priori accepter (la validation sert à repousser les
-    petits malins). Refuse si tu connais la personne et que tu es sure 
+    public $promo_sortie;
+
+    public $rules = "A priori accepter (la validation sert à repousser les
+    petits malins). Refuse si tu connais la personne et que tu es sure
     qu'elle n'est pas orange.";
 
     // }}}
     // {{{ constructor
 
-    function OrangeReq($_uid, $_sortie)
+    public function __construct(User &$_user, $_sortie)
     {
-        $this->Validate($_uid, true, 'orange');
+        parent::__construct($_user, true, 'orange');
         $this->promo_sortie  = $_sortie;
-        $res = XDB::query("SELECT promo FROM auth_user_md5 WHERE user_id = {?}", $_uid);
-        $this->promo = $res->fetchOneCell(); 
+        $res = XDB::query("SELECT promo FROM auth_user_md5 WHERE user_id = {?}", $_user->id());
     }
 
     // }}}
     // {{{ function formu()
 
-    function formu()
-    { return 'include/form.valid.orange.tpl'; }
+    public function formu()
+    {
+        return 'include/form.valid.orange.tpl';
+    }
 
     // }}}
     // {{{ function _mail_subj()
 
-    function _mail_subj()
+    protected function _mail_subj()
     {
-        return "[Polytechnique.org/ORANGE] Changement de nom de promo de sortie";
+        return "[Polytechnique.org/ORANGE] Changement de promo de sortie";
     }
 
     // }}}
     // {{{ function _mail_body
 
-    function _mail_body($isok)
+    protected function _mail_body($isok)
     {
         if ($isok) {
             $res = "  La demande de changement de promo de sortie que tu as demandée vient d'être effectuée.";
@@ -75,9 +75,9 @@ class OrangeReq extends Validate
     // }}}
     // {{{ function commit()
 
-    function commit()
+    public function commit()
     {
-        XDB::execute("UPDATE auth_user_md5 set promo_sortie={?} WHERE user_id={?}",$this->promo_sortie ,$this->uid);
+        XDB::execute("UPDATE auth_user_md5 set promo_sortie = {?} WHERE user_id = {?}",$this->promo_sortie, $this->user->id());
         return true;
     }