Fixed bug, forgot to update a model
这个提交包含在:
父节点
94daa81b2c
当前提交
cb8bdfc539
共有 2 个文件被更改,包括 33 次插入 和 2 次删除
|
|
@ -26,7 +26,6 @@ class Clublog extends CI_Controller {
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
print_r($clublog_info);
|
print_r($clublog_info);
|
||||||
|
|
||||||
$data['qsos'] = $this->logbook_model->get_clublog_qsos();
|
$data['qsos'] = $this->logbook_model->get_clublog_qsos();
|
||||||
|
|
@ -41,6 +40,31 @@ class Clublog extends CI_Controller {
|
||||||
echo "uploads/clublog.adi file created.";
|
echo "uploads/clublog.adi file created.";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$file_info = get_file_info('uploads/clublog.adi');
|
||||||
|
|
||||||
|
// initialise the curl request
|
||||||
|
$request = curl_init('https://clublog.org/putlogs.php');
|
||||||
|
|
||||||
|
// send a file
|
||||||
|
curl_setopt($request, CURLOPT_POST, true);
|
||||||
|
curl_setopt(
|
||||||
|
$request,
|
||||||
|
CURLOPT_POSTFIELDS,
|
||||||
|
array(
|
||||||
|
'email' => $clublog_info['user_clublog_name'],
|
||||||
|
'password' => $clublog_info['user_clublog_password'],
|
||||||
|
'callsign' => $clublog_info['user_clublog_callsign'],
|
||||||
|
'api' => "",
|
||||||
|
'file' => '@' . $file_info['server_path']
|
||||||
|
));
|
||||||
|
|
||||||
|
// output the response
|
||||||
|
curl_setopt($request, CURLOPT_RETURNTRANSFER, true);
|
||||||
|
echo curl_exec($request);
|
||||||
|
|
||||||
|
// close the session
|
||||||
|
curl_close($request);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -125,7 +125,9 @@ class User_Model extends CI_Model {
|
||||||
'user_timezone' => $fields['user_timezone'],
|
'user_timezone' => $fields['user_timezone'],
|
||||||
'user_lotw_name' => $fields['user_lotw_name'],
|
'user_lotw_name' => $fields['user_lotw_name'],
|
||||||
'user_eqsl_name' => $fields['user_eqsl_name'],
|
'user_eqsl_name' => $fields['user_eqsl_name'],
|
||||||
'user_eqsl_qth_nickname' => $fields['user_eqsl_qth_nickname']
|
'user_eqsl_qth_nickname' => $fields['user_eqsl_qth_nickname'],
|
||||||
|
'user_clublog_name' => $fields['user_clublog_name'],
|
||||||
|
'user_clublog_callsign' => $fields['user_clublog_callsign'],
|
||||||
);
|
);
|
||||||
|
|
||||||
// Check to see if the user is allowed to change user levels
|
// Check to see if the user is allowed to change user levels
|
||||||
|
|
@ -155,6 +157,11 @@ class User_Model extends CI_Model {
|
||||||
{
|
{
|
||||||
$data['user_lotw_password'] = $fields['user_lotw_password'];
|
$data['user_lotw_password'] = $fields['user_lotw_password'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if($fields['user_clublog_password'] != NULL)
|
||||||
|
{
|
||||||
|
$data['user_clublog_password'] = $fields['user_clublog_password'];
|
||||||
|
}
|
||||||
|
|
||||||
if($fields['user_eqsl_password'] != NULL)
|
if($fields['user_eqsl_password'] != NULL)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
正在加载…
在新工单中引用