Implements Diogenes' clean_request in Env classes

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1814 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/classes/env.php b/classes/env.php
index aed838b..378305f 100644 (file)
--- a/classes/env.php
+++ b/classes/env.php
@@ -41,6 +41,11 @@ class Env
         return Env::_get($key, $default);
     }
 
+    public static function s($key, $default = '') 
+    { 
+        return (string)Env::_get($key, $default); 
+    } 
+
     public static function b($key, $default = false)
     {
         return (bool)Env::_get($key, $default);
@@ -51,6 +56,11 @@ class Env
         $i = Env::_get($key, $default);
         return is_numeric($i) ? intval($i) : $default;
     }
+
+    public static function l(array $keys)
+    {
+        return array_map(array('Env', 'v'), $keys);
+    }
 }
 
 class Post
@@ -80,11 +90,21 @@ class Post
         return (bool)Post::_get($key, $default);
     }
 
+    public static function s($key, $default = '') 
+    { 
+        return (string)Post::_get($key, $default); 
+    } 
+
     public static function i($key, $default = 0)
     {
         $i = Post::_get($key, $default);
         return is_numeric($i) ? intval($i) : $default;
     }
+
+     public static function l(array $keys)
+    {
+        return array_map(array('Post', 'v'), $keys);
+    }
 }
 
 class Get
@@ -114,11 +134,21 @@ class Get
         return (bool)Get::_get($key, $default);
     }
 
+    public static function s($key, $default = '')
+    {
+        return (string)Get::_get($key, $default);
+    }
+
     public static function i($key, $default = 0)
     {
         $i = Get::_get($key, $default);
         return is_numeric($i) ? intval($i) : $default;
     }
+
+    public static function l(array $keys)
+    {
+        return array_map(array('Get', 'v'), $keys);
+    }
 }
 
 class Cookie
@@ -143,6 +173,11 @@ class Cookie
         return Cookie::_get($key, $default);
     }
 
+    public static function s($key, $default = '') 
+    {
+        return (string)Cookie::_get($key, $default); 
+    }
+
     public static function b($key, $default = false)
     {
         return (bool)Cookie::_get($key, $default);
@@ -153,6 +188,11 @@ class Cookie
         $i = Cookie::_get($key, $default);
         return is_numeric($i) ? intval($i) : $default;
     }
+
+    public static function l(array $keys)
+    {
+        return array_map(array('Cookie', 'v'), $keys);
+    }
 }
 
 function fix_gpc_magic(&$item, $key) {

diff --git a/classes/session.php b/classes/session.php
index 28a02d2..8fa0db7 100644 (file)
--- a/classes/session.php
+++ b/classes/session.php
@@ -53,12 +53,22 @@ class Session
         return isset($_SESSION[$key]) ? $_SESSION[$key] : $default;
     }
 
+    public static function s($key, $default = '') 
+    {
+        return (string)Session::v($key, $default);
+    } 
+
     public static function i($key, $default = 0)
     {
         $i = Session::v($key, $default);
         return is_numeric($i) ? intval($i) : $default;
     }
 
+    public static function l(array $keys)
+    {
+        return array_map(array('Session', 'v'), $keys);
+    }
+
     public static function has_perms()
     {
         return Session::logged() && Session::v('perms')->hasFlag(PERMS_ADMIN);

diff --git a/modules/payment.php b/modules/payment.php
index 00c9c11..2e9aaa1 100644 (file)
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -30,11 +30,6 @@ function cb_erreur($text) {
     exit;
 }
 
-// schmurtz : hot bugfix
-function clean_request($param) {
-    return $_REQUEST[$param]; 
-}
-
 /* sort en affichant une erreur */
 function paypal_erreur($text, $send=true)
 {
@@ -158,19 +153,19 @@ class PaymentModule extends PLModule
     function handler_cyber_return(&$page, $uid = null)
     {
         /* reference banque (numero de transaction) */
-        $champ901 = clean_request('CHAMP901');
+        $champ901 = Env::s('CHAMP901');
         /* cle d'acceptation */
-        $champ905 = clean_request('CHAMP905');
+        $champ905 = Env::s('CHAMP905');
         /* code retour */
-        $champ906 = clean_request('CHAMP906');
+        $champ906 = Env::s('CHAMP906');
         /* email renvoye par la banque */
-        $champ104 = clean_request('CHAMP104');
+        $champ104 = Env::s('CHAMP104');
         /* reference complete de la commande */
-        $champ200 = clean_request('CHAMP200');
+        $champ200 = Env::s('CHAMP200');
         /* montant de la transaction */
-        $champ201 = clean_request('CHAMP201');
+        $champ201 = Env::s('CHAMP201');
         /* devise */
-        $champ202 = clean_request('CHAMP202');
+        $champ202 = Env::s('CHAMP202');
         $montant = "$champ201 $champ202";
 
         /* on extrait les informations sur l'utilisateur */
@@ -257,19 +252,19 @@ class PaymentModule extends PLModule
         }
 
         /* reference banque (numero de transaction) */
-        $no_transaction = clean_request('tx');
+        $no_transaction = Env::s('tx');
         /* token a renvoyer pour avoir plus d'information */
-        $clef = clean_request('sig');
+        $clef = Env::s('sig');
         /* code retour */
-        $status = clean_request('st');
+        $status = Env::s('st');
         /* raison */
-        $reason = ($status == 'Pending')?clean_request('pending_reason'):clean_request('reason_code');
+        $reason = ($status == 'Pending')? Env::s('pending_reason'): Env::s('reason_code');
         /* reference complete de la commande */
-        $fullref = clean_request('cm');
+        $fullref = Env::s('cm');
         /* montant de la transaction */
-        $montant_nb = clean_request('amt');
+        $montant_nb = Env::s('amt');
         /* devise */
-        $montant_dev = clean_request('cc');
+        $montant_dev = Env::s('cc');
         $montant = "$montant_nb $montant_dev";
 
         /* on extrait le code de retour */