diff --git a/application/config/config.sample.php b/application/config/config.sample.php index d96dbccce..ff3616efb 100644 --- a/application/config/config.sample.php +++ b/application/config/config.sample.php @@ -676,7 +676,7 @@ $config['proxy_ips'] = ''; | */ -$config['userdata'] = 'userdata'; +$config['userdata'] = 'userdata'; /* |-------------------------------------------------------------------------- @@ -695,3 +695,6 @@ $config['disable_manual_qrz'] = false; # Disables QSL-Image-Feature if true. if non-existant or false the QSL-Feature is enabled $config['disable_qsl'] = false; + +# Disables OQRS-Feature if true. if non-existant or false the OQRS-Feature is enabled +$config['disable_oqrs'] = false; diff --git a/application/controllers/Oqrs.php b/application/controllers/Oqrs.php index e49af8d10..54b7dbb5d 100644 --- a/application/controllers/Oqrs.php +++ b/application/controllers/Oqrs.php @@ -7,7 +7,21 @@ if ( ! defined('BASEPATH')) exit('No direct script access allowed'); class Oqrs extends CI_Controller { +<<<<<<< alpha public function index() { +======= + function __construct() { + parent::__construct(); + $this->lang->load('lotw'); + $this->lang->load('eqsl'); + // Commented out to get public access + // $this->load->model('user_model'); + // if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } + if (($this->config->item('disable_oqrs') ?? false)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } + } + + public function index() { +>>>>>>> dev $this->load->model('oqrs_model'); $data['stations'] = $this->oqrs_model->get_oqrs_stations(); diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index d10514168..866fd81dc 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -393,13 +393,20 @@ $location_list = null; } + if (!($this->config->item('disable_oqrs') ?? false)) { $oqrs_requests = $this->oqrs_model->oqrs_requests($location_list); ?>
  • 0) { echo "" . $oqrs_requests . ""; } ?>
    • +<<<<<<< alpha
    • +======= + +
    • +
    • +>>>>>>> dev
  • diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index 0bc7e553d..676951f65 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -259,6 +259,7 @@ +config->item('disable_oqrs') ?? false)) { ?>
    + diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index a6fc68f11..be2463185 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -390,6 +390,8 @@ + +config->item('disable_oqrs') ?? false)) { ?>
    @@ -420,6 +422,7 @@
    + diff --git a/application/views/user/edit.php b/application/views/user/edit.php index f4268e7af..6a6f3fe29 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -204,10 +204,17 @@ diff --git a/application/views/visitor/layout/header.php b/application/views/visitor/layout/header.php index d9d971882..c141a9042 100644 --- a/application/views/visitor/layout/header.php +++ b/application/views/visitor/layout/header.php @@ -69,7 +69,7 @@
    • CI =& get_instance(); - if ($this->CI->oqrs_enabled($slug)) { + if ($this->CI->oqrs_enabled($slug) && !$this->CI->config->item('disable_oqrs')) { ?>
  • diff --git a/install/config/config.php b/install/config/config.php index d147f2104..e7fd8b5b7 100644 --- a/install/config/config.php +++ b/install/config/config.php @@ -676,7 +676,7 @@ $config['proxy_ips'] = ''; | */ -$config['userdata'] = 'userdata'; +$config['userdata'] = 'userdata'; /* |-------------------------------------------------------------------------- @@ -692,3 +692,6 @@ $config['disable_manual_lotw'] = false; $config['disable_manual_eqsl'] = false; $config['disable_manual_hrdlog'] = false; $config['disable_manual_qrz'] = false; + +# Disables OQRS-Feature if true. if non-existant or false the OQRS-Feature is enabled +$config['disable_oqrs'] = false;