mirrors/Cloudlog
1
0
Fork 0
mirror of https://github.com/magicbug/Cloudlog synced 2024-11-22 00:07:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add same fixes

Browse Source 
* add proper error message
* improve usability
This commit is contained in:
Christoph Kottke 2024-02-05 21:30:23 +01:00 committed by Christoph Kottke
parent 4b4724d872
commit c4df1467fc
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/controllers/Eqsl.php
View File

@ -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");
exit;
$this->session->set_flashdata('error', 'eQSL Nicknames in Station Profiles aren\'t defined!');
}
ini_set('memory_limit', '-1');

12
application/views/eqsl/import.php
View File

@ -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>
<br><br>
<hr class="divider">
<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>
<br>
<hr class="divider">
<div class="mb-3"><input class="btn btn-primary" type="submit" value="Import eQSL QSO Matches" /></div>
</form>
</div>