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

First round of fixes

pull/304/merge
iglocska 2014-08-11 15:11:57 +02:00
parent 2ad040f0e6
commit 99c04afa85
4 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Controller/EventsController.php
View File

@ -2252,12 +2252,13 @@ class EventsController extends AppController {
public function proposalEventIndex() {
$this->loadModel('ShadowAttribute');
$this->ShadowAttribute->recursive = -1;
$conditions = array('ShadowAttribute.deleted' => 0);
if (!$this->_isSiteAdmin()) $conditions[] = array('ShadowAttribute.event_org' => $this->Auth->user('org'));
$result = $this->ShadowAttribute->find('all', array(
'fields' => array('event_id'),
'group' => 'event_id',
'conditions' => array(
'ShadowAttribute.event_org =' => $this->Auth->user('org'),
)));
'conditions' => $conditions
));
$this->Event->recursive = -1;
$conditions = array();
foreach ($result as $eventId) {

22
app/Controller/ShadowAttributesController.php
View File

@ -99,7 +99,7 @@ class ShadowAttributesController extends AppController {
$date = new DateTime();
$activeAttribute['Attribute']['timestamp'] = $date->getTimestamp();
$this->Attribute->save($activeAttribute['Attribute']);
$this->ShadowAttribute->delete($id, $cascade = false);
$this->ShadowAttribute->setDeleted($id);
$this->loadModel('Event');
$this->Event->Behaviors->detach('SysLogLogable.SysLogLogable');
$this->Event->recursive = -1;
@ -152,7 +152,7 @@ class ShadowAttributesController extends AppController {
if ($this->ShadowAttribute->typeIsAttachment($shadow['type'])) {
$this->_moveFile($toDeleteId, $this->Attribute->id, $shadow['event_id']);
}
$this->ShadowAttribute->delete($toDeleteId, $cascade = false);
$this->ShadowAttribute->setDeleted($toDeleteId);
$fieldList = array('proposal_email_lock', 'id', 'info', 'published');
$event['Event']['proposal_email_lock'] = 0;
@ -216,7 +216,7 @@ class ShadowAttributesController extends AppController {
$this->redirect(array('controller' => 'events', 'action' => 'view', $eventId));
}
}
if ($this->ShadowAttribute->delete($id, $cascade = false)) {
if ($this->ShadowAttribute->setDeleted($id)) {
$this->_setProposalLock($eventId, false);
$this->autoRender = false;
return new CakeResponse(array('body'=> json_encode(array('saved' => true, 'success' => 'Proposal discarded.')),'status'=>200));
@ -766,9 +766,10 @@ class ShadowAttributesController extends AppController {
if (!$this->_isSiteAdmin()) {
$conditions = array('Event.org =' => $this->Auth->user('org'));
}
$conditions[] = array('deleted' => 0);
$this->paginate = array(
'conditions' => $conditions,
'fields' => array('id', 'org', 'old_id'),
'fields' => array('id', 'org', 'old_id', 'deleted'),
'contain' => array(
'Event' => array(
'fields' => array('id', 'org', 'info', 'orgc'),
@ -779,19 +780,6 @@ class ShadowAttributesController extends AppController {
$this->set('shadowAttributes', $this->paginate());
}
public function eventIndex() {
$result = $this->ShadowAttribute->find('all', array(
'fields' => array('event_id'),
'group' => 'event_id',
'conditions' => array(
'ShadowAttribute.event_org =' => $this->Auth->user('org'),
)));
$this->loadModel('Event');
foreach ($result as $eventId) {
}
}
private function _getEventData($event_id) {
$this->loadModel('Event');
$this->Event->recursive = -1;

1
app/Model/Event.php
View File

@ -914,6 +914,7 @@ class Event extends AppModel {
),
'ShadowAttribute' => array(
'fields' => $fieldsShadowAtt,
'conditions' => array('deleted' => 0),
),
)
);

5
app/Model/ShadowAttribute.php
View File

@ -756,5 +756,10 @@ class ShadowAttribute extends AppModel {
}
return $fails;
}
public function setDeleted($id) {
$this->id = $id;
$this->saveField('deleted', 1);
}
}