diff --git a/scripts/zmvideo.pl b/scripts/zmvideo.pl index c97066ca6..3fa9ce06f 100644 --- a/scripts/zmvideo.pl +++ b/scripts/zmvideo.pl @@ -100,7 +100,7 @@ if ( !$event_id || $event_id < 0 ) Usage(); } -if ( ZM_OPT_FFMPEG ) +if ( !ZM_OPT_FFMPEG ) { print( STDERR "Mpeg encoding is not currently enabled\n" ); exit(-1); diff --git a/web/includes/config.php.in b/web/includes/config.php.in index 007b1f8ba..a7679f5b4 100644 --- a/web/includes/config.php.in +++ b/web/includes/config.php.in @@ -113,6 +113,8 @@ $GLOBALS['defaultUser'] = array( "Monitors" => 'Edit', "Devices" => 'Edit', "System" => 'Edit', + "MaxBandwidth" => "", + "MonitorIds" => "", ); function loadConfig( $defineConsts=true ) diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index 0c9b9f4e4..ffe0a42e9 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -259,7 +259,7 @@ if ( canEdit('Monitors') ) - + - disabled="disabled"/> + disabled="disabled"/>