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

implement crude cache busting code for .js and .css files

pull/2077/head
Isaac Connor 2017-11-01 09:41:19 -04:00
parent 3deb8a35bb
commit e6918cd1bd
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/includes/functions.php
View File

@ -2060,6 +2060,18 @@ function detaintPath( $path ) {
return( $path ); return( $path );
} }
function cache_bust( $file ) {
# Use the last modified timestamp to create a link that gets a different filename
# To defeat caching. Should probably use md5 hash
$cacheFile = '/cache/'.basename($file).'-'.filemtime($file);
if ( file_exists( ZM_PATH_WEB.$cacheFile ) or symlink( ZM_PATH_WEB.'/'.$file, ZM_PATH_WEB.$cacheFile ) ) {
return $cacheFile;
} else {
Warning("Failed linking $file to $cacheFile");
}
return $file;
}
function getSkinFile( $file ) { function getSkinFile( $file ) {
global $skinBase; global $skinBase;
$skinFile = false; $skinFile = false;
@ -2068,7 +2080,7 @@ function getSkinFile( $file ) {
if ( file_exists( $tempSkinFile ) ) if ( file_exists( $tempSkinFile ) )
$skinFile = $tempSkinFile; $skinFile = $tempSkinFile;
} }
return( $skinFile ); return $skinFile;
} }
function getSkinIncludes( $file, $includeBase=false, $asOverride=false ) { function getSkinIncludes( $file, $includeBase=false, $asOverride=false ) {

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

@ -60,11 +60,11 @@ if ( file_exists( "skins/$skin/css/$css/graphics/favicon.ico" ) ) {
<link rel="stylesheet" href="css/reset.css" type="text/css"/> <link rel="stylesheet" href="css/reset.css" type="text/css"/>
<link rel="stylesheet" href="css/overlay.css" type="text/css"/> <link rel="stylesheet" href="css/overlay.css" type="text/css"/>
<link rel="stylesheet" href="css/bootstrap.min.css" type="text/css"/> <link rel="stylesheet" href="css/bootstrap.min.css" type="text/css"/>
<link rel="stylesheet" href="<?php echo $skinCssFile ?>" type="text/css" media="screen"/> <link rel="stylesheet" href="<?php echo cache_bust($skinCssFile) ?>" type="text/css" media="screen"/>
<?php <?php
if ( $viewCssFile ) { if ( $viewCssFile ) {
?> ?>
<link rel="stylesheet" href="<?php echo $viewCssFile ?>" type="text/css" media="screen"/> <link rel="stylesheet" href="<?php echo cache_bust($viewCssFile) ?>" type="text/css" media="screen"/>
<?php <?php
} }
if ( $viewCssPhpFile ) { if ( $viewCssPhpFile ) {
@ -138,18 +138,18 @@ if ( file_exists( "skins/$skin/css/$css/graphics/favicon.ico" ) ) {
} }
if ( $cssJsFile ) { if ( $cssJsFile ) {
?> ?>
<script type="text/javascript" src="<?php echo $cssJsFile ?>"></script> <script type="text/javascript" src="<?php echo cache_bust($cssJsFile) ?>"></script>
<?php <?php
} else { } else {
?> ?>
<script type="text/javascript" src="skins/classic/js/classic.js"></script> <script type="text/javascript" src="skins/classic/js/classic.js"></script>
<?php } ?> <?php } ?>
<script type="text/javascript" src="<?php echo $skinJsFile ?>"></script> <script type="text/javascript" src="<?php echo cache_bust($skinJsFile) ?>"></script>
<script type="text/javascript" src="js/logger.js"></script> <script type="text/javascript" src="js/logger.js"></script>
<?php <?php
if ( $viewJsFile ) { if ( $viewJsFile ) {
?> ?>
<script type="text/javascript" src="<?php echo $viewJsFile ?>"></script> <script type="text/javascript" src="<?php echo cache_bust($viewJsFile) ?>"></script>
<?php <?php
} }
?> ?>