mirror of
https://github.com/wavelog/wavelog.git
synced 2026-03-22 10:24:14 +00:00
More error messages to widget design
This commit is contained in:
@@ -80,15 +80,28 @@ class Widgets extends CI_Controller {
|
|||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function on_air($user_slug = "") {
|
public function on_air($user_slug = "") {
|
||||||
|
// 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 (empty($user_slug)) {
|
if (empty($user_slug)) {
|
||||||
show_404(__("User slug not specified"));
|
$data['theme'] = $theme;
|
||||||
|
$data['text_size_class'] = $this->prepare_text_size_css_class($text_size);
|
||||||
|
$data['error'] = __("User slug not specified");
|
||||||
|
$this->load->view('widgets/on_air', $data);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$user = $this->get_user_by_slug($user_slug);
|
$user = $this->get_user_by_slug($user_slug);
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
show_404($e->getMessage());
|
$data['theme'] = $theme;
|
||||||
|
$data['text_size_class'] = $this->prepare_text_size_css_class($text_size);
|
||||||
|
$data['error'] = __("User slug not specified");
|
||||||
|
$data['error'] = $e->getMessage();
|
||||||
|
$this->load->view('widgets/on_air', $data);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -96,19 +109,16 @@ class Widgets extends CI_Controller {
|
|||||||
$widget_options = $this->get_on_air_widget_options($user_id);
|
$widget_options = $this->get_on_air_widget_options($user_id);
|
||||||
|
|
||||||
if ($widget_options->is_enabled === false) {
|
if ($widget_options->is_enabled === false) {
|
||||||
show_404(__("User has on-air widget disabled"));
|
$data['theme'] = $theme;
|
||||||
|
$data['text_size_class'] = $this->prepare_text_size_css_class($text_size);
|
||||||
|
$data['error'] = __("User has on-air widget disabled");
|
||||||
|
$this->load->view('widgets/on_air', $data);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->load->model('cat');
|
$this->load->model('cat');
|
||||||
$query = $this->cat->status_for_user_id($user_id);
|
$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) {
|
if ($query->num_rows() > 0) {
|
||||||
$radio_timeout_seconds = $this->get_radio_timeout_seconds();
|
$radio_timeout_seconds = $this->get_radio_timeout_seconds();
|
||||||
@@ -165,6 +175,7 @@ class Widgets extends CI_Controller {
|
|||||||
$data['user_callsign'] = strtoupper($user->user_callsign);
|
$data['user_callsign'] = strtoupper($user->user_callsign);
|
||||||
$data['error'] = __("No CAT interfaced radios found. You need to have at least one radio interface configured.");
|
$data['error'] = __("No CAT interfaced radios found. You need to have at least one radio interface configured.");
|
||||||
$this->load->view('widgets/on_air', $data);
|
$this->load->view('widgets/on_air', $data);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user