Applied Corey patch.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2640 e3e1d417-86f3-4887-817a-d78f3d33393f

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);

web/includes/config.php.in

@@ -113,6 +113,8 @@ $GLOBALS['defaultUser'] = array(
     "Monitors"  => 'Edit',
     "Devices"   => 'Edit',
     "System"    => 'Edit',
+    "MaxBandwidth" => "",
+    "MonitorIds"   => "",
 );
 
 function loadConfig( $defineConsts=true )

web/skins/classic/views/console.php

@@ -259,7 +259,7 @@ if ( canEdit('Monitors') )
           <tr>
             <td class="colLeftButtons" colspan="3">
               <input type="button" value="<?= $SLANG['Refresh'] ?>" onclick="location.reload(true);"/>
-              <?= makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', $SLANG['AddNewMonitor'], (canEdit( 'Monitors' )&&!$user['MonitorIds']) ) ?>
+              <?= makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', $SLANG['AddNewMonitor'], (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?>
               <?= makePopupButton( '?view=filter&filter[terms][0][attr]=DateTime&filter[terms][0][op]=%3c&filter[terms][0][val]=now', 'zmFilter', 'filter', $SLANG['Filters'], canView( 'Events' ) ) ?>
             </td>
 <?php

web/skins/classic/views/video.php

@@ -143,7 +143,7 @@ else
             </tr>
           </tbody>
         </table>
-        <input type="button" value="<?= $SLANG['GenerateVideo'] ?>" onclick="generateVideo( this.form );"<?php if ( ZM_OPT_FFMPEG ) { ?> disabled="disabled"<?php } ?>/>
+        <input type="button" value="<?= $SLANG['GenerateVideo'] ?>" onclick="generateVideo( this.form );"<?php if ( !ZM_OPT_FFMPEG ) { ?> disabled="disabled"<?php } ?>/>
       </form>
 <?php
     if ( isset($_REQUEST['generated']) )