ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

leaflet can't be cache busted so update output_link_if_exists and output_script_if_exists to take a cache_bust flag

pull/3054/head
Isaac Connor 2020-09-24 20:21:38 -04:00
parent e9d8279d8a
commit a109d7bba0
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/skins/classic/includes/functions.php
View File

@ -39,22 +39,30 @@ function xhtmlHeaders($file, $title) {
$baseViewCssPhpFile = getSkinFile('/css/base/views/'.$basename.'.css.php'); $baseViewCssPhpFile = getSkinFile('/css/base/views/'.$basename.'.css.php');
$viewCssPhpFile = getSkinFile('/css/'.$css.'/views/'.$basename.'.css.php'); $viewCssPhpFile = getSkinFile('/css/'.$css.'/views/'.$basename.'.css.php');
function output_link_if_exists($files) { function output_link_if_exists($files, $cache_bust=true) {
global $skin; global $skin;
$html = array(); $html = array();
foreach ( $files as $file ) { foreach ( $files as $file ) {
if ( getSkinFile($file) ) { if ( getSkinFile($file) ) {
if ( $cache_bust ) {
$html[] = '<link rel="stylesheet" href="'.cache_bust('skins/'.$skin.'/'.$file).'" type="text/css"/>'; $html[] = '<link rel="stylesheet" href="'.cache_bust('skins/'.$skin.'/'.$file).'" type="text/css"/>';
} else {
$html[] = '<link rel="stylesheet" href="skins/'.$skin.'/'.$file.'" type="text/css"/>';
}
} }
} }
$html[] = ''; // So we ge a trailing \n $html[] = ''; // So we ge a trailing \n
return implode(PHP_EOL, $html); return implode(PHP_EOL, $html);
} }
function output_script_if_exists($files) { function output_script_if_exists($files, $cache_bust=true) {
global $skin; global $skin;
$html = array(); $html = array();
foreach ( $files as $file ) { foreach ( $files as $file ) {
if ( $cache_bust ) {
$html[] = '<script src="'.cache_bust('skins/'.$skin.'/'.$file).'"></script>'; $html[] = '<script src="'.cache_bust('skins/'.$skin.'/'.$file).'"></script>';
} else {
$html[] = '<script src="skins/'.$skin.'/'.$file.'"></script>';
}
} }
$html[] = ''; // So we ge a trailing \n $html[] = ''; // So we ge a trailing \n
return implode(PHP_EOL, $html); return implode(PHP_EOL, $html);
@ -122,7 +130,7 @@ if ( $css != 'base' )
if ( $css != 'base' ) if ( $css != 'base' )
echo output_link_if_exists(array('/css/'.$css.'/views/control.css')); echo output_link_if_exists(array('/css/'.$css.'/views/control.css'));
} else if ( $basename == 'monitor' ) { } else if ( $basename == 'monitor' ) {
echo output_link_if_exists(array('/js/leaflet/leaflet.css')); echo output_link_if_exists(array('js/leaflet/leaflet.css'), false);
} }
?> ?>
<style> <style>
@ -918,7 +926,7 @@ function xhtmlFooter() {
<script src="<?php echo cache_bust('js/overlay.js') ?>"></script> <script src="<?php echo cache_bust('js/overlay.js') ?>"></script>
<?php <?php
} else if ( $basename == 'monitor' ) { } else if ( $basename == 'monitor' ) {
echo output_script_if_exists(array('js/leaflet/leaflet.js')); echo output_script_if_exists(array('js/leaflet/leaflet.js'), false);
} ?> } ?>
<script nonce="<?php echo $cspNonce; ?>">$j('.chosen').chosen();</script> <script nonce="<?php echo $cspNonce; ?>">$j('.chosen').chosen();</script>
</body> </body>