X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fenv.php;h=7d67d4a306533f730284810728501e73f04468bc;hb=7446ea512d015e4b6b07ed378bed4bb9fd5418ba;hp=23ebd50abacd7ffeceb02063e81dce3f8baebc46;hpb=42a50827dc2ac2b13ddaf77ea16c0989cd8b960d;p=platal.git

diff --git a/classes/env.php b/classes/env.php
index 23ebd50..7d67d4a 100644
--- a/classes/env.php
+++ b/classes/env.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,215 +21,290 @@
 
 class Env
 {
-    // {{{ function _get
-
-    function _get($key, $default)
+    public static function _get($key, $default)
     {
         return isset($_REQUEST[$key]) ? $_REQUEST[$key] : $default;
     }
 
-    // }}}
-    // {{{ function has
-
-    function has($key)
+    public static function has($key)
     {
         return isset($_REQUEST[$key]);
     }
 
-    // }}}
-    // {{{ function kill
-
-    function kill($key)
+    public static function kill($key)
     {
         unset($_REQUEST[$key]);
     }
 
-    // }}}
-    // {{{ function v
-
-    function v($key, $default = null)
+    public static function v($key, $default = null)
     {
         return Env::_get($key, $default);
     }
 
-    // }}}
-    // {{{ function b
+    public static function s($key, $default = '')
+    {
+        return (string)Env::_get($key, $default);
+    }
+
+    public static function t($key, $default = '')
+    {
+        return trim(Env::s($key, $default));
+    }
+
+    public static function blank($key, $strict = false)
+    {
+        if (!Env::has($key)) {
+            return true;
+        }
+        $var = $strict ? Env::s($key) : Env::t($key);
+        return empty($var);
+    }
 
-    function b($key, $default = false)
+    public static function b($key, $default = false)
     {
         return (bool)Env::_get($key, $default);
     }
 
-    // }}}
-    // {{{ function i
+    public static function i($key, $default = 0)
+    {
+        $i = to_integer(Env::_get($key, $default));
+        return $i === false ? $default : $i;
+    }
 
-    function i($key, $default = 0)
+    public static function l(array $keys)
     {
-        $i = Env::_get($key, $default);
-        return is_numeric($i) ? intval($i) : $default;
+        return array_map(array('Env', 'v'), $keys);
     }
 
-    // }}}
-}
+    public static function set($key, $value)
+    {
+        $_REQUEST[$key] =& $value;
+    }
 
+    public static function bootstrap($key, $value)
+    {
+        if (!Env::has($key)) {
+            Env::set($key, $value);
+        }
+    }
+}
 
 class Post
 {
-    // {{{ function _get
-
-    function _get($key, $default)
+    public static function _get($key, $default)
     {
         return isset($_POST[$key]) ? $_POST[$key] : $default;
     }
 
-    // }}}
-    // {{{ function has
-
-    function has($key)
+    public static function has($key)
     {
         return isset($_POST[$key]);
     }
 
-    // }}}
-    // {{{ function kill
-
-    function kill($key)
+    public static function kill($key)
     {
         unset($_POST[$key]);
     }
 
-    // }}}
-    // {{{ function v
-
-    function v($key, $default = null)
+    public static function v($key, $default = null)
     {
         return Post::_get($key, $default);
     }
 
-    // }}}
-    // {{{ function b
-
-    function b($key, $default = false)
+    public static function b($key, $default = false)
     {
         return (bool)Post::_get($key, $default);
     }
 
-    // }}}
-    // {{{ function i
+    public static function s($key, $default = '')
+    {
+        return (string)Post::_get($key, $default);
+    }
+
+    public static function t($key, $default = '')
+    {
+        return trim(Post::s($key, $default));
+    }
+
+    public static function blank($key, $strict = false)
+    {
+        if (!Post::has($key)) {
+            return true;
+        }
+        $var = $strict ? Post::s($key) : Post::t($key);
+        return empty($var);
+    }
+
+    public static function i($key, $default = 0)
+    {
+        $i = to_integer(Post::_get($key, $default));
+        return $i === false ? $default : $i;
+    }
+
+     public static function l(array $keys)
+    {
+        return array_map(array('Post', 'v'), $keys);
+    }
 
-    function i($key, $default = 0)
+    public static function set($key, $value)
     {
-        $i = Post::_get($key, $default);
-        return is_numeric($i) ? intval($i) : $default;
+        $_POST[$key] =& $value;
+        Env::set($key, $value);
     }
 
-    // }}}
+    public static function bootstrap($key, $value)
+    {
+        if (!Post::has($key)) {
+            Post::set($key, $value);
+        }
+    }
 }
 
 class Get
 {
-    // {{{ function _get
-
-    function _get($key, $default)
+    public static function _get($key, $default)
     {
         return isset($_GET[$key]) ? $_GET[$key] : $default;
     }
 
-    // }}}
-    // {{{ function has
-
-    function has($key)
+    public static function has($key)
     {
         return isset($_GET[$key]);
     }
 
-    // }}}
-    // {{{ function kill
-
-    function kill($key)
+    public static function kill($key)
     {
         unset($_GET[$key]);
     }
 
-    // }}}
-    // {{{ function v
-
-    function v($key, $default = null)
+    public static function v($key, $default = null)
     {
         return Get::_get($key, $default);
     }
 
-    // }}}
-    // {{{ function b
-
-    function b($key, $default = false)
+    public static function b($key, $default = false)
     {
         return (bool)Get::_get($key, $default);
     }
 
-    // }}}
-    // {{{ function i
+    public static function s($key, $default = '')
+    {
+        return (string)Get::_get($key, $default);
+    }
+
+    public static function t($key, $default = '')
+    {
+        return trim(Get::s($key, $default));
+    }
+
+    public static function blank($key, $strict = false)
+    {
+        if (!Get::has($key)) {
+            return true;
+        }
+        $var = $strict ? Get::s($key) : Get::t($key);
+        return empty($var);
+    }
+
+    public static function i($key, $default = 0)
+    {
+        $i = to_integer(Get::_get($key, $default));
+        return $i === false ? $default : $i;
+    }
+
+    public static function l(array $keys)
+    {
+        return array_map(array('Get', 'v'), $keys);
+    }
 
-    function i($key, $default = 0)
+    public static function set($key, $value)
     {
-        $i = Get::_get($key, $default);
-        return is_numeric($i) ? intval($i) : $default;
+        $_GET[$key] =& $value;
+        Env::set($key, $value);
     }
 
-    // }}}
+    public static function bootstrap($key, $value)
+    {
+        if (!Get::has($key)) {
+            Get::set($key, $value);
+        }
+    }
 }
 
 class Cookie
 {
-    // {{{ function _get
-
-    function _get($key, $default)
+    public static function _get($key, $default)
     {
+        global $globals;
+        $key = $globals->cookie_ns . $key;
         return isset($_COOKIE[$key]) ? $_COOKIE[$key] : $default;
     }
 
-    // }}}
-    // {{{ function has
-
-    function has($key)
+    public static function has($key)
     {
+        global $globals;
+        $key = $globals->cookie_ns . $key;
         return isset($_COOKIE[$key]);
     }
 
-    // }}}
-    // {{{ function kill
-
-    function kill($key)
+    public static function kill($key)
     {
+        global $globals;
+        $key = $globals->cookie_ns . $key;
+        setcookie($key, '', time() - 3600, $globals->cookie_path);
         unset($_COOKIE[$key]);
     }
 
-    // }}}
-    // {{{ function v
+    public static function set($key, $value, $days, $secure = false) {
+        global $globals;
+        $key = $globals->cookie_ns . $key;
+        if (!$secure || @$_SERVER['HTTPS']) {
+            setcookie($key, $value, time() + 86400 * $days, $globals->cookie_path, '',
+                      $secure, $secure);
+            $_COOKIE[$key] = $value;
+            Env::set($key, $value);
+        }
+    }
 
-    function v($key, $default = null)
+    public static function v($key, $default = null)
     {
         return Cookie::_get($key, $default);
     }
 
-    // }}}
-    // {{{ function b
+    public static function s($key, $default = '')
+    {
+        return (string)Cookie::_get($key, $default);
+    }
 
-    function b($key, $default = false)
+    public static function t($key, $default = '')
     {
-        return (bool)Cookie::_get($key, $default);
+        return trim(Cookie::s($key, $default));
     }
 
-    // }}}
-    // {{{ function i
+    public static function blank($key, $strict = false)
+    {
+        if (!Cookie::has($key)) {
+            return true;
+        }
+        $var = $strict ? Cookie::s($key) : Cookie::t($key);
+        return empty($var);
+    }
 
-    function i($key, $default = 0)
+    public static function b($key, $default = false)
     {
-        $i = Cookie::_get($key, $default);
-        return is_numeric($i) ? intval($i) : $default;
+        return (bool)Cookie::_get($key, $default);
     }
 
-    // }}}
+    public static function i($key, $default = 0)
+    {
+        $i = to_integer(Cookie::_get($key, $default));
+        return $i === false ? $default : $i;
+    }
+
+    public static function l(array $keys)
+    {
+        return array_map(array('Cookie', 'v'), $keys);
+    }
 }
 
 function fix_gpc_magic(&$item, $key) {
@@ -247,5 +322,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:
 ?>