Update Clublog.php

这个提交包含在:
Peter Goodhall 2019-09-26 13:19:37 +01:00
父节点 bd8cbd5616
当前提交 7f18ffcabf

查看文件

@ -43,71 +43,73 @@ class Clublog extends CI_Controller {
if($station_row->qso_total > 0) { if($station_row->qso_total > 0) {
$data['qsos'] = $this->logbook_model->get_clublog_qsos($station_row->station_id); $data['qsos'] = $this->logbook_model->get_clublog_qsos($station_row->station_id);
$string = $this->load->view('adif/data/clublog', $data, TRUE); if($data['qsos']->num_rows()){
$string = $this->load->view('adif/data/clublog', $data, TRUE);
$ranid = uniqid(); $ranid = uniqid();
if ( ! write_file('uploads/clublog'.$ranid.$station_row->station_id.'.adi', $string)) { if ( ! write_file('uploads/clublog'.$ranid.$station_row->station_id.'.adi', $string)) {
echo 'Unable to write the file - Make the folder Upload folder has write permissions.'; echo 'Unable to write the file - Make the folder Upload folder has write permissions.';
} }
else { else {
$file_info = get_file_info('uploads/clublog'.$ranid.$station_row->station_id.'.adi'); $file_info = get_file_info('uploads/clublog'.$ranid.$station_row->station_id.'.adi');
// initialise the curl request // initialise the curl request
$request = curl_init('https://clublog.org/putlogs.php'); $request = curl_init('https://clublog.org/putlogs.php');
if($this->config->item('directory') != "") { if($this->config->item('directory') != "") {
$filepath = $_SERVER['DOCUMENT_ROOT']."/".$this->config->item('directory')."/".$file_info['server_path']; $filepath = $_SERVER['DOCUMENT_ROOT']."/".$this->config->item('directory')."/".$file_info['server_path'];
} else { } else {
$filepath = $_SERVER['DOCUMENT_ROOT']."/".$file_info['server_path']; $filepath = $_SERVER['DOCUMENT_ROOT']."/".$file_info['server_path'];
} }
if (function_exists('curl_file_create')) { // php 5.5+ if (function_exists('curl_file_create')) { // php 5.5+
$cFile = curl_file_create($filepath); $cFile = curl_file_create($filepath);
} else { // } else { //
$cFile = '@' . realpath($filepath); $cFile = '@' . realpath($filepath);
} }
// send a file // send a file
curl_setopt($request, CURLOPT_POST, true); curl_setopt($request, CURLOPT_POST, true);
curl_setopt( curl_setopt(
$request, $request,
CURLOPT_POSTFIELDS, CURLOPT_POSTFIELDS,
array( array(
'email' => $clublog_info['user_clublog_name'], 'email' => $clublog_info['user_clublog_name'],
'password' => $clublog_info['user_clublog_password'], 'password' => $clublog_info['user_clublog_password'],
'callsign' => $station_row->station_callsign, 'callsign' => $station_row->station_callsign,
'api' => "a11c3235cd74b88212ce726857056939d52372bd", 'api' => "a11c3235cd74b88212ce726857056939d52372bd",
'file' => $cFile 'file' => $cFile
)); ));
// output the response // output the response
curl_setopt($request, CURLOPT_RETURNTRANSFER, true); curl_setopt($request, CURLOPT_RETURNTRANSFER, true);
$response = curl_exec($request); $response = curl_exec($request);
$info = curl_getinfo($request); $info = curl_getinfo($request);
if(curl_errno($request)) { if(curl_errno($request)) {
echo curl_error($request); echo curl_error($request);
} }
curl_close ($request); curl_close ($request);
// If Clublog Accepts mark the QSOs // If Clublog Accepts mark the QSOs
if (preg_match('/\baccepted\b/', $response)) { if (preg_match('/\baccepted\b/', $response)) {
echo "QSOs uploaded and Logbook QSOs marked as sent to Clublog"; echo "QSOs uploaded and Logbook QSOs marked as sent to Clublog";
$this->load->model('clublog_model'); $this->load->model('clublog_model');
$this->clublog_model->mark_qsos_sent($station_row->station_id); $this->clublog_model->mark_qsos_sent($station_row->station_id);
} else { } else {
echo "Error ".$response; echo "Error ".$response;
}
} }
} else {
echo "Nothing awaiting upload to clublog";
} }
} }
} }
} else {
echo "Nothing awaiting upload to clublog";
} }
} }