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

Merge branch 'storageareas' into zma_to_thread

This commit is contained in:
Isaac Connor 2017-12-08 13:46:16 -05:00
parent aff08358f4 3b5e70c51a
commit 6b9007c6a7
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/ajax/status.php
View File

@ -156,7 +156,7 @@ $statusData = array(
'permission' => 'Events',
'table' => 'Frames',
'limit' => 1,
'selector' => array( array( 'table' => 'Events', 'join' => 'Events.Id = Frames.EventId', 'selector'=>"Events.Id' ), 'Frames.FrameId" ),
'selector' => array( array( 'table' => 'Events', 'join' => 'Events.Id = Frames.EventId', 'selector'=>'Events.Id' ), 'Frames.FrameId' ),
'elements' => array(
//'Id' => array( 'sql' => 'Frames.FrameId' ),
'FrameId' => true,
@ -312,7 +312,7 @@ switch( $_REQUEST['layout'] ) {
case 'xml NOT CURRENTLY SUPPORTED' :
{
header("Content-type: application/xml" );
echo( '<?xml version="1.0' encoding='iso-8859-1"?>'.'\n' );
echo( '<?xml version="1.0" encoding="iso-8859-1"?>'.'\n' );
echo "<".strtolower($_REQUEST['entity']).">\n";
foreach ( $data as $key=>$value ) {
$key = strtolower( $key );

7
web/skins/classic/includes/config.php
View File

@ -45,8 +45,11 @@ $scales = array(
'12.5' => '1/8x',
);
if (isset($_REQUEST['view']) && ($_REQUEST['view'] == 'montage'))
unset($scales['auto']); //Remove auto if we aren't using event view
if (isset($_REQUEST['view']) && ($_REQUEST['view'] == 'montage')) {
unset($scales['auto']); //Remove auto on montage, use everywhere else
} else {
unset($scales['']); //Remove fixed on everything but montage
}
$bandwidth_options = array(
'high' => translate('High'),

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

@ -298,7 +298,7 @@ if ($reload == 'reload') ob_start();
echo ' ' . ZM_PATH_MAP .': '. getDiskPercent(ZM_PATH_MAP).'%';
?></li>
</ul>
</div> <!-- End .footer/reload -->
<!-- End .footer/reload --></div>
<?php
if ($reload == 'reload') return( ob_get_clean() );
?>