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

chg: Trying not to break the MVC pattern 

Server model is not passed to the constructor anymore, as well as the
Organisation model.
pull/3214/head
Sami Mokaddem 2018-05-04 06:27:54 +00:00
parent 6d476814b0
commit 507cd0ee85
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controller/EventsController.php
View File

@ -4389,7 +4389,10 @@ class EventsController extends AppController {
$extended = 0;
}
$grapher->construct($this->Event, $this->Server, $this->Organisation, $this->Auth->user(), $extended);
$servers = $this->Server->find('list', array(
'fields' => array('name'),
));
$grapher->construct($this->Event, $servers, $this->Auth->user(), $extended);
$json = $grapher->get_distributions_graph($id);
array_walk_recursive($json, function(&$item, $key){

19
app/Lib/Tools/DistributionGraphTool.php
View File

@ -1,19 +1,14 @@
<?php
class DistributionGraphTool {
private $__lookupTables = array();
private $__user = false;
private $__json = array();
private $__eventModel = false;
private $__refModel = false;
# Will be use latter on
private $__related_events = array();
private $__related_attributes = array();
public function construct($eventModel, $serverModel, $orgModel, $user, $extended_view=0) {
public function construct($eventModel, $servers, $user, $extended_view=0) {
$this->__eventModel = $eventModel;
$this->__serverModel = $serverModel;
$this->__organisationModel = $orgModel;
$this->__serverList = $servers;
$this->__organisationModel = $eventModel->Orgc;
$this->__user = $user;
$this->__json = array();
$this->__extended_view = $extended_view;
@ -29,10 +24,6 @@
}
$this->__json['distributionInfo'][5] = ""; // inherit event. Will be deleted afterward
$this->__lookupTables = array(
'analysisLevels' => $this->__eventModel->analysisLevels,
'distributionLevels' => $this->__eventModel->Attribute->distributionLevels
);
return true;
}
@ -68,9 +59,7 @@
$this->__addAdditionalDistributionInfo(3, "All other communities"); // add current community
// connected
$servers = $this->__serverModel->find('list', array(
'fields' => array('name'),
));
$servers = $this->__serverList;
$this->__addAdditionalDistributionInfo(2, "This community"); // add current community
foreach ($servers as $server) {
$this->__addAdditionalDistributionInfo(2, $server);