| 19,12 → 19,10 |
|---|
| |
| use MatthiasMullie\Minify; |
| |
| require_once __DIR__ . '/includes/oidplus.inc.php'; |
| require_once __DIR__ . '/3p/minify/src/Minify.php'; |
| require_once __DIR__ . '/3p/minify/src/JS.php'; |
| require_once __DIR__ . '/3p/minify/src/Exception.php'; |
| if (file_exists(__DIR__ . '/includes/config.inc.php')) { |
| include_once __DIR__ . '/includes/config.inc.php'; |
| } |
| |
| error_reporting(E_ALL); |
| |
| 57,24 → 55,39 |
|---|
| # --- |
| |
| $minifier = null; |
| $out = ''; |
| |
| foreach ($files as $file) { |
| if (OIDplus::baseConfig()->getValue('MINIFY_JS', true)) { |
| if (is_null($minifier)) { |
| $minifier = new Minify\JS($file); |
| } else { |
| $minifier->add($file); |
| } |
| } else { |
| $out .= file_get_contents($file)."\n"; |
| } |
| } |
| |
| if (defined('RECAPTCHA_ENABLED') && RECAPTCHA_ENABLED) { |
| if (OIDplus::baseConfig()->getValue('RECAPTCHA_ENABLED', false) == true) { |
| if (OIDplus::baseConfig()->getValue('MINIFY_JS', true)) { |
| $minifier->add('oidplus_external_recaptcha();'); |
| } else { |
| $out .= "oidplus_external_recaptcha();\n"; |
| } |
| } |
| |
| if (!defined('DISABLE_MSIE_COMPAT') || !DISABLE_MSIE_COMPAT) { |
| if (OIDplus::baseConfig()->getValue('DISABLE_MSIE_COMPAT', false) == false) { |
| if (OIDplus::baseConfig()->getValue('MINIFY_JS', true)) { |
| $minifier->add('oidplus_external_polyfill();'); |
| } else { |
| $out .= "oidplus_external_polyfill();\n"; |
| } |
| } |
| |
| if (OIDplus::baseConfig()->getValue('MINIFY_JS', true)) { |
| $out = $minifier->minify(); |
| } |
| |
| $etag = md5($out); |
| header("Etag: $etag"); |