mirror of https://github.com/MISP/MISP
Colouring of search terms works in links
- links now have proper colouring to make the found terms more visiblepull/63/head
parent
036308bc0e
commit
4a368918eb
File diff suppressed because it is too large
Load Diff
|
@ -854,7 +854,7 @@ class Attribute extends AppModel {
|
||||||
if (PHP_OS == 'WINNT') {
|
if (PHP_OS == 'WINNT') {
|
||||||
$rootDir = APP . "files" . DS . $eventId;
|
$rootDir = APP . "files" . DS . $eventId;
|
||||||
} else {
|
} else {
|
||||||
$rootDir = APP . DS . "files" . DS . $eventId;
|
$rootDir = APP . "files" . DS . $eventId;
|
||||||
}
|
}
|
||||||
$dir = new Folder($rootDir, true);
|
$dir = new Folder($rootDir, true);
|
||||||
// move the file to the correct location
|
// move the file to the correct location
|
||||||
|
|
|
@ -56,9 +56,9 @@ foreach ($attributes as $attribute): ?>
|
||||||
<?php
|
<?php
|
||||||
$sigDisplay = nl2br(($attribute['Attribute']['value']));
|
$sigDisplay = nl2br(($attribute['Attribute']['value']));
|
||||||
if ('attachment' == $attribute['Attribute']['type'] || 'malware-sample' == $attribute['Attribute']['type']) {
|
if ('attachment' == $attribute['Attribute']['type'] || 'malware-sample' == $attribute['Attribute']['type']) {
|
||||||
echo $this->Html->link($sigDisplay, array('controller' => 'attributes', 'action' => 'download', $attribute['Attribute']['id']));
|
echo $this->Html->link($sigDisplay, array('controller' => 'attributes', 'action' => 'download', $attribute['Attribute']['id']), array('escape' => FALSE));
|
||||||
} elseif ('link' == $attribute['Attribute']['type']) {
|
} elseif ('link' == $attribute['Attribute']['type']) {
|
||||||
echo $this->Html->link($sigDisplay, $sigDisplay);
|
echo $this->Html->link($sigDisplay, nl2br($attribute['Attribute']['valueNoScript']), array('escape' => FALSE));
|
||||||
} else {
|
} else {
|
||||||
echo $sigDisplay;
|
echo $sigDisplay;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue