Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added config switch to upload function in controller

Browse Source
This commit is contained in:
Andreas Kristiansen
2025-01-28 07:53:17 +01:00
parent 085e3684c2
commit 71ffe7fc6b
2 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
application/controllers/Clublog.php
View File

@@ -122,28 +122,33 @@ class Clublog extends CI_Controller
}
public function uploadlog() {
$this->load->model('clublog_model');
if (!($this->config->item('disable_manual_clublog'))) {
$this->load->model('clublog_model');
$clean_station_id = $this->security->xss_clean($this->input->post('station_id'));
$clean_station_id = $this->security->xss_clean($this->input->post('station_id'));
$users = $this->clublog_model->get_clublog_users($this->session->userdata('user_id'));
$users = $this->clublog_model->get_clublog_users($this->session->userdata('user_id'));
if (!empty($users)) {
$stationinfo = $this->clublog_model->stations_with_clublog_enabled();
$info = $stationinfo->result();
$data['info'] = $info;
foreach ($users as $user) {
$data['status'] = 'OK';
$data['infomessage'] = $this->clublog_model->uploadUser($user->user_id, $user->user_clublog_name, $user->user_clublog_password, $clean_station_id);
if (!empty($users)) {
$stationinfo = $this->clublog_model->stations_with_clublog_enabled();
$info = $stationinfo->result();
$data['info'] = $info;
foreach ($users as $user) {
$data['status'] = 'OK';
$data['infomessage'] = $this->clublog_model->uploadUser($user->user_id, $user->user_clublog_name, $user->user_clublog_password, $clean_station_id);
$data['errormessages'] = '';
}
} else {
$data['status'] = 'Error';
$data['errormessages'] = __("No user has configured Clublog.");
$data['info'] = '';
}
} else {
$data['status'] = 'Error';
$data['errormessages']= __("No user has configured Clublog.");
$data['info'] = '';
}
header('Content-type: application/json');
echo json_encode($data);
header('Content-type: application/json');
echo json_encode($data);
} else {
redirect('dashboard');
}
}
public function importlog() {

18
assets/js/sections/clublog.js
View File

@@ -26,6 +26,24 @@ function ExportClublog(station_id) {
else {
$(".card-body").append('<div class="alert alert-danger" role="alert">' + data.info + '</div>');
}
if (data.errormessages.length > 0) {
$("#clublog_export").append(
'<div class="errormessages">\n' +
' <div class="card mt-2">\n' +
' <div class="card-header bg-danger">\n' +
' Error Message\n' +
' </div>\n' +
' <div class="card-body">\n' +
' <div class="errors"></div>\n' +
' </div>\n' +
' </div>\n' +
'</div>'
);
$.each(data.errormessages, function (index, value) {
$(".errors").append('<li>' + value);
});
}
}
});
}