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

Applied Corey patch. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2640 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2008-09-29 13:15:13 +00:00
parent 435c469d4b
commit 323338b661
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/zmvideo.pl
View File

@ -100,7 +100,7 @@ if ( !$event_id || $event_id < 0 )
Usage(); Usage();
} }
if ( ZM_OPT_FFMPEG ) if ( !ZM_OPT_FFMPEG )
{ {
print( STDERR "Mpeg encoding is not currently enabled\n" ); print( STDERR "Mpeg encoding is not currently enabled\n" );
exit(-1); exit(-1);

2
web/includes/config.php.in
View File

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

2
web/skins/classic/views/console.php
View File

@ -259,7 +259,7 @@ if ( canEdit('Monitors') )
<tr> <tr>
<td class="colLeftButtons" colspan="3"> <td class="colLeftButtons" colspan="3">
<input type="button" value="<?= $SLANG['Refresh'] ?>" onclick="location.reload(true);"/> <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' ) ) ?> <?= 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> </td>
<?php <?php

2
web/skins/classic/views/video.php
View File

@ -143,7 +143,7 @@ else
</tr> </tr>
</tbody> </tbody>
</table> </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> </form>
<?php <?php
if ( isset($_REQUEST['generated']) ) if ( isset($_REQUEST['generated']) )