-
+
@@ -588,8 +641,6 @@ attributes or the appropriate distribution level. If you think there is a mistak
popoverStartup();
$('.select_attribute').removeAttr('checked');
$('.select_proposal').removeAttr('checked');
- $('.mass-select').hide();
- $('.mass-proposal-select').hide();
$('.select_attribute').click(function(e) {
if ($(this).is(':checked')) {
if (e.shiftKey) {
@@ -620,6 +671,20 @@ attributes or the appropriate distribution level. If you think there is a mistak
$('.screenshot').click(function() {
screenshotPopup($(this).attr('src'), $(this).attr('title'));
});
+ $('.sightings_advanced_add').click(function() {
+ var selected = [];
+ var object_id = $(this).data('object-id');
+ if (object_id == 'selected') {
+ $(".select_attribute").each(function() {
+ if ($(this).is(":checked")) {
+ selected.push($(this).data("id"));
+ }
+ });
+ object_id = selected.join('|');
+ }
+ url = "" + "/sightings/advanced/" + object_id;
+ genericPopup(url, '#screenshot_box');
+ });
});
+Html->script('d3');
+ //echo $this->Html->css('sightingstyle');
+?>
+
+
diff --git a/app/View/Events/add.ctp b/app/View/Events/add.ctp
index 3f78ce072..fc02495a7 100644
--- a/app/View/Events/add.ctp
+++ b/app/View/Events/add.ctp
@@ -67,21 +67,21 @@ echo $this->Form->end();
foreach ($formInfoTypes as $formInfoType => $humanisedName) {
echo 'var ' . $formInfoType . 'FormInfoValues = {' . PHP_EOL;
foreach ($info[$formInfoType] as $key => $formInfoData) {
- echo '"' . $key . '": "
' . h($formInfoData['key']) . ': ' . h($formInfoData['desc']) . '
",' . PHP_EOL;
+ echo '"' . $key . '": "
' . h($formInfoData['key']) . ': ' . h($formInfoData['desc']) . '
",' . PHP_EOL;
}
echo '}' . PHP_EOL;
}
?>
-
+
$('#EventDistribution').change(function() {
if ($('#EventDistribution').val() == 4) $('#SGContainer').show();
else $('#SGContainer').hide();
});
-
+
$("#EventDistribution, #EventAnalysis, #EventThreatLevelId").change(function() {
initPopoverContent('Event');
});
-
+
$(document).ready(function() {
if ($('#EventDistribution').val() == 4) $('#SGContainer').show();
else $('#SGContainer').hide();
diff --git a/app/View/Events/ajax/handleSelected.ctp b/app/View/Events/ajax/handleSelected.ctp
new file mode 100644
index 000000000..a11deeaba
--- /dev/null
+++ b/app/View/Events/ajax/handleSelected.ctp
@@ -0,0 +1,30 @@
+
+ Form->create($model, array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => $url));
+ echo $this->Form->input($varName, array(
+ 'type' => 'text',
+ 'value' => 'test',
+ 'style' => 'display:none;',
+ 'label' => false,
+ ));
+ ?>
+
+
+
+
+
+ |
+ Yes
+ |
+
+ |
+
+ No
+ |
+
+
+
+ Form->end();
+ ?>
+
diff --git a/app/View/Feeds/add.ctp b/app/View/Feeds/add.ctp
index 422f8bae3..c4b025351 100644
--- a/app/View/Feeds/add.ctp
+++ b/app/View/Feeds/add.ctp
@@ -16,7 +16,7 @@
'class' => 'form-control span6'
));
echo $this->Form->input('input_source', array(
- 'label' => 'Input Source',
+ 'label' => 'Source Format',
'div' => 'input clear',
'options' => array('network' => 'Network', 'local' => 'Local'),
'class' => 'form-control span6'
diff --git a/app/View/Feeds/edit.ctp b/app/View/Feeds/edit.ctp
index ce3197bfc..62a4dfe68 100644
--- a/app/View/Feeds/edit.ctp
+++ b/app/View/Feeds/edit.ctp
@@ -16,7 +16,7 @@
'class' => 'form-control span6'
));
echo $this->Form->input('input_source', array(
- 'label' => 'Input Source',
+ 'label' => 'Source Format',
'div' => 'input clear',
'options' => array('network' => 'Network', 'local' => 'Local'),
'class' => 'form-control span6'
@@ -187,9 +187,12 @@ var rules = {"pull": {"tags": {"OR":[], "NOT":[]}, "orgs": {"OR":[], "NOT":[]}}}
var validOptions = ['pull'];
var validFields = ['tags', 'orgs'];
var modelContext = 'Feed';
+var tags = [];
+var orgs = [];
$(document).ready(function() {
rules = convertServerFilterRules(rules);
+ serverRulePopulateTagPicklist();
feedDistributionChange();
$("#pull_modify").click(function() {
serverRuleFormActivate('pull');
diff --git a/app/View/Layouts/default.ctp b/app/View/Layouts/default.ctp
index 74452a609..12b3d16f7 100644
--- a/app/View/Layouts/default.ctp
+++ b/app/View/Layouts/default.ctp
@@ -34,8 +34,8 @@
-
+
element('global_menu');
diff --git a/app/View/Roles/admin_add.ctp b/app/View/Roles/admin_add.ctp
index 555da1a3a..6596c0909 100644
--- a/app/View/Roles/admin_add.ctp
+++ b/app/View/Roles/admin_add.ctp
@@ -24,9 +24,6 @@ echo $this->Form->end();
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'addRole'));
$this->Js->get('#RolePermission')->event('change', 'deactivateActions()');
foreach ($permFlags as $k => $flag) {
- if ($k == 'perm_audit' || $k == 'perm_auth') {
- continue;
- }
if ($k !== 'perm_site_admin') $this->Js->get('#' . $flag['id'])->event('change', 'checkPerms("' . $flag['id'] . '")');
else $this->Js->get('#RolePermSiteAdmin')->event('change', 'checkPerms("RolePermSiteAdmin");activateAll();');
}
diff --git a/app/View/Roles/admin_edit.ctp b/app/View/Roles/admin_edit.ctp
index dc375a277..b1c625999 100644
--- a/app/View/Roles/admin_edit.ctp
+++ b/app/View/Roles/admin_edit.ctp
@@ -24,9 +24,6 @@
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'editRole'));
$this->Js->get('#RolePermission')->event('change', 'deactivateActions()');
foreach ($permFlags as $k => $flag) {
- if ($k == 'perm_audit' || $k == 'perm_auth') {
- continue;
- }
if ($k !== 'perm_site_admin') $this->Js->get('#' . $flag['id'])->event('change', 'checkPerms("' . $flag['id'] . '")');
else $this->Js->get('#RolePermSiteAdmin')->event('change', 'checkPerms("RolePermSiteAdmin");activateAll();');
}
diff --git a/app/View/Sightings/ajax/add_sighting.ctp b/app/View/Sightings/ajax/add_sighting.ctp
new file mode 100644
index 000000000..3c5f80eee
--- /dev/null
+++ b/app/View/Sightings/ajax/add_sighting.ctp
@@ -0,0 +1,37 @@
+
Add Sighting
+
+Form->create('Sighting', array('id', 'url' => '/sightings/add/' . urlencode(h($id)), 'style' => 'margin-bottom:0px;'));
+ echo $this->Form->input('type', array(
+ 'options' => array('Sighting', 'Fase-positive', 'Expiration'),
+ 'default' => 0,
+ 'style' => 'width:230px;margin-right:0px;'
+ ));
+ echo $this->Form->input('source', array(
+ 'placeholder' => 'honeypot, IDS sensor id, SIEM,...',
+ 'style' => 'width:447px;',
+ 'div' => array('style' => 'width:457px !important;')
+ ));
+ echo $this->Form->label('Sighting date');
+ echo $this->Form->input('date', array(
+ 'type' => 'text',
+ 'id' => 'datepicker',
+ 'default' => date('Y-m-d'),
+ 'style' => 'width:110px;',
+ 'div' => array('style' => 'width:120px !important;'),
+ 'label' => false
+ ));
+ echo $this->Form->input('time', array(
+ 'class' => 'input-mini',
+ 'default' => date('H:i:s'),
+ 'id' => 'timepicker',
+ 'style' => 'width:120px;',
+ 'div' => array('style' => 'width:120px !important;'),
+ 'label' => false
+ ));
+?>
+
Add
+
+Form->end();
+?>
diff --git a/app/View/Sightings/ajax/advanced.ctp b/app/View/Sightings/ajax/advanced.ctp
new file mode 100644
index 000000000..dbb5d1881
--- /dev/null
+++ b/app/View/Sightings/ajax/advanced.ctp
@@ -0,0 +1,59 @@
+
+
+
+ Graph
+ All
+ My org
+ Add sighting
+
+
+
+
+
+
+Js->writeBuffer(); // Write cached scripts
diff --git a/app/View/Sightings/ajax/list_sightings.ctp b/app/View/Sightings/ajax/list_sightings.ctp
new file mode 100644
index 000000000..2ab5c3af8
--- /dev/null
+++ b/app/View/Sightings/ajax/list_sightings.ctp
@@ -0,0 +1,52 @@
+
+
+
Galaxies
+
+
+ | Date |
+ Organisation |
+ Type |
+ Source |
+ Event ID |
+ Attribute ID |
+ Actions |
+
+
+
+ |
+
+ Html->image('orgs/' . h($item['Organisation']['name']) . '.png', array('alt' => h($item['Organisation']['name']), 'title' => h($item['Organisation']['name']), 'style' => 'width:24px; height:24px'));
+ else:
+ echo h($item['Organisation']['name']);
+ endif;
+
+ ?>
+ |
+
+
+ |
+ |
+ |
+ |
+
+
+
+
+ |
+
+
+
+
diff --git a/app/View/Sightings/ajax/quickDeleteConfirmationForm.ctp b/app/View/Sightings/ajax/quickDeleteConfirmationForm.ctp
new file mode 100644
index 000000000..ca22c2788
--- /dev/null
+++ b/app/View/Sightings/ajax/quickDeleteConfirmationForm.ctp
@@ -0,0 +1,24 @@
+
+ Form->create('Sighting', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => '/sightings/quickDelete/' . $id . '/' . urlencode($rawId) . '/' . $context));
+ ?>
+
+
+
Remove sighting ()?
+
+
+ |
+ Yes
+ |
+
+ |
+
+ No
+ |
+
+
+
+ Form->end();
+ ?>
+
diff --git a/app/View/Sightings/ajax/view_sightings.ctp b/app/View/Sightings/ajax/view_sightings.ctp
new file mode 100644
index 000000000..7c33009f2
--- /dev/null
+++ b/app/View/Sightings/ajax/view_sightings.ctp
@@ -0,0 +1,150 @@
+Html->script('d3');
+ echo $this->Html->css('sightingstyle');
+?>
+
+
diff --git a/app/View/Whitelists/admin_index.ctp b/app/View/Whitelists/admin_index.ctp
index e19ddc61f..34aac3f0d 100644
--- a/app/View/Whitelists/admin_index.ctp
+++ b/app/View/Whitelists/admin_index.ctp
@@ -1,6 +1,5 @@
-
Signature Whitelist
-
Regex entries (in the standard php regex /{regex}/{modifier} format) entered below will restrict matching attributes from being included in the IDS flag sensitive exports (such as NIDS exports).
+
Import Whitelist