mirror of https://github.com/MISP/MISP
Merge branch 'hotfix-2.2.34' into develop
commit
a6a353252e
|
@ -6,9 +6,11 @@ INSTALLATION INSTRUCTIONS
|
|||
|
||||
1/ Minimal ubuntu install
|
||||
-------------------------
|
||||
|
||||
Install a minimal ubuntu 12.04-server system with the software:
|
||||
|
||||
- OpenSSH server
|
||||
- LAMP server
|
||||
- LAMP server (don't forget php5-mysql)
|
||||
- Mail server
|
||||
|
||||
You will get some questions, you will probably want to set:
|
||||
|
|
|
@ -1025,6 +1025,7 @@ class Event extends AppModel {
|
|||
$attributes = $this->Attribute->find('all', $params);
|
||||
foreach ($attributes as &$attribute) {
|
||||
$attribute['Attribute']['value'] = str_replace(array("\r\n", "\n", "\r"), "", $attribute['Attribute']['value']);
|
||||
$attribute['Attribute']['value'] = '"' . $attribute['Attribute']['value'] . '"';
|
||||
$attribute['Attribute']['timestamp'] = date('Ymd', $attribute['Attribute']['timestamp']);
|
||||
}
|
||||
return $attributes;
|
||||
|
|
Loading…
Reference in New Issue