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

Remove STATE_ and CMD defines as they are in skin.js.php now. quote connKey so that it retains leading 0s. Should quiet some zms errors.

pull/3477/head
Isaac Connor 2022-04-27 17:45:08 -04:00
parent 2434c39c2d
commit f21df362fa
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,9 +16,9 @@ var monitorData = new Array();
global $monitors; global $monitors;
foreach ( $monitors as $monitor ) { foreach ( $monitors as $monitor ) {
?> ?>
monitorData[monitorData.length] = { monitorData[monitorData.length] = {
'id': <?php echo $monitor->Id() ?>, 'id': <?php echo $monitor->Id() ?>,
'connKey': <?php echo $monitor->connKey() ?>, 'connKey': '<?php echo $monitor->connKey() ?>',
'width': <?php echo $monitor->ViewWidth() ?>, 'width': <?php echo $monitor->ViewWidth() ?>,
'height':<?php echo $monitor->ViewHeight() ?>, 'height':<?php echo $monitor->ViewHeight() ?>,
'janusEnabled':<?php echo $monitor->JanusEnabled() ?>, 'janusEnabled':<?php echo $monitor->JanusEnabled() ?>,
@ -40,4 +40,6 @@ foreach ( $layouts as $layout ) {
layouts[<?php echo $layout->Id() ?>] = {"Name":"<?php echo $layout->Name()?>","Positions":<?php echo json_decode($layout->Positions())?$layout->Positions():'{}' ?>}; layouts[<?php echo $layout->Id() ?>] = {"Name":"<?php echo $layout->Name()?>","Positions":<?php echo json_decode($layout->Positions())?$layout->Positions():'{}' ?>};
<?php <?php
} // end foreach layout } // end foreach layout
global $FreeFormLayoutId;
echo 'freeform_layout_id='.$FreeFormLayoutId.';'
?> ?>