Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules

app/Controller/EventsController.php

@@ -3671,7 +3671,6 @@ class EventsController extends AppController
                                 if (empty($tagCollection)) {
                                     return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid Tag Collection.')), 'status'=>200, 'type' => 'json'));
                                 }
-                                $tag_id_list = array();
                                 foreach ($tagCollection[0]['TagCollectionTag'] as $tagCollectionTag) {
                                     $tag_id_list[] = $tagCollectionTag['tag_id'];
                                 }

app/View/Events/view_graph.ctp

@@ -12,7 +12,7 @@
 <?php
     if (!$ajax):
 ?>
-    <div class="view">
+    <div class="graph-view">
 <?php endif; ?>
     <span id="fullscreen-btn-correlation" class="fullscreen-btn-correlation btn btn-xs btn-primary" data-toggle="tooltip" data-placement="top" data-title="<?php echo __('Toggle fullscreen');?>"><span class="fa fa-desktop"></span></span>
     <div id="chart" style="width:100%;height:100%"></div>
@@ -30,6 +30,7 @@
             <li id="expand"><?php echo __('Expand');?></li>
             <li id="context-delete"><?php echo __('Delete');?></li>
         </ul>
+        <button class="correlation-stop-btn btn btn-inverse" onClick="togglePhysics();" title="<?php echo __('Toggle the physics engine on/off.');?> ">Toggle physics</button>
 <?php
     if (!$ajax):
 ?>

app/files/misp-galaxy

@@ -1 +1 @@
-Subproject commit 0ebe2c50a7a04ae2108e0c32da058826cf15387c
+Subproject commit 9517c8b8782a9385874940eec6741a78597cad12

app/files/taxonomies

@@ -1 +1 @@
-Subproject commit b82ab8bfd5e3b8e29b7b147053935cfc2d5868bc
+Subproject commit 788371461432499007d558fc7acb4477c3d9a898

app/webroot/css/correlation-graph.css

@@ -88,4 +88,15 @@ line.link {
   cursor: nesw-resize;
 }
 
+.graph-view {
+    float: right;
+    width: calc(100% - 216px);
+    border-left: 1px solid #666;
+    padding: 0px 10px;
+}
 
+.correlation-stop-btn {
+    position: absolute;
+    top: 60px;
+    right:10px;
+}

app/webroot/js/correlation-graph.js

@@ -1,13 +1,24 @@
+var pinNodes = true;
+
+function togglePhysics() {
+    d3.selectAll(".node").each(
+        function(d) {
+            d.fixed = pinNodes;
+        }
+    );
+    pinNodes = !pinNodes;
+}
+
 $(document).ready( function() {
   var currentMousePos = { x: -1, y: -1 };
   $(document).mousemove(function(event) {
-  	currentMousePos.x = event.pageX;
+  	currentMousePos  .x = event.pageX;
   	currentMousePos.y = event.pageY;
   });
 
   var margin = {top: -5, right: -5, bottom: -5, left: -5},
   width = $(window).width() - margin.left - margin.right,
-  height = $(window).height() - 160 - margin.top - margin.bottom;
+  height = $(window).height() - 115 - margin.top - margin.bottom;
   var menu_x_buffer_ = width - 150;
   var menu_y_buffer = height - 100;
 
@@ -524,5 +535,6 @@ $(document).ready( function() {
   			}
   		}
   	}
+
   });
 });