adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-05 19:12:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moving Router::__filter() to Set::filter()

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4867 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2007-04-17 07:00:26 +00:00
parent 9a865176aa
commit e5b0f2e3fa
2 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

33
cake/libs/router.php
View file

@ -190,7 +190,7 @@ class Router extends Object {
return array($route, '/^[\/]*$/', array(), $default, array());
} else {
$names = array();
$elements = $this->__filter(array_map('trim', explode('/', $route)));
$elements = Set::filter(array_map('trim', explode('/', $route)));
if (!count($elements)) {
return false;
@ -262,7 +262,7 @@ class Router extends Object {
}
}
foreach($_this->__filter($r, true) as $key => $found) {
foreach(Set::filter($r, true) as $key => $found) {
// if $found is a named url element (i.e. ':action')
if (isset($names[$key])) {
$out[$names[$key]] = $found;
@ -405,23 +405,6 @@ class Router extends Object {
$_this->{$key} = $val;
}
}
/**
* Filters empty elements out of a route array, excluding '0'.
*
* @return mixed
*/
function __filter($var, $isArray = false) {
if (is_array($var) && (!empty($var) || $isArray)) {
$_this =& Router::getInstance();
return array_filter($var, array(&$_this, '__filter'));
} else {
if($var === '0' || !empty($var)) {
return true;
} else {
return false;
}
}
}
/**
* Finds URL for specified action.
*
@ -527,7 +510,7 @@ class Router extends Object {
$url['action'] = null;
}
$urlOut = $_this->__filter(array($url['plugin'], $url['controller'], $url['action']));
$urlOut = Set::filter(array($url['plugin'], $url['controller'], $url['action']));
if($url['plugin'] == $url['controller']) {
array_shift($urlOut);
@ -540,17 +523,17 @@ class Router extends Object {
if (!empty($args)) {
if($output{strlen($output)-1} == '/') {
$output .= join('/', $_this->__filter($args, true));
$output .= join('/', Set::filter($args, true));
} else {
$output .= '/'. join('/', $_this->__filter($args, true));
$output .= '/'. join('/', Set::filter($args, true));
}
}
if (!empty($named)) {
if($output{strlen($output)-1} == '/') {
$output .= join('/', $_this->__filter($named, true));
$output .= join('/', Set::filter($named, true));
} else {
$output .= '/'. join('/', $_this->__filter($named, true));
$output .= '/'. join('/', Set::filter($named, true));
}
}
@ -657,7 +640,7 @@ class Router extends Object {
$_this =& Router::getInstance();
if (isset($params['pass']) && is_array($params['pass'])) {
$_this->__mapped = $params['pass'];
$params['pass'] = implode('/', $_this->__filter($params['pass'], true));
$params['pass'] = implode('/', Set::filter($params['pass'], true));
} elseif (!isset($params['pass'])) {
$params['pass'] = '';
}

17
cake/libs/set.php
View file

@ -104,6 +104,23 @@ class Set extends Object {
}
return $r;
}
/**
* Filters empty elements out of a route array, excluding '0'.
*
* @return mixed
*/
function filter($var, $isArray = false) {
if (is_array($var) && (!empty($var) || $isArray)) {
$set = new Set();
return array_filter($var, array(&$set, 'filter'));
} else {
if ($var === 0 || $var === '0' || !empty($var)) {
return true;
} else {
return false;
}
}
}
/**
* Pushes the differences in $array2 onto the end of $array
*