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

Removed some obsolete code 

- getName functions removed

- Fixed a reference to it in the logable behaviour
pull/64/merge
Andras Iklody 2013-04-18 08:49:59 +02:00
parent ada0fd2bfb
commit 3e89c80d09
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controller/EventsController.php
View File

@ -1542,14 +1542,6 @@ 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;
}
public function addGfiZip($id) {
if (!empty($this->data) && $this->data['Event']['submittedfile']['size'] > 0 &&
is_uploaded_file($this->data['Event']['submittedfile']['tmp_name'])) {

8
app/Controller/ServersController.php
View File

@ -366,12 +366,4 @@ class ServersController extends AppController {
$this->set('successes', $successes);
$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;
}
}

2
app/Plugin/SysLogLogable/Model/Behavior/SysLogLogableBehavior.php
View File

@ -201,7 +201,7 @@ class SysLogLogableBehavior extends LogableBehavior {
case "Server":
$this->Servers = new ServersController();
$this->Servers->constructClasses();
$title = 'Server ('. $Model->data[$Model->alias]['id'].'): '. $this->Servers->getName($Model->data[$Model->alias]['id']);
$title = 'Server ('. $Model->data[$Model->alias]['id'].'): '. $Model->data[$Model->alias]['url'];
$logData['Log']['title'] = $title;
break;
case "Role":