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 60cceff..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
@@ -90,12 +82,11 @@ class Validate
      */
     function Validate($_uid, $_unique, $_type)
     {
-        global $globals;
         $this->uid    = $_uid;
         $this->stamp  = date('YmdHis');
         $this->unique = $_unique;
         $this->type   = $_type;
-        $res = $globals->xdb->query(
+        $res = XDB::query(
                 "SELECT  u.prenom, u.nom, u.promo, a.alias, b.alias
                    FROM  auth_user_md5 AS u
              INNER JOIN  aliases       AS a ON ( u.user_id=a.id AND a.type='a_vie' )
@@ -112,13 +103,12 @@ class Validate
      */
     function submit ()
     {
-        global $globals;
         if ($this->unique) {
-            $globals->xdb->execute('DELETE FROM requests WHERE user_id={?} AND type={?}', $this->uid, $this->type);
+            XDB::execute('DELETE FROM requests WHERE user_id={?} AND type={?}', $this->uid, $this->type);
         }
        
         $this->stamp = date('YmdHis');
-        $globals->xdb->execute('INSERT INTO requests (user_id, type, data, stamp) VALUES ({?}, {?}, {?}, {?})',
+        XDB::execute('INSERT INTO requests (user_id, type, data, stamp) VALUES ({?}, {?}, {?}, {?})',
                 $this->uid, $this->type, $this, $this->stamp);
 
         return true;
@@ -129,8 +119,7 @@ class Validate
 
     function update ()
     {
-        global $globals;
-        $globals->xdb->execute('UPDATE requests SET data={?}, stamp=stamp
+        XDB::execute('UPDATE requests SET data={?}, stamp=stamp
                                  WHERE user_id={?} AND type={?} AND stamp={?}',
                                  $this, $this->uid, $this->type, $this->stamp);
 
@@ -145,12 +134,11 @@ class Validate
      */
     function clean ()
     {
-        global $globals;
         if ($this->unique) {
-            return $globals->xdb->execute('DELETE FROM requests WHERE user_id={?} AND type={?}',
+            return XDB::execute('DELETE FROM requests WHERE user_id={?} AND type={?}',
                     $this->uid, $this->type);
         } else {
-            return $globals->xdb->execute('DELETE FROM requests WHERE user_id={?} AND type={?} AND stamp={?}',
+            return XDB::execute('DELETE FROM requests WHERE user_id={?} AND type={?} AND stamp={?}',
                     $this->uid, $this->type, $this->stamp);
         }
     }
@@ -170,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;
@@ -181,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";
 
@@ -262,11 +250,10 @@ class Validate
      */
     function get_request($uid, $type, $stamp = -1)
     {
-        global $globals;
         if ($stamp == -1) {
-            $res = $globals->xdb->query('SELECT data FROM requests WHERE user_id={?} and type={?}', $uid, $type);
+            $res = XDB::query('SELECT data FROM requests WHERE user_id={?} and type={?}', $uid, $type);
         } else {
-            $res = $globals->xdb->query("SELECT data, stamp FROM requests WHERE user_id={?} AND type={?} and stamp={?}", $uid, $type, $stamp);
+            $res = XDB::query("SELECT data, stamp FROM requests WHERE user_id={?} AND type={?} and stamp={?}", $uid, $type, $stamp);
         }
         if ($result = $res->fetchOneCell()) {
             $result = unserialize($result);
@@ -309,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: */
 ?>