-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
25 changed files
with
176 additions
and
138 deletions.
There are no files selected for viewing
Submodule PyMISP
updated
10 files
| +1 −1 | .github/workflows/pytest.yml | |
| +1 −1 | .readthedocs.yml | |
| +53 −0 | CHANGELOG.txt | |
| +3 −3 | README.md | |
| +945 −526 | poetry.lock | |
| +6 −6 | pymisp/__init__.py | |
| +4 −1 | pymisp/abstract.py | |
| +1 −1 | pymisp/data/misp-objects | |
| +2 −2 | pymisp/tools/emailobject.py | |
| +14 −14 | pyproject.toml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| {"major":2, "minor":4, "hotfix":167} | ||
| {"major":2, "minor":4, "hotfix":168} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,59 @@ | ||
| <div class="logs index"> | ||
| <h2><?= __('Audit logs for event #%s', intval($event['Event']['id'])) ?></h2> | ||
| <div class="pagination"> | ||
| <ul> | ||
| <?php | ||
| $paginator = $this->LightPaginator->prev('« ' . __('previous'), array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'prev disabled', 'escape' => false, 'disabledTag' => 'span')); | ||
| $paginator .= $this->LightPaginator->next(__('next') . ' »', array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'next disabled', 'escape' => false, 'disabledTag' => 'span')); | ||
| echo $paginator; | ||
| ?> | ||
| <li><a href="<?= $baseurl . '/logs/event_index/' . intval($event['Event']['id']) ?>"><?= __('Older logs') ?></a></li> | ||
| </ul> | ||
| </div> | ||
| <table class="table table-striped table-hover table-condensed"> | ||
| <tr> | ||
| <th><?= $this->LightPaginator->sort('created') ?></th> | ||
| <th><?= $this->LightPaginator->sort('user_id', __('User')) ?></th> | ||
| <th><?= $this->LightPaginator->sort('org_id', __('Org')) ?></th> | ||
| <th><?= $this->LightPaginator->sort('action') ?></th> | ||
| <th><?= __('Model') ?></th> | ||
| <th><?= __('Title') ?></th> | ||
| <th><?= __('Change') ?></th> | ||
| </tr> | ||
| <?php foreach ($list as $item): ?> | ||
| <tr> | ||
| <td class="short"><?= $this->Time->time($item['AuditLog']['created']); ?></td> | ||
| <td class="short"><?php | ||
| if (isset($item['AuditLog']['user_id']) && $item['AuditLog']['user_id'] == 0) { | ||
| echo __('SYSTEM'); | ||
| } else if (isset($item['User']['email'])) { | ||
| echo h($item['User']['email']); | ||
| } ?></td> | ||
| <td class="short"><?= isset($item['Organisation']) ? $this->OrgImg->getOrgLogo($item, 24) : '' ?></td> | ||
| <td class="short"><?= h($item['AuditLog']['action_human']) ?></td> | ||
| <td class="short"><?= h($item['AuditLog']['model']) . ' #' . intval($item['AuditLog']['model_id']) ?></td> | ||
| <td class="limitedWidth"><?= h($item['AuditLog']['title']) ?></td> | ||
| <td><?= $this->element('AuditLog/change', ['item' => $item]) ?></td> | ||
| </tr> | ||
| <?php endforeach; ?> | ||
| </table> | ||
| <div class="pagination"> | ||
| <ul> | ||
| <?= $paginator ?> | ||
| <li><a href="<?= $baseurl . '/logs/event_index/' . intval($event['Event']['id']) ?>"><?= __('Older logs') ?></a></li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| <?= $this->element('/genericElements/SideMenu/side_menu', ['menuList' => 'event', 'menuItem' => 'eventLog']); | ||
|
|
||
| <?php | ||
| echo sprintf('<div%s>', empty($ajax) ? ' class="index"' : ''); | ||
| echo $this->element('genericElements/IndexTable/index_table', [ | ||
| 'data' => [ | ||
| 'light_paginator' => 1, | ||
| 'data' => $data, | ||
| 'fields' => [ | ||
| [ | ||
| 'name' => __('Created'), | ||
| 'data_path' => 'AuditLog.created', | ||
| 'sort' => 'AuditLog.created', | ||
| 'class' => 'short', | ||
| 'element' => 'time' | ||
| ], | ||
| [ | ||
| 'name' => __('User'), | ||
| 'data_path' => 'User.email', | ||
| 'sort' => 'User.email', | ||
| 'class' => 'short', | ||
| 'empty' => 'SYSTEM' | ||
| ], | ||
| [ | ||
| 'name' => __('Organisation'), | ||
| 'data_path' => 'Organisation', | ||
| 'sort' => 'Organisation.name', | ||
| 'element' => 'org', | ||
| 'class' => 'short' | ||
| ], | ||
| [ | ||
| 'name' => __('Action'), | ||
| 'data_path' => 'AuditLog.action_human', | ||
| 'sort' => 'AuditLog.action_human', | ||
| 'class' => 'short' | ||
| ], | ||
| [ | ||
| 'name' => __('Model'), | ||
| 'data_path' => 'AuditLog', | ||
| 'element' => 'model', | ||
| 'class' => 'short' | ||
| ], | ||
| [ | ||
| 'name' => __('Title'), | ||
| 'data_path' => 'AuditLog.title', | ||
| 'class' => 'limitedWidth' | ||
| ], | ||
| [ | ||
| 'name' => __('Change'), | ||
| 'data_path' => 'AuditLog', | ||
| 'element' => 'custom_element', | ||
| 'element_path' => 'AuditLog/change' | ||
| ] | ||
| ], | ||
| 'title' => __('Audit logs for event #%s', intval($event['Event']['id'])) | ||
| ] | ||
| ]); | ||
| echo '</div>'; | ||
| if (empty($ajax)) { | ||
| echo $this->element('/genericElements/SideMenu/side_menu', $menuData); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
app/View/Elements/genericElements/IndexTable/Fields/custom_element.ctp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| <?= $this->element($field['element_path'], ['item' => $row]) ?> |
Oops, something went wrong.