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

Merge branch 'master' into storageareas

This commit is contained in:
Isaac Connor 2018-09-23 12:25:17 -04:00
parent 5dba17e1fc c8c533ca2f
commit 772c74243c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,6 +190,12 @@ echo output_link_if_exists( array(
<?php } ?> <?php } ?>
<script src="<?php echo cache_bust($skinJsFile) ?>"></script> <script src="<?php echo cache_bust($skinJsFile) ?>"></script>
<script src="js/logger.js"></script> <script src="js/logger.js"></script>
<?php
if ($basename == 'watch') {
// This is used in the log popup for the export function. Not sure if it's used anywhere else
?>
<script type="text/javascript" src="js/overlay.js"></script>
<?php } ?>
<?php <?php
if ( $viewJsFile ) { if ( $viewJsFile ) {
?> ?>

2
web/skins/classic/views/monitorprobe.php
View File

@ -288,7 +288,7 @@ function probeNetwork() {
if ( isset($macBases[$macRoot]) ) { if ( isset($macBases[$macRoot]) ) {
$macBase = $macBases[$macRoot]; $macBase = $macBases[$macRoot];
$camera = call_user_func($macBase['probeFunc'], $ip); $camera = call_user_func($macBase['probeFunc'], $ip);
$sourceDesc = htmlspecialchars(serialize($camera['monitor'])); $sourceDesc = base64_encode(serialize($camera['monitor']));
$sourceString = $camera['model'].' @ '.$host; $sourceString = $camera['model'].' @ '.$host;
if ( isset($monitors[$ip]) ) { if ( isset($monitors[$ip]) ) {
$monitor = $monitors[$ip]; $monitor = $monitors[$ip];