diff options
| -rw-r--r-- | lib/exe/js.php | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php index a55783a61..ca9fc68a8 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -91,7 +91,7 @@ function js_out(){ // load files foreach($files as $file){ echo "\n\n/* XXXXXXXXXX begin of $file XXXXXXXXXX */\n\n"; - @readfile($file); + js_load($file); echo "\n\n/* XXXXXXXXXX end of $file XXXXXXXXXX */\n\n"; } @@ -132,7 +132,7 @@ function js_out(){ foreach($plugins as $plugin){ if (@file_exists($plugin)) { echo "\n\n/* XXXXXXXXXX begin of $plugin XXXXXXXXXX */\n\n"; - @readfile($plugin); + js_load($plugin); echo "\n\n/* XXXXXXXXXX end of $plugin XXXXXXXXXX */\n\n"; } } @@ -164,6 +164,27 @@ function js_out(){ } /** + * Load the given file, handle include calls and print it + */ +function js_load($file){ + if(!@file_exists($file)) return; + + $data = io_readFile($file); + while(preg_match('#/\*\s*!!include\s+([\w\./]+)\s*\*/#',$data,$match)){ + $ifile = $match[1]; + if($ifile{0} != '/') $ifile = dirname($file).'/'.$ifile; + + if(@file_exists($ifile)){ + $idata = io_readFile($ifile); + }else{ + $idata = ''; + } + $data = str_replace($match[0],$idata,$data); + } + echo $data; +} + +/** * Checks if a JavaScript Cache file still is valid * * @author Andreas Gohr <andi@splitbrain.org> |