Subversion Repositories oidplus

Rev

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

Rev 215 Rev 218
Line 20... Line 20...
20 
use MatthiasMullie\Minify;
 20 
use MatthiasMullie\Minify;
21 
 
 21 
 
22 
require_once __DIR__ . '/3p/minify/src/Minify.php';
 22 
require_once __DIR__ . '/3p/minify/src/Minify.php';
23 
require_once __DIR__ . '/3p/minify/src/JS.php';
 23 
require_once __DIR__ . '/3p/minify/src/JS.php';
24 
require_once __DIR__ . '/3p/minify/src/Exception.php';
 24 
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 
}
25 
 
 28 
 
26 
error_reporting(E_ALL);
 29 
error_reporting(E_ALL);
27 
 
 30 
 
28 
$files = array();
 31 
$files = array();
29 
 
 32 
 
Line 39... Line 42...
39 
 
 42 
 
40 
$files[] = __DIR__ . '/oidplus_base.js';
 43 
$files[] = __DIR__ . '/oidplus_base.js';
41 
 
 44 
 
42 
$ary = glob(__DIR__ . '/plugins/publicPages/'.'*'.'/script.js');
 45 
$ary = glob(__DIR__ . '/plugins/publicPages/'.'*'.'/script.js');
43 
sort($ary);
 46 
sort($ary);
44 
foreach ($ary as $a) $files[] = $a;
 47 
$files = array_merge($files, $ary);
45 
 
 48 
 
46 
$ary = glob(__DIR__ . '/plugins/adminPages/'.'*'.'/script.js');
 49 
$ary = glob(__DIR__ . '/plugins/adminPages/'.'*'.'/script.js');
47 
sort($ary);
 50 
sort($ary);
48 
foreach ($ary as $a) $files[] = $a;
 51 
$files = array_merge($files, $ary);
49 
 
 52 
 
50 
$ary = glob(__DIR__ . '/plugins/raPages/'.'*'.'/script.js');
 53 
$ary = glob(__DIR__ . '/plugins/raPages/'.'*'.'/script.js');
51 
sort($ary);
 54 
sort($ary);
52 
foreach ($ary as $a) $files[] = $a;
 55 
$files = array_merge($files, $ary);
53 
 
 56 
 
54 
# ---
 57 
# ---
55 
 
 58 
 
56 
$minifier = null;
 59 
$minifier = null;
57 
 
 60 
 
Line 61... Line 64...
61 
        } else {
 64 
        } else {
62 
                $minifier->add($file);
 65 
                $minifier->add($file);
63 
        }
 66 
        }
64 
}
 67 
}
65 
 
 68 
 
- 
 
 69 
if (defined('RECAPTCHA_ENABLED') && RECAPTCHA_ENABLED) {
- 
 
 70 
        $minifier->add('oidplus_external_recaptcha();');
- 
 
 71 
}
- 
 
 72 
 
- 
 
 73 
if (!defined('DISABLE_MSIE_COMPAT') || !DISABLE_MSIE_COMPAT) {
- 
 
 74 
        $minifier->add('oidplus_external_polyfill();');
- 
 
 75 
}
- 
 
 76 
 
66 
$out = $minifier->minify();
 77 
$out = $minifier->minify();
- 
 
 78 
 
67 
$etag = md5($out);
 79 
$etag = md5($out);
68 
header("Etag: $etag");
 80 
header("Etag: $etag");
69 
if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && (trim($_SERVER['HTTP_IF_NONE_MATCH']) == $etag)) {
 81 
if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && (trim($_SERVER['HTTP_IF_NONE_MATCH']) == $etag)) {
70 
        header("HTTP/1.1 304 Not Modified");
 82 
        header("HTTP/1.1 304 Not Modified");
71 
} else {
 83 
} else {