Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tweaking has methods.

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
system/config.php
View File

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

4
system/cookie.php
View File

@ -95,7 +95,7 @@ public function send()
*/
public static function has($name)
{
return ! is_null(static::get($key));
return ! is_null(static::get($name));
}
/**
@ -107,7 +107,7 @@ public static function has($name)
*/
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;
/**
* 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
*/
public static function has()
public static function has($key)
{
foreach (func_get_args() as $key)
{
if (is_null(static::get($key)) or trim((string) static::get($key)) == '')
{
return false;
}
}
return true;
return ( ! is_null(static::get($key)) and trim((string) static::get($key)) != '');
}
/**
@ -45,22 +38,14 @@ public static function get($key = null, $default = null)
}
/**
* Determine if the old input data contains an item or set of
* items that are not empty.
* Determine if the old input data contains an item that is not empty.
*
* @param string $key
* @return bool
*/
public static function had()
public static function had($key)
{
foreach (func_get_args() as $key)
{
if (is_null(static::old($key)) or trim((string) static::old($key)) == '')
{
return false;
}
}
return true;
return ( ! is_null(static::old($key)) and trim((string) static::old($key)) != '');
}
/**
@ -72,6 +57,10 @@ public static function had()
*/
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') == '')
{
throw new \Exception("Sessions must be enabled to retrieve old input data.");

19
system/session.php
View File

@ -68,23 +68,16 @@ public static function load()
}
/**
* 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
*/
public static function has()
public static function has($key)
{
foreach (func_get_args() as $key)
{
if ( ! array_key_exists($key, static::$session['data']) and
! array_key_exists(':old:'.$key, static::$session['data']) and
! array_key_exists(':new:'.$key, static::$session['data']))
{
return false;
}
}
return true;
return (array_key_exists($key, static::$session['data']) or
array_key_exists(':old:'.$key, static::$session['data']) or
array_key_exists(':new:'.$key, static::$session['data']));
}
/**