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

Make error message use the widget theme

Browse Source
This commit is contained in:
phl0
2025-02-24 11:51:38 +01:00
parent b6efbd2a96
commit bc662b39a6
2 changed files with 48 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
application/controllers/Widgets.php
View File

@@ -1,9 +1,9 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
Widgets are designed to be addons to use around the internet.
*/
class Widgets extends CI_Controller {
@@ -12,8 +12,8 @@ class Widgets extends CI_Controller {
{
// Show a help page
}
// Can be used to embed last 11 QSOs in a iframe or javascript include.
public function qsos($logbook_slug = null) {
@@ -41,7 +41,7 @@ class Widgets extends CI_Controller {
}
$data['last_qsos_list'] = $this->logbook_model->get_last_qsos(15, $logbooks_locations_array);
$this->load->view('widgets/qsos', $data);
}
}
@@ -49,7 +49,7 @@ class Widgets extends CI_Controller {
public function oqrs($user_callsign = 'CALL MISSING') {
$this->load->model('oqrs_model');
$stations = $this->oqrs_model->get_oqrs_stations();
if ($stations->result() === NULL) {
show_404(__("No stations found that are using Wavelog OQRS."));
return;
@@ -68,7 +68,7 @@ class Widgets extends CI_Controller {
} else {
$data['theme'] = $this->config->item('option_theme');
}
$data['user_callsign'] = strtoupper($this->security->xss_clean($user_callsign));
$this->load->view('widgets/oqrs', $data);
}
@@ -91,10 +91,10 @@ class Widgets extends CI_Controller {
show_404($e->getMessage());
return;
}
$user_id = $user->user_id;
$user_id = $user->user_id;
$widget_options = $this->get_on_air_widget_options($user_id);
if ($widget_options->is_enabled === false) {
show_404(__("User has on-air widget disabled"));
return;
@@ -103,6 +103,13 @@ class Widgets extends CI_Controller {
$this->load->model('cat');
$query = $this->cat->status_for_user_id($user_id);
// determine theme
$theme = $this->input->get('theme', true) ?? $this->config->item('option_theme');
// determine text size
$text_size = $this->input->get('text_size', true) ?? 1;
if ($query->num_rows() > 0) {
$radio_timeout_seconds = $this->get_radio_timeout_seconds();
$cat_timeout_interval_minutes = floor($radio_timeout_seconds / 60);
@@ -112,7 +119,7 @@ class Widgets extends CI_Controller {
foreach ($query->result() as $radio_data) {
// There can be multiple radios online, we need to take into account all of them
$radio_updated_ago_minutes = $this->calculate_radio_updated_ago_minutes($radio_data->timestamp);
if ($radio_updated_ago_minutes > $cat_timeout_interval_minutes) {
// Radio was updated too long ago - calculate user's "last seen X days ago" value
$mins_per_day = 1440;
@@ -127,27 +134,22 @@ class Widgets extends CI_Controller {
}
}
// determine theme
$theme = $this->input->get('theme', true) ?? $this->config->item('option_theme');
$data['theme'] = $theme;
// determine text size
$text_size = $this->input->get('text_size', true) ?? 1;
$data['text_size_class'] = $this->prepare_text_size_css_class($text_size);
if (count($radios_online) > 1 && $widget_options->display_only_most_recent_radio) {
// in case only most recent radio should be displayed, use only most recently updated radio as a result
usort($radios_online, function($radio_a, $radio_b) {
if ($radio_a->updated_at == $radio_b->updated_at) return 0;
return ($radio_a->updated_at > $radio_b->updated_at) ? -1 : 1;
});
$radios_online = [$radios_online[0]];
}
// last seen text
$last_seen_text = $widget_options->display_last_seen ? $this->prepare_last_seen_text($last_seen_days_ago) : null;
$data['theme'] = $theme;
$data['text_size_class'] = $this->prepare_text_size_css_class($text_size);
// prepare rest of the data for UI
$data['user_callsign'] = strtoupper($user->user_callsign);
$data['is_on_air'] = count($radios_online) > 0;
@@ -157,10 +159,12 @@ class Widgets extends CI_Controller {
$this->load->view('widgets/on_air', $data);
} else {
show_error(
__("No CAT interfaced radios found. You need to have at least one radio interface configured.")
);
return;
$theme = $this->input->get('theme', true) ?? $this->config->item('option_theme');
$data['theme'] = $theme;
$data['text_size_class'] = $this->prepare_text_size_css_class($text_size);
$data['user_callsign'] = strtoupper($user->user_callsign);
$data['error'] = __("No CAT interfaced radios found. You need to have at least one radio interface configured.");
$this->load->view('widgets/on_air', $data);
}
}
@@ -171,7 +175,7 @@ class Widgets extends CI_Controller {
*/
private function get_on_air_widget_options($user_id) {
$raw_widget_options = $this->user_options_model->get_options('widget', null, $user_id)->result_array();
// default values
$options = new \stdClass();
$options->is_enabled = false;
@@ -331,4 +335,4 @@ class Widgets extends CI_Controller {
return trim(sprintf("%s / %s %s", $rx_frequency, $tx_frequency, $mode_string));
}
}
}
}

25
application/views/widgets/on_air.php
View File

@@ -1,6 +1,6 @@
<!--
This is an On-Air widget to place in your QRZ.com Bio or somewhere else.
<!--
This is an On-Air widget to place in your QRZ.com Bio or somewhere else.
To use this widget insert this Element:
@@ -69,14 +69,15 @@ To use this widget insert this Element:
<div class="left-column">
<img class="widgetLogo" src="<?php echo base_url(); ?>assets/logo/<?php echo $this->optionslib->get_logo('header_logo', $theme); ?>.png" alt="Logo" />
</div>
<?php if (!isset($error)) { ?>
<div class="right-column">
<div class="top-right">
<p class="<?= $text_size_class ?>">
<?php
<?php
if ($is_on_air === true) {
printf("%s is ON-AIR", $user_callsign);
printf("%s is ON-AIR", $user_callsign);
} else {
printf("%s is OFF-AIR", $user_callsign);
printf("%s is OFF-AIR", $user_callsign);
}
?>
</p>
@@ -92,9 +93,19 @@ To use this widget insert this Element:
<p class="<?= $text_size_class ?>">
<?= sprintf($last_seen_text); ?>
</p>
<?php } ?>
<?php } ?>
</div>
</div>
<?php } else { ?>
<div class="right-column">
<div class="top-right">
<p class="<?= $text_size_class ?>"><?= __("Error") ?></p>
</div>
<div class="bottom-right mt-3">
<p class="<?= $text_size_class ?>"><?= $error ?></p>
</div>
</div>
<?php } ?>
</div>
</body>