goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Merge remote-tracking branch 'origin'

浏览代码
这个提交包含在：
Andy 2016-01-18 22:02:57 +00:00
当前提交 6a7336c01d
共有 2 个文件被更改，包括 17 次插入 和 6 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

14
application/controllers/qso.php
查看文件

@ -47,14 +47,17 @@ class QSO extends CI_Controller {
// This solves the problem of CI dumping out the session
// cookie each time set_userdata is called.
// For more info, see http://bizhole.com/codeigniter-nginx-error-502-bad-gateway/
$qso_data = [
// $qso_data = [
// 18-Jan-2016 - make php v5.3 friendly!
$sqo_data = array(
'band' => $this->input->post('band'),
'freq' => $this->input->post('freq'),
'mode' => $this->input->post('mode'),
'sat_name' => $this->input->post('sat_name'),
'sat_mode' => $this->input->post('sat_mode'),
'radio' => $this->input->post('radio')
];
);
// ];
$this->session->set_userdata($qso_data);
@ -111,14 +114,17 @@ class QSO extends CI_Controller {
$this->logbook_model->create_qso();
// Store Basic QSO Info for reuse
$qso_data = [
//$qso_data = [
// 18-Jan-2016 - make php v5.3 friendly!
$qso_data = array(
'band' => $this->input->post('band'),
'freq' => $this->input->post('freq'),
'mode' => $this->input->post('mode'),
'sat_name' => $this->input->post('sat_name'),
'sat_mode' => $this->input->post('sat_mode'),
'radio' => $this->input->post('radio')
];
);
//];
$this->session->set_userdata($qso_data);

9
application/models/logbook_model.php
查看文件

@ -695,8 +695,13 @@ class Logbook_model extends CI_Model {
}
// Store Freq
$cleanfreq = preg_replace('#\W#', '', $record['freq']);
$freqlng = strlen($cleanfreq);
// Check if 'freq' is defined in the import?
if (isset($record['freq'])){
$cleanfreq = preg_replace('#\W#', '', $record['freq']);
$freqlng = strlen($cleanfreq);
}else{
$freqlng = 0;
}
if(isset($record['freq']) && $freqlng < 7 ) {
$cleansedstring = preg_replace('#\W#', '', $record['freq']);
$freq = $cleansedstring."000";