Merge branch '2.4' of github.com:MISP/MISP into 2.4

.gitmodules

@@ -27,4 +27,6 @@
 [submodule "misp-vagrant"]
 	path = misp-vagrant
 	url = https://github.com/MISP/misp-vagrant.git
-
+[submodule "cti-python-stix2"]
+	path = cti-python-stix2
+	url = https://github.com/oasis-open/cti-python-stix2

app/Model/Server.php

@@ -1415,7 +1415,7 @@ class Server extends AppModel {
 					),
 					'Export_services_enable' => array(
 							'level' => 0,
-							'description' => 'Enable/disable the import services',
+							'description' => 'Enable/disable the export services',
 							'value' => false,
 							'errorMessage' => '',
 							'test' => 'testBool',
@@ -1423,7 +1423,7 @@ class Server extends AppModel {
 					),
 					'Export_timeout' => array(
 							'level' => 1,
-							'description' => 'Set a timeout for the import services',
+							'description' => 'Set a timeout for the export services',
 							'value' => 10,
 							'errorMessage' => '',
 							'test' => 'testForEmpty',

app/View/Feeds/index.ctp

@@ -170,7 +170,7 @@ foreach ($feeds as $item):
 					if ($item['Feed']['enabled']) echo $this->Html->link('', array('action' => 'fetchFromFeed', $item['Feed']['id']), array('class' => 'icon-download', 'title' => 'Fetch all events'));
 				}
 			?>
-			<a href="<?php echo $baseurl;?>/feeds/edit/<?php echo h($item['Feed']['id']); ?>"><span class="icon-edit" title="edit">&nbsp;</span></a>
+			<a href="<?php echo $baseurl;?>/feeds/edit/<?php echo h($item['Feed']['id']); ?>"><span class="icon-edit" title="Edit">&nbsp;</span></a>
 			<?php echo $this->Form->postLink('', array('action' => 'delete', h($item['Feed']['id'])), array('class' => 'icon-trash', 'title' => 'Delete'), __('Are you sure you want to permanently remove the feed (%s)?', h($item['Feed']['name']))); ?>
 			<a href="<?php echo $baseurl;?>/feeds/view/<?php echo h($item['Feed']['id']); ?>.json" title="Download feed metadata as JSON" download><span class="fa fa-cloud-download black"></span></a>
 		</td>

app/View/Feeds/preview_index.ctp

@@ -32,7 +32,7 @@
 			<th class="filter">Tags</th>
 			<th class="filter"><?php echo $this->Paginator->sort('date');?></th>
 			<th class="filter" title="<?php echo $eventDescriptions['threat_level_id']['desc'];?>"><?php echo $this->Paginator->sort('threat_level_id');?></th>
-			<th title="<?php echo $eventDescriptions['analysis']['desc'];?>"><?php echo $this->Paginator->sort('analysis');?></th>
+			<th title="<?php echo $eventDescriptions['analysis']['desc'];, 'title' => 'Fetch the event'?>"><?php echo $this->Paginator->sort('analysis');?></th>
 			<th class="filter"><?php echo $this->Paginator->sort('info');?></th>
 			<th class="filter"><?php echo $this->Paginator->sort('timestamp');?></th>
 			<th class="actions">Actions</th>
@@ -62,7 +62,7 @@
 			</td>
 			<td ondblclick="document.location.href ='<?php echo $eventViewURL . h($uuid);?>'" class="short"><?php echo h($event['timestamp']); ?></td>
 			<td class="short action-links">
-				<?php if ($feed['Feed']['enabled']) echo $this->Form->postLink('', '/feeds/getEvent/' . $id . '/' . $uuid, array('class' => 'icon-download'), __('Are you sure you want to fetch and save this event on your instance?', $this->Form->value('Feed.id'))); ?>
+				<?php if ($feed['Feed']['enabled']) echo $this->Form->postLink('', '/feeds/getEvent/' . $id . '/' . $uuid, array('class' => 'icon-download', 'title' => 'Fetch the event'), __('Are you sure you want to fetch and save this event on your instance?', $this->Form->value('Feed.id'))); ?>
 				<a href='<?php echo $eventViewURL . h($uuid);?>' class = "icon-list-alt" title = "View"></a>
 			</td>
 		</tr>

app/View/Servers/preview_index.ctp

@@ -144,7 +144,7 @@
 				?>
 			</td>
 			<td class="short action-links">
-				<?php if ($event['Event']['published']) echo $this->Form->postLink('', '/servers/pull/' . $server['Server']['id'] . '/' . $event['Event']['id'], array('class' => 'icon-download'), __('Are you sure you want to fetch and save this event on your instance?', $this->Form->value('Server.id'))); ?>
+				<?php if ($event['Event']['published']) echo $this->Form->postLink('', '/servers/pull/' . $server['Server']['id'] . '/' . $event['Event']['id'], array('class' => 'icon-download', 'title' => 'Fetch the event'), __('Are you sure you want to fetch and save this event on your instance?', $this->Form->value('Server.id'))); ?>
 				<a href='<?php echo $eventViewURL . h($event['Event']['id']);?>' class = "icon-list-alt" title = "View"></a>
 			</td>
 		</tr>

cti-python-stix2

@@ -0,0 +1 @@
+Subproject commit ef6dade6f6773edd14aa16a2e4566e50bf74cbb4