Reformatted the mess

This commit is contained in:
int2001
2025-05-30 05:08:58 +00:00
parent f2c37cfce0
commit 13fe512a99

View File

@@ -3,52 +3,50 @@
class Search extends CI_Controller {
function __construct()
{
parent::__construct();
function __construct() {
parent::__construct();
$this->load->helper(array('form', 'url'));
if($this->optionslib->get_option('global_search') != "true") {
$this->load->model('user_model');
if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); }
}
}
public function index()
{
$data['page_title'] = __("Search");
$this->load->view('interface_assets/header', $data);
$this->load->view('search/main');
$this->load->view('interface_assets/footer');
$this->load->helper(array('form', 'url'));
if($this->optionslib->get_option('global_search') != "true") {
$this->load->model('user_model');
if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); }
}
}
// Filter is for advanced searching and filtering of the logbook
public function filter() {
$data['page_title'] = __("Search & Filter Logbook");
public function index() {
$data['page_title'] = __("Search");
$this->load->library('form_validation');
$this->load->view('interface_assets/header', $data);
$this->load->view('search/main');
$this->load->view('interface_assets/footer');
}
$this->load->model('Search_filter');
// Filter is for advanced searching and filtering of the logbook
public function filter() {
$data['page_title'] = __("Search & Filter Logbook");
$data['get_table_names'] = $this->Search_filter->get_table_columns();
$this->load->library('form_validation');
$this->load->model('Search_filter');
$data['get_table_names'] = $this->Search_filter->get_table_columns();
$data['stored_queries'] = $this->Search_filter->get_stored_queries();
//print_r($this->Search_filter->get_table_columns());
//print_r($this->Search_filter->get_table_columns());
if ($this->form_validation->run() == FALSE)
{
$this->load->view('interface_assets/header', $data);
$this->load->view('search/filter');
$this->load->view('interface_assets/footer');
}
else
{
$this->load->view('interface_assets/header', $data);
$this->load->view('search/filter');
$this->load->view('interface_assets/footer');
}
}
if ($this->form_validation->run() == FALSE)
{
$this->load->view('interface_assets/header', $data);
$this->load->view('search/filter');
$this->load->view('interface_assets/footer');
}
else
{
$this->load->view('interface_assets/header', $data);
$this->load->view('search/filter');
$this->load->view('interface_assets/footer');
}
}
// Searches for incorrect CQ Zones
public function incorrect_cq_zones() {
@@ -62,17 +60,17 @@ class Search extends CI_Controller {
$this->load->view('interface_assets/footer');
}
// Searches for incorrect ITU Zones
public function incorrect_itu_zones() {
$this->load->model('stations');
// Searches for incorrect ITU Zones
public function incorrect_itu_zones() {
$this->load->model('stations');
$data['station_profile'] = $this->stations->all_of_user();
$data['page_title'] = __("Incorrectly logged ITU zones");
$data['station_profile'] = $this->stations->all_of_user();
$data['page_title'] = __("Incorrectly logged ITU zones");
$this->load->view('interface_assets/header', $data);
$this->load->view('search/ituzones');
$this->load->view('interface_assets/footer');
}
$this->load->view('interface_assets/header', $data);
$this->load->view('search/ituzones');
$this->load->view('interface_assets/footer');
}
// Searches for unconfirmed Lotw QSOs where QSO partner has uploaded to LoTW after the QSO date
public function lotw_unconfirmed() {
@@ -86,10 +84,10 @@ class Search extends CI_Controller {
$this->load->view('interface_assets/footer');
}
function json_result() {
function json_result() {
$result = $this->fetchQueryResult(($this->input->post('search', TRUE) ?? ''), FALSE);
echo json_encode($result->result_array());
}
}
function get_stored_queries() {
$this->load->model('Search_filter');
@@ -163,8 +161,7 @@ class Search extends CI_Controller {
$this->db->update('queries', $data);
}
function buildWhere(array $object, string $condition = null): void
{
function buildWhere(array $object, string $condition = null): void {
/*
* The $object is one of the following:
* - a group, with 'condition' and 'rules' keys