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

Merge pull request #1856 from deralexxx/patch-5 

Small UI patch to make users aware to upload *.pem files
pull/1857/head
Andras Iklody 2017-01-20 16:38:14 +01:00 committed by GitHub
parent 045a4b88bd 8f0f714737
commit 7f22df0eeb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/View/Servers/add.ctp
View File

@ -129,7 +129,7 @@ var formInfoValues = {
'ServerAuthkey' : "You can find the authentication key on your profile on the external server.",
'ServerPush' : "Allow the upload of events and their attributes.",
'ServerPull' : "Allow the download of events and their attributes from the server.",
'ServerSubmittedCert' : "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority.",
'ServerSubmittedCert' : "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority. (*.pem)",
'ServerSelfSigned' : "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
};

2
app/View/Servers/edit.ctp
View File

@ -85,7 +85,7 @@
?>
<div class="clear">
<p>
<span class="bold">Server certificate file: </span>
<span class="bold">Server certificate file (*.pem): </span>
<span id="serverEditCertValue">
<?php
if (isset($server['Server']['cert_file']) && !empty($server['Server']['cert_file'])) echo h($server['Server']['cert_file']);