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

some left over merging issues among other things

pull/762/head
iglocska 2015-11-17 22:01:22 +01:00
parent 043057f133
commit db359170f6
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Console/Command/EventShell.php
View File

@ -114,13 +114,13 @@ class EventShell extends AppShell
}
public function cacherpz() {
$org = $this->args[0];
$isSiteAdmin = $this->args[1];
$id = $this->args[2];
$user_id = $this->args[0];
$user = $this->User->getAuthUser($user_id);
$id = $this->args[1];
$this->Job->id = $id;
$extra = $this->args[3];
$extra = $this->args[2];
$this->Job->saveField('progress', 1);
$values = $this->Attribute->rpz($org, $isSiteAdmin);
$values = $this->Attribute->rpz($user);
$this->Job->saveField('progress', 80);
$dir = new Folder(APP . DS . '/tmp/cached_exports/' . $extra);
if ($isSiteAdmin) {

7
app/Lib/Tools/XMLConverterTool.php
View File

@ -87,15 +87,8 @@ class XMLConverterTool {
$event['Event']['Attribute'][$key]['value'] = str_replace($toEscape, $escapeWith, $event['Event']['Attribute'][$key]['value']);
$event['Event']['Attribute'][$key]['comment'] = preg_replace ('/[^\x{0009}\x{000a}\x{000d}\x{0020}-\x{D7FF}\x{E000}-\x{FFFD}]+/u', ' ', $event['Event']['Attribute'][$key]['comment']);
$event['Event']['Attribute'][$key]['comment'] = str_replace($toEscape, $escapeWith, $event['Event']['Attribute'][$key]['comment']);
<<<<<<< HEAD
unset($event['Event']['Attribute'][$key]['value1'], $event['Event']['Attribute'][$key]['value2'], $event['Event']['Attribute'][$key]['category_order']);
if (isset($event['Event']['RelatedAttribute'][$value['id']])) $event['Event']['Attribute'][$key]['RelatedAttribute'] = $event['Event']['RelatedAttribute'][$value['id']];
=======
unset($event['Event']['Attribute'][$key]['value1']);
unset($event['Event']['Attribute'][$key]['value2']);
unset($event['Event']['Attribute'][$key]['category_order']);
if (isset($event['Event']['RelatedAttribute']) && isset($event['Event']['RelatedAttribute'][$value['id']])) $event['Event']['Attribute'][$key]['RelatedAttribute'] = $event['Event']['RelatedAttribute'][$value['id']];
>>>>>>> master
if (isset($event['Event']['Attribute'][$key]['ShadowAttribute'])) {
foreach($event['Event']['Attribute'][$key]['ShadowAttribute'] as $skey => $svalue) {
$event['Event']['Attribute'][$key]['ShadowAttribute'][$skey]['value'] = preg_replace ('/[^\x{0009}\x{000a}\x{000d}\x{0020}-\x{D7FF}\x{E000}-\x{FFFD}]+/u', ' ', $event['Event']['Attribute'][$key]['ShadowAttribute'][$skey]['value']);

4
app/Model/Attribute.php
View File

@ -1431,8 +1431,8 @@ class Attribute extends AppModel {
}
$attributes = $this->fetchAttributes($user, array(
'conditions' => $conditions,
'order' => 'Attribute.value',
'group' => 'Attribute.value',
'order' => 'Attribute.value1',
'group' => 'Attribute.value1',
'fields' => array('value'),
'contain' => array('Event' => array(
'fields' => array('Event.id', 'Event.published', 'Event.date', 'Event.publish_timestamp'),