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

2021-05-04 09:47:04 +02:00 · 2021-05-04 09:47:04 +02:00 · 25ceea7f4e
parent 43836e2fb4 2da03a7924
commit 25ceea7f4e
3 changed files with 48 additions and 60 deletions
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@ -3280,41 +3280,40 @@ class EventsController extends AppController
    public function proposalEventIndex()
    {
        $this->loadModel('ShadowAttribute');
-        $this->ShadowAttribute->recursive = -1;
        $conditions = array('ShadowAttribute.deleted' => 0);
        if (!$this->_isSiteAdmin()) {
            $conditions[] = array('ShadowAttribute.event_org_id' => $this->Auth->user('org_id'));
        }
-        $result = $this->ShadowAttribute->find('all', array(
-                'fields' => array('event_id'),
-                'group' => array('event_id', 'id'),
-                'conditions' => $conditions
-        ));
+        $result = $this->ShadowAttribute->find('column', [
+            'fields' => ['event_id'],
+            'conditions' => $conditions,
+            'unique' => true,
+        ]);
        $this->Event->recursive = -1;
-        $conditions = array();
-        foreach ($result as $eventId) {
-            $conditions['OR'][] = array('Event.id =' => $eventId['ShadowAttribute']['event_id']);
-        }
+
        if (empty($result)) {
-            $conditions['OR'][] = array('Event.id =' => -1);
+            $conditions = array('Event.id' => -1);
+        } else {
+            $conditions = array('Event.id' => $result);
        }
        $this->paginate = array(
-                'fields' => array('Event.id', 'Event.org_id', 'Event.orgc_id', 'Event.publish_timestamp', 'Event.distribution', 'Event.info', 'Event.date', 'Event.published'),
-                'conditions' => $conditions,
-                'contain' => array(
-                    'User' => array(
-                            'fields' => array(
-                                'User.email'
-                    )),
-                    'ShadowAttribute'=> array(
-                        'fields' => array(
-                            'ShadowAttribute.id', 'ShadowAttribute.org_id', 'ShadowAttribute.event_id'
-                        ),
-                        'conditions' => array(
-                            'ShadowAttribute.deleted' => 0
-                        ),
+            'fields' => array('Event.id', 'Event.org_id', 'Event.orgc_id', 'Event.publish_timestamp', 'Event.distribution', 'Event.info', 'Event.date', 'Event.published'),
+            'conditions' => $conditions,
+            'contain' => array(
+                'User' => array(
+                    'fields' => array(
+                        'User.email'
+                )),
+                'ShadowAttribute'=> array(
+                    'fields' => array(
+                        'ShadowAttribute.id', 'ShadowAttribute.org_id', 'ShadowAttribute.event_id'
                    ),
-        ));
+                    'conditions' => array(
+                        'ShadowAttribute.deleted' => 0
+                    ),
+                ),
+            )
+        );
        $events = $this->paginate();
        $orgIds = array();
        foreach ($events as $k => $event) {
@ -5455,10 +5454,10 @@ class EventsController extends AppController
        $editors = array_unique($editors);

        if ($event['Event']['timestamp'] > $timestamp && empty($editors)) {
-            $message = __('<b>Warning<b>: This event view is outdated. Please reload page to see latest changes.');
+            $message = __('<b>Warning</b>: This event view is outdated. Please reload page to see latest changes.');
            $this->set('class', 'alert');
        } else if ($event['Event']['timestamp'] > $timestamp) {
-            $message = __('<b>Warning<b>: This event view is outdated, because is currently being edited by: %s. Please reload page to see latest changes.', h(implode(', ', $editors)));
+            $message = __('<b>Warning</b>: This event view is outdated, because is currently being edited by: %s. Please reload page to see latest changes.', h(implode(', ', $editors)));
            $this->set('class', 'alert');
        } else if (empty($editors)) {
            return new CakeResponse(['status' => 204]);
--- a/app/View/Events/proposal_event_index.ctp
+++ b/app/View/Events/proposal_event_index.ctp
@ -1,5 +1,5 @@
 <div class="events index">
-    <h2><?php echo __('Event with proposals');?></h2>
+    <h2><?= __('Event with proposals');?></h2>
    <div class="pagination">
        <ul>
        <?php
@ -14,7 +14,7 @@
            <th class="filter">
                <?php echo $this->Paginator->sort('published');?>
            </th>
-            <th><?php echo $this->Paginator->sort('id', 'Id', array('direction' => 'desc'));?></th>
+            <th><?php echo $this->Paginator->sort('id', 'ID', array('direction' => 'desc'));?></th>
            <th><?php echo $this->Paginator->sort('attribute_count', __('Proposals'));?></th>
            <th><?php echo __('Contributors');?></th>
            <?php if ($isSiteAdmin): ?>
@ -30,48 +30,38 @@
                <?php echo $this->Paginator->sort('distribution');?>
            </th>
        </tr>
-        <?php foreach ($events as $event):?>
-        <tr <?php if ($event['Event']['distribution'] == 0) echo 'class = "privateRed"'?>>
-            <td class="short" onclick="document.location.href ='<?php echo $baseurl."/events/view/".$event['Event']['id'];?>'">
-                <?php
-                if ($event['Event']['published'] == 1) {
-                ?>
-                    <a href="<?php echo $baseurl."/events/view/".$event['Event']['id'] ?>" class = "icon-ok" title = "<?php echo __('View');?>" aria-label = "<?php echo __('View');?>"></a>
-                <?php
-                } else {
-                ?>
-                    <a href="<?php echo $baseurl."/events/view/".$event['Event']['id'] ?>" class = "icon-remove" title = "<?php echo __('View');?>" aria-label = "<?php echo __('View');?>"></a>
-                <?php
-                }?>&nbsp;
+        <?php foreach ($events as $event): ?>
+        <tr<?php if ($event['Event']['distribution'] == 0) echo ' class="privateRed"'?>>
+            <td class="short dblclickElement">
+                <a href="<?= $baseurl."/events/view/".$event['Event']['id'] ?>" title="<?= __('View') ?>" aria-label="<?= __('View') ?>"><i class="<?= $event['Event']['published'] ? 'black fa fa-check' : 'black fa fa-times' ?>"></i></a>
            </td>
            <td class="short">
-                <a href="<?php echo $baseurl."/events/view/".$event['Event']['id'] ?>"><?php echo $event['Event']['id'];?></a>
+                <a href="<?= $baseurl."/events/view/".$event['Event']['id'] ?>" class="dblclickActionElement"><?= $event['Event']['id'] ?></a>
            </td>
-            <td class="short" onclick="location.href ='<?php echo $baseurl."/events/view/".$event['Event']['id'];?>'" style="color:red;font-weight:bold;">
-                <?php echo count($event['ShadowAttribute']); ?>&nbsp;
+            <td class="short">
+                <a href="<?= $baseurl."/events/view/".$event['Event']['id'] . '/proposal:1' ?>" style="color:red;font-weight:bold;"><?= $event['Event']['proposal_count']; ?></a>
            </td>
            <td class="short">
                <?php
                    foreach ($event['orgArray'] as $k => $org) {
                        echo $this->OrgImg->getOrgImg(array('name' => $orgs[$org], 'id' => $org, 'size' => 24));
-                        if ((1 + $k) < (count($event['orgArray']))) echo '<br />';
+                        if ((1 + $k) < (count($event['orgArray']))) echo '<br>';
                    }
                ?>
-                &nbsp;
            </td>
-            <?php if ('true' == $isSiteAdmin): ?>
-            <td class="short" onclick="location.href ='<?php echo $baseurl."/events/view/".$event['Event']['id'];?>'">
-                <?php echo h($event['User']['email']); ?>&nbsp;
+            <?php if ($isSiteAdmin): ?>
+            <td class="short dblclickElement">
+                <?php echo h($event['User']['email']); ?>
            </td>
            <?php endif; ?>
-            <td class="short" onclick="location.href ='<?php echo $baseurl."/events/view/".$event['Event']['id'];?>'">
-                <?php echo $event['Event']['date']; ?>&nbsp;
+            <td class="short dblclickElement">
+                <?php echo $event['Event']['date']; ?>
            </td>
-            <td onclick="location.href ='<?php echo $baseurl."/events/view/".$event['Event']['id'];?>'">
-                <?php echo nl2br(h($event['Event']['info'])); ?>&nbsp;
+            <td class="dblclickElement">
+                <?php echo nl2br(h($event['Event']['info'])); ?>
            </td>
-            <td class="short <?php if ($event['Event']['distribution'] == 0) echo 'privateRedText';?>" onclick="location.href ='<?php echo $baseurl."/events/view/".$event['Event']['id'];?>'">
-                <?php echo $event['Event']['distribution'] != 3 ? $distributionLevels[$event['Event']['distribution']] : 'All';?>
+            <td class="short dblclickElement <?php if ($event['Event']['distribution'] == 0) echo 'privateRedText';?>">
+                <?= $event['Event']['distribution'] != 3 ? $distributionLevels[$event['Event']['distribution']] : __('All');?>
            </td>
        </tr>
        <?php endforeach; ?>
@ -93,5 +83,4 @@
        </ul>
    </div>
 </div>
-<?php
-    echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => 'viewProposalIndex'));
+<?= $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => 'viewProposalIndex'));
--- a/app/files/feed-metadata/defaults.json
+++ b/app/files/feed-metadata/defaults.json
@ -3,7 +3,7 @@
    "Feed": {
      "name": "CIRCL OSINT Feed",
      "provider": "CIRCL",
-      "url": "https://www.circl.lu/doc/misp/feed-osint",
+      "url": "https://www.circl.lu/doc/misp/feed-osint/",
      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
      "enabled": true,
      "distribution": "3",