diff options
Diffstat (limited to 'itjs.class')
| -rw-r--r-- | itjs.class | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -146,7 +146,7 @@ static function filenames($filelist) /** * Return (php-interpreted by default) files that will be sent to client. Files must exist. */ -static function filecontents($filenames, $execphp = true) +static function filecontents($filenames) { foreach ($filenames as $filename) { @@ -155,9 +155,9 @@ static function filecontents($filenames, $execphp = true) { $origget = $_GET; list($filename, $paramstr) = explode("?", $filename); - if ($paramstr && $execphp) + if ($paramstr) parse_str($paramstr, $_GET); - $result .= it::replace(array('^1$' => ""), $execphp ? include($filename) : file_get_contents($filename), array('utf8' => false)); + $result .= it::replace(array('^1$' => ""), it::match('\.(js|css)$', $filename) ? include_once($filename) : it_url::get($filename), array('utf8' => false)); $_GET = $origget; } $result .= ob_get_clean(); @@ -198,15 +198,12 @@ static function checksum($fnlist, $p = array()) foreach (is_array($fnlist) ? $fnlist : itjs::filenames($fnlist) as $filename) $filenames[] = !file_exists($filename) && file_exists($t = it::replace(array('^/www/[^/]*' => "/www/lib.search.ch"), $filename)) ? $t : $filename; - if (preg_grep('/jquery(build)\.js/', $filenames)) # jquery files may be included invisibly - $filenames = array_merge($filenames, array("/www/lib.search.ch/var/jquery-ui/dist/minified/core.min.js", "/www/lib.search.ch/var/jquery/dist/jquery.min.js")); - $key = "itjs_" . md5(join("", it::map('"$v" . @filemtime("$v")', $filenames))); if ($filenames && $p['short_expire'] && (time() - max(@array_map('filemtime', $filenames)) < 60)) return "-"; # trigger short expire, our file may not yet be up to date on other slaves else if ($filenames) - return it_cache::get($key) ?: it_cache::put($key, substr(md5(self::filecontents($filenames, false)), 0, 10), array('ttl' => 60)); + return it_cache::get($key) ?: it_cache::put($key, substr(md5("X" . self::filecontents($filenames)), 0, 10), array('ttl' => 60)); } /** @@ -214,8 +211,8 @@ static function checksum($fnlist, $p = array()) */ function crcurl($url, $p = array()) { - if (it::match('^http', $url)) # remote url, must fetch to crc - list($fn, $short_expire) = array(it_url::get_cache(array('url' => $url, 'maxage' => 3600, 'id' => "itjs_crcurl") + $p), false); + if (it::match('^(http|//)', $url)) # remote url, must fetch to crc + list($fn, $short_expire) = array(it_url::get_cache(array('url' => $url, 'maxage' => 3600, 'safety' => 1, 'id' => "itjs_crcurl") + $p), false); else list($fn, $short_expire) = array(($m = it::match("^//(\w+)(/.*)", $url)) ? "/www/$m[0].search.ch" . $m[1] : $GLOBALS['ULTRAHOME'] . $url, true);; |