diff --git a/application/config/mimes.php b/application/config/mimes.php index 86486228..c3a1de5a 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -117,7 +117,7 @@ return array( 'json' => array('application/json', 'text/json'), 'pem' => array('application/x-x509-user-cert', 'application/x-pem-file', 'application/octet-stream'), 'p10' => array('application/x-pkcs10', 'application/pkcs10'), - 'p12' => 'application/octet-stream', + 'p12' => array('application/octet-stream', 'application/x-pkcs12'), 'p7a' => 'application/x-pkcs7-signature', 'p7c' => array('application/pkcs7-mime', 'application/x-pkcs7-mime'), 'p7m' => array('application/pkcs7-mime', 'application/x-pkcs7-mime'), diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php index 5505a045..98f7bf5b 100644 --- a/application/controllers/Lotw.php +++ b/application/controllers/Lotw.php @@ -121,6 +121,9 @@ class Lotw extends CI_Controller { // Upload of P12 Failed $error = array('error' => $this->upload->display_errors()); + // Load DXCC Countrys List + $data['dxcc_list'] = $this->dxcc->list(); + // Set Page Title $data['page_title'] = "Logbook of the World";