Skip to content

Commit 3c10b59

Browse files
cauldcauld
committed
Better handling of CSS image path replacements within the local combo handler
1 parent 3deb693 commit 3c10b59

File tree

4 files changed

+67
-22
lines changed

4 files changed

+67
-22
lines changed

‎INSTALL

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on a remote combo-service.
2121
this file in the same location as loader.php.
2222

2323
Note: If the phploader directory does not live in the webserver's root
24-
folder then modify the PATH_TO_LOADER variable in combo.php accordingly.
24+
folder then modify the PATH_TO_LIB variable in combo.php accordingly.
2525

2626
2. Download and extract each version of YUI you intend to support into
2727
the phploader/lib directory.

‎examples/phploader-advanced_source.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?PHP
22
include("./inc/config.inc");
33
include("../phploader/loader.php");
4-
$loader = new YAHOO_util_Loader($yuiCurrentVersion); //$customModules
4+
$loader = new YAHOO_util_Loader($yuiCurrentVersion);
55

66
//Specify YUI components to load
77
$loader->load("calendar");

‎phploader/combo.php

+38-20
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
this file in the same location as loader.php.
1616
1717
Note: If the phploader directory does not live in the webserver's root
18-
folder then modify the PATH_TO_LOADER variable in combo.php accordingly
18+
folder then modify the PATH_TO_LIB variable accordingly
1919
2020
2. Download and extract each version of YUI you intend to support into
2121
the phploader/lib directory.
@@ -26,31 +26,23 @@
2626
etc...
2727
*/
2828

29+
require "./combo_functions.inc.php";
30+
2931
//Web accessible path to the YUI PHP loader lib directory (Override as needed)
30-
define("PATH_TO_LOADER", server() . "/phploader/lib/");
32+
define("PATH_TO_LIB", server() . "/phploader/lib/");
3133

3234
//APC Configuration
3335
define("APC_AVAIL", function_exists('apc_fetch') ? true : false);
3436
define("APC_TTL", 0);
3537

36-
//server(): Computes the base URL of the current page (protocol, server, path)
37-
//credit: http://code.google.com/p/simple-php-framework/ (modified version of full_url), license: MIT
38-
function server()
39-
{
40-
$s = getenv('HTTPS') ? '' : (getenv('HTTPS') == 'on') ? 's' : '';
41-
$protocol = substr(strtolower(getenv('SERVER_PROTOCOL')), 0, strpos(strtolower(getenv('SERVER_PROTOCOL')), '/')) . $s;
42-
$port = (getenv('SERVER_PORT') == '80') ? '' : (":".getenv('SERVER_PORT'));
43-
return $protocol . "://" . getenv('HTTP_HOST') . $port;
44-
}
45-
4638
$queryString = getenv('QUERY_STRING') ? urldecode(getenv('QUERY_STRING')) : '';
4739
if (isset($queryString) && !empty($queryString)) {
4840
$yuiFiles = explode("&", $queryString);
4941
$contentType = strpos($yuiFiles[0], ".js") ? 'application/x-javascript' : ' text/css';
5042

5143
$cache = false;
5244
if (APC_AVAIL === true) {
53-
$cache = apc_fetch('combo:'.$queryString);
45+
//$cache = apc_fetch('combo:'.$queryString);
5446
}
5547

5648
if ($cache) {
@@ -68,8 +60,15 @@ function server()
6860

6961
include("./loader.php");
7062
$loader = new YAHOO_util_Loader($yuiVersion);
71-
$base = PATH_TO_LOADER . $yuiVersion . "/build/";
72-
$loader->base = $base;
63+
$base = PATH_TO_LIB . $yuiVersion . "/build/";
64+
$baseWithoutBuild = PATH_TO_LIB . $yuiVersion . "/";
65+
$loader->base = $base;
66+
67+
//Verify this version of the library exists locally
68+
$localPathToBuild = "../lib/" . $yuiVersion . "/build/";
69+
if (file_exists($localPathToBuild) === false || is_readable($localPathToBuild ) === false) {
70+
die('<!-- Unable to locate the YUI build directory! -->');
71+
}
7372

7473
//Detect and load the required components now
7574
$yuiComponents = array();
@@ -97,11 +96,30 @@ function server()
9796
}
9897
echo $rawScript;
9998
} else {
100-
$rawCSS = $loader->css_raw();
101-
//Handle image path corrections
102-
$rawCSS = preg_replace('/((url\()(\w+)(.*);)/', '${2}'. $base . '${3}${4}', $rawCSS); // subdirs
103-
$rawCSS = preg_replace('/(\.\.\/)+/', $base, $rawCSS); // relative pathes
104-
$rawCSS = str_replace("url(/", "url($base", $rawCSS); // url(/whatever)
99+
$rawCSS = '';
100+
$cssResourceList = $loader->css_data();
101+
foreach ($cssResourceList["css"] as $cssResource=>$val) {
102+
foreach($cssResourceList["css"][$cssResource] as $key=>$value) {
103+
$crtResourceBase = substr($key, 0, strrpos($key, "/") + 1);
104+
$crtResourceContent = $loader->getRemoteContent($key);
105+
106+
//Handle image path corrections (order is important)
107+
$crtResourceContent = preg_replace('/((url\()(\w+)(.*);)/', '${2}'. $crtResourceBase . '${3}${4}', $crtResourceContent); // subdirs (e.g) url(foo/foo.png)
108+
$crtResourceContent = preg_replace('/(url\([^\.\/]\))+/', $crtResourceBase, $crtResourceContent); // just filename (e.g.) url(picker_mask.png)
109+
$crtResourceContent = str_replace("url(/", "url($crtResourceBase", $crtResourceContent); // slash filename (e.g.) url(/whatever)
110+
$crtResourceContent = preg_replace('/(\.\.\/)+/', $crtResourceBase, $crtResourceContent); // relative pathes (e.g.) url(../../foo.png)
111+
$crtResourceContent = preg_replace_callback(
112+
'/AlphaImageLoader\(src=[\'"](.*?)[\'"]/',
113+
'alphaImageLoaderPathCorrection',
114+
$crtResourceContent
115+
); // AlphaImageLoader relative pathes (e.g.) AlphaImageLoader(src='../../foo.png')
116+
117+
$rawCSS .= $crtResourceContent;
118+
}
119+
}
120+
121+
//Cleanup build path dups caused by relative pathes that already included the build directory
122+
$rawCSS = str_replace("/build/build/", "/build/", $rawCSS);
105123

106124
if (APC_AVAIL === true) {
107125
apc_store('combo:'.$queryString, $rawCSS, APC_TTL);

‎phploader/combo_functions.inc.php

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?PHP
2+
/**
3+
* Copyright (c) 2009, Yahoo! Inc. All rights reserved.
4+
* Code licensed under the BSD License:
5+
* http://developer.yahoo.net/yui/license.html
6+
* version: 1.0.0b2
7+
*/
8+
9+
//server(): Computes the base URL of the current page (protocol, server, path)
10+
//credit: http://code.google.com/p/simple-php-framework/ (modified version of full_url), license: MIT
11+
function server()
12+
{
13+
$s = getenv('HTTPS') ? '' : (getenv('HTTPS') == 'on') ? 's' : '';
14+
$protocol = substr(strtolower(getenv('SERVER_PROTOCOL')), 0, strpos(strtolower(getenv('SERVER_PROTOCOL')), '/')) . $s;
15+
$port = (getenv('SERVER_PORT') == '80') ? '' : (":".getenv('SERVER_PORT'));
16+
return $protocol . "://" . getenv('HTTP_HOST') . $port;
17+
}
18+
19+
function alphaImageLoaderPathCorrection($matches) {
20+
global $crtResourceBase;
21+
22+
$matchedFile = substr($matches[1], strrpos($matches[1], "/") + 1);
23+
$newFilePath = 'AlphaImageLoader(src=\'' . $crtResourceBase . $matchedFile . '\'';
24+
25+
return $newFilePath;
26+
}
27+
?>

0 commit comments

Comments
 (0)