Make sure that ADIF logs are always handled as UTF-8 encoded to support international langs
这个提交包含在:
父节点
d6b447ea1f
当前提交
e660f1640a
共有 3 个文件被更改,包括 3 次插入 和 1 次删除
|
|
@ -13,6 +13,7 @@ class adif extends CI_Controller {
|
||||||
if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
|
if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Shows Export Views */
|
/* Shows Export Views */
|
||||||
public function export() {
|
public function export() {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -117,7 +117,7 @@ class ADIF_Parser
|
||||||
|
|
||||||
public function load_from_file($fname) //allows the user to accept a filename as input
|
public function load_from_file($fname) //allows the user to accept a filename as input
|
||||||
{
|
{
|
||||||
$this->data = file_get_contents($fname);
|
$this->data = $string = mb_convert_encoding(file_get_contents($fname), "UTF-8");
|
||||||
}
|
}
|
||||||
|
|
||||||
//the following function does the processing of the array into its key and value pairs
|
//the following function does the processing of the array into its key and value pairs
|
||||||
|
|
|
||||||
|
|
@ -877,6 +877,7 @@ class Logbook_model extends CI_Model {
|
||||||
function import($record) {
|
function import($record) {
|
||||||
$CI =& get_instance();
|
$CI =& get_instance();
|
||||||
$CI->load->library('frequency');
|
$CI->load->library('frequency');
|
||||||
|
|
||||||
// Join date+time
|
// Join date+time
|
||||||
|
|
||||||
$time_on = date('Y-m-d', strtotime($record['qso_date'])) ." ".date('H:i', strtotime($record['time_on']));
|
$time_on = date('Y-m-d', strtotime($record['qso_date'])) ." ".date('H:i', strtotime($record['time_on']));
|
||||||
|
|
|
||||||
正在加载…
在新工单中引用