Subversion Repositories oidplus

Rev

Rev 218 | Rev 277 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 218 Rev 261
Line 17... Line 17...
17 
 * limitations under the License.
 17 
 * limitations under the License.
18 
 */
 18 
 */
19 
 
 19 
 
20 
use MatthiasMullie\Minify;
 20 
use MatthiasMullie\Minify;
21 
 
 21 
 
- 
 
 22 
require_once __DIR__ . '/includes/oidplus.inc.php';
22 
require_once __DIR__ . '/3p/minify/src/Minify.php';
 23 
require_once __DIR__ . '/3p/minify/src/Minify.php';
23 
require_once __DIR__ . '/3p/minify/src/JS.php';
 24 
require_once __DIR__ . '/3p/minify/src/JS.php';
24 
require_once __DIR__ . '/3p/minify/src/Exception.php';
 25 
require_once __DIR__ . '/3p/minify/src/Exception.php';
25 
if (file_exists(__DIR__ . '/includes/config.inc.php')) {
 - 
 
26 
        include_once __DIR__ . '/includes/config.inc.php';
 - 
 
27 
}
 - 
 
28 
 
 26 
 
29 
error_reporting(E_ALL);
 27 
error_reporting(E_ALL);
30 
 
 28 
 
31 
$files = array();
 29 
$files = array();
32 
 
 30 
 
Line 55... Line 53...
55 
$files = array_merge($files, $ary);
 53 
$files = array_merge($files, $ary);
56 
 
 54 
 
57 
# ---
 55 
# ---
58 
 
 56 
 
59 
$minifier = null;
 57 
$minifier = null;
- 
 
 58 
$out = '';
60 
 
 59 
 
61 
foreach ($files as $file) {
 60 
foreach ($files as $file) {
- 
 
 61 
        if (OIDplus::baseConfig()->getValue('MINIFY_JS', true)) {
62 
        if (is_null($minifier)) {
 62 
                if (is_null($minifier)) {
63 
                $minifier = new Minify\JS($file);
 63 
                        $minifier = new Minify\JS($file);
64 
        } else {
 64 
                } else {
65 
                $minifier->add($file);
 65 
                        $minifier->add($file);
66 
        }
 66 
                }
- 
 
 67 
        } else {
- 
 
 68 
                $out .= file_get_contents($file)."\n";
- 
 
 69 
        }
67 
}
 70 
}
68 
 
 71 
 
69 
if (defined('RECAPTCHA_ENABLED') && RECAPTCHA_ENABLED) {
 72 
if (OIDplus::baseConfig()->getValue('RECAPTCHA_ENABLED', false) == true) {
- 
 
 73 
        if (OIDplus::baseConfig()->getValue('MINIFY_JS', true)) {
70 
        $minifier->add('oidplus_external_recaptcha();');
 74 
                $minifier->add('oidplus_external_recaptcha();');
- 
 
 75 
        } else {
- 
 
 76 
                $out .= "oidplus_external_recaptcha();\n";
- 
 
 77 
        }
71 
}
 78 
}
72 
 
 79 
 
73 
if (!defined('DISABLE_MSIE_COMPAT') || !DISABLE_MSIE_COMPAT) {
 80 
if (OIDplus::baseConfig()->getValue('DISABLE_MSIE_COMPAT', false) == false) {
- 
 
 81 
        if (OIDplus::baseConfig()->getValue('MINIFY_JS', true)) {
74 
        $minifier->add('oidplus_external_polyfill();');
 82 
                $minifier->add('oidplus_external_polyfill();');
- 
 
 83 
        } else {
- 
 
 84 
                $out .= "oidplus_external_polyfill();\n";
- 
 
 85 
        }
75 
}
 86 
}
76 
 
 87 
 
- 
 
 88 
if (OIDplus::baseConfig()->getValue('MINIFY_JS', true)) {
77 
$out = $minifier->minify();
 89 
        $out = $minifier->minify();
- 
 
 90 
}
78 
 
 91 
 
79 
$etag = md5($out);
 92 
$etag = md5($out);
80 
header("Etag: $etag");
 93 
header("Etag: $etag");
81 
if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && (trim($_SERVER['HTTP_IF_NONE_MATCH']) == $etag)) {
 94 
if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && (trim($_SERVER['HTTP_IF_NONE_MATCH']) == $etag)) {
82 
        header("HTTP/1.1 304 Not Modified");
 95 
        header("HTTP/1.1 304 Not Modified");