ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tweaking has methods.

Browse Source
This commit is contained in:
Taylor Otwell
2011-06-16 22:45:33 -05:00
parent 73d8e2f2fa
commit 5c275db6f4
4 changed files with 23 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
system/config.php
View File

@@ -24,10 +24,12 @@ class Config {
if(strpos($key, '.') === false) if(strpos($key, '.') === false)
{ {
static::load($key); static::load($key);
return static::$items[$key]; return static::$items[$key];
} }
list($file, $key) = static::parse($key); list($file, $key) = static::parse($key);
static::load($file); static::load($file);
if (array_key_exists($key, static::$items[$file])) if (array_key_exists($key, static::$items[$file]))
@@ -48,6 +50,7 @@ class Config {
public static function set($key, $value) public static function set($key, $value)
{ {
list($file, $key) = static::parse($key); list($file, $key) = static::parse($key);
static::load($file); static::load($file);
static::$items[$file][$key] = $value; static::$items[$file][$key] = $value;

4
system/cookie.php
View File

@@ -95,7 +95,7 @@ class Cookie {
*/ */
public static function has($name) public static function has($name)
{ {
return ! is_null(static::get($key)); return ! is_null(static::get($name));
} }
/** /**
@@ -107,7 +107,7 @@ class Cookie {
*/ */
public static function get($name, $default = null) public static function get($name, $default = null)
{ {
return (array_key_exists($name, $_COOKIE)) ? $_COOKIE[$name] : $default; return Arr::get($_COOKIE, $name, $default);
} }
/** /**

35
system/input.php
View File

@@ -10,21 +10,14 @@ class Input {
public static $input; public static $input;
/** /**
* Determine if the input data contains an item or set of items that are not empty. * Determine if the input data contains an item that is not empty.
* *
* @param string $key
* @return bool * @return bool
*/ */
public static function has() public static function has($key)
{ {
foreach (func_get_args() as $key) return ( ! is_null(static::get($key)) and trim((string) static::get($key)) != '');
{
if (is_null(static::get($key)) or trim((string) static::get($key)) == '')
{
return false;
}
}
return true;
} }
/** /**
@@ -45,22 +38,14 @@ class Input {
} }
/** /**
* Determine if the old input data contains an item or set of * Determine if the old input data contains an item that is not empty.
* items that are not empty.
* *
* @param string $key
* @return bool * @return bool
*/ */
public static function had() public static function had($key)
{ {
foreach (func_get_args() as $key) return ( ! is_null(static::old($key)) and trim((string) static::old($key)) != '');
{
if (is_null(static::old($key)) or trim((string) static::old($key)) == '')
{
return false;
}
}
return true;
} }
/** /**
@@ -72,6 +57,10 @@ class Input {
*/ */
public static function old($key = null, $default = null) public static function old($key = null, $default = null)
{ {
// ----------------------------------------------------------
// Since old input data is flashed to the session, we need
// to make sure a session driver has been specified.
// ----------------------------------------------------------
if (Config::get('session.driver') == '') if (Config::get('session.driver') == '')
{ {
throw new \Exception("Sessions must be enabled to retrieve old input data."); throw new \Exception("Sessions must be enabled to retrieve old input data.");

19
system/session.php
View File

@@ -68,23 +68,16 @@ class Session {
} }
/** /**
* Determine if the session or flash data contains an item or set of items. * Determine if the session or flash data contains an item.
* *
* @param string $key
* @return bool * @return bool
*/ */
public static function has() public static function has($key)
{ {
foreach (func_get_args() as $key) return (array_key_exists($key, static::$session['data']) or
{ array_key_exists(':old:'.$key, static::$session['data']) or
if ( ! array_key_exists($key, static::$session['data']) and array_key_exists(':new:'.$key, static::$session['data']));
! array_key_exists(':old:'.$key, static::$session['data']) and
! array_key_exists(':new:'.$key, static::$session['data']))
{
return false;
}
}
return true;
} }
/** /**