mirror of https://github.com/MISP/MISP
commit
9fca396bb4
|
@ -77,7 +77,7 @@ class EventBlacklistsController extends AppController
|
||||||
if ($this->_isRest()) {
|
if ($this->_isRest()) {
|
||||||
return $this->RestResponse->saveSuccessResponse('EventBlacklist', 'Deleted', $ids, $this->response->type());
|
return $this->RestResponse->saveSuccessResponse('EventBlacklist', 'Deleted', $ids, $this->response->type());
|
||||||
} else {
|
} else {
|
||||||
$this->Flash->success('Event deleted.');
|
$this->Flash->success('Blacklist entry removed');
|
||||||
$this->redirect(array('controller' => 'eventBlacklists', 'action' => 'index'));
|
$this->redirect(array('controller' => 'eventBlacklists', 'action' => 'index'));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
?>
|
?>
|
||||||
<div class="input clear"></div>
|
<div class="input clear"></div>
|
||||||
<?php
|
<?php
|
||||||
echo $this->Form->input('gpgkey', array('label' => __('GnuPG key'), 'div' => 'clear', 'class' => 'input-xxlarge'));
|
echo $this->Form->input('gpgkey', array('label' => __('GnuPG key'), 'div' => 'clear', 'class' => 'input-xxlarge', 'placeholder' => __('Paste the user\'s GnuPG key here or try to retrieve it from the MIT key server by clicking on "Fetch GnuPG key" below.')));
|
||||||
?>
|
?>
|
||||||
<div class="clear"><span role="button" tabindex="0" aria-label="<?php echo __('Fetch GnuPG key');?>" onClick="lookupPGPKey('UserEmail');" class="btn btn-inverse" style="margin-bottom:10px;"><?php echo __('Fetch GnuPG key');?></span></div>
|
<div class="clear"><span role="button" tabindex="0" aria-label="<?php echo __('Fetch GnuPG key');?>" onClick="lookupPGPKey('UserEmail');" class="btn btn-inverse" style="margin-bottom:10px;"><?php echo __('Fetch GnuPG key');?></span></div>
|
||||||
<?php
|
<?php
|
||||||
|
|
Loading…
Reference in New Issue