From 25e63dda68a965f1f53c54ec6ae466310ab3dd17 Mon Sep 17 00:00:00 2001 From: Andrzej Dereszowski Date: Mon, 22 Oct 2012 16:29:08 +0200 Subject: [PATCH] Wording change Changed Private column to Distribution + some minor vocabulary changes. --- app/Controller/AttributesController.php | 2 +- app/Controller/EventsController.php | 2 +- app/Model/Attribute.php | 2 +- app/Model/Event.php | 1 + app/View/Attributes/add.ctp | 2 +- app/View/Attributes/edit.ctp | 2 +- app/View/Attributes/event.ctp | 2 +- app/View/Events/add.ctp | 2 +- app/View/Events/edit.ctp | 2 +- app/View/Events/view.ctp | 2 +- 10 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/Controller/AttributesController.php b/app/Controller/AttributesController.php index 36200cc2d..c5188ff18 100755 --- a/app/Controller/AttributesController.php +++ b/app/Controller/AttributesController.php @@ -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')); } diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php index f0a9d8412..2d553c35c 100755 --- a/app/Controller/EventsController.php +++ b/app/Controller/EventsController.php @@ -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')); } diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php index b045aa315..6fa2513e6 100644 --- a/app/Model/Attribute.php +++ b/app/Model/Attribute.php @@ -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( diff --git a/app/Model/Event.php b/app/Model/Event.php index 801825d72..53a6c4d15 100644 --- a/app/Model/Event.php +++ b/app/Model/Event.php @@ -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:
low: mass-malware
medium: APT malware
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:
Org - only organization memebers will see the event
Community - event visible to all on this CyDefSIG instance but will not be shared past it
No push - to be distributed to other servers but no push (compatible with CyDefSIG v1 *private* field)
All - to be distributed to other connected CyDefSIG servers'), 'classification' => array('desc' => 'Set the Traffic Light Protocol classification.
  1. TLP:AMBER- Share only within the organization on a need-to-know basis
  2. TLP:GREEN:NeedToKnow- Share within your constituency on the need-to-know basis.
  3. TLP:GREEN- Share within your constituency.
'), 'submittedfile' => array('desc' => 'GFI sandbox: export upload', 'formdesc' => 'GFI sandbox:
export upload'), ); diff --git a/app/View/Attributes/add.ctp b/app/View/Attributes/add.ctp index 782093bec..dbdab5a3c 100755 --- a/app/View/Attributes/add.ctp +++ b/app/View/Attributes/add.ctp @@ -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 { diff --git a/app/View/Attributes/edit.ctp b/app/View/Attributes/edit.ctp index f291de012..6e2a409cb 100755 --- a/app/View/Attributes/edit.ctp +++ b/app/View/Attributes/edit.ctp @@ -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 { diff --git a/app/View/Attributes/event.ctp b/app/View/Attributes/event.ctp index 83c2bd12f..72545c1d3 100755 --- a/app/View/Attributes/event.ctp +++ b/app/View/Attributes/event.ctp @@ -47,7 +47,7 @@   -
Private
+
Distribution
  diff --git a/app/View/Events/add.ctp b/app/View/Events/add.ctp index 2f416cc38..38e6f99bb 100755 --- a/app/View/Events/add.ctp +++ b/app/View/Events/add.ctp @@ -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( diff --git a/app/View/Events/edit.ctp b/app/View/Events/edit.ctp index ebe34e7d8..c014e256c 100755 --- a/app/View/Events/edit.ctp +++ b/app/View/Events/edit.ctp @@ -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( diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp index d618c5e26..2441b367b 100755 --- a/app/View/Events/view.ctp +++ b/app/View/Events/view.ctp @@ -64,7 +64,7 @@ if ($mayPublish) {
-
Private
+
Distribution