update validations

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-281

diff --git a/htdocs/alias.php b/htdocs/alias.php
index e4b14ec..ef3b17c 100644 (file)
--- a/htdocs/alias.php
+++ b/htdocs/alias.php
@@ -27,7 +27,7 @@ new_skinned_page('alias.tpl', AUTH_MDP);
 $uid     = Session::getInt('uid');
 $forlife = Session::get('forlife');
 
-$page->assign('demande', AliasReq::get_unique_request($uid));
+$page->assign('demande', AliasReq::get_request($uid));
 
 //Récupération des alias éventuellement existants
 $res = $globals->xdb->query(

diff --git a/htdocs/getphoto.php b/htdocs/getphoto.php
index 815b35f..5283ecf 100644 (file)
--- a/htdocs/getphoto.php
+++ b/htdocs/getphoto.php
@@ -26,8 +26,9 @@ new_skinned_page('login.tpl', AUTH_PUBLIC);
 if (Env::has('x')) {
     if (Env::get('req') == "true") {
         include 'validations.inc.php';
-       $myphoto = PhotoReq::get_unique_request(Env::get('x'));
-       Header('Content-type: image/'.$myphoto->mimetype);
+        $res = $globals->xdb->query("SELECT id FROM aliases WHERE alias = {?}", Env::get('x'));
+       $myphoto = PhotoReq::get_request($a = $res->fetchOneCell());
+        Header('Content-type: image/'.$myphoto->mimetype);
        echo $myphoto->data;
     } else {
         $res = $globals->xdb->query(

diff --git a/include/validations.inc.php b/include/validations.inc.php
index 3fb629d..cb72667 100644 (file)
--- a/include/validations.inc.php
+++ b/include/validations.inc.php
@@ -224,34 +224,6 @@ class Validate
     }
     
     // }}}
-    // --- VIRTUAL FUNCTIONS ---
-    // {{{ function get_unique_request
-    
-    /** fonction statique qui renvoie la requête dans le cas d'un objet unique de l'utilisateur d'id $uid
-     * @param   $uid    l'id de l'utilisateur concerné
-     * @param   $type   le type de la requête
-     *
-     * XXX fonction "statique" XXX
-     * XXX à dériver XXX
-     * à utiliser uniquement pour récupérer un objet <strong>unique</strong>
-     */
-    function get_unique_request($uid, $type)
-    {
-        global $globals;
-        $res = $globals->xdb->query('SELECT data FROM requests WHERE user_id={?} and type={?}', $uid, $type);
-        if ($result = $res->fetchOneCell()) {
-            $result = unserialize($result);
-            if (!$result->unique) { // on vérifie que c'est tout de même bien un objet unique
-                $result = false;
-            }
-        } else {
-            $result = false;
-        }
-        
-        return $result;
-    }
-
-    // }}}
     // {{{ function get_request()
 
     /** fonction statique qui renvoie la requête de l'utilisateur d'id $uidau timestamp $t
@@ -262,11 +234,14 @@ class Validate
      * XXX fonction "statique" XXX
      * à utiliser uniquement pour récupérer un objet dans la BD avec Validate::get_request(...)
      */
-    function get_request($uid, $type, $stamp)
+    function get_request($uid, $type, $stamp = -1)
     {
         global $globals;
-        $res = $globals->xdb->query("SELECT data, stamp FROM requests WHERE user_id={?} AND type={?} and stamp={?}",
-                $uid, $type, $stamp);
+        if ($stamp == -1) {
+            $res = $globals->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);
+        }
         if ($result = $res->fetchOneCell()) {
             $result = unserialize($result);
         } else {

diff --git a/include/validations/aliases.inc.php b/include/validations/aliases.inc.php
index 5c455b9..5207382 100644 (file)
--- a/include/validations/aliases.inc.php
+++ b/include/validations/aliases.inc.php
@@ -27,6 +27,7 @@ class AliasReq extends Validate
 
     var $alias;
     var $raison;
+    var $unique = true;
 
     var $old='';
 
@@ -51,11 +52,11 @@ class AliasReq extends Validate
     }
 
     // }}}
-    // {{{ function get_unique_request()
+    // {{{ function get_request()
 
-    function get_unique_request($uid)
+    function get_request($uid)
     {
-        return parent::get_unique_request($uid,'alias');
+        return parent::get_request($uid,'alias');
     }
 
     // }}}

diff --git a/include/validations/epouses.inc.php b/include/validations/epouses.inc.php
index 20ab95e..45d6227 100644 (file)
--- a/include/validations/epouses.inc.php
+++ b/include/validations/epouses.inc.php
@@ -25,6 +25,8 @@ class EpouseReq extends Validate
 {
     // {{{ properties
 
+    var $unique = true;
+
     var $epouse;
     var $alias = '';
 
@@ -55,11 +57,11 @@ class EpouseReq extends Validate
     }
 
     // }}}
-    // {{{ function get_unique_request()
+    // {{{ function get_request()
 
-    function get_unique_request($uid)
+    function get_request($uid)
     {
-        return parent::get_unique_request($uid,'epouse');
+        return parent::get_request($uid,'epouse');
     }
 
     // }}}

diff --git a/include/validations/evts.inc.php b/include/validations/evts.inc.php
index 2469e3d..4d67aa7 100644 (file)
--- a/include/validations/evts.inc.php
+++ b/include/validations/evts.inc.php
@@ -24,7 +24,7 @@
 class EvtReq extends Validate
 {
     // {{{ properties
-    
+
     var $evtid;
     var $titre;
     var $texte;
@@ -48,14 +48,6 @@ class EvtReq extends Validate
     }
 
     // }}}
-    // {{{ function get_unique_request()
-    
-    function get_unique_request($uid)
-    {
-        return false;  //non unique
-    }
-
-    // }}}
     // {{{ function formu()
 
     function formu()

diff --git a/include/validations/listes.inc.php b/include/validations/listes.inc.php
index 53187b1..70fa74d 100644 (file)
--- a/include/validations/listes.inc.php
+++ b/include/validations/listes.inc.php
@@ -53,14 +53,6 @@ class ListeReq extends Validate
     }
 
     // }}}
-    // {{{ function get_unique_request()
-
-    function get_unique_request($uid)
-    {
-        return parent::get_unique_request($uid,'liste');
-    }
-
-    // }}}
     // {{{ function formu()
 
     function formu()

diff --git a/include/validations/photos.inc.php b/include/validations/photos.inc.php
index 3d0a91e..5361a6f 100644 (file)
--- a/include/validations/photos.inc.php
+++ b/include/validations/photos.inc.php
@@ -30,6 +30,8 @@ class PhotoReq extends Validate
     var $x;
     var $y;
 
+    var $unique = true;
+
     // }}}
     // {{{ constructor
    
@@ -93,11 +95,11 @@ class PhotoReq extends Validate
     }
     
     // }}}
-    // {{{ function get_unique_request()
+    // {{{ function get_request()
 
-    function get_unique_request($uid)
+    function get_request($uid)
     {
-        return parent::get_unique_request($uid,'photo');
+        return parent::get_request($uid,'photo');
     }
 
     // }}}