X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fenv.php;h=e3bbd88da2a075e988bdda9d823ddf15df1853a2;hb=cf717526ca30dc21c337bf7710c02df8583b11f8;hp=22a5b7d1fdc96dbab008436f0c29ff0b49111b87;hpb=fd8d40e7411aaad6191d3cc2caae8a1c9bc87585;p=platal.git

diff --git a/classes/env.php b/classes/env.php
index 22a5b7d..e3bbd88 100644
--- a/classes/env.php
+++ b/classes/env.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -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) {
@@ -162,13 +202,6 @@ function fix_gpc_magic(&$item, $key) {
         $item = stripslashes($item);
     }
 }
-function fix_encoding(&$item, $key = null) {
-    if (is_array($item)) {
-        array_walk($item, 'fix_encoding');
-    } elseif (preg_match('/[\x80-\x9f]/', $item)) {
-        $item = iconv('CP1252', 'ISO-8859-15//TRANSLIT', $item);
-    }
-}
 
 if (ini_get('magic_quotes_gpc') && empty($DONT_FIX_GPC)) {
     array_walk($_GET, 'fix_gpc_magic');
@@ -176,12 +209,6 @@ if (ini_get('magic_quotes_gpc') && empty($DONT_FIX_GPC)) {
     array_walk($_COOKIE, 'fix_gpc_magic');
     array_walk($_REQUEST, 'fix_gpc_magic');
 }
-if (empty($DONT_FIX_ENCODING)) {
-    array_walk($_GET, 'fix_encoding');
-    array_walk($_POST, 'fix_encoding');
-    array_walk($_COOKIE, 'fix_encoding');
-    array_walk($_REQUEST, 'fix_encoding');
-}
 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>