adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactoring Dispatcher::asset() to remove code left behind from previous

Browse source 
refactoring.  Simplifies asset location as well.
This commit is contained in:
Mark Story 2010-02-16 23:31:54 -05:00
parent 42a5665660
commit bff7ce6925
1 changed files with 17 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
cake/dispatcher.php
View file

@ -612,46 +612,29 @@ class Dispatcher extends Object {
} }
$controller = null; $controller = null;
$ext = array_pop(explode('.', $url)); $ext = array_pop(explode('.', $url));
$pos = 0;
$parts = explode('/', $url); $parts = explode('/', $url);
$assetFile = null;
if ($parts[0] === 'theme') { if ($parts[0] === 'theme') {
$pos = strlen($parts[0] . $parts[1]) + 1; $themeName = $parts[1];
unset($parts[0], $parts[1]);
$fileFragment = implode('/', $parts);
$viewPaths = App::path('views');
foreach ($viewPaths as $viewPath) {
$path = $viewPath . 'themed' . DS . $themeName . DS . 'webroot' . DS;
if (file_exists($path . $fileFragment)) {
$assetFile = $path . $fileFragment;
break;
}
}
} else { } else {
$pos = strlen($parts[0]); $plugin = $parts[0];
} unset($parts[0]);
$assetFile = null; $fileFragment = implode('/', $parts);
$paths = array(); $pluginWebroot = App::pluginPath($plugin) . 'webroot' . DS;
$matched = false; if (file_exists($pluginWebroot . $fileFragment)) {
$assetFile = $pluginWebroot . $fileFragment;
if ($pos > 0) {
$plugin = substr($url, 0, $pos);
$url = preg_replace('/^' . preg_quote($plugin, '/') . '\//i', '', $url);
if (strpos($plugin, '/') !== false) {
list($plugin, $theme) = explode('/', $plugin);
$themePaths = App::path('views');
foreach ($themePaths as $viewPath) {
$path = $viewPath . 'themed' . DS . $theme . DS . 'webroot' . DS;
if ($plugin === 'theme' && (is_file($path . $url) && file_exists($path . $url))) {
$assetFile = $path . $url;
break;
}
}
}
if ($matched === false) {
$paths[] = App::pluginPath($plugin) . 'webroot' . DS;
}
}
if ($matched === false) {
foreach ($paths as $path) {
if (is_file($path . $url) && file_exists($path . $url)) {
$assetFile = $path . $url;
break;
}
} }
} }