Merge pull request #2960 from dg0tm/eqsl_fix_page

Eqsl fix page

application/controllers/Eqsl.php

@@ -40,8 +40,7 @@ class eqsl extends CI_Controller {
 		$this->load->model('eqslmethods_model');
 		$eqsl_locations = $this->eqslmethods_model->all_of_user_with_eqsl_nick_defined();
 		if($eqsl_locations->num_rows() == 0) {
-			show_error("eQSL Nicknames in Station Profiles aren't defined");
+			$this->session->set_flashdata('error', 'eQSL Nicknames in Station Profiles aren\'t defined!');
-			exit;
 		}
 
 		ini_set('memory_limit', '-1');
@@ -129,8 +128,7 @@ class eqsl extends CI_Controller {
 		// Check if eQSL Nicknames have been defined
 			$this->load->model('stations');
 			if($this->stations->are_eqsl_nicks_defined() == 0) {
-				show_error('eQSL Nicknames in Station Profiles arent defined');
+				$this->session->set_flashdata('error', 'eQSL Nicknames in Station Profiles aren\'t defined!');
-				exit;
 			}
 
 		ini_set('memory_limit', '-1');

application/views/eqsl/import.php

@@ -31,9 +31,6 @@
 			  </label>
  			  <br>
 			  <p>Upload the Exported ADIF file from eQSL from the <a href="https://eqsl.cc/qslcard/DownloadInBox.cfm" target="_blank">Download Inbox</a> page, to mark QSOs as confirmed on eQSL.</p>
-					<p><span class="label important">Important</span> Log files must have the file type .adi</p>
-					<input type="file" name="userfile" size="20" />
-			  <br/><br/>
 			<p>Choose Station(location) eQSL File belongs to:</p>
                     <select name="station_profile" class="form-select mb-2 me-sm-2" style="width: 20%;">
                     <option value="0">Select Station Location</option>
@@ -42,10 +39,10 @@
                     <option value="<?php echo $station->station_id; ?>" <?php if ($station->station_id == $this->stations->find_active()) { echo " selected =\"selected\""; } ?>>Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name.") eQSL: ".$station->eqslqthnickname; ?></option>
                     <?php } } ?>
                     </select>
+                    <p><span class="label important">Important</span>Log files must have the file type .adi</p>
+                    <input type="file" name="userfile" size="20" />
 			</div>
-
+			<hr class="divider">
-			<br><br>
-			
 			<div class="form-check">
 			  <input class="form-check-input" type="radio" name="eqslimport" id="fetch" value="fetch"  checked="checked"/>
 			  <label class="form-check-label" for="exampleRadios1">Import directly from eQSL</label>
@@ -59,8 +56,7 @@
 		         	<div class="mb-3 col-sm-5" style="vertical-align:middle;"><label class="form-label"><?php echo "(Select a date, only if you want to force an import with an older date)"; //$this->lang->line(''); ?></label></div>
 				</div>
 			</div>
-
+			<hr class="divider">
-			<br>
 			<div class="mb-3"><input class="btn btn-primary" type="submit" value="Import eQSL QSO Matches" /></div>
 		</form>
   </div>