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

Wording change 

Changed Private column to Distribution + some minor vocabulary changes.
pull/63/head
Andrzej Dereszowski 2012-10-22 16:29:08 +02:00
parent 5a385b4e0b
commit 25e63dda68
10 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/AttributesController.php
View File

@ -195,7 +195,7 @@ class AttributesController extends AppController {
$this->set('categories',compact('categories'));
if ('true' == Configure::read('CyDefSIG.private')) {
$sharings = array('Org', 'Server', 'Pull only', 'All');
$sharings = array('Org', 'Community', 'No push', 'All');
$sharings = $this->_arrayToValuesIndexArray($sharings);
$this->set('sharings',compact('sharings'));
}

2
app/Controller/EventsController.php
View File

@ -324,7 +324,7 @@ class EventsController extends AppController {
$this->set('risks',compact('risks'));
if ('true' == Configure::read('CyDefSIG.private')) {
$sharings = array('Org', 'Server', 'Pull only', 'All');
$sharings = array('Org', 'Community', 'No push', 'All');
$sharings = $this->_arrayToValuesIndexArray($sharings);
$this->set('sharings',compact('sharings'));
}

2
app/Model/Attribute.php
View File

@ -284,7 +284,7 @@ class Attribute extends AppModel {
));
$this->fieldDescriptions = Set::merge($this->fieldDescriptions,array(
'sharing' => array('desc' => 'This field tells how and if the attribute should be shared with other CyDefSIG users'),
'sharing' => array('desc' => 'This fields indicates the intended distribution of the attribute (same as when adding an event, see Add Event)'),
));
$this->validate = Set::merge($this->validate,array(

1
app/Model/Event.php
View File

@ -33,6 +33,7 @@ class Event extends AppModel {
public $fieldDescriptions = array(
'risk' => array('desc' => 'Risk levels: *low* means mass-malware, *medium* means APT malware, *high* means sophisticated APT malware or 0-day attack', 'formdesc' => 'Risk levels:<br/>low: mass-malware<br/>medium: APT malware<br/>high: sophisticated APT malware or 0-day attack'),
'private' => array('desc' => 'This field tells if the event should be shared with other CyDefSIG servers'),
'sharing' => array('desc' => 'This field determines the current distribution of the event', 'formdesc' => 'This field determines the current distribution of the event:<br/>Org - only organization memebers will see the event<br/>Community - event visible to all on this CyDefSIG instance but will not be shared past it</br>No push - to be distributed to other servers but no push (compatible with CyDefSIG v1 *private* field)<br/>All - to be distributed to other connected CyDefSIG servers'),
'classification' => array('desc' => 'Set the Traffic Light Protocol classification. <ol><li><em>TLP:AMBER</em>- Share only within the organization on a need-to-know basis</li><li><em>TLP:GREEN:NeedToKnow</em>- Share within your constituency on the need-to-know basis.</li><li><em>TLP:GREEN</em>- Share within your constituency.</li></ol>'),
'submittedfile' => array('desc' => 'GFI sandbox: export upload', 'formdesc' => 'GFI sandbox:<br/>export upload'),
);

2
app/View/Attributes/add.ctp
View File

@ -15,7 +15,7 @@ echo $this->Form->input('type', array(
));
if ('true' == Configure::read('CyDefSIG.sync')) {
if ('true' == Configure::read('CyDefSIG.private')) {
echo $this->Form->input('sharing', array('label' => 'Private',
echo $this->Form->input('sharing', array('label' => 'Distribution',
'before' => $this->Html->div('forminfo', isset($attrDescriptions['sharing']['formdesc']) ? $attrDescriptions['sharing']['formdesc'] : $attrDescriptions['sharing']['desc']),
));
} else {

2
app/View/Attributes/edit.ctp
View File

@ -17,7 +17,7 @@ if ($attachment) {
}
if ('true' == Configure::read('CyDefSIG.sync')) {
if ('true' == Configure::read('CyDefSIG.private')) {
echo $this->Form->input('sharing', array('label' => 'Private',
echo $this->Form->input('sharing', array('label' => 'Distribution',
'before' => $this->Html->div('forminfo', isset($attrDescriptions['sharing']['formdesc']) ? $attrDescriptions['sharing']['formdesc'] : $attrDescriptions['sharing']['desc']),
));
} else {

2
app/View/Attributes/event.ctp
View File

@ -47,7 +47,7 @@
&nbsp;
</dd>
<?php if ('true' == Configure::read('CyDefSIG.sync')): ?>
<dt>Private</dt>
<dt>Distribution</dt>
<dd>
<?php echo ($event['Event']['private'])? 'Yes, never upload Event or any Attributes.' : 'No, upload Event and all Attributes except those marked as Private.'; ?>
&nbsp;

2
app/View/Events/add.ctp
View File

@ -6,7 +6,7 @@
echo $this->Form->input('date');
if ('true' == Configure::read('CyDefSIG.sync')) {
if ('true' == Configure::read('CyDefSIG.private')) {
echo $this->Form->input('sharing', array('label' => 'Private',
echo $this->Form->input('sharing', array('label' => 'Distribution',
'before' => $this->Html->div('forminfo', isset($eventDescriptions['sharing']['formdesc']) ? $eventDescriptions['sharing']['formdesc'] : $eventDescriptions['sharing']['desc']),));
} else {
echo $this->Form->input('private', array(

2
app/View/Events/edit.ctp
View File

@ -9,7 +9,7 @@ echo $this->Form->input('risk', array(
'before' => $this->Html->div('forminfo', isset($eventDescriptions['risk']['formdesc']) ? $eventDescriptions['risk']['formdesc'] : $eventDescriptions['risk']['desc'])));
if ('true' == Configure::read('CyDefSIG.sync')) {
if ('true' == Configure::read('CyDefSIG.private')) {
echo $this->Form->input('sharing', array('label' => 'Private',
echo $this->Form->input('sharing', array('label' => 'Distribution',
'before' => $this->Html->div('forminfo', isset($eventDescriptions['sharing']['formdesc']) ? $eventDescriptions['sharing']['formdesc'] : $eventDescriptions['sharing']['desc']),));
} else {
echo $this->Form->input('private', array(

2
app/View/Events/view.ctp
View File

@ -64,7 +64,7 @@ if ($mayPublish) {
</dd>
<?php if ('true' == Configure::read('CyDefSIG.sync')): ?>
<?php if ('true' == Configure::read('CyDefSIG.private')): ?>
<dt>Private</dt>
<dt>Distribution</dt>
<dd>
<?php echo ($event['Event']['sharing'] == 'All') ? 'upload Event and all Attributes except those marked as to keep in Org or Server.' : (($event['Event']['sharing'] == 'Server') ? 'Server, Only show Event or any Attributes to Server members.' : (($event['Event']['sharing'] == 'Pull only') ? 'Pull only, Do not show Event or any Attributes, but do Pull this Event or Attribute.': 'Org, Only show Event or any Attributes to Org members.')); ?>
&nbsp;