" +
+ data.adalanche.program +
+ "
" +
data.adalanche.shortversion +
- '' +
- data.statistics.Total +
+ "
";
+
+ if (data.adalanche.status == "Ready") {
+ statustext += data.statistics.Total +
' objects connected by '+data.statistics.PwnConnections+' links
';
+ } else {
+ statustext += "Backend status: "+data.adalanche.status;
+ }
first = true
for (datatype in data.statistics) {
@@ -577,7 +588,7 @@ $(function () {
$.ajax({
type: 'GET',
- url: '/filteroptions',
+ url: '/backend/filteroptions',
dataType: 'json',
success: function (data) {
buttons = `
`;
diff --git a/modules/analyze/html/graph.js b/modules/analyze/html/graph.js
index c37f3ec9..ad9e0f4f 100644
--- a/modules/analyze/html/graph.js
+++ b/modules/analyze/html/graph.js
@@ -836,7 +836,7 @@ function initgraph(data) {
onClickFunction: function (evt) {
$.ajax({
type: "GET",
- url: "details/id/" + evt.target.id().substring(1), // n123 format -> 123
+ url: "api/details/id/" + evt.target.id().substring(1), // n123 format -> 123
dataType: "json",
success: function (data) {
if (data.attributes["distinguishedName"]) {
@@ -866,7 +866,7 @@ function initgraph(data) {
onClickFunction: function (evt) {
$.ajax({
type: "GET",
- url: "details/id/" + evt.target.id().substring(1), // n123 format -> 123
+ url: "api/details/id/" + evt.target.id().substring(1), // n123 format -> 123
dataType: "json",
success: function (data) {
if (data.attributes["distinguishedName"]) {
@@ -906,7 +906,7 @@ function initgraph(data) {
// console.log('clicked node ' + this.id());
$.ajax({
type: "GET",
- url: "details/id/" + (evt.target.id().substring(1)), // n123 format -> 123
+ url: "api/details/id/" + (evt.target.id().substring(1)), // n123 format -> 123
dataType: "json",
success: function (data) {
details = rendernode(evt.target)
@@ -975,6 +975,19 @@ function initgraph(data) {
});
});
+ // Distribute all objects to predictable locations
+ data.forEach(function (ele) {
+ if (ele.group == "nodes") {
+ // set x to node id modulus 1024
+ x = ele.data.id.substr(1) % 1024;
+ y = Math.floor(ele.data.id.substr(1) / 1024);
+ ele.position = {
+ x: x,
+ y: y
+ }
+ }
+ });
+
// Load data into Cytoscape
cy.add(data);
diff --git a/modules/analyze/html/icons/twitter.svg b/modules/analyze/html/icons/twitter.svg
deleted file mode 100644
index 2e39d2e2..00000000
--- a/modules/analyze/html/icons/twitter.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
diff --git a/modules/analyze/html/icons/x-logo.svg b/modules/analyze/html/icons/x-logo.svg
new file mode 100644
index 00000000..437e2bfd
--- /dev/null
+++ b/modules/analyze/html/icons/x-logo.svg
@@ -0,0 +1,3 @@
+
diff --git a/modules/analyze/html/index.html b/modules/analyze/html/index.html
index d7c82768..a87673b0 100644
--- a/modules/analyze/html/index.html
+++ b/modules/analyze/html/index.html
@@ -81,8 +81,8 @@
Adalanche
