kopia lustrzana https://github.com/magicbug/Cloudlog
Merge pull request #1772 from agrif/p12-file-type
rodzic
740b358020
commit
96dadd685e
|
@ -117,7 +117,7 @@ return array(
|
||||||
'json' => array('application/json', 'text/json'),
|
'json' => array('application/json', 'text/json'),
|
||||||
'pem' => array('application/x-x509-user-cert', 'application/x-pem-file', 'application/octet-stream'),
|
'pem' => array('application/x-x509-user-cert', 'application/x-pem-file', 'application/octet-stream'),
|
||||||
'p10' => array('application/x-pkcs10', 'application/pkcs10'),
|
'p10' => array('application/x-pkcs10', 'application/pkcs10'),
|
||||||
'p12' => 'application/octet-stream',
|
'p12' => array('application/octet-stream', 'application/x-pkcs12'),
|
||||||
'p7a' => 'application/x-pkcs7-signature',
|
'p7a' => 'application/x-pkcs7-signature',
|
||||||
'p7c' => array('application/pkcs7-mime', 'application/x-pkcs7-mime'),
|
'p7c' => array('application/pkcs7-mime', 'application/x-pkcs7-mime'),
|
||||||
'p7m' => array('application/pkcs7-mime', 'application/x-pkcs7-mime'),
|
'p7m' => array('application/pkcs7-mime', 'application/x-pkcs7-mime'),
|
||||||
|
|
|
@ -121,6 +121,9 @@ class Lotw extends CI_Controller {
|
||||||
// Upload of P12 Failed
|
// Upload of P12 Failed
|
||||||
$error = array('error' => $this->upload->display_errors());
|
$error = array('error' => $this->upload->display_errors());
|
||||||
|
|
||||||
|
// Load DXCC Countrys List
|
||||||
|
$data['dxcc_list'] = $this->dxcc->list();
|
||||||
|
|
||||||
// Set Page Title
|
// Set Page Title
|
||||||
$data['page_title'] = "Logbook of the World";
|
$data['page_title'] = "Logbook of the World";
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue