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

Add globals

This commit is contained in:
Isaac Connor 2020-08-04 17:35:52 -04:00
parent dd627d9234
commit 1ab828c110
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/skins/classic/views/js/montage.js.php
View File

@ -28,6 +28,7 @@ var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
var monitorData = new Array(); var monitorData = new Array();
<?php <?php
global $monitors;
foreach ( $monitors as $monitor ) { foreach ( $monitors as $monitor ) {
?> ?>
monitorData[monitorData.length] = { monitorData[monitorData.length] = {
@ -46,6 +47,7 @@ monitorData[monitorData.length] = {
layouts = new Array(); layouts = new Array();
layouts[0] = {}; // reserved, should hold which fields to clear when transitioning layouts[0] = {}; // reserved, should hold which fields to clear when transitioning
<?php <?php
global $layouts;
foreach ( $layouts as $layout ) { foreach ( $layouts as $layout ) {
?> ?>
layouts[<?php echo $layout->Id() ?>] = {"Name":"<?php echo $layout->Name()?>","Positions":<?php echo $layout->Positions() ?>}; layouts[<?php echo $layout->Id() ?>] = {"Name":"<?php echo $layout->Name()?>","Positions":<?php echo $layout->Positions() ?>};

17
web/skins/classic/views/js/montagereview.js.php
View File

@ -4,6 +4,18 @@ $TimeZone = new DateTimeZone( ini_get('date.timezone') );
$now = new DateTime('now', $TimeZone); $now = new DateTime('now', $TimeZone);
$offset = $TimeZone->getOffset($now); $offset = $TimeZone->getOffset($now);
echo $offset.'; // '.floor($offset / 3600).' hours '; echo $offset.'; // '.floor($offset / 3600).' hours ';
global $defaultScale;
global $liveMode;
global $fitMode;
global $speeds;
global $speedIndex;
global $initialDisplayInterval;
global $minTimeSecs;
global $maxTimeSecs;
global $minTime;
global $maxTime;
global $monitors;
?> ?>
var currentScale=<?php echo $defaultScale?>; var currentScale=<?php echo $defaultScale?>;
@ -146,7 +158,6 @@ foreach ( ZM\Server::find() as $Server ) {
echo 'Servers[' . $Server->Id() . '] = new Server(' . $Server->to_json(). ");\n"; echo 'Servers[' . $Server->Id() . '] = new Server(' . $Server->to_json(). ");\n";
} }
echo ' echo '
var monitorName = []; var monitorName = [];
var monitorLoading = []; var monitorLoading = [];
@ -167,8 +178,8 @@ var monitorCanvasCtx = [];
var monitorPtr = []; // monitorName[monitorPtr[0]] is first monitor var monitorPtr = []; // monitorName[monitorPtr[0]] is first monitor
'; ';
$numMonitors=0; // this array is indexed by the monitor ID for faster access later, so it may be sparse $numMonitors = 0; // this array is indexed by the monitor ID for faster access later, so it may be sparse
$avgArea=floatval(0); // Calculations the normalizing scale $avgArea = floatval(0); // Calculations the normalizing scale
foreach ( $monitors as $m ) { foreach ( $monitors as $m ) {
$avgArea = $avgArea + floatval($m->Width() * $m->Height()); $avgArea = $avgArea + floatval($m->Width() * $m->Height());