Merge branch 'dev' into alpha

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;

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();

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);
 								?>
 								<li><a class="dropdown-item" href="<?php echo site_url('oqrs/requests'); ?>" title="OQRS Requests"><i class="fa fa-id-card"></i> <?= __("OQRS Requests"); ?> <?php if ($oqrs_requests > 0) {
 																																																				echo "<span class=\"badge text-bg-light\">" . $oqrs_requests . "</span>";
 																																																			} ?></a></li>
+<<<<<<< alpha
 								<li><a class="dropdown-item" href="<?php echo site_url('qslprint'); ?>" title="Print Requested QSLs"><i class="fas fa-print"></i> <?= __("Print Requested QSLs"); ?></a></li>
 								<li><a class="dropdown-item" href="<?php echo site_url('labels'); ?>" title="Label setup"><i class="fas fa-print"></i> <?= __("Labels"); ?></a></li>
+=======
+								<?php } ?>
+								<li><a class="dropdown-item" href="<?php echo site_url('qslprint'); ?>" title="Print Requested QSLs"><i class="fas fa-print"></i> <?php echo lang('menu_print_requested_qsls'); ?></a></li>
+								<li><a class="dropdown-item" href="<?php echo site_url('labels'); ?>" title="Label setup"><i class="fas fa-print"></i> <?php echo lang('menu_labels'); ?></a></li>
+>>>>>>> dev
 								<div class="dropdown-divider"></div>
 								<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown"><i class="fas fa-sync"></i> <?= __("Third-Party Services"); ?></a>
 									<ul class="submenu submenu-left dropdown-menu">

application/views/options/oqrs.php

@@ -1,3 +1,4 @@
+<?php if (!($this->config->item('disable_oqrs') ?? false)) { ?>
 <div class="container settings">
 
 	<div class="row">
@@ -66,4 +67,5 @@
 		</div>
 	</div>
 
-</div>
+</div>
+<?php } ?>

application/views/options/sidebar.php

@@ -4,7 +4,9 @@
 			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/appearance'); ?>"><?= __("Appearance"); ?></a></li>
 			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/radio'); ?>"><?= __("Radios"); ?></a></li>
 			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/email'); ?>"><?= __("Email"); ?></a></li>
+      <?php if (!($this->config->item('disable_oqrs') ?? false)) { ?>
 			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/oqrs'); ?>"><?= __("OQRS Options"); ?></a></li>
+      <?php } ?>
 			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/dxcluster'); ?>"><?= __("DXCluster"); ?></a></li>
 			<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/version_dialog'); ?>"><?= __("Version Info"); ?></a></li>
 		</ul>

application/views/station_profile/create.php

@@ -259,6 +259,7 @@
 				</div>
 			</div>
 
+<?php if (!($this->config->item('disable_oqrs') ?? false)) { ?>
 			<div class="mb-3">
 				<label for="oqrs"><?= __("OQRS Enabled"); ?></label>
 				<select class="form-select" id="oqrs" name="oqrs">
@@ -279,6 +280,7 @@
 				<input type="text" class="form-control" name="oqrstext" id="oqrstext" aria-describedby="oqrstextHelp">
 				<small id="oqrstextHelp" class="form-text text-muted"><?= __("Some info you want to add regarding QSL'ing."); ?></small>
 			</div>
+<?php } ?>
 
 			<button type="submit" class="btn btn-primary"><i class="fas fa-plus-square"></i> <?= __("Create"); ?> <?= __("Station Location"); ?></button>
 

application/views/station_profile/edit.php

@@ -390,6 +390,8 @@
 			</div>
 		</div>
 	</div>
+
+<?php if (!($this->config->item('disable_oqrs') ?? false)) { ?>
 	<div class="row">
 		<div class="col-md">
 			<div class="card">
@@ -420,6 +422,7 @@
 			</div>
 		</div>
 	</div>
+<?php } ?>
 
 	<button type="submit" class="btn btn-primary" style="margin-bottom: 30px;"><i class="fas fa-plus-square"></i> <?php echo $form_action; ?> <?= __("Station Location"); ?></button>
 

application/views/user/edit.php

@@ -204,10 +204,17 @@
 										<label for="user_measurement_base"><?= __("Measurement preference"); ?></label>
 										<?php if(!isset($user_measurement_base)) { $user_measurement_base='M'; }?>
 										<select class="form-select" id="user_measurement_base" name="user_measurement_base" aria-describedby="user_measurement_base_Help" required>
+<<<<<<< alpha
 											<option value ''></option>
 											<option value='K' <?php if($user_measurement_base == "K") { echo "selected=\"selected\""; } ?>><?= __("Kilometers"); ?></option>
 											<option value='M' <?php if($user_measurement_base == "M") { echo "selected=\"selected\""; } ?>><?= __("Miles"); ?></option>
 											<option value='N' <?php if($user_measurement_base == "N") { echo "selected=\"selected\""; } ?>><?= __("Nautical miles"); ?></option>
+=======
+											<option value=''></option>
+											<option value='K' <?php if($user_measurement_base == "K") { echo "selected=\"selected\""; } ?>>Kilometers</option>
+											<option value='M' <?php if($user_measurement_base == "M") { echo "selected=\"selected\""; } ?>>Miles</option>
+											<option value='N' <?php if($user_measurement_base == "N") { echo "selected=\"selected\""; } ?>>Nautical miles</option>
+>>>>>>> dev
 										</select>
 										<small id="user_measurement_base_Help" class="form-text text-muted"><?= __("Choose which unit distances will be shown in"); ?></small>
 									</div>

application/views/visitor/layout/header.php

@@ -69,7 +69,7 @@
 				</li>
 		<?php }
 			$this->CI =& get_instance();
-			if ($this->CI->oqrs_enabled($slug)) {
+			if ($this->CI->oqrs_enabled($slug) && !$this->CI->config->item('disable_oqrs')) {
 			?>
 			<li class="nav-item">
 				<a class="nav-link" href="<?php echo site_url('oqrs');?>"><?= __("OQRS"); ?></a>

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;