diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index 04df6daf9..90270e1ad 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -61,7 +61,6 @@ class Attribute extends AppModel {
public $distributionDescriptions = array(
'Org' => array('desc' => 'This field determines the current distribution of the even', 'formdesc' => "Only organization members will see the attribute"),
'Community' => array('desc' => 'This field determines the current distribution of the even', 'formdesc' => "Attribute visible to all on this CyDefSIG instance but will not be shared past it"),
- 'No push' => array('desc' => 'This field determines the current distribution of the even', 'formdesc' => "To be distributed to other servers but no push (compatible with CyDefSIG v1 *private* field"),
'All' => array('desc' => 'This field determines the current distribution of the even', 'formdesc' => "To be distributed to other connected CyDefSIG servers"),
);
@@ -287,7 +286,7 @@ class Attribute extends AppModel {
if ('true' == Configure::read('CyDefSIG.private')) {
$this->virtualFields = Set::merge($this->virtualFields,array(
- 'distribution' => 'IF (Attribute.private=true, "Org", IF (Attribute.cluster=true, "Community", IF (Attribute.pull=true, "No push", "All")))',
+ 'distribution' => 'IF (Attribute.private=true, "Org", IF (Attribute.cluster=true, "Community", "All"))',
));
$this->fieldDescriptions = Set::merge($this->fieldDescriptions,array(
@@ -316,7 +315,7 @@ class Attribute extends AppModel {
),
),
'distribution' => array(
- 'rule' => array('inList', array('Org', 'Community', 'No push', 'All')),
+ 'rule' => array('inList', array('Org', 'Community', 'All')),
//'message' => 'Your custom message here',
'allowEmpty' => false,
'required' => false,
@@ -427,11 +426,6 @@ class Attribute extends AppModel {
$data['Attribute']['cluster'] = true;
$data['Attribute']['pull'] = false;
break;
- case 'No push':
- $data['Attribute']['private'] = false;
- $data['Attribute']['cluster'] = false;
- $data['Attribute']['pull'] = true;
- break;
case 'All':
$data['Attribute']['private'] = false;
$data['Attribute']['cluster'] = false;
diff --git a/app/Model/Event.php b/app/Model/Event.php
index bb7820113..77ee28ef5 100644
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -47,7 +47,6 @@ class Event extends AppModel {
public $distributionDescriptions = array(
'Org' => array('desc' => 'This field determines the current distribution of the even', 'formdesc' => "Only organization members will see the event"),
'Community' => array('desc' => 'This field determines the current distribution of the even', 'formdesc' => "Event visible to all on this CyDefSIG instance but will not be shared past it"),
- 'No push' => array('desc' => 'This field determines the current distribution of the even', 'formdesc' => "To be distributed to other servers but no push (compatible with CyDefSIG v1 *private* field"),
'All' => array('desc' => 'This field determines the current distribution of the even', 'formdesc' => "To be distributed to other connected CyDefSIG servers"),
);
@@ -161,11 +160,11 @@ class Event extends AppModel {
if ('true' == Configure::read('CyDefSIG.private')) {
$this->virtualFields = Set::merge($this->virtualFields, array(
- 'distribution' => 'IF (Event.private=true, "Org", IF (Event.cluster=true, "Community", IF (Event.pull=true, "No push", "All")))',
+ 'distribution' => 'IF (Event.private=true, "Org", IF (Event.cluster=true, "Community", "All"))',
));
$this->fieldDescriptions = Set::merge($this->fieldDescriptions, array(
- 'distribution' => 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 itNo 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'),
+ 'distribution' => 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 itAll - to be distributed to other connected CyDefSIG servers'),
));
$this->validate = Set::merge($this->validate,array(
@@ -190,7 +189,7 @@ class Event extends AppModel {
),
),
'distribution' => array(
- 'rule' => array('inList', array('Org', 'Community', 'No push', 'All')),
+ 'rule' => array('inList', array('Org', 'Community', 'All')),
//'message' => 'Your custom message here',
'allowEmpty' => false,
'required' => false,
@@ -293,11 +292,6 @@ class Event extends AppModel {
$data['Event']['cluster'] = true;
$data['Event']['pull'] = false;
break;
- case 'No push':
- $data['Event']['private'] = false;
- $data['Event']['cluster'] = false;
- $data['Event']['pull'] = true;
- break;
case 'All':
$data['Event']['private'] = false;
$data['Event']['cluster'] = false;
@@ -377,9 +371,6 @@ class Event extends AppModel {
if (true == $event['Event']['private']) { // never upload private events
return "Event is private and non exportable";
}
- if (('true' == Configure::read('CyDefSIG.private')) && ($event['Event']['pull'])) {
- return "Event is No push so non exportable";
- }
$url = $server['Server']['url'];
$authkey = $server['Server']['authkey'];
diff --git a/app/View/Events/index.ctp b/app/View/Events/index.ctp
index 60953ca42..6144ab535 100755
--- a/app/View/Events/index.ctp
+++ b/app/View/Events/index.ctp
@@ -57,7 +57,7 @@ $buttonPublishStatus = $isAclPublish ? 'button_on':'button_off';