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

loggable behaviour. 

some merge correction for events and servers, so we log again.
pull/63/head
noud 2012-08-22 14:39:41 +02:00
parent cf40a908d4
commit 8c1cfa731a
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Controller/EventsController.php
View File

@ -838,6 +838,13 @@ class EventsController extends AppController {
// $gv->image();
// }
public function getName($id = null) {
$events = $this->Event->find('first', array(
'conditions' => array('Event.id' => $id)
));
$name = $events['Event']['info'];
return $name;
}
}

7
app/Controller/ServersController.php Executable file → Normal file
View File

@ -286,5 +286,12 @@ class ServersController extends AppController {
$this->set('fails', $fails);
}
public function getName($id = null) {
$servers = $this->Server->find('first', array(
'conditions' => array('Server.id' => $id)
));
$name = $servers['Server']['url'];
return $name;
}
}

13
app/Model/Behavior/LogableBehavior.php
View File

@ -66,7 +66,7 @@ App::import('Lib', 'SysLog.SysLog'); // Audit, syslogd, extra
*/
class LogableBehavior extends ModelBehavior {
public $user = NULL;
public $UserModel = FALSE;
@ -553,7 +553,12 @@ class LogableBehavior extends ModelBehavior {
$title = 'User ('. $Model->data[$Model->alias]['id'].') '. $Model->data[$Model->alias]['email'];
break;
case "Event":
$title = 'Event ('. $Model->data[$Model->alias]['id'].'): '. $Model->data[$Model->alias]['info'];
$this->Events = new EventsController();
$this->Events->constructClasses();
debug($Model->data[$Model->alias]['id']);
debug($this->Events->getName($Model->data[$Model->alias]['id']));
debug(false);
$title = 'Event ('. $Model->data[$Model->alias]['id'].'): '.$this->Events->getName($Model->data[$Model->alias]['id']);
$logData['Log']['title'] = $title;
break;
case "Attribute":
@ -565,7 +570,9 @@ class LogableBehavior extends ModelBehavior {
}
break;
case "Server":
$title = 'Server ('. $Model->data[$Model->alias]['id'].'): '. $Model->data[$Model->alias]['url'];
$this->Servers = new ServersController();
$this->Servers->constructClasses();
$title = 'Server ('. $Model->data[$Model->alias]['id'].'): '. $this->Servers->getName($Model->data[$Model->alias]['id']);
$logData['Log']['title'] = $title;
break;
default: