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

fix: Setting naming consistency fail 

- separator != delimiter
pull/1856/head
iglocska 2016-12-31 22:22:58 +01:00
parent 998294690f
commit 2aad201f26
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controller/FeedsController.php
View File

@ -129,8 +129,8 @@ class FeedsController extends AppController {
if (!isset($this->request->data['Feed']['settings'])) {
$this->request->data['Feed']['settings'] = array();
}
if (isset($this->request->data['Feed']['settings']['separator']) && empty($this->request->data['Feed']['settings']['separator'])) {
$this->request->data['Feed']['settings']['separator'] = ',';
if (isset($this->request->data['Feed']['settings']['delimiter']) && empty($this->request->data['Feed']['settings']['delimiter'])) {
$this->request->data['Feed']['settings']['delimiter'] = ',';
}
if (empty($this->request->data['Feed']['target_event'])) {
$this->request->data['Feed']['target_event'] = 0;
@ -181,8 +181,8 @@ class FeedsController extends AppController {
if (!isset($this->request->data['Feed']['settings'])) {
$this->request->data['Feed']['settings'] = array();
}
if (isset($this->request->data['Feed']['settings']['separator']) && empty($this->request->data['Feed']['settings']['separator'])) {
$this->request->data['Feed']['settings']['separator'] = ',';
if (isset($this->request->data['Feed']['settings']['delimiter']) && empty($this->request->data['Feed']['settings']['delimiter'])) {
$this->request->data['Feed']['settings']['delimiter'] = ',';
}
$this->request->data['Feed']['settings'] = json_encode($this->request->data['Feed']['settings']);
$fields = array('id', 'name', 'provider', 'enabled', 'rules', 'url', 'distribution', 'sharing_group_id', 'tag_id', 'fixed_event', 'event_id', 'publish', 'delta_merge', 'override_ids', 'settings');

8
app/View/Feeds/add.ctp
View File

@ -58,11 +58,11 @@
));
?>
</div>
<div id="settingsCsvSeparatorDiv" class="optionalField">
<div id="settingsCsvDelimiterDiv" class="optionalField">
<?php
echo $this->Form->input('Feed.settings.csv.separator', array(
'label' => 'Separator',
'title' => 'Set the default CSV separator (default = ",")',
echo $this->Form->input('Feed.settings.csv.delimiter', array(
'label' => 'Delimiter',
'title' => 'Set the default CSV delimiter (default = ",")',
'div' => 'input clear',
'placeholder' => ',',
'class' => 'form-control span6',

8
app/View/Feeds/edit.ctp
View File

@ -58,11 +58,11 @@
));
?>
</div>
<div id="settingsCsvSeparatorDiv" class="optionalField">
<div id="settingsCsvDelimiterDiv" class="optionalField">
<?php
echo $this->Form->input('Feed.settings.csv.separator', array(
'label' => 'Separator',
'title' => 'Set the default CSV separator (default = ",")',
echo $this->Form->input('Feed.settings.csv.delimiter', array(
'label' => 'Delimiter',
'title' => 'Set the default CSV delimiter (default = ",")',
'div' => 'input clear',
'placeholder' => ',',
'class' => 'form-control span6'

2
app/webroot/js/misp2.4.58.js
View File

@ -2578,7 +2578,7 @@ function feedFormUpdate() {
$('#DeltaMergeDiv').show();
}
$('#settingsCsvValueDiv').show();
$('#settingsCsvSeparatorDiv').show();
$('#settingsCsvDelimiterDiv').show();
break;
}
}