Fixes XSRF token generation for Xnet.

[platal.git] / classes / env.php

diff --git a/classes/env.php b/classes/env.php
index 7e5212a..e3bbd88 100644 (file)
--- a/classes/env.php
+++ b/classes/env.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,101 +21,79 @@
 
 class Env
 {
-    // {{{ public static function _get
-
     public static function _get($key, $default)
     {
         return isset($_REQUEST[$key]) ? $_REQUEST[$key] : $default;
     }
 
-    // }}}
-    // {{{ public static function has
-
     public static function has($key)
     {
         return isset($_REQUEST[$key]);
     }
 
-    // }}}
-    // {{{ public static function kill
-
     public static function kill($key)
     {
         unset($_REQUEST[$key]);
     }
 
-    // }}}
-    // {{{ public static function v
-
     public static function v($key, $default = null)
     {
         return Env::_get($key, $default);
     }
 
-    // }}}
-    // {{{ public static function b
+    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);
     }
 
-    // }}}
-    // {{{ public static function i
-
     public static function i($key, $default = 0)
     {
         $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
 {
-    // {{{ public static function _get
-
     public static function _get($key, $default)
     {
         return isset($_POST[$key]) ? $_POST[$key] : $default;
     }
 
-    // }}}
-    // {{{ public static function has
-
     public static function has($key)
     {
         return isset($_POST[$key]);
     }
 
-    // }}}
-    // {{{ public static function kill
-
     public static function kill($key)
     {
         unset($_POST[$key]);
     }
 
-    // }}}
-    // {{{ public static function v
-
     public static function v($key, $default = null)
     {
         return Post::_get($key, $default);
     }
 
-    // }}}
-    // {{{ public static function b
-
     public static function b($key, $default = false)
     {
         return (bool)Post::_get($key, $default);
     }
 
-    // }}}
-    // {{{ public static function i
+    public static function s($key, $default = '')
+    {
+        return (string)Post::_get($key, $default);
+    }
 
     public static function i($key, $default = 0)
     {
@@ -123,52 +101,43 @@ class Post
         return is_numeric($i) ? intval($i) : $default;
     }
 
-    // }}}
+     public static function l(array $keys)
+    {
+        return array_map(array('Post', 'v'), $keys);
+    }
 }
 
 class Get
 {
-    // {{{ public static function _get
-
     public static function _get($key, $default)
     {
         return isset($_GET[$key]) ? $_GET[$key] : $default;
     }
 
-    // }}}
-    // {{{ public static function has
-
     public static function has($key)
     {
         return isset($_GET[$key]);
     }
 
-    // }}}
-    // {{{ public static function kill
-
     public static function kill($key)
     {
         unset($_GET[$key]);
     }
 
-    // }}}
-    // {{{ public static function v
-
     public static function v($key, $default = null)
     {
         return Get::_get($key, $default);
     }
 
-    // }}}
-    // {{{ public static function b
-
     public static function b($key, $default = false)
     {
         return (bool)Get::_get($key, $default);
     }
 
-    // }}}
-    // {{{ public static function i
+    public static function s($key, $default = '')
+    {
+        return (string)Get::_get($key, $default);
+    }
 
     public static function i($key, $default = 0)
     {
@@ -176,60 +145,54 @@ class Get
         return is_numeric($i) ? intval($i) : $default;
     }
 
-    // }}}
+    public static function l(array $keys)
+    {
+        return array_map(array('Get', 'v'), $keys);
+    }
 }
 
 class Cookie
 {
-    // {{{ public static function _get
-
     public static function _get($key, $default)
     {
         return isset($_COOKIE[$key]) ? $_COOKIE[$key] : $default;
     }
 
-    // }}}
-    // {{{ public static function has
-
     public static function has($key)
     {
         return isset($_COOKIE[$key]);
     }
 
-    // }}}
-    // {{{ public static function kill
-
     public static function kill($key)
     {
         unset($_COOKIE[$key]);
     }
 
-    // }}}
-    // {{{ public static function v
-
     public static function v($key, $default = null)
     {
         return Cookie::_get($key, $default);
     }
 
-    // }}}
-    // {{{ public static function b
+    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);
     }
 
-    // }}}
-    // {{{ public static function i
-
     public static function i($key, $default = 0)
     {
         $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) {
@@ -247,5 +210,5 @@ if (ini_get('magic_quotes_gpc') && empty($DONT_FIX_GPC)) {
     array_walk($_REQUEST, 'fix_gpc_magic');
 }
 
-// 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:
 ?>