X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fenv.php;h=cecee849f1113f7d5a47bd918565cdbcd7b1354d;hb=4d1c62e006bc896e9ddb59d15dc7a7e30f9eb48e;hp=7e5212aa7213f65ed0f97ac585f2ed6ba7fec05b;hpb=6995a9b92e68cffcf7a8375080f9e5a210acf0af;p=platal.git

diff --git a/classes/env.php b/classes/env.php
index 7e5212a..cecee84 100644
--- a/classes/env.php
+++ b/classes/env.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,101 +21,107 @@
 
 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 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);
+    }
 
     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 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)
     {
@@ -123,52 +129,57 @@ 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 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)
     {
@@ -176,60 +187,85 @@ 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)
     {
+        global $globals;
+        $key = $globals->cookie_ns . $key;
         return isset($_COOKIE[$key]) ? $_COOKIE[$key] : $default;
     }
 
-    // }}}
-    // {{{ public static function has
-
     public static function has($key)
     {
+        global $globals;
+        $key = $globals->cookie_ns . $key;
         return isset($_COOKIE[$key]);
     }
 
-    // }}}
-    // {{{ public static function kill
-
     public static function kill($key)
     {
+        global $globals;
+        $key = $globals->cookie_ns . $key;
+        setcookie($key, '', time() - 3600, $globals->cookie_path);
         unset($_COOKIE[$key]);
     }
 
-    // }}}
-    // {{{ public static 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;
+        }
+    }
 
     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 t($key, $default = '')
+    {
+        return trim(Cookie::s($key, $default));
+    }
+
+    public static function blank($key, $strict = false)
+    {
+        if (!Cookie::has($key)) {
+            return true;
+        }
+        $var = $strict ? Cookie::s($key) : Cookie::t($key);
+        return empty($var);
+    }
 
     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 +283,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:
 ?>