ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas

This commit is contained in:
Isaac Connor 2017-11-20 20:22:11 -05:00
parent dae2a6ae0a 12b47cbfe4
commit 6a3e4b84b2
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/includes/functions.php
View File

@ -2076,7 +2076,7 @@ function cache_bust( $file ) {
# Use the last modified timestamp to create a link that gets a different filename # Use the last modified timestamp to create a link that gets a different filename
# To defeat caching. Should probably use md5 hash # To defeat caching. Should probably use md5 hash
$parts = pathinfo($file); $parts = pathinfo($file);
$cacheFile = 'cache/'.$parts['filename'].'-'.filemtime($file).'.'.$parts['extension']; $cacheFile = 'cache/'.$parts['filename'].'-'.$_COOKIE['zmCSS'].'-'.filemtime($file).'.'.$parts['extension'];
if ( file_exists( ZM_PATH_WEB.'/'.$cacheFile ) or symlink( ZM_PATH_WEB.'/'.$file, ZM_PATH_WEB.'/'.$cacheFile ) ) { if ( file_exists( ZM_PATH_WEB.'/'.$cacheFile ) or symlink( ZM_PATH_WEB.'/'.$file, ZM_PATH_WEB.'/'.$cacheFile ) ) {
return $cacheFile; return $cacheFile;
} else { } else {
@ -2213,6 +2213,7 @@ function getStreamMode( ) {
$streamMode = 'single'; $streamMode = 'single';
Info( 'The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser.' ); Info( 'The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser.' );
} }
return $streamMode;
} // end function getStreamMode } // end function getStreamMode
function folder_size($dir) { function folder_size($dir) {

6
web/skins/classic/css/classic/views/event.css
View File

@ -149,9 +149,9 @@ span.noneCue {
} }
.dvrControls input { .dvrControls input {
height: 20px; height: 1.5em;
width: 28px; width: 2em;
padding-bottom: 3px; padding: 0 ;
margin: 0 3px; margin: 0 3px;
} }

1
web/skins/classic/css/dark/skin.css
View File

@ -518,7 +518,6 @@ input[type=submit]:disabled {
.sidebar { .sidebar {
position: absolute; position: absolute;
top: 0; top: 0;
bottom: 0;
left: 0; left: 0;
z-index: 1000; z-index: 1000;
display: block; display: block;

6
web/skins/classic/css/dark/views/event.css
View File

@ -131,9 +131,9 @@ span.noneCue {
} }
.dvrControls input { .dvrControls input {
height: 20px; height: 1.5em;
width: 28px; width: 2em;
padding-bottom: 3px; padding: 0;
margin: 0 3px; margin: 0 3px;
} }

1
web/skins/classic/views/options.php
View File

@ -65,6 +65,7 @@ if ( $tab == 'skins' ) {
$current_css = $_COOKIE['zmCSS']; $current_css = $_COOKIE['zmCSS'];
if ( isset($_GET['css-choice']) and ( $_GET['css-choice'] != $current_css ) ) { if ( isset($_GET['css-choice']) and ( $_GET['css-choice'] != $current_css ) ) {
setcookie('zmCSS',$_GET['css-choice'], time()+3600*24*30*12*10 ); setcookie('zmCSS',$_GET['css-choice'], time()+3600*24*30*12*10 );
array_map('unlink', glob(ZM_PATH_WEB.'/cache/*')); //cleanup symlinks from cache_bust
//header("Location: index.php?view=options&tab=skins&reset_parent=1"); //header("Location: index.php?view=options&tab=skins&reset_parent=1");
$reload = true; $reload = true;
} }