From be7683299ec865f2cf028f744de840bec93fd14f Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 22 Aug 2016 11:49:45 -0400 Subject: [PATCH] use single quotes instead of double quotes --- web/includes/functions.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/web/includes/functions.php b/web/includes/functions.php index 9a2060939..da9d3d9ec 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php @@ -2141,23 +2141,23 @@ function validHtmlStr( $input ) { return( htmlspecialchars( $input, ENT_QUOTES ) ); } -function getStreamHTML( $monitor, $scale=100, $mode="stream" ) { +function getStreamHTML( $monitor, $scale=100, $mode='stream' ) { //FIXME, the width and height of the image need to be scaled. if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) { - $streamSrc = $monitor->getStreamSrc( array( "mode=mpeg", "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_MPEG_LIVE_FORMAT ) ); - return getVideoStream( "liveStream".$monitor->Id(), $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), ZM_MPEG_LIVE_FORMAT, $monitor->Name() ); - } else if ( $mode == "stream" and canStream() ) { + $streamSrc = $monitor->getStreamSrc( array( 'mode=mpeg', 'scale='.$scale, 'bitrate='.ZM_WEB_VIDEO_BITRATE, 'maxfps='.ZM_WEB_VIDEO_MAXFPS, 'format='.ZM_MPEG_LIVE_FORMAT ) ); + return getVideoStream( 'liveStream'.$monitor->Id(), $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), ZM_MPEG_LIVE_FORMAT, $monitor->Name() ); + } else if ( $mode == 'stream' and canStream() ) { $streamSrc = $monitor->getStreamSrc( array( 'mode=jpeg', 'scale='.$scale, 'maxfps='.ZM_WEB_VIDEO_MAXFPS, 'buffer='.$monitor->StreamReplayBuffer() ) ); if ( canStreamNative() ) - return getImageStream( "liveStream".$monitor->Id(), $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() ); + return getImageStream( 'liveStream'.$monitor->Id(), $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() ); elseif ( canStreamApplet() ) - return getHelperStream( "liveStream".$monitor->Id(), $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() ); + return getHelperStream( 'liveStream'.$monitor->Id(), $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() ); } else { - $streamSrc = $monitor->getStreamSrc( array( 'mode=single', "scale=".$scale ) ); - if ( $mode == "stream" ) { - Info( "The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser."); + $streamSrc = $monitor->getStreamSrc( array( 'mode=single', 'scale='.$scale ) ); + if ( $mode == 'stream' ) { + Info( 'The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser.' ); } - return getImageStill( "liveStream".$monitor->Id(), $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() ); + return getImageStill( 'liveStream'.$monitor->Id(), $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() ); } } // end function getStreamHTML @@ -2169,7 +2169,7 @@ function getStreamMode( ) { $streamMode = 'jpeg'; } else { $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.' ); } } // end function getStreamMode