Skip to content

Commit e4d17a2

Browse files
authored
Merge pull request #2409 from wavelog/dev
Release 2.1.2
2 parents cf4bc59 + 498f086 commit e4d17a2

File tree

128 files changed

+40628
-30236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+40628
-30236
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ https://demo.wavelog.org
4141
### Recommended: Classic-LAMP-Stack:
4242
* Linux based Operating System (Windows stack may also work)
4343
* Apache (Nginx should work)
44-
* PHP Version 7.4 up to PHP 8.2 (PHP 8.3. in friendly Usertest)
44+
* PHP Version 8.0 up to PHP 8.2 (PHP 8.4. in friendly Usertest)
4545
* MySQL or MariaDB (MySQL 5.7 or higher // MariaDB 10.1 or higher)
4646

4747
### Alternative - Easy start with prebuilt Docker-image:
@@ -68,11 +68,11 @@ Wavelog-support can be reached by creating an issue here at github. If you've an
6868

6969
Special thanks to our contributors, who are part of Wavelog by improving code!
7070

71-
[F4ANS](https://github.com/abarrau), [DG0TM](https://github.com/dg0tm), [DG9VH](https://github.com/dg9vh), [DJ3CE](https://github.com/dj3ce), [R1BLH](https://github.com/r1blh), [BG2ELG](https://github.com/violarulan), [DF1ASH](https://github.com/derFogel), [DB4SCW](https://github.com/DB4SCW), [VE2HEW](https://github.com/anthonydiiorio), [OK1GOD](https://github.com/filipmelik), [DJ1PW](https://github.com/winnieXY), [toseppo](https://github.com/toseppo), [N7DSB](https://github.com/desertblade), [BA7LAC](https://github.com/imlonghao), [AE4CE](https://github.com/ethancedwards8), [K1AF](https://github.com/patrickrb), [OE4BAM](https://github.com/MatykoBr), [HB9HJQ](https://github.com/zone11), [R3DHX](https://github.com/AleksdemSA), [uiolee](https://github.com/uiolee), [VK3ARR](https://github.com/VK3ARR), [BI7BST](https://github.com/Cryolitia), [ludoux](https://github.com/ludoux), [BG5ATV](https://github.com/tallcode), [BH6SKD](https://github.com/xiaosuan2b), [VK7TO](https://github.com/RhinoLance), [IU2FRL](https://github.com/iu2frl)
71+
[F4ANS](https://github.com/abarrau), [DG0TM](https://github.com/dg0tm), [DG9VH](https://github.com/dg9vh), [DJ3CE](https://github.com/dj3ce), [R1BLH](https://github.com/r1blh), [BG2ELG](https://github.com/violarulan), [DF1ASH](https://github.com/derFogel), [DB4SCW](https://github.com/DB4SCW), [VE2HEW](https://github.com/anthonydiiorio), [OK1GOD](https://github.com/filipmelik), [DJ1PW](https://github.com/winnieXY), [toseppo](https://github.com/toseppo), [N7DSB](https://github.com/desertblade), [BA7LAC](https://github.com/imlonghao), [AE4CE](https://github.com/ethancedwards8), [K1AF](https://github.com/patrickrb), [OE4BAM](https://github.com/MatykoBr), [HB9HJQ](https://github.com/zone11), [R3DHX](https://github.com/AleksdemSA), [uiolee](https://github.com/uiolee), [VK3ARR](https://github.com/VK3ARR), [BI7BST](https://github.com/Cryolitia), [ludoux](https://github.com/ludoux), [BG5ATV](https://github.com/tallcode), [BH6SKD](https://github.com/xiaosuan2b), [VK7TO](https://github.com/RhinoLance), [IU2FRL](https://github.com/iu2frl), [szporwolik](https://github.com/szporwolik), [agrif](https://github.com/agrif)
7272

7373
Translators:
7474

75-
[Ondřej Koloničný (OK1CDJ)](https://translate.wavelog.org/user/ok1cdj/), [Michael Skolsky (R1BLH)](https://translate.wavelog.org/user/R1BLH/), [Karuru (BG2ELG)](https://translate.wavelog.org/user/viola/), [Byt3](https://translate.wavelog.org/user/205er/), [BG6HJE](https://translate.wavelog.org/user/BG6HJE/), [Francisco (F4VSE)](https://translate.wavelog.org/user/kikosgc/), [Kim (DG9VH)](https://translate.wavelog.org/user/dg9vh/), [Casper van Lieburg (PA7DX)](https://translate.wavelog.org/user/pa7dx/), [Halil AYYILDIZ (TA2LG)](https://translate.wavelog.org/user/TA2LG/), [Michal Šiman](https://translate.wavelog.org/user/michalsiman/), [DN4BS](https://github.com/dn4bs), [Luca (IU2FRL)](https://translate.wavelog.org/user/iu2frl/), [Dragan Đorđević (4O4A)](https://translate.wavelog.org/user/4o4a/), [Dren Imeraj (Z63DRI)](https://translate.wavelog.org/user/Dren/), [Filip Melik (OK1GOD)](https://translate.wavelog.org/user/filipmelik/), [Petr (OK1PTR)](https://translate.wavelog.org/user/OK1PTR/), [Stefan (DB4SCW)](https://translate.wavelog.org/user/DB4SCW/), [F4JSU](https://translate.wavelog.org/user/F4JSU/), [Maciej](https://translate.wavelog.org/user/maciejla/), [imlonghao](https://translate.wavelog.org/user/imlonghao/), [Reiner Herrmann](https://translate.wavelog.org/user/reinerh/), [Jian ke (BG8IXZ)](https://translate.wavelog.org/user/bg8ixz/), [Fabian Franz](https://translate.wavelog.org/user/fabianfrz/), [Fatih Önder](https://translate.wavelog.org/user/cektor/), [Qing He(BD8DHF)](https://translate.wavelog.org/user/BD8DHF), [hellofinch](https://translate.wavelog.org/user/hellofinch/), [tviitkar (ES5TVI )](https://translate.wavelog.org/user/tviitkar/), [utkuyalcin](https://translate.wavelog.org/user/utkuyalcin/), [Plamen Panteleev (LZ1PPL)](https://translate.wavelog.org/user/lz1ppl/), [Bartek](https://translate.wavelog.org/user/atimias/), [Samir (DL4DCO)](https://translate.wavelog.org/user/DL4DCO/), [Stanisław Korzeń (SP5CRO)](https://translate.wavelog.org/user/sp5cro/), [wxy (BA7NID)](https://translate.wavelog.org/user/ba7nid/), [David Quental (CT1DRB)](https://translate.wavelog.org/user/ct1drb/), [Sebastian K.](https://translate.wavelog.org/user/sebket/), [Limes](https://translate.wavelog.org/user/limes-github/), [Ethan C. Edwards (AE4CE)](https://translate.wavelog.org/user/ethancedwards8/), [Simon Pribec](https://translate.wavelog.org/user/spribec/), [Christian Egger (HB9HJQ)](https://translate.wavelog.org/user/HB9HJQ/), [André Berends (PE1PQX)](https://translate.wavelog.org/user/PE1PQX/), [Alexander (PA8S)](https://translate.wavelog.org/user/pa8s/), [Jorgen Dahl (NU1T)](https://translate.wavelog.org/user/Jorgen/), [bel-pol](https://translate.wavelog.org/user/bel-pol/), [Mathias Regner (OE4BAM)](https://translate.wavelog.org/user/MatykoBr/), [remy56k](https://translate.wavelog.org/user/remy56k/), [YuanRetro (VA3LPZ/BI4LPZ)](https://translate.wavelog.org/user/yuanretro/), [李宇翔](https://translate.wavelog.org/user/vastsea-wuji/), [Pascal HB9HCG](https://translate.wavelog.org/user/hb9hcg/), [André Aubin](https://github.com/lambda2), [Tao Xu](https://translate.wavelog.org/user/tallcode/), [flothom](https://translate.wavelog.org/user/flothom/), [BH3HNI](https://translate.wavelog.org/user/BH3HNI/), [Lu Chang](https://translate.wavelog.org/user/ludoux/), [Alexey Khromov](https://translate.wavelog.org/user/zxalexis/), [BG8LNG](https://translate.wavelog.org/user/BG8LNG/), [Karim Malfi (F4CTJ)](https://translate.wavelog.org/user/F4CTJ/), [FengziLeo (BH7GZB)](https://translate.wavelog.org/user/BH7GZB/), [MiaoTony](https://translate.wavelog.org/user/miaotony/), [Aleksey Ubozhenko (R3DHX)](https://translate.wavelog.org/user/AleksdemSA/), [Stephane Tauziede (F4IZC)](https://translate.wavelog.org/user/F4IZC/), [S. NAKAO](https://translate.wavelog.org/user/NAKAO/), [Artur Greficz (SQ7ACP)](https://translate.wavelog.org/user/SQ7ACP/), [Matthias Jung](https://translate.wavelog.org/user/myzinsky/), [Erkin Mercan (TA4AQG/SP9AQG)](https://translate.wavelog.org/user/TA4AQG-SP9AQG/), [Fabian (EB1TR)](https://translate.wavelog.org/user/EB1TR/)
75+
[Ondřej Koloničný (OK1CDJ)](https://translate.wavelog.org/user/ok1cdj/), [Michael Skolsky (R1BLH)](https://translate.wavelog.org/user/R1BLH/), [Karuru (BG2ELG)](https://translate.wavelog.org/user/viola/), [Byt3](https://translate.wavelog.org/user/205er/), [BG6HJE](https://translate.wavelog.org/user/BG6HJE/), [Francisco (F4VSE)](https://translate.wavelog.org/user/kikosgc/), [Kim (DG9VH)](https://translate.wavelog.org/user/dg9vh/), [Casper van Lieburg (PA7DX)](https://translate.wavelog.org/user/pa7dx/), [Halil AYYILDIZ (TA2LG)](https://translate.wavelog.org/user/TA2LG/), [Michal Šiman](https://translate.wavelog.org/user/michalsiman/), [DN4BS](https://github.com/dn4bs), [Luca (IU2FRL)](https://translate.wavelog.org/user/iu2frl/), [Dragan Đorđević (4O4A)](https://translate.wavelog.org/user/4o4a/), [Dren Imeraj (Z63DRI)](https://translate.wavelog.org/user/Dren/), [Filip Melik (OK1GOD)](https://translate.wavelog.org/user/filipmelik/), [Petr (OK1PTR)](https://translate.wavelog.org/user/OK1PTR/), [Stefan (DB4SCW)](https://translate.wavelog.org/user/DB4SCW/), [F4JSU](https://translate.wavelog.org/user/F4JSU/), [Maciej](https://translate.wavelog.org/user/maciejla/), [imlonghao](https://translate.wavelog.org/user/imlonghao/), [Reiner Herrmann](https://translate.wavelog.org/user/reinerh/), [Jian ke (BG8IXZ)](https://translate.wavelog.org/user/bg8ixz/), [Fabian Franz](https://translate.wavelog.org/user/fabianfrz/), [Fatih Önder](https://translate.wavelog.org/user/cektor/), [Qing He(BD8DHF)](https://translate.wavelog.org/user/BD8DHF), [hellofinch](https://translate.wavelog.org/user/hellofinch/), [tviitkar (ES5TVI )](https://translate.wavelog.org/user/tviitkar/), [utkuyalcin](https://translate.wavelog.org/user/utkuyalcin/), [Plamen Panteleev (LZ1PPL)](https://translate.wavelog.org/user/lz1ppl/), [Bartek](https://translate.wavelog.org/user/atimias/), [Samir (DL4DCO)](https://translate.wavelog.org/user/DL4DCO/), [Stanisław Korzeń (SP5CRO)](https://translate.wavelog.org/user/sp5cro/), [wxy (BA7NID)](https://translate.wavelog.org/user/ba7nid/), [David Quental (CT1DRB)](https://translate.wavelog.org/user/ct1drb/), [Sebastian K.](https://translate.wavelog.org/user/sebket/), [Limes](https://translate.wavelog.org/user/limes-github/), [Ethan C. Edwards (AE4CE)](https://translate.wavelog.org/user/ethancedwards8/), [Simon Pribec](https://translate.wavelog.org/user/spribec/), [Christian Egger (HB9HJQ)](https://translate.wavelog.org/user/HB9HJQ/), [André Berends (PE1PQX)](https://translate.wavelog.org/user/PE1PQX/), [Alexander (PA8S)](https://translate.wavelog.org/user/pa8s/), [Jorgen Dahl (NU1T)](https://translate.wavelog.org/user/Jorgen/), [bel-pol](https://translate.wavelog.org/user/bel-pol/), [Mathias Regner (OE4BAM)](https://translate.wavelog.org/user/MatykoBr/), [remy56k](https://translate.wavelog.org/user/remy56k/), [YuanRetro (VA3LPZ/BI4LPZ)](https://translate.wavelog.org/user/yuanretro/), [李宇翔](https://translate.wavelog.org/user/vastsea-wuji/), [Pascal HB9HCG](https://translate.wavelog.org/user/hb9hcg/), [André Aubin](https://github.com/lambda2), [Tao Xu](https://translate.wavelog.org/user/tallcode/), [flothom](https://translate.wavelog.org/user/flothom/), [BH3HNI](https://translate.wavelog.org/user/BH3HNI/), [Lu Chang](https://translate.wavelog.org/user/ludoux/), [Alexey Khromov](https://translate.wavelog.org/user/zxalexis/), [BG8LNG](https://translate.wavelog.org/user/BG8LNG/), [Karim Malfi (F4CTJ)](https://translate.wavelog.org/user/F4CTJ/), [FengziLeo (BH7GZB)](https://translate.wavelog.org/user/BH7GZB/), [MiaoTony](https://translate.wavelog.org/user/miaotony/), [Aleksey Ubozhenko (R3DHX)](https://translate.wavelog.org/user/AleksdemSA/), [Stephane Tauziede (F4IZC)](https://translate.wavelog.org/user/F4IZC/), [S. NAKAO](https://translate.wavelog.org/user/NAKAO/), [Artur Greficz (SQ7ACP)](https://translate.wavelog.org/user/SQ7ACP/), [Matthias Jung](https://translate.wavelog.org/user/myzinsky/), [Erkin Mercan (TA4AQG/SP9AQG)](https://translate.wavelog.org/user/TA4AQG-SP9AQG/), [Fabian (EB1TR)](https://translate.wavelog.org/user/EB1TR/), [Szymon (SP9SPM)](https://translate.wavelog.org/user/sp9spm/), [Yoshida Kanae](translate.wavelog.org/user/xiaoxis654/)
7676

7777
If you would like to contribute in any way to Wavelog, it is most appreciated. This has been developed in free time, help coding new features or writing documentation is always useful.
7878

application/config/migration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
|
2323
*/
2424

25-
$config['migration_version'] = 255;
25+
$config['migration_version'] = 260;
2626

2727
/*
2828
|--------------------------------------------------------------------------

application/controllers/Adif.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,12 @@ public function import() {
254254
};
255255
$record=''; // free memory
256256
try {
257-
$custom_errors = $this->logbook_model->import_bulk($alladif, $this->input->post('station_profile', TRUE), $this->input->post('skipDuplicate'), $this->input->post('markClublog'),$this->input->post('markLotw'), $this->input->post('dxccAdif'), $this->input->post('markQrz'), $this->input->post('markEqsl'), $this->input->post('markHrd'), $this->input->post('markDcl'), true, $this->input->post('operatorName') ?? false, false, $this->input->post('skipStationCheck'));
257+
if (($this->input->post('skipDuplicate',true) ?? '') == '1') { // Reverse Logic. View states: "Import Dupes", while Flag is called skipDuplicates
258+
$skipDups=false; // Box ticked? Means: Import Dupes
259+
} else {
260+
$skipDups=true; // Box not ticked? Means: Skip Dupes, don't import them
261+
}
262+
$custom_errors = $this->logbook_model->import_bulk($alladif, $this->input->post('station_profile', TRUE), $skipDups, $this->input->post('markClublog'),$this->input->post('markLotw'), $this->input->post('dxccAdif'), $this->input->post('markQrz'), $this->input->post('markEqsl'), $this->input->post('markHrd'), $this->input->post('markDcl'), true, $this->input->post('operatorName') ?? false, false, $this->input->post('skipStationCheck'));
258263
} catch (Exception $e) {
259264
log_message('error', 'Import error: '.$e->getMessage());
260265
$data['page_title'] = __("ADIF Import failed!");

application/controllers/Api.php

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ function qso($dryrun = false) {
277277
};
278278
$record=''; // free memory
279279
gc_collect_cycles();
280-
$result = $this->logbook_model->import_bulk($alladif, $obj['station_profile_id'], false, false, false, false, false, false, false, false, true, false, true, false);
280+
$result = $this->logbook_model->import_bulk($alladif, $obj['station_profile_id'], true, false, false, false, false, false, false, false, true, false, true, false);
281281
$custom_errors = $result['errormessage'];
282282
if ($custom_errors) {
283283
$adif_errors++;
@@ -592,6 +592,17 @@ function logbook_check_grid() {
592592

593593
function radio() {
594594
session_write_close();
595+
596+
if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') { // Preflight CORS-Check: Allow posting from web-application as well (key is still needed!)
597+
header('Access-Control-Allow-Origin: *');
598+
header('Access-Control-Allow-Methods: POST, GET, OPTIONS');
599+
header('Access-Control-Allow-Headers: Content-Type');
600+
header('Access-Control-Max-Age: 86400');
601+
http_response_code(200);
602+
exit(0);
603+
}
604+
header('Access-Control-Allow-Origin: *'); // Allow posting from web-application as well (key is still needed!)
605+
595606
header('Content-type: application/json');
596607

597608
$this->load->model('api_model');

application/controllers/Awards.php

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2209,4 +2209,113 @@ public function seven3on73 () {
22092209
$this->load->view('awards/73on73/index');
22102210
$this->load->view('interface_assets/footer');
22112211
}
2212+
2213+
public function wpx () {
2214+
$footerData = [];
2215+
$footerData['scripts'] = [
2216+
'assets/js/sections/wpx.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/wpx.js")),
2217+
];
2218+
2219+
$this->load->model('wpx');
2220+
$this->load->model('modes');
2221+
$this->load->model('bands');
2222+
2223+
$data['orbits'] = $this->bands->get_worked_orbits();
2224+
$data['sats_available'] = $this->bands->get_worked_sats();
2225+
$data['user_default_band'] = $this->session->userdata('user_default_band');
2226+
2227+
$data['worked_bands'] = $this->bands->get_worked_bands('dxcc'); // Used in the view for band select
2228+
$data['modes'] = $this->modes->active(); // Used in the view for mode select
2229+
2230+
if ($this->input->post('band') != NULL) { // Band is not set when page first loads.
2231+
if ($this->input->post('band') == 'All') { // Did the user specify a band? If not, use all bands
2232+
$bands = $data['worked_bands'];
2233+
} else {
2234+
$bands[] = $this->security->xss_clean($this->input->post('band'));
2235+
}
2236+
} else {
2237+
$bands = $data['worked_bands'];
2238+
}
2239+
2240+
$data['bands'] = $bands; // Used for displaying selected band(s) in the table in the view
2241+
2242+
if($this->input->method() === 'post') {
2243+
$postdata['qsl'] = ($this->input->post('qsl',true) ?? 0) == 0 ? NULL: 1;
2244+
$postdata['lotw'] = ($this->input->post('lotw',true) ?? 0) == 0 ? NULL: 1;
2245+
$postdata['eqsl'] = ($this->input->post('eqsl',true) ?? 0) == 0 ? NULL: 1;
2246+
$postdata['qrz'] = ($this->input->post('qrz',true) ?? 0) == 0 ? NULL: 1;
2247+
$postdata['clublog'] = ($this->input->post('clublog',true) ?? 0) == 0 ? NULL: 1;
2248+
$postdata['Africa'] = ($this->input->post('Africa',true) ?? 0) == 0 ? NULL: 1;
2249+
$postdata['Asia'] = ($this->input->post('Asia',true) ?? 0) == 0 ? NULL: 1;
2250+
$postdata['Europe'] = ($this->input->post('Europe',true) ?? 0) == 0 ? NULL: 1;
2251+
$postdata['NorthAmerica'] = ($this->input->post('NorthAmerica',true) ?? 0) == 0 ? NULL: 1;
2252+
$postdata['SouthAmerica'] = ($this->input->post('SouthAmerica',true) ?? 0) == 0 ? NULL: 1;
2253+
$postdata['Oceania'] = ($this->input->post('Oceania',true) ?? 0) == 0 ? NULL: 1;
2254+
$postdata['Antarctica'] = ($this->input->post('Antarctica',true) ?? 0) == 0 ? NULL: 1;
2255+
$postdata['band'] = $this->security->xss_clean($this->input->post('band'));
2256+
$postdata['mode'] = $this->security->xss_clean($this->input->post('mode'));
2257+
$postdata['sat'] = $this->security->xss_clean($this->input->post('sats'));
2258+
$postdata['orbit'] = $this->security->xss_clean($this->input->post('orbits'));
2259+
} else { // Setting default values at first load of page
2260+
$postdata['qsl'] = 1;
2261+
$postdata['lotw'] = 1;
2262+
$postdata['eqsl'] = NULL;
2263+
$postdata['qrz'] = NULL;
2264+
$postdata['clublog'] = NULL;
2265+
$postdata['Africa'] = 1;
2266+
$postdata['Asia'] = 1;
2267+
$postdata['Europe'] = 1;
2268+
$postdata['NorthAmerica'] = 1;
2269+
$postdata['SouthAmerica'] = 1;
2270+
$postdata['Oceania'] = 1;
2271+
$postdata['Antarctica'] = 1;
2272+
$postdata['band'] = 'All';
2273+
$postdata['mode'] = 'All';
2274+
$postdata['sat'] = 'All';
2275+
$postdata['orbit'] = 'All';
2276+
}
2277+
2278+
$data['wpx_array'] = $this->wpx->get_wpx_array($bands, $postdata);
2279+
2280+
// Render Page
2281+
$data['page_title'] = sprintf(__("Awards - %s"), __("WPX"));
2282+
$data['posted_band']=$postdata['band'];
2283+
$this->load->view('interface_assets/header', $data);
2284+
$this->load->view('awards/wpx/index');
2285+
$this->load->view('interface_assets/footer', $footerData);
2286+
}
2287+
2288+
public function wpx_details() {
2289+
$postdata['band'] = $this->input->post('band', true);
2290+
$postdata['status'] = $this->input->post('status', true);
2291+
$postdata['sat'] = $this->security->xss_clean($this->input->post('sats'));
2292+
$postdata['orbit'] = $this->security->xss_clean($this->input->post('orbits'));
2293+
$postdata['mode'] = $this->input->post('mode');
2294+
$postdata['qsl'] = ($this->input->post('qsl', true) ?? 0) == 0 ? NULL: 1;
2295+
$postdata['lotw'] = ($this->input->post('lotw', true) ?? 0) == 0 ? NULL: 1;
2296+
$postdata['eqsl'] = ($this->input->post('eqsl', true) ?? 0) == 0 ? NULL: 1;
2297+
$postdata['qrz'] = ($this->input->post('qrz', true) ?? 0) == 0 ? NULL: 1;
2298+
$postdata['clublog'] = ($this->input->post('clublog', true) ?? 0) == 0 ? NULL: 1;
2299+
$postdata['Africa'] = ($this->input->post('Africa', true) ?? 0) == 0 ? NULL: 1;
2300+
$postdata['Asia'] = ($this->input->post('Asia', true) ?? 0) == 0 ? NULL: 1;
2301+
$postdata['Europe'] = ($this->input->post('Europe', true) ?? 0) == 0 ? NULL: 1;
2302+
$postdata['NorthAmerica'] = ($this->input->post('NorthAmerica', true) ?? 0) == 0 ? NULL: 1;
2303+
$postdata['SouthAmerica'] = ($this->input->post('SouthAmerica', true) ?? 0) == 0 ? NULL: 1;
2304+
$postdata['Oceania'] = ($this->input->post('Oceania', true) ?? 0) == 0 ? NULL: 1;
2305+
$postdata['Antarctica'] = ($this->input->post('Antarctica', true) ?? 0) == 0 ? NULL: 1;
2306+
$postdata['summaryband'] = $this->input->post('summaryband', true);
2307+
2308+
$this->load->model('wpx');
2309+
$this->load->model('modes');
2310+
$this->load->model('bands');
2311+
2312+
$results = $this->wpx->getWpxBandDetails($postdata);
2313+
2314+
$data['band'] = $postdata['band'];
2315+
$data['status'] = $postdata['status'];
2316+
$data['results'] = $results;
2317+
2318+
$this->load->view('awards/wpx/wpx_details', $data);
2319+
}
2320+
22122321
}

application/controllers/Clublog.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ public function download()
6161
if (!empty($users)) {
6262
foreach ($users as $user) {
6363
$r = $this->clublog_model->downloadUser($user->user_id, $user->user_clublog_name, $user->user_clublog_password);
64+
if ($r == 'Impossible to reach Clublog') { // Stop Download immediatly, because we're blocked
65+
log_message("Error","We're blocked by Clublog. Stopping Download!");
66+
break;
67+
}
6468
}
6569
} else {
6670
$r = __("No user has configured Clublog.");

0 commit comments

Comments
 (0)