merge xmlrpc stuff, and put it in classes/

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

diff --git a/include/validations.inc.php b/include/validations.inc.php
index fdd0fae..03e82ff 100644 (file)
--- a/include/validations.inc.php
+++ b/include/validations.inc.php
@@ -19,20 +19,15 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-// {{{ DEFINES
-
 define('SIZE_MAX', 32768);
 
-// }}}
-// {{{ class ValidateIterator
-
 /**
  * Iterator class, that lists objects through the database
  */
 class ValidateIterator extends XOrgDBIterator
 {
     // {{{ constuctor
-    
+
     function ValidateIterator ()
     {
         parent::XOrgDBIterator('SELECT data,stamp FROM requests ORDER BY stamp', MYSQL_NUM);
@@ -55,9 +50,6 @@ class ValidateIterator extends XOrgDBIterator
     // }}}
 }
 
-// }}}
-// {{{ class Validate
-
 /** classe "virtuelle" à dériver pour chaque nouvelle implémentation
  */
 class Validate
@@ -166,7 +158,7 @@ class Validate
 
         // ajout d'un commentaire
         if (Env::has('hold') && Env::has('comm')) {
-            $this->comments[] = Array(Session::get('bestalias'), Env::get('comm'));
+            $this->comments[] = Array(S::v('bestalias'), Env::get('comm'));
 
             // envoi d'un mail à hotliners
             global $globals;
@@ -177,7 +169,7 @@ class Validate
             $mailer->addTo("hotliners@{$globals->mail->domain}");
 
             $body = "Validation {$this->type} pour {$this->prenom} {$this->nom}\n\n"
-              . Session::get('bestalias')." a ajouté le commentaire :\n\n" 
+              . S::v('bestalias')." a ajouté le commentaire :\n\n" 
               . Env::get('comm')."\n\n"
               . "cf la discussion sur : ".$globals->baseurl."/admin/valider.php";
 
@@ -304,14 +296,9 @@ class Validate
     // }}}
 }
 
-// }}}
-// {{{ IMPLEMENTATIONS
-
 foreach (glob(dirname(__FILE__).'/validations/*.inc.php') as $file) {
     require_once($file);
 }
 
-// }}}
-
 /* vim: set expandtab shiftwidth=4 tabstop=4 softtabstop=4 foldmethod=marker: */
 ?>