MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'hotfix-2.3.155' into develop

pull/727/head
iglocska 2015-11-10 15:25:20 +01:00
parent ea2420c889 6548297b80
commit 2addc61346
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.json
View File

@ -1 +1 @@
{"major":2, "minor":3, "hotfix":154}
{"major":2, "minor":3, "hotfix":155}

3
app/Controller/EventsController.php
View File

@ -644,8 +644,7 @@ class EventsController extends AppController {
// This happens if the user doesn't have permission to view the event.
// TODO change this to NotFoundException to keep it in line with the other invalid event messages, but will have to check if it impacts the sync before doing that
if (!isset($results[0])) {
$this->Session->setFlash(__('Invalid event.'));
$this->redirect(array('controller' => 'events', 'action' => 'index'));
throw new NotFoundException(__('Invalid event.'));
}
// We'll only have one event in the array since we specified an id. The array returned only has several elements in the xml exports
$result = $results[0];

6
app/View/Users/ajax/fetchpgpkey.ctp
View File

@ -9,9 +9,9 @@
</tr>
<?php foreach ($keys as $k => $key): ?>
<tr style="border-bottom:1px solid black;" class="templateChoiceButton">
<td style="padding-left:10px; text-align:left;width:20%;" title="<?php echo h($key['fingerprint']); ?>" onClick="pgpChoiceSelect('<?php echo $key['uri']; ?>')"><?php echo h($key['key_id']); ?></td>
<td style="text-align:left;width:20%;" title="<?php echo h($key['fingerprint']); ?>" onClick="pgpChoiceSelect('<?php echo $key['uri']; ?>')"><?php echo h($key['date']); ?></td>
<td style="padding-right:10px; text-align:left;width:60%;" title="<?php echo h($key['fingerprint']); ?>" onClick="pgpChoiceSelect('<?php echo $key['uri']; ?>')"><?php echo nl2br(h($key['address'])); ?></td>
<td style="padding-left:10px; text-align:left;width:20%;" title="<?php echo h($key['fingerprint']); ?>" onClick="pgpChoiceSelect('<?php echo h($key['uri']); ?>')"><?php echo h($key['key_id']); ?></td>
<td style="text-align:left;width:20%;" title="<?php echo h($key['fingerprint']); ?>" onClick="pgpChoiceSelect('<?php echo h($key['uri']); ?>')"><?php echo h($key['date']); ?></td>
<td style="padding-right:10px; text-align:left;width:60%;" title="<?php echo h($key['fingerprint']); ?>" onClick="pgpChoiceSelect('<?php echo h($key['uri']); ?>')"><?php echo nl2br(h($key['address'])); ?></td>
</tr>
<?php endforeach; ?>
</table>