kopia lustrzana https://github.com/magicbug/Cloudlog
check if qso belongs to user when deleting/requesting/confirming QSOs/QSLs
rodzic
61b55a2e3d
commit
ef65d6a7c4
|
@ -290,13 +290,13 @@ class QSO extends CI_Controller {
|
||||||
function delete($id) {
|
function delete($id) {
|
||||||
$this->load->model('logbook_model');
|
$this->load->model('logbook_model');
|
||||||
|
|
||||||
$this->logbook_model->delete($id);
|
if ($this->logbook_model->check_qso_is_accessible($id)) {
|
||||||
|
$this->logbook_model->delete($id);
|
||||||
$this->session->set_flashdata('notice', 'QSO Deleted Successfully');
|
$this->session->set_flashdata('notice', 'QSO Deleted Successfully');
|
||||||
$data['message_title'] = "Deleted";
|
$data['message_title'] = "Deleted";
|
||||||
$data['message_contents'] = "QSO Deleted Successfully";
|
$data['message_contents'] = "QSO Deleted Successfully";
|
||||||
$this->load->view('messages/message', $data);
|
$this->load->view('messages/message', $data);
|
||||||
|
}
|
||||||
|
|
||||||
// If deletes from /logbook dropdown redirect
|
// If deletes from /logbook dropdown redirect
|
||||||
if (strpos($_SERVER['HTTP_REFERER'], '/logbook') !== false) {
|
if (strpos($_SERVER['HTTP_REFERER'], '/logbook') !== false) {
|
||||||
|
@ -309,10 +309,14 @@ class QSO extends CI_Controller {
|
||||||
$id = str_replace('"', "", $this->input->post("id"));
|
$id = str_replace('"', "", $this->input->post("id"));
|
||||||
|
|
||||||
$this->load->model('logbook_model');
|
$this->load->model('logbook_model');
|
||||||
|
if ($this->logbook_model->check_qso_is_accessible($id)) {
|
||||||
$this->logbook_model->delete($id);
|
$this->logbook_model->delete($id);
|
||||||
header('Content-Type: application/json');
|
header('Content-Type: application/json');
|
||||||
echo json_encode(array('message' => 'OK'));
|
echo json_encode(array('message' => 'OK'));
|
||||||
|
} else {
|
||||||
|
header('Content-Type: application/json');
|
||||||
|
echo json_encode(array('message' => 'not allowed'));
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1289,68 +1289,88 @@ class Logbook_model extends CI_Model {
|
||||||
return $name;
|
return $name;
|
||||||
}
|
}
|
||||||
/* Return QSO Info */
|
/* Return QSO Info */
|
||||||
function qso_info($id) {
|
function qso_info($id) {
|
||||||
$this->db->where('COL_PRIMARY_KEY', $id);
|
if ($this->logbook_model->check_qso_is_accessible($id)) {
|
||||||
|
$this->db->where('COL_PRIMARY_KEY', $id);
|
||||||
|
|
||||||
return $this->db->get($this->config->item('table_name'));
|
return $this->db->get($this->config->item('table_name'));
|
||||||
}
|
} else {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Set Paper to received
|
// Set Paper to received
|
||||||
function paperqsl_update($qso_id, $method) {
|
function paperqsl_update($qso_id, $method) {
|
||||||
|
if ($this->logbook_model->check_qso_is_accessible($qso_id)) {
|
||||||
|
|
||||||
$data = array(
|
$data = array(
|
||||||
'COL_QSLRDATE' => date('Y-m-d H:i:s'),
|
'COL_QSLRDATE' => date('Y-m-d H:i:s'),
|
||||||
'COL_QSL_RCVD' => 'Y',
|
'COL_QSL_RCVD' => 'Y',
|
||||||
'COL_QSL_RCVD_VIA' => $method
|
'COL_QSL_RCVD_VIA' => $method
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->db->where('COL_PRIMARY_KEY', $qso_id);
|
$this->db->where('COL_PRIMARY_KEY', $qso_id);
|
||||||
|
|
||||||
$this->db->update($this->config->item('table_name'), $data);
|
$this->db->update($this->config->item('table_name'), $data);
|
||||||
}
|
} else {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Set Paper to sent
|
// Set Paper to sent
|
||||||
function paperqsl_update_sent($qso_id, $method) {
|
function paperqsl_update_sent($qso_id, $method) {
|
||||||
|
if ($this->logbook_model->check_qso_is_accessible($qso_id)) {
|
||||||
|
|
||||||
$data = array(
|
$data = array(
|
||||||
'COL_QSLSDATE' => date('Y-m-d H:i:s'),
|
'COL_QSLSDATE' => date('Y-m-d H:i:s'),
|
||||||
'COL_QSL_SENT' => 'Y',
|
'COL_QSL_SENT' => 'Y',
|
||||||
'COL_QSL_SENT_VIA' => $method
|
'COL_QSL_SENT_VIA' => $method
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->db->where('COL_PRIMARY_KEY', $qso_id);
|
$this->db->where('COL_PRIMARY_KEY', $qso_id);
|
||||||
|
|
||||||
$this->db->update($this->config->item('table_name'), $data);
|
$this->db->update($this->config->item('table_name'), $data);
|
||||||
|
} else {
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Set Paper to requested
|
// Set Paper to requested
|
||||||
function paperqsl_requested($qso_id, $method) {
|
function paperqsl_requested($qso_id, $method) {
|
||||||
|
if ($this->logbook_model->check_qso_is_accessible($qso_id)) {
|
||||||
|
|
||||||
$data = array(
|
$data = array(
|
||||||
'COL_QSLSDATE' => date('Y-m-d H:i:s'),
|
'COL_QSLSDATE' => date('Y-m-d H:i:s'),
|
||||||
'COL_QSL_SENT' => 'R',
|
'COL_QSL_SENT' => 'R',
|
||||||
'COL_QSL_SENT_VIA' => $method
|
'COL_QSL_SENT_VIA' => $method
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->db->where('COL_PRIMARY_KEY', $qso_id);
|
$this->db->where('COL_PRIMARY_KEY', $qso_id);
|
||||||
|
|
||||||
$this->db->update($this->config->item('table_name'), $data);
|
$this->db->update($this->config->item('table_name'), $data);
|
||||||
|
} else {
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function paperqsl_ignore($qso_id, $method) {
|
function paperqsl_ignore($qso_id, $method) {
|
||||||
|
if ($this->logbook_model->check_qso_is_accessible($qso_id)) {
|
||||||
|
|
||||||
$data = array(
|
$data = array(
|
||||||
'COL_QSLSDATE' => date('Y-m-d H:i:s'),
|
'COL_QSLSDATE' => date('Y-m-d H:i:s'),
|
||||||
'COL_QSL_SENT' => 'I'
|
'COL_QSL_SENT' => 'I'
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->db->where('COL_PRIMARY_KEY', $qso_id);
|
$this->db->where('COL_PRIMARY_KEY', $qso_id);
|
||||||
|
|
||||||
$this->db->update($this->config->item('table_name'), $data);
|
$this->db->update($this->config->item('table_name'), $data);
|
||||||
|
} else {
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_qsos_for_printing($station_id2 = null) {
|
function get_qsos_for_printing($station_id2 = null) {
|
||||||
|
@ -1427,16 +1447,20 @@ class Logbook_model extends CI_Model {
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_qso($id) {
|
function get_qso($id) {
|
||||||
$this->db->select($this->config->item('table_name').'.*, station_profile.*, dxcc_entities.*, coalesce(dxcc_entities_2.name, "- NONE -") as station_country, dxcc_entities_2.end as station_end, eQSL_images.image_file as eqsl_image_file, lotw_users.callsign as lotwuser, lotw_users.lastupload');
|
if ($this->logbook_model->check_qso_is_accessible($id)) {
|
||||||
$this->db->from($this->config->item('table_name'));
|
$this->db->select($this->config->item('table_name').'.*, station_profile.*, dxcc_entities.*, coalesce(dxcc_entities_2.name, "- NONE -") as station_country, dxcc_entities_2.end as station_end, eQSL_images.image_file as eqsl_image_file, lotw_users.callsign as lotwuser, lotw_users.lastupload');
|
||||||
$this->db->join('dxcc_entities', $this->config->item('table_name').'.col_dxcc = dxcc_entities.adif', 'left');
|
$this->db->from($this->config->item('table_name'));
|
||||||
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id', 'left');
|
$this->db->join('dxcc_entities', $this->config->item('table_name').'.col_dxcc = dxcc_entities.adif', 'left');
|
||||||
$this->db->join('dxcc_entities as dxcc_entities_2', 'station_profile.station_dxcc = dxcc_entities_2.adif', 'left outer');
|
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id', 'left');
|
||||||
$this->db->join('eQSL_images', $this->config->item('table_name').'.COL_PRIMARY_KEY = eQSL_images.qso_id', 'left outer');
|
$this->db->join('dxcc_entities as dxcc_entities_2', 'station_profile.station_dxcc = dxcc_entities_2.adif', 'left outer');
|
||||||
$this->db->join('lotw_users', $this->config->item('table_name').'.COL_CALL = lotw_users.callsign', 'left outer');
|
$this->db->join('eQSL_images', $this->config->item('table_name').'.COL_PRIMARY_KEY = eQSL_images.qso_id', 'left outer');
|
||||||
$this->db->where('COL_PRIMARY_KEY', $id);
|
$this->db->join('lotw_users', $this->config->item('table_name').'.COL_CALL = lotw_users.callsign', 'left outer');
|
||||||
|
$this->db->where('COL_PRIMARY_KEY', $id);
|
||||||
|
|
||||||
return $this->db->get();
|
return $this->db->get();
|
||||||
|
} else {
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -2627,10 +2651,14 @@ class Logbook_model extends CI_Model {
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Delete QSO based on the QSO ID */
|
/* Delete QSO based on the QSO ID */
|
||||||
function delete($id) {
|
function delete($id) {
|
||||||
$this->db->where('COL_PRIMARY_KEY', $id);
|
if ($this->check_qso_is_accessible($id)) {
|
||||||
$this->db->delete($this->config->item('table_name'));
|
$this->db->where('COL_PRIMARY_KEY', $id);
|
||||||
}
|
$this->db->delete($this->config->item('table_name'));
|
||||||
|
} else {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* Used to check if the qso is already in the database */
|
/* Used to check if the qso is already in the database */
|
||||||
function import_check($datetime, $callsign, $band, $mode, $station_callsign) {
|
function import_check($datetime, $callsign, $band, $mode, $station_callsign) {
|
||||||
|
|
Ładowanie…
Reference in New Issue