Bug 418 - Fixed inconsistent Export permissions.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2251 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2007-12-08 18:42:38 +00:00
parent 0a1291a762
commit 5aad02876b
2 changed files with 11 additions and 1 deletions

View File

@ -255,7 +255,7 @@ Learn Pref:&nbsp;<select name="learn_state" class="form" onChange="learn_form.su
<?php } ?> <?php } ?>
<?php if ( canEdit( 'Events' ) ) { ?><td align="center" class="text"><a href="<?= $PHP_SELF ?>?view=none&action=delete&mark_eid=<?= $eid ?>"><?= $zmSlangDelete ?></a></td><?php } ?> <?php if ( canEdit( 'Events' ) ) { ?><td align="center" class="text"><a href="<?= $PHP_SELF ?>?view=none&action=delete&mark_eid=<?= $eid ?>"><?= $zmSlangDelete ?></a></td><?php } ?>
<?php if ( canEdit( 'Events' ) ) { ?><td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=eventdetail&eid=<?= $eid ?>', 'zmEventDetail', <?= $jws['eventdetail']['w'] ?>, <?= $jws['eventdetail']['h'] ?> )"><?= $zmSlangEdit ?></a></td><?php } ?> <?php if ( canEdit( 'Events' ) ) { ?><td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=eventdetail&eid=<?= $eid ?>', 'zmEventDetail', <?= $jws['eventdetail']['w'] ?>, <?= $jws['eventdetail']['h'] ?> )"><?= $zmSlangEdit ?></a></td><?php } ?>
<?php if ( canEdit( 'Events' ) ) { ?><td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=export&eid=<?= $eid ?>', 'zmExport', <?= $jws['export']['w'] ?>, <?= $jws['export']['h'] ?> )"><?= $zmSlangExport ?></a></td><?php } ?> <?php if ( canView( 'Events' ) ) { ?><td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=export&eid=<?= $eid ?>', 'zmExport', <?= $jws['export']['w'] ?>, <?= $jws['export']['h'] ?> )"><?= $zmSlangExport ?></a></td><?php } ?>
<?php if ( canEdit( 'Events' ) ) { ?> <?php if ( canEdit( 'Events' ) ) { ?>
<?php if ( $event['Archived'] ) { ?> <?php if ( $event['Archived'] ) { ?>
<td align="center" class="text"><a href="<?= $PHP_SELF ?>?view=<?= $view ?>&action=unarchive&eid=<?= $eid ?><?= $filter_query ?><?= $sort_query ?>"><?= $zmSlangUnarchive ?></a></td> <td align="center" class="text"><a href="<?= $PHP_SELF ?>?view=<?= $view ?>&action=unarchive&eid=<?= $eid ?><?= $filter_query ?><?= $sort_query ?>"><?= $zmSlangUnarchive ?></a></td>

View File

@ -533,7 +533,17 @@ if ( canEdit( 'Events' ) )
?> ?>
<span id="deleteEvent"><a href="javascript: deleteEvent()"><?= $zmSlangDelete ?></a></span> <span id="deleteEvent"><a href="javascript: deleteEvent()"><?= $zmSlangDelete ?></a></span>
<span id="editEvent"><a href="javascript: editEvent()"><?= $zmSlangEdit ?></a></span> <span id="editEvent"><a href="javascript: editEvent()"><?= $zmSlangEdit ?></a></span>
<?php
}
if ( canView( 'Events' ) )
{
?>
<span id="exportEvent"><a href="javascript: exportEvent()"><?= $zmSlangExport ?></a></span> <span id="exportEvent"><a href="javascript: exportEvent()"><?= $zmSlangExport ?></a></span>
<?php
}
if ( canEdit( 'Events' ) )
{
?>
<span id="archiveEvent"><a href="javascript: void(0)">&nbsp;</a></span> <span id="archiveEvent"><a href="javascript: void(0)">&nbsp;</a></span>
<?php <?php
} }