MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

chg: [UI] Collapse S/MIME or GPG key

pull/5254/head
Jakub Onderka 2019-10-02 18:48:16 +02:00
parent 44f1b89848
commit 3af080337d
4 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/View/Communities/view.ctp
View File

@ -14,13 +14,20 @@
)
);
$optional_fields = array(
'type', 'description', 'rules', 'email', 'sector', 'nationality', 'eligibility', 'pgp_key'
'type', 'description', 'rules', 'email', 'sector', 'nationality', 'eligibility',
);
foreach ($optional_fields as $field) {
if (!empty($community[$field])) {
$table_data[] = array('key' => Inflector::humanize($field), 'value' => $community[$field]);
}
}
if (!empty($community['pgp_key'])) {
$table_data[] = array(
'key' => __('GnuPG key'),
'element' => 'genericElements/key',
'element_params' => array('key' => $community['pgp_key']),
);
}
//misp-project.org/org-logos/uuid.png
echo sprintf(
'<div class="row-fluid"><div class="span8" style="margin:0px;">%s</div></div>',

10
app/View/Elements/genericElements/key.ctp Normal file
View File

@ -0,0 +1,10 @@
<?php if (empty($key)): ?>
<span class="bold red"><?= __('N/A') ?></span>
<?php else: ?>
<details>
<?php if (!empty($description)): ?>
<summary style="cursor: pointer"><?= h($description) ?></summary>
<?php endif; ?>
<pre class="quickSelect" style="line-height: 1.44"><?= h($key) ?></pre>
</details>
<?php endif; ?>

10
app/View/Users/admin_view.ctp
View File

@ -59,8 +59,8 @@ $buttonModifyStatus = $mayModify ? 'button_on':'button_off';
$table_data[] = array('key' => __('Password change'), 'boolean' => $user['User']['change_pw']);
$table_data[] = array(
'key' => __('GnuPG key'),
'class_value' => "quickSelect " . $user['User']['gpgkey'] ? 'green' : 'bold red',
'html' => $user['User']['gpgkey'] ? nl2br(h($user['User']['gpgkey'])) : __("N/A")
'element' => 'genericElements/key',
'element_params' => array('key' => $user['User']['gpgkey']),
);
if (!empty($user['User']['gpgkey'])) {
$table_data[] = array(
@ -76,9 +76,9 @@ $buttonModifyStatus = $mayModify ? 'button_on':'button_off';
}
if (Configure::read('SMIME.enabled')) {
$table_data[] = array(
'key' => __('SMIME Public certificate'),
'class_value' => "red quickSelect",
'html' => (h($user['User']['certif_public'])) ? $this->Utility->space2nbsp(nl2br(h($user['User']['certif_public']))) : "N/A"
'key' => __('S/MIME Public certificate'),
'element' => 'genericElements/key',
'element_params' => array('key' => $user['User']['certif_public']),
);
}
$table_data[] = array('key' => __('Newsread'), 'html' => $user['User']['newsread'] ? date('Y/m/d H:i:s', h($user['User']['newsread'])) : __('N/A'));

10
app/View/Users/view.ctp
View File

@ -29,8 +29,8 @@
$table_data[] = array('key' => __('Terms accepted'), 'boolean' => $user['User']['termsaccepted']);
$table_data[] = array(
'key' => __('GnuPG key'),
'class_value' => "quickSelect " . $user['User']['gpgkey'] ? 'green' : 'bold red',
'html' => $user['User']['gpgkey'] ? nl2br(h($user['User']['gpgkey'])) : __("N/A")
'element' => 'genericElements/key',
'element_params' => array('key' => $user['User']['gpgkey']),
);
if (!empty($user['User']['gpgkey'])) {
$table_data[] = array(
@ -46,9 +46,9 @@
}
if (Configure::read('SMIME.enabled')) {
$table_data[] = array(
'key' => __('SMIME Public certificate'),
'class_value' => "red quickSelect",
'html' => (h($user['User']['certif_public'])) ? $this->Utility->space2nbsp(nl2br(h($user['User']['certif_public']))) : "N/A"
'key' => __('S/MIME Public certificate'),
'element' => 'genericElements/key',
'element_params' => array('key' => $user['User']['certif_public']),
);
}
echo sprintf(